From 9037cef5e88d18c2407f04a70a8341541b01181c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Jun 2021 11:27:36 +0800
Subject: [PATCH] screen-manage 修复前台菜单管理删除BUG
---
screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 81 insertions(+), 22 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index 63a8175..a589883 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -103,9 +103,9 @@
int totalNumber = monitorPointMapper.selectCount(wrapper);
String orderType = map.get("orderType").toString();
if (orderType.equals(Constants.ORDER_ASC)){
- wrapper.orderByAsc("create_time");
+ wrapper.orderByAsc("update_time");
}else {
- wrapper.orderByDesc("create_time");
+ wrapper.orderByDesc("update_time");
}
Page resultPage = monitorPointMapper.selectPage(page,wrapper);
List<MonitorPoint> monitorPoints = resultPage.getRecords();
@@ -118,13 +118,33 @@
monitorPointMap.put("createTime",createTime);
monitorPointMap.put("updateTime",updateTime);
monitorPointMap.put("key",monitorPoint.getId());
- monitorPointMap.put("provinceCode",getAreaArr(monitorPointMap.get("provinceCode").toString()));
- monitorPointMap.put("cityCode",getAreaArr(monitorPointMap.get("cityCode").toString()));
- monitorPointMap.put("areaCode",getAreaArr(monitorPointMap.get("areaCode").toString()));
- Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
- if (!ObjectUtils.isEmpty(organization)) {
- String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
- monitorPointMap.put("organizationId",organizationArr);
+ if (monitorPointMap.get("provinceCode")!=null&&monitorPointMap.get("provinceCode")!=""){
+ monitorPointMap.put("provinceCode",getAreaArr(monitorPointMap.get("provinceCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("provinceCode",arr);
+ }
+ if (monitorPointMap.get("cityCode")!=null&&monitorPointMap.get("cityCode")!=""){
+ monitorPointMap.put("cityCode",getAreaArr(monitorPointMap.get("cityCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("cityCode",arr);
+ }
+ if (monitorPointMap.get("areaCode")!=null&&monitorPointMap.get("areaCode")!=""){
+ monitorPointMap.put("areaCode",getAreaArr(monitorPointMap.get("areaCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("areaCode",arr);
+ }
+ if (monitorPointMap.get("organizationId")!=null&&monitorPointMap.get("organizationId")!=""){
+ Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
+ if (!ObjectUtils.isEmpty(organization)) {
+ String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
+ monitorPointMap.put("organizationId",organizationArr);
+ }
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("organizationId",arr);
}
monitorPointtList.add(monitorPointMap);
}
@@ -161,7 +181,7 @@
resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
return resultMap;
}
- if (updateMap.get("name").equals("")){
+ if (updateMap.get("name")!=null&&updateMap.get("name").equals("")){
resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
@@ -181,31 +201,31 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "���������������:"+oldMonitorPoint.getName()+";";
for (Object key:updateMap.keySet()) {
- if (key.toString().equals("name")){
+ if (key.toString().equals("name")&&updateMap.get(key)!=null){
content = content+"������������:"+oldMonitorPoint.getName()+"->"+updateMap.get(key)+";";
}
- if (key.toString().equals("longitude")){
+ if (key.toString().equals("longitude")&&updateMap.get(key)!=null){
content = content+"������:"+oldMonitorPoint.getLongitude()+"->"+updateMap.get(key)+";";
}
- if (key.toString().equals("latitude")){
+ if (key.toString().equals("latitude")&&updateMap.get(key)!=null){
content = content+"������:"+oldMonitorPoint.getLatitude()+"->"+updateMap.get(key)+";";
}
- if (key.toString().equals("province_code")){
+ if (key.toString().equals("province_code")&&updateMap.get(key)!=null){
content = content+"������������:"+oldMonitorPoint.getProvinceCode()+"->"+updateMap.get(key)+";";
}
- if (key.toString().equals("city_code")){
+ if (key.toString().equals("city_code")&&updateMap.get(key)!=null){
content = content+"���������������:"+oldMonitorPoint.getCityCode()+"->"+updateMap.get(key)+";";
}
- if (key.toString().equals("area_code")){
+ if (key.toString().equals("area_code")&&updateMap.get(key)!=null){
content = content+"���/���/���������:"+oldMonitorPoint.getAreaCode()+"->"+updateMap.get(key)+";";
}
- if (key.toString().equals("address")){
+ if (key.toString().equals("address")&&updateMap.get(key)!=null){
content = content+"������:"+oldMonitorPoint.getAddress()+"->"+updateMap.get(key)+";";
}
- if (key.toString().equals("organization_id")){
+ if (key.toString().equals("organization_id")&&updateMap.get(key)!=null){
content = content+"������id:"+oldMonitorPoint.getOrganizationId()+"->"+updateMap.get(key)+";";
}
- if (key.toString().equals("desc")){
+ if (key.toString().equals("desc")&&updateMap.get(key)!=null){
content = content+"������:"+oldMonitorPoint.getDesc()+"->"+updateMap.get(key)+";";
}
}
@@ -266,9 +286,9 @@
int totalNumber = monitorPointMapper.selectCount(wrapper);
String orderType = map.get("orderType").toString();
if (orderType.equals(Constants.ORDER_ASC)){
- wrapper.orderByAsc("create_time");
+ wrapper.orderByAsc("update_time");
}else {
- wrapper.orderByDesc("create_time");
+ wrapper.orderByDesc("update_time");
}
Page resultPage = monitorPointMapper.selectPage(page,wrapper);
List<MonitorPoint> monitorPoints = resultPage.getRecords();
@@ -281,10 +301,38 @@
monitorPointMap.put("createTime",createTime);
monitorPointMap.put("updateTime",updateTime);
monitorPointMap.put("key",monitorPoint.getId());
- Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
+ if (monitorPointMap.get("provinceCode")!=null&&monitorPointMap.get("provinceCode")!=""){
+ monitorPointMap.put("provinceCode",getAreaArr(monitorPointMap.get("provinceCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("provinceCode",arr);
+ }
+ if (monitorPointMap.get("cityCode")!=null&&monitorPointMap.get("cityCode")!=""){
+ monitorPointMap.put("cityCode",getAreaArr(monitorPointMap.get("cityCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("cityCode",arr);
+ }
+ if (monitorPointMap.get("areaCode")!=null&&monitorPointMap.get("areaCode")!=""){
+ monitorPointMap.put("areaCode",getAreaArr(monitorPointMap.get("areaCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("areaCode",arr);
+ }
+ /*Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
if (!ObjectUtils.isEmpty(organization)) {
String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
monitorPointMap.put("organizationId",organizationArr);
+ }*/
+ if (monitorPointMap.get("organizationId")!=null&&monitorPointMap.get("organizationId")!=""){
+ Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
+ if (!ObjectUtils.isEmpty(organization)) {
+ String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
+ monitorPointMap.put("organizationId",organizationArr);
+ }
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("organizationId",arr);
}
monitorPointtList.add(monitorPointMap);
}
@@ -299,6 +347,17 @@
return resultMap;
}
+ @Override
+ public List<MonitorPoint> getMonitorPointsByOrganizationId(Integer organizationId) {
+ QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ MonitorPoint monitorPoint = new MonitorPoint();
+ monitorPoint.setOrganizationId(organizationId);
+ monitorPoint.setIsDelete(Constants.NOT_DELETE);
+ monitorPointQueryWrapper.setEntity(monitorPoint);
+ List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(monitorPointQueryWrapper);
+ return monitorPoints;
+ }
+
/**
* @Description: ���������������
* @Param: [areaArr, menu]menuMap���key���menuid���value���menu
--
Gitblit v1.8.0