From c8748cf690e2806b59a5cf39732ee56995dd4e7b Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 14 Apr 2021 11:28:48 +0800
Subject: [PATCH] 添加角色新增日志
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 112 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 82 insertions(+), 30 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 600db90..ced4963 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,59 +1,111 @@
package com.moral.api.controller;
-import com.moral.api.pojo.dto.LoginDTO;
+import com.moral.api.entity.SysArea;
+import com.moral.api.pojo.dto.account.*;
+import com.moral.api.pojo.dto.organization.OrganizationDTO;
+import com.moral.api.pojo.form.account.AccountDeleteForm;
+import com.moral.api.pojo.form.account.AccountInsertForm;
+import com.moral.api.pojo.form.account.AccountQueryForm;
+import com.moral.api.pojo.form.account.AccountUpdateForm;
+import com.moral.api.pojo.vo.account.AccountDeleteVO;
+import com.moral.api.pojo.vo.account.AccountInsertVO;
+import com.moral.api.pojo.vo.account.AccountQueryVO;
+import com.moral.api.pojo.vo.account.AccountUpdateVO;
import com.moral.api.service.ManageAccountService;
-import com.moral.constant.Constants;
+import com.moral.api.service.SysAreaService;
+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;
+import java.util.List;
@Slf4j
@Api(tags = {"������������������"})
@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
@RequestMapping("/account")
public class AccountController {
- @Resource
- ManageAccountService accountService;
@Autowired
- @Qualifier("tokenRedisTemplate")
- RedisTemplate redisTemplate;
+ ManageAccountService accountService;
+ @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> parameters) {
- if (!ObjectUtils.isNotAllEmpty(parameters, "account", "password"))
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
- String AESAccount = (String) parameters.get("account");
- String AESPassword = (String) parameters.get("password");
+ //������������������������
+ AccountInsertDTO conditionDTO = form.paramValid();
+ if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+ return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+ }
- LoginDTO loginDTO = accountService.login(AESAccount,AESPassword);
+ //������������������
+ AccountDTO dto = accountService.insertAccount(form);
- if(loginDTO.getCode().equals(LoginDTO.SUCCESS))
- return ResultMessage.ok(loginDTO);
- return ResultMessage.fail(loginDTO);
+ //������������������������
+ AccountInsertVO accountInsertVO = AccountInsertVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), accountInsertVO);
}
+ @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> parameters, HttpServletRequest request) {
- if(!ObjectUtils.isNotAllEmpty(parameters,"accountId"))
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
- String token = request.getHeader("token");
+ //������������������������
+ AccountUpdateDTO conditionDTO = form.paramValid();
+ if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+ return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+ }
- if(accountService.logout(String.valueOf(parameters.get("accountId")),token))
- return ResultMessage.ok("������������");
- return ResultMessage.fail("������������");
+ //������������������
+ AccountDTO dto = accountService.updateAccount(form);
+ //���������������������������
+ AccountUpdateVO vo = AccountUpdateVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
}
+ @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);
+
+ //���������������������������
+ AccountDeleteVO vo = AccountDeleteVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ }
+
+ @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);
+ }
}
--
Gitblit v1.8.0