From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 53620af..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,13 +1,11 @@
package com.moral.api.controller;
import com.moral.api.pojo.dto.account.*;
-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.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.pojo.vo.account.AccountUpdateVO;
+import com.moral.api.service.ManageAccountRoleService;
import com.moral.api.service.ManageAccountService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -25,6 +23,8 @@
public class AccountController {
@Autowired
ManageAccountService accountService;
+ @Autowired
+ ManageAccountRoleService manageAccountRoleService;
@PostMapping("insert")
public ResultMessage insert(@RequestBody AccountInsertForm form) {
@@ -94,4 +94,18 @@
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