From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 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 23ab730..aff0a72 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,16 +1,20 @@
package com.moral.api.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.ManageMenu;
import com.moral.api.mapper.ManageMenuMapper;
import com.moral.api.mapper.ManageRoleMenuMapper;
import com.moral.api.service.ManageMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.constant.ResponseCodeEnum;
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;
+import java.util.List;
import java.util.Map;
/**
@@ -35,17 +39,17 @@
public Map<String,Object> insertManageMenu(ManageMenu manageMenu) {
Map<String,Object> resultMap = new HashMap<>();
if (manageMenu.getName()==null){
- resultMap.put("flag",false);
- resultMap.put("msg","���������������");
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
if (manageMenuMapper.getManageMenuByName(manageMenu.getName()) != null){
- resultMap.put("flag",false);
- resultMap.put("msg","���������������������");
+ resultMap.put("code",ResponseCodeEnum.MENU_IS_EXPIRE.getCode());
+ resultMap.put("msg",ResponseCodeEnum.MENU_IS_EXPIRE.getMsg());
}else {
manageMenuMapper.insertOne(manageMenu);
- resultMap.put("flag",true);
- resultMap.put("msg","���������������");
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
return resultMap;
}
@@ -55,17 +59,17 @@
public Map<String,Object> updateManageMenu(Map map) {
Map<String,Object> resultMap = new HashMap<>();
if (!map.containsKey("id")){
- resultMap.put("flag",false);
- resultMap.put("msg","������������������������");
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
if (manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString())) == null){
- resultMap.put("flag",false);
- resultMap.put("msg","���������������������");
+ resultMap.put("code",ResponseCodeEnum.MENU_IS_NULL.getCode());
+ resultMap.put("msg",ResponseCodeEnum.MENU_IS_NULL.getMsg());
}else {
manageMenuMapper.updateManageMenuById(map);
- resultMap.put("flag",true);
- resultMap.put("msg","���������������");
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
return resultMap;
}
@@ -75,13 +79,13 @@
public Map<String, Object> deleteManageMenu(Map map) {
Map<String,Object> resultMap = new HashMap<>();
if (!map.containsKey("id")){
- resultMap.put("flag",false);
- resultMap.put("msg","������������������������");
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
if (manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString())) == null){
- resultMap.put("flag",false);
- resultMap.put("msg","������������������������������������");
+ resultMap.put("code",ResponseCodeEnum.MENU_IS_NULL.getCode());
+ resultMap.put("msg",ResponseCodeEnum.MENU_IS_NULL.getMsg());
}else {
Map deleteMap = new HashMap();
int id = Integer.parseInt(map.get("id").toString());
@@ -91,9 +95,29 @@
Map role_menuDeleteMap = new HashMap();
role_menuDeleteMap.put("menu_id",id);
manageRoleMenuMapper.updateDeleteStateByMenu_id(role_menuDeleteMap);
- resultMap.put("flag",true);
- resultMap.put("msg","���������������");
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
return resultMap;
}
+
+ @Override
+ public List<ManageMenu> 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);
+ System.out.println(manageMenus);
+ return manageMenus;
+ }
+
+ @Override
+ public List<ManageMenu> getManageMenuByNameFuzzy(Map map) {
+ Map limitMap = new HashMap();
+ limitMap.put("name",map.get("name"));
+ 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);
+ return manageMenus;
+ }
}
--
Gitblit v1.8.0