From ba4993e6eb1c9456d4c40a186fd8284ad7ad9ac2 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 15 Apr 2021 17:44:26 +0800
Subject: [PATCH] 添加列表根据父菜单和order排序
---
screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java | 2 +-
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 3 ++-
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 25 ++++++++++++++++++++++---
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml | 1 +
4 files changed, 26 insertions(+), 5 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 69fced5..fc71ae0 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
@@ -65,6 +65,7 @@
})
@RequestMapping(value = "updateManageMenuById", method = RequestMethod.POST)
public ResultMessage updateManageMenuById(@RequestBody Map<String, Object> parameters) {
+ System.out.println("parameters:"+parameters);
Map<String,Object> resultMap = manageMenuService.updateManageMenu(parameters);
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
@@ -153,7 +154,7 @@
@RequestMapping(value = "getManageMenuList", method = RequestMethod.GET)
public ResultMessage getManageMenuList(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- List<ManageMenu> result = manageMenuService.getAllWithPagingQuery(parameters);
+ List<Map<String,Object>> result = manageMenuService.getAllWithPagingQuery(parameters);
return ResultMessage.ok(result);
}
}
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 df78a6e..2a7f7a5 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,7 +28,7 @@
@Transactional
Map<String,Object> deleteManageMenu(Map map);
- List<ManageMenu> getAllWithPagingQuery(Map map);
+ List<Map<String,Object>> getAllWithPagingQuery(Map map);
List<ManageMenu> getAllMenus();
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 f665091..577e189 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
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.ManageMenu;
@@ -20,6 +21,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -126,6 +128,8 @@
resultMap.put("code", ResponseCodeEnum.MENU_IS_NULL.getCode());
resultMap.put("msg", ResponseCodeEnum.MENU_IS_NULL.getMsg());
} else {
+ //������������������������������
+ ManageMenu manageMenuDelete = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
Map deleteMap = new HashMap();
int id = Integer.parseInt(map.get("id").toString());
deleteMap.put("id", id);
@@ -136,7 +140,6 @@
manageRoleMenuMapper.updateDeleteStateByMenu_id(role_menuDeleteMap);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- ManageMenu manageMenuDelete = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
String content = "������������:"+manageMenuDelete.getName()+";";
logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
@@ -146,12 +149,28 @@
}
@Override
- public List<ManageMenu> getAllWithPagingQuery(Map map) {
+ public List<Map<String,Object>> getAllWithPagingQuery(Map map) {
Map limitMap = new HashMap();
limitMap.put("start", (Integer.parseInt(map.get("current").toString()) - 1) * Integer.parseInt(map.get("size").toString()));
limitMap.put("number", Integer.parseInt(map.get("size").toString()));
List<ManageMenu> manageMenus = manageMenuMapper.getDataWithPage(limitMap);
- return manageMenus;
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> resultList = new ArrayList<>();
+ for (ManageMenu manageMenu:manageMenus) {
+ Map manegeMenuMap = JSON.parseObject(JSON.toJSONString(manageMenu));
+ if (manageMenu.getParentId().equals(0)){
+ manegeMenuMap.put("parent_name","");
+ }else {
+ String parent_name = manageMenuMapper.getManageMenuById(manageMenu.getParentId()).getName();
+ manegeMenuMap.put("parent_name",parent_name);
+ }
+ String createTime = SDF.format(manageMenu.getCreateTime());
+ String updateTime = SDF.format(manageMenu.getUpdateTime());
+ manegeMenuMap.put("createTime",createTime);
+ manegeMenuMap.put("updateTime",updateTime);
+ resultList.add(manegeMenuMap);
+ }
+ return resultList;
}
@Override
diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index 41a065c..1d85053 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -123,6 +123,7 @@
<include refid="Base_Column_List"></include>
from manage_menu mm
where mm.is_delete = 0
+ ORDER BY parent_id ASC,`order` ASC
limit #{start},#{number}
</select>
--
Gitblit v1.8.0