From 616dca8f5bbb17f0b3a124340965c0232fdae894 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Sun, 25 Apr 2021 10:32:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java | 91 +++++++++++++++++++++++++++++++--------------
1 files changed, 63 insertions(+), 28 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..4b43851 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
@@ -1,11 +1,13 @@
package com.moral.api.controller;
import com.alibaba.fastjson.JSON;
-import com.moral.api.entity.ManageMenu;
import com.moral.api.entity.ManageRole;
-import com.moral.api.service.ManageMenuService;
+import com.moral.api.pojo.dto.login.AccountInfoDTO;
+import com.moral.api.service.ManageRoleMenuService;
import com.moral.api.service.ManageRoleService;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
+import com.moral.util.TokenUtils;
import com.moral.util.WebUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -13,13 +15,12 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -28,11 +29,17 @@
@Slf4j
@Api(tags = {"������"})
@RestController
-@RequestMapping("/manage")
+@RequestMapping("/manageRole")
public class ManageRoleController {
@Autowired
private ManageRoleService manageRoleService;
+
+ @Autowired
+ private ManageRoleMenuService manageRoleMenuService;
+
+ @Autowired
+ private RedisTemplate redisTemplate;
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
@@ -42,45 +49,53 @@
@RequestMapping(value = "getAllManageRole", method = RequestMethod.GET)
public ResultMessage getAllManageRole(HttpServletRequest request) {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- List<ManageRole> re = manageRoleService.getAllWithPagingQuery(parameters);
+ Map<String,Object> re = manageRoleService.getAllWithPagingQuery(parameters);
return ResultMessage.ok(re);
}
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "desc", value = "������", required = true, paramType = "query", dataType = "String")
+ @ApiImplicitParam(name = "desc", value = "������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "menuIds", value = "������������", required = true, paramType = "query", dataType = "String")
})
@RequestMapping(value = "insertOneManageRole", method = RequestMethod.POST)
- public ResultMessage insertOneManageRole(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- ManageRole manageRole = JSON.parseObject(JSON.toJSONString(parameters), ManageRole.class);
+ @ResponseBody
+ public ResultMessage insertOneManageRole(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
List list = new ArrayList();
- list.add(1);
- list.add(2);
- list.add(3);
- list.add(4);
+ if (parameters.get("menuIds") != null){
+ String menuIdsStr = parameters.get("menuIds").toString();
+ menuIdsStr = menuIdsStr.replace(" ","");
+ if (menuIdsStr.length() > 2){
+ menuIdsStr = menuIdsStr.substring(1,menuIdsStr.length()-1);
+ String[] menuIdsArray = menuIdsStr.split(",");
+ list = Arrays.asList(menuIdsArray);
+ }
+ parameters.remove("menuIds");
+ }
+ ManageRole manageRole = JSON.parseObject(JSON.toJSONString(parameters), ManageRole.class);
Map<String,Object> resultMap = manageRoleService.insertOne(manageRole,list);
String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
return ResultMessage.ok(msg);
}
return ResultMessage.fail(msg);
+ //return null;
}
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "������", required = true, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = "name", value = "������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "desc", value = "������", required = true, paramType = "query", dataType = "String")
})
@RequestMapping(value = "updateManageRole", method = RequestMethod.POST)
- public ResultMessage updateManageRole(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage updateManageRole(@RequestBody Map<String, Object> parameters) {
Map<String,Object> resultMap = manageRoleService.updateManageRole(parameters);
String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
return ResultMessage.ok(msg);
}
return ResultMessage.fail(msg);
@@ -91,12 +106,11 @@
@ApiImplicitParam(name = "id", value = "������", required = true, paramType = "query", dataType = "int")
})
@RequestMapping(value = "deleteManageRole", method = RequestMethod.POST)
- public ResultMessage deleteManageRole(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage deleteManageRole(@RequestBody Map<String, Object> parameters) {
Map<String,Object> resultMap = manageRoleService.deleteManageRole(parameters);
String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
return ResultMessage.ok(msg);
}
return ResultMessage.fail(msg);
@@ -111,8 +125,29 @@
@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);
+ Map<String,Object> 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(@RequestBody Map<String, Object> parameters) {
+ List list = new ArrayList();
+ if (parameters.get("menuIds") != null){
+ String menuIdsStr = parameters.get("menuIds").toString();
+ menuIdsStr = menuIdsStr.replace(" ","");
+ if (menuIdsStr.length() > 2){
+ menuIdsStr = menuIdsStr.substring(1,menuIdsStr.length()-1);
+ String[] menuIdsArray = menuIdsStr.split(",");
+ list = Arrays.asList(menuIdsArray);
+ }
+ parameters.remove("menuIds");
+ }
+ int id = Integer.parseInt(parameters.get("id").toString());
+ Map<String,Object> re = manageRoleMenuService.updateRoleMenu(list,id);
return ResultMessage.ok(re);
}
}
--
Gitblit v1.8.0