From a52b9c0e0f708b36d35dbc95c591645d249d7db7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Jun 2021 17:27:26 +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/impl/ManageMenuServiceImpl.java |   75 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 insertions(+), 2 deletions(-)

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 5b9656c..e5fabb1 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
@@ -85,6 +85,11 @@
             resultMap.put("code", ResponseCodeEnum.MENU_IS_NULL.getCode());
             resultMap.put("msg", ResponseCodeEnum.MENU_IS_NULL.getMsg());
         } else {
+            if (map.get("name")!=null && manageMenuMapper.getManageMenuByName(map.get("name").toString()) != null) {
+                resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
+                resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
+                return resultMap;
+            }
             //���������������������������������������
             ManageMenu manageMenuOld = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
             manageMenuMapper.updateManageMenuById(map);
@@ -237,10 +242,15 @@
     @Override
     public List<Map<String,Object>> getManageMenuByNameFuzzy(Map map) {
         Map limitMap = new HashMap();
-        limitMap.put("name", map.get("name"));
+        if(!ObjectUtils.isEmpty(map.get("name"))){
+            limitMap.put("name", map.get("name"));
+        }
+        if(!ObjectUtils.isEmpty(map.get("parent_id"))){
+            limitMap.put("parent_id", map.get("parent_id"));
+        }
         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.getManageRoleByNameFuzzy(limitMap);
+        List<ManageMenu> manageMenus = manageMenuMapper.getManageMenuByNameFuzzy(limitMap);
         SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<Map<String,Object>> resultList = new ArrayList<>();
         for (ManageMenu manageMenu:manageMenus) {
@@ -266,6 +276,67 @@
     }
 
     @Override
+    public Map<String, Object> getManageMenuByCondition(Map map) {
+        Map<String,Object> resultMap = new HashMap<>();
+        int current = Integer.parseInt(map.get("current").toString());
+        int size = Integer.parseInt(map.get("size").toString());
+        Page<ManageMenu> page = new Page<>(current,size);
+        QueryWrapper<ManageMenu> wrapper = new QueryWrapper();
+        wrapper.eq("is_delete",Constants.NOT_DELETE);
+        if(!ObjectUtils.isEmpty(map.get("name"))){
+            wrapper.like("name", map.get("name"));
+        }
+        if(!ObjectUtils.isEmpty(map.get("parent_id"))){
+            wrapper.eq("parent_id", map.get("parent_id"));
+        }
+        Page resultpage = manageMenuMapper.selectPage(page,wrapper);
+        List<ManageMenu> manageMenus = resultpage.getRecords();
+        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<Map<String,Object>> manageMenuList = new ArrayList<>();
+        for (ManageMenu manageMenu:manageMenus) {
+            Map manegeMenuMap = JSON.parseObject(JSON.toJSONString(manageMenu));
+            if (manageMenu.getParentId().equals(0)){
+                manegeMenuMap.put("parent_name","");
+            }else {
+                ManageMenu parentMenu = manageMenuMapper.getManageMenuById(manageMenu.getParentId());
+                if (ObjectUtils.isEmpty(parentMenu)){
+                    manegeMenuMap.put("parent_name","");
+                }else {
+                    String parent_name = parentMenu.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);
+            manageMenuList.add(manegeMenuMap);
+        }
+        resultMap.put("manageMenus",manageMenuList);
+        int totalNumber = manageMenuMapper.selectCount(wrapper);
+        resultMap.put("totalNumber",totalNumber);
+        resultMap.put("current",current);
+        resultMap.put("size",size);
+        int totalPageNumber = totalNumber/size;
+        if(totalNumber%size != 0){
+            totalPageNumber += 1;
+        }
+        resultMap.put("totalPageNumber",totalPageNumber);
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> getManageParentMenu(Map map) {
+        Map<String,Object> resultMap = new HashMap();
+        QueryWrapper<ManageMenu> wrapper = new QueryWrapper();
+        wrapper.eq("is_delete",Constants.NOT_DELETE);
+        wrapper.eq("parent_id",0);
+        List<ManageMenu> manageMenus = manageMenuMapper.selectList(wrapper);
+        resultMap.put("manageMenus",manageMenus);
+        return resultMap;
+    }
+
+    @Override
     public List<Map<String, Object>> getManageMenuByParentId(Map map) {
         Map limitMap = new HashMap();
         limitMap.put("parent_id", map.get("parent_id"));

--
Gitblit v1.8.0