From 657182c7989dc77b69bb3f9adaf6c75b6466ff95 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 09 Jun 2021 10:31:35 +0800
Subject: [PATCH] screen-manage 编辑账号接口删除分配角色功能，分配角色功能变为单独接口
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 93 insertions(+), 15 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 5b3ff22..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,33 +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.netty.util.internal.ObjectUtil;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import java.util.Map;
@Slf4j
-@Api(tags = {"������������"})
+@Api(tags = {"������������������"})
@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
@RequestMapping("/account")
public class AccountController {
- @Resource
+ @Autowired
ManageAccountService accountService;
+ @Autowired
+ ManageAccountRoleService manageAccountRoleService;
- @PostMapping("login")
- public ResultMessage login(@RequestBody Map<String,Object> paramters){
- if(!ObjectUtils.checkParamAndMap(paramters,"account","password"))
- return ResultMessage.fail("���������������");
- Map<String, Object> result = accountService.login(paramters);
- if((int)result.get("accountId")<0)
- return ResultMessage.fail(result);
- return ResultMessage.ok(result);
+ @PostMapping("insert")
+ public ResultMessage insert(@RequestBody AccountInsertForm form) {
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+ //������������������������
+ AccountDTO conditionDTO = form.paramValid();
+ if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+ return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+ }
+
+ //������������������
+ AccountDTO dto = accountService.insertAccount(form);
+
+ 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());
+
+ //������������������������
+ AccountDTO conditionDTO = form.paramValid();
+ if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+ return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), 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