From 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 12 Apr 2021 15:52:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java | 4 +-
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 10 ++--
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 26 +++++++++++++
screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java | 4 -
screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java | 2
screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java | 2 +
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 32 +++++++++++++---
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml | 7 +++
8 files changed, 70 insertions(+), 17 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
index dbe1b57..c9d1342 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
@@ -93,13 +93,13 @@
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "current", value = "������", required = true, paramType = "query", dataType = "int"),
- @ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")
+ /*@ApiImplicitParam(name = "current", value = "������", required = true, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")*/
})
@RequestMapping(value = "getAllManageMenu", method = RequestMethod.GET)
public ResultMessage getAllManageMenu(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- Map<String,Object> resultMap = new HashMap<>();
+ /*Map<String,Object> resultMap = new HashMap<>();
if (parameters.get("current") == null || parameters.get("size") == null){
resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -109,8 +109,8 @@
resultMap.put("code",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getCode());
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getMsg());
return ResultMessage.fail(resultMap);
- }
- List<ManageMenu> result = manageMenuService.getAllWithPagingQuery(parameters);
+ }*/
+ List<ManageMenu> result = manageMenuService.getAllMenus();
return ResultMessage.ok(result);
}
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..0fb5f4a 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
@@ -120,7 +120,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);
}
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java
index 69decf7..93155b2 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java
@@ -30,6 +30,8 @@
List<ManageMenu> getDataWithPage(Map map);
+ List<ManageMenu> getAll();
+
List<ManageMenu> getManageRoleByNameFuzzy(Map map);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java b/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java
index c0f5cb5..3915f76 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java
@@ -28,10 +28,10 @@
@Transactional
Map<String,Object> deleteManageMenu(Map map);
- @Transactional
List<ManageMenu> getAllWithPagingQuery(Map map);
- @Transactional
+ List<ManageMenu> getAllMenus();
+
List<ManageMenu> getManageMenuByNameFuzzy(Map map);
List<ManageMenu> getParentChildrenMenusByRoles(List<ManageRole> roles);
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 f3d6066..a04c024 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
@@ -18,7 +18,6 @@
@Transactional
public interface ManageRoleService extends IService<ManageRole> {
- @Transactional
Map<String,Object> getAllWithPagingQuery(Map map);
@Transactional
@@ -27,8 +26,7 @@
@Transactional
Map<String,Object> updateManageRole(Map map);
- @Transactional
- List<ManageRole> getManageRoleByNameFuzzy(Map map);
+ Map<String,Object> 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 f969784..35b3607 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
@@ -115,6 +115,32 @@
}
@Override
+ public List<ManageMenu> getAllMenus() {
+ List<ManageMenu> allMenus = manageMenuMapper.getAll();
+ if(ObjectUtils.isEmpty(allMenus))
+ return null;
+ Map<Integer, ManageMenu> menusMap = new HashMap<>();
+ for (ManageMenu menu : allMenus) {
+ menu.setChildren(new ArrayList<>());//���������
+ menusMap.put(menu.getId(), menu);
+ }
+ for (ManageMenu menu : allMenus) {
+ combinationParentChildrenMenus(menusMap, menu);
+ }
+
+ //������������������������������������parentId������0������������������������
+ allMenus.removeIf(new Predicate<ManageMenu>() {
+ @Override
+ public boolean test(ManageMenu manageMenu) {
+ if(manageMenu.getParentId().equals(0))
+ return false;
+ return true;
+ }
+ });
+ return allMenus;
+ }
+
+ @Override
public List<ManageMenu> getManageMenuByNameFuzzy(Map map) {
Map limitMap = new HashMap();
limitMap.put("name", map.get("name"));
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
index a262230..b0bf07e 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.ManageAccountRole;
-import com.moral.api.entity.ManageMenu;
import com.moral.api.entity.ManageRole;
import com.moral.api.mapper.ManageAccountRoleMapper;
import com.moral.api.mapper.ManageRoleMapper;
@@ -52,7 +51,6 @@
private ManageAccountRoleMapper manageAccountRoleMapper;
@Override
- @Transactional
public Map<String,Object> getAllWithPagingQuery(Map map) {
Map<String,Object> resultMap = new HashMap<>();
int current = Integer.parseInt(map.get("current").toString());
@@ -71,6 +69,7 @@
String updateTime = SDF.format(manageRole.getUpdateTime());
manageRoleMap.put("createTime",createTime);
manageRoleMap.put("updateTime",updateTime);
+ manageRoleMap.put("key",manageRole.getId());
manageRolesList.add(manageRoleMap);
}
resultMap.put("manageRoles",manageRolesList);
@@ -139,15 +138,36 @@
}
@Override
- @Transactional
- public List<ManageRole> getManageRoleByNameFuzzy(Map map) {
- com.baomidou.mybatisplus.extension.plugins.pagination.Page<ManageRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(Integer.parseInt(map.get("current").toString()), Integer.parseInt(map.get("size").toString()));
+ public Map<String,Object> getManageRoleByNameFuzzy(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<ManageRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(current, size);
QueryWrapper<ManageRole> wrapper = new QueryWrapper();
wrapper.eq("is_delete",0);
wrapper.like("name",map.get("name"));
com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
List<ManageRole> manageRoles = resultpage.getRecords();
- return manageRoles;
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> manageRolesList = new ArrayList<>();
+ for (ManageRole manageRole:manageRoles) {
+ Map manageRoleMap = JSON.parseObject(JSON.toJSONString(manageRole),Map.class);
+ String createTime = SDF.format(manageRole.getCreateTime());
+ String updateTime = SDF.format(manageRole.getUpdateTime());
+ manageRoleMap.put("createTime",createTime);
+ manageRoleMap.put("updateTime",updateTime);
+ manageRolesList.add(manageRoleMap);
+ }
+ resultMap.put("manageRoles",manageRolesList);
+ int totalNumber = manageRoleMapper.selectCount(wrapper);
+ resultMap.put("totalNumber",totalNumber);
+ resultMap.put("current",current);
+ int totalPageNumber = totalNumber/size;
+ if(totalNumber%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
}
@Override
diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index d463427..1ba6ee4 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -126,6 +126,13 @@
limit #{start},#{number}
</select>
+ <select id="getAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_menu mm
+ where mm.is_delete = 0
+ </select>
+
<select id="getManageRoleByNameFuzzy" parameterType="java.util.Map" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"></include>
--
Gitblit v1.8.0