From 0fd4853ab2cf6e8ff6775803f80c4970c484a529 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:01 +0800
Subject: [PATCH] 角色菜单配置
---
/dev/null | 170 ------------------------
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 91 +++++++++++++
screen-manage/src/main/resources/mapper/ManageRoleMapper.xml | 28 ++-
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 9 +
screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java | 4
screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java | 118 ++++++++++++++++
6 files changed, 236 insertions(+), 184 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
new file mode 100644
index 0000000..45ac4b5
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
@@ -0,0 +1,91 @@
+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.ManageRoleService;
+import com.moral.constant.ResultMessage;
+import com.moral.util.WebUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.springframework.web.util.WebUtils.getParametersStartingWith;
+
+@Slf4j
+@Api(tags = {"������"})
+@RestController
+@RequestMapping("/manage")
+public class ManageMenuController {
+
+ @Autowired
+ private ManageMenuService manageMenuService;
+
+
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "url", value = "url������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "icon", value = "������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "parent_id", value = "���������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "order", value = "������������������", required = true, paramType = "query", dataType = "String")
+ })
+ @RequestMapping(value = "insertOneManageMenu", method = RequestMethod.POST)
+ public ResultMessage insertOneManageMenu(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ ManageMenu manageMenu = JSON.parseObject(JSON.toJSONString(parameters), ManageMenu.class);
+ Map<String,Object> resultMap = manageMenuService.insertManageMenu(manageMenu);
+ String msg = resultMap.get("msg").toString();
+ boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
+ if (flag){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(msg);
+ }
+
+ @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 = "url", value = "url������", required = true, paramType = "query", dataType = "String")
+ })
+ @RequestMapping(value = "updateManageMenuById", method = RequestMethod.POST)
+ public ResultMessage updateManageMenuById(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map<String,Object> resultMap = manageMenuService.updateManageMenu(parameters);
+ String msg = resultMap.get("msg").toString();
+ boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
+ if (flag){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(msg);
+ }
+
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "������", required = true, paramType = "query", dataType = "int")
+ })
+ @RequestMapping(value = "deleteManageMenu", method = RequestMethod.POST)
+ public ResultMessage deleteManageMenu(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map<String,Object> resultMap = manageMenuService.deleteManageMenu(parameters);
+ String msg = resultMap.get("msg").toString();
+ boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
+ if (flag){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(msg);
+ }
+}
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
new file mode 100644
index 0000000..c34831d
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java
@@ -0,0 +1,118 @@
+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.ManageRoleService;
+import com.moral.constant.ResultMessage;
+import com.moral.util.WebUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.springframework.web.util.WebUtils.getParametersStartingWith;
+
+@Slf4j
+@Api(tags = {"������"})
+@RestController
+@RequestMapping("/manage")
+public class ManageRoleController {
+
+ @Autowired
+ private ManageRoleService manageRoleService;
+
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "current", value = "������", required = true, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")
+ })
+ @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);
+ 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")
+ })
+ @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);
+ List list = new ArrayList();
+ list.add(1);
+ list.add(2);
+ list.add(3);
+ list.add(4);
+ Map<String,Object> resultMap = manageRoleService.insertOne(manageRole,list);
+ String msg = resultMap.get("msg").toString();
+ boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
+ if (flag){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(msg);
+ }
+
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @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);
+ Map<String,Object> resultMap = manageRoleService.updateManageRole(parameters);
+ String msg = resultMap.get("msg").toString();
+ boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
+ if (flag){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(msg);
+ }
+
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @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);
+ Map<String,Object> resultMap = manageRoleService.deleteManageRole(parameters);
+ String msg = resultMap.get("msg").toString();
+ boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
+ if (flag){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(msg);
+ }
+
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "current", value = "������", required = true, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")
+ })
+ @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);
+ }
+}
diff --git a/screen-manage/src/main/java/com/moral/api/controller/WebController.java b/screen-manage/src/main/java/com/moral/api/controller/WebController.java
deleted file mode 100644
index cf48806..0000000
--- a/screen-manage/src/main/java/com/moral/api/controller/WebController.java
+++ /dev/null
@@ -1,170 +0,0 @@
-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.ManageRoleService;
-import com.moral.constant.ResultMessage;
-import com.moral.util.WebUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-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 javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static org.springframework.web.util.WebUtils.getParametersStartingWith;
-
-@Slf4j
-@Api(tags = {"������"})
-@RestController
-@RequestMapping("/manage")
-public class WebController {
-
- @Autowired
- private ManageRoleService manageRoleService;
-
- @Autowired
- private ManageMenuService manageMenuService;
-
- @ApiOperation(value = "������������������", notes = "������������������")
- @ApiImplicitParams({})
- @RequestMapping(value = "getAllManageRole", method = RequestMethod.GET)
- public ResultMessage getAllManageRole() {
- List<ManageRole> re = manageRoleService.getAll();
- 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")
- })
- @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);
- List list = new ArrayList();
- list.add(1);
- list.add(2);
- list.add(3);
- list.add(4);
- Map<String,Object> resultMap = manageRoleService.insertOne(manageRole,list);
- String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
- return ResultMessage.ok(msg);
- }
- return ResultMessage.fail(msg);
- }
-
- @ApiOperation(value = "������������", notes = "������������")
- @ApiImplicitParams({
- @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);
- Map<String,Object> resultMap = manageRoleService.updateManageRole(parameters);
- String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
- return ResultMessage.ok(msg);
- }
- return ResultMessage.fail(msg);
- }
-
- @ApiOperation(value = "������������", notes = "������������")
- @ApiImplicitParams({
- @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);
- Map<String,Object> resultMap = manageRoleService.deleteManageRole(parameters);
- String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
- return ResultMessage.ok(msg);
- }
- return ResultMessage.fail(msg);
- }
-
- @ApiOperation(value = "������������������", notes = "������������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "������", required = true, paramType = "query", dataType = "String")
- })
- @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(manageRole);
- return ResultMessage.ok(re);
- }
-
- @ApiOperation(value = "������������", notes = "������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "url", value = "url������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "icon", value = "������������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "parent_id", value = "���������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "order", value = "������������������", required = true, paramType = "query", dataType = "String")
- })
- @RequestMapping(value = "insertOneManageMenu", method = RequestMethod.POST)
- public ResultMessage insertOneManageMenu(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- ManageMenu manageMenu = JSON.parseObject(JSON.toJSONString(parameters), ManageMenu.class);
- Map<String,Object> resultMap = manageMenuService.insertManageMenu(manageMenu);
- String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
- return ResultMessage.ok(msg);
- }
- return ResultMessage.fail(msg);
- }
-
- @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 = "url", value = "url������", required = true, paramType = "query", dataType = "String")
- })
- @RequestMapping(value = "updateManageMenuById", method = RequestMethod.POST)
- public ResultMessage updateManageMenuById(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- Map<String,Object> resultMap = manageMenuService.updateManageMenu(parameters);
- String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
- return ResultMessage.ok(msg);
- }
- return ResultMessage.fail(msg);
- }
-
- @ApiOperation(value = "������������", notes = "������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "������", required = true, paramType = "query", dataType = "int")
- })
- @RequestMapping(value = "deleteManageMenu", method = RequestMethod.POST)
- public ResultMessage deleteManageMenu(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- Map<String,Object> resultMap = manageMenuService.deleteManageMenu(parameters);
- String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
- return ResultMessage.ok(msg);
- }
- return ResultMessage.fail(msg);
- }
-}
diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java b/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
index 91084c0..8b237d7 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
@@ -19,7 +19,7 @@
public interface ManageRoleService extends IService<ManageRole> {
@Transactional
- List<ManageRole> getAll();
+ List<ManageRole> getAllWithPagingQuery(Map map);
@Transactional
Map<String,Object> insertOne(ManageRole manageRole,List list);
@@ -28,7 +28,7 @@
Map<String,Object> updateManageRole(Map map);
@Transactional
- List<ManageRole> getManageRoleByNameFuzzy(ManageRole manageRole);
+ List<ManageRole> getManageRoleByNameFuzzy(Map map);
@Transactional
Map<String,Object> deleteManageRole(Map map);
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
index 40149bf..23ab730 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
@@ -5,7 +5,9 @@
import com.moral.api.mapper.ManageRoleMenuMapper;
import com.moral.api.service.ManageMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -22,13 +24,14 @@
@Service
public class ManageMenuServiceImpl extends ServiceImpl<ManageMenuMapper, ManageMenu> implements ManageMenuService {
- @Resource
+ @Autowired(required = false)
private ManageMenuMapper manageMenuMapper;
- @Resource
+ @Autowired(required = false)
private ManageRoleMenuMapper manageRoleMenuMapper;
@Override
+ @Transactional
public Map<String,Object> insertManageMenu(ManageMenu manageMenu) {
Map<String,Object> resultMap = new HashMap<>();
if (manageMenu.getName()==null){
@@ -48,6 +51,7 @@
}
@Override
+ @Transactional
public Map<String,Object> updateManageMenu(Map map) {
Map<String,Object> resultMap = new HashMap<>();
if (!map.containsKey("id")){
@@ -67,6 +71,7 @@
}
@Override
+ @Transactional
public Map<String, Object> deleteManageMenu(Map map) {
Map<String,Object> resultMap = new HashMap<>();
if (!map.containsKey("id")){
diff --git a/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml b/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml
index 8e3e2a3..b7521d2 100644
--- a/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml
@@ -30,26 +30,34 @@
</select>
<select id="getAll" resultMap="BaseResultMap">
- select * from manage_role
- where is_delete = 0
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_role mr
+ where mr.is_delete = 0
</select>
<select id="getManageRoleByName" resultMap="BaseResultMap">
- select * from manage_role
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_role mr
where name = #{name}
- and is_delete = 0
+ and mr.is_delete = 0
</select>
<select id="getManageRoleById" resultMap="BaseResultMap">
- select * from manage_role
- where id = #{id}
- and is_delete = 0
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_role mr
+ where mr.id = #{id}
+ and mr.is_delete = 0
</select>
<select id="getManageRoleByNameFuzzy" resultMap="BaseResultMap">
- select * from manage_role
- where name like concat('%',#{name},'%')
- and is_delete = 0
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_role mr
+ where mr.name like concat('%',#{name},'%')
+ and mr.is_delete = 0
</select>
<insert id="insertOne" parameterType="com.moral.api.entity.ManageRole">
--
Gitblit v1.8.0