From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java
index c34831d..b902599 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java
@@ -4,6 +4,7 @@
import com.moral.api.entity.ManageMenu;
import com.moral.api.entity.ManageRole;
import com.moral.api.service.ManageMenuService;
+import com.moral.api.service.ManageRoleMenuService;
import com.moral.api.service.ManageRoleService;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
@@ -28,11 +29,14 @@
@Slf4j
@Api(tags = {"������"})
@RestController
-@RequestMapping("/manage")
+@RequestMapping("/role")
public class ManageRoleController {
@Autowired
private ManageRoleService manageRoleService;
+
+ @Autowired
+ private ManageRoleMenuService manageRoleMenuService;
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
@@ -111,8 +115,26 @@
@RequestMapping(value = "getManageRoleByNameFuzzy", method = RequestMethod.GET)
public ResultMessage getManageRoleByNameFuzzy(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- //ManageRole manageRole = JSON.parseObject(JSON.toJSONString(parameters), ManageRole.class);
List<ManageRole> re = manageRoleService.getManageRoleByNameFuzzy(parameters);
return ResultMessage.ok(re);
}
+
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "������", required = true, paramType = "query", dataType = "int")
+ })
+ @RequestMapping(value = "updateRoleMenu", method = RequestMethod.POST)
+ public ResultMessage updateRoleMenu(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ int id = Integer.parseInt(parameters.get("id").toString());
+ List list = new ArrayList();
+ //list.add(1);
+ //list.add(2);
+ list.add(3);
+ list.add(4);
+ list.add(5);
+ list.add(6);
+ Map<String,Object> re = manageRoleMenuService.updateRoleMenu(list,id);
+ return ResultMessage.ok(re);
+ }
}
--
Gitblit v1.8.0