From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 c7b3c65..ff2b526 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,9 +1,7 @@
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.service.ManageRoleMenuService;
import com.moral.api.service.ManageRoleService;
import com.moral.constant.ResultMessage;
@@ -14,6 +12,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -27,7 +26,7 @@
@Slf4j
@Api(tags = {"������"})
@RestController
-@RequestMapping("/role")
+@RequestMapping("/manageRole")
public class ManageRoleController {
@Autowired
@@ -35,6 +34,9 @@
@Autowired
private ManageRoleMenuService manageRoleMenuService;
+
+ @Autowired
+ private RedisTemplate redisTemplate;
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
@@ -56,7 +58,7 @@
})
@RequestMapping(value = "insertOneManageRole", method = RequestMethod.POST)
@ResponseBody
- public ResultMessage insertOneManageRole(@RequestBody Map<String, Object> parameters) {
+ public ResultMessage insertOneManageRole(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
List list = new ArrayList();
if (parameters.get("menuIds") != null){
String menuIdsStr = parameters.get("menuIds").toString();
@@ -120,7 +122,7 @@
@RequestMapping(value = "getManageRoleByNameFuzzy", method = RequestMethod.GET)
public ResultMessage getManageRoleByNameFuzzy(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- List<ManageRole> re = manageRoleService.getManageRoleByNameFuzzy(parameters);
+ Map<String,Object> re = manageRoleService.getManageRoleByNameFuzzy(parameters);
return ResultMessage.ok(re);
}
--
Gitblit v1.8.0