From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 14:12:48 +0800
Subject: [PATCH] chore:过滤海城小时数据

---
 screen-manage/src/main/java/com/moral/api/controller/AccountController.java |  102 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
index 779cea6..3d6d8af 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
@@ -1,49 +1,111 @@
 package com.moral.api.controller;
 
+import com.moral.api.pojo.dto.account.*;
+import com.moral.api.pojo.dto.accountRole.AccountRoleDTO;
+import com.moral.api.pojo.form.account.*;
+import com.moral.api.pojo.form.accountRole.AccountRoleUpdateForm;
+import com.moral.api.pojo.vo.account.AccountQueryVO;
+import com.moral.api.service.ManageAccountRoleService;
 import com.moral.api.service.ManageAccountService;
+import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
-import com.moral.util.ObjectUtils;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
 
 @Slf4j
 @Api(tags = {"������������������"})
 @RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
 @RequestMapping("/account")
 public class AccountController {
-    @Resource
+    @Autowired
     ManageAccountService accountService;
     @Autowired
-    @Qualifier("tokenRedisTemplate")
-    RedisTemplate redisTemplate;
+    ManageAccountRoleService manageAccountRoleService;
 
+    @PostMapping("insert")
+    public ResultMessage insert(@RequestBody AccountInsertForm form) {
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-    @PostMapping("login")
-    public ResultMessage login(@RequestBody Map<String, Object> paramters) {
-        if (!ObjectUtils.checkParamAndMap(paramters, "account", "password"))
-            return ResultMessage.fail("���������������");
+        //������������������������
+        AccountDTO conditionDTO = form.paramValid();
+        if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+            return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+        }
 
-        Map<String, Object> result = accountService.login(paramters);
+        //������������������
+        AccountDTO dto = accountService.insertAccount(form);
 
-        if ((int) result.get("accountId") < 0)
-            return ResultMessage.fail(result);
-        return ResultMessage.ok(result);
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
     }
 
+    @PostMapping("update")
+    public ResultMessage update(@RequestBody AccountUpdateForm form) {
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-    @PostMapping("logout")
-    public ResultMessage logout(@RequestBody Map<String, Object> paramters, HttpServletRequest request) {
+        //������������������������
+        AccountDTO conditionDTO = form.paramValid();
+        if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+            return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+        }
 
-        return null;
+        //������������������
+        AccountDTO dto = accountService.updateAccount(form);
+
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
     }
 
+    @PostMapping("delete")
+    public ResultMessage delete(@RequestBody AccountDeleteForm form) {
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+        //������������������
+        AccountDTO dto = accountService.deleteAccount(form);
+
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
+    }
+
+    @GetMapping("query")
+    public ResultMessage query(AccountQueryForm form) {
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+        //������������������
+        AccountQueryDTO accountQueryDTO = accountService.queryAccount(form);
+
+        //���������������������������
+        AccountQueryVO accountQueryVO = AccountQueryVO.convert(accountQueryDTO);
+
+
+        return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO);
+    }
+
+    @PostMapping("updateRole")
+    public ResultMessage updateRole(@RequestBody AccountRoleUpdateForm form){
+
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+        //������������������
+        AccountRoleDTO dto = manageAccountRoleService.updateAccountRole(form);
+
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
+    }
 
 }

--
Gitblit v1.8.0