From 52f100ec7860c781c1b44259c6c54b221a30c100 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 24 May 2021 17:11:36 +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/MonitorPointServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 2a3ed9b..0c047cd 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
@@ -117,7 +117,7 @@
monitorPointMap.put("key",monitorPoint.getId());
monitorPointtList.add(monitorPointMap);
}
- resultMap.put("manageRoles",monitorPointtList);
+ resultMap.put("monitorPoints",monitorPointtList);
resultMap.put("totalNumber",totalNumber);
resultMap.put("current",current);
int totalPageNumber = totalNumber/size;
@@ -137,6 +137,15 @@
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
+ QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>();
+ wapper_id.eq("id",updateMap.get("id"));
+ wapper_id.eq("is_delete",Constants.NOT_DELETE);
+ MonitorPoint oldMonitorPoint = monitorPointMapper.selectOne(wapper_id);
+ if (oldMonitorPoint==null){
+ resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
+ return resultMap;
+ }
if (updateMap.get("name")==null||updateMap.get("name")==""){
resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -149,15 +158,6 @@
if(monitorPoint_name!=null&&!monitorPoint_name.getId().toString().equals(updateMap.get("id").toString())){
resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getCode());
resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getMsg());
- return resultMap;
- }
- QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>();
- wapper_id.eq("id",updateMap.get("id"));
- wapper_id.eq("is_delete",Constants.NOT_DELETE);
- MonitorPoint oldMonitorPoint = monitorPointMapper.selectOne(wapper_id);
- if (oldMonitorPoint==null){
- resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getCode());
- resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
return resultMap;
}
monitorPointMapper.updateMonitorPoint(updateMap);
@@ -266,7 +266,7 @@
monitorPointMap.put("key",monitorPoint.getId());
monitorPointtList.add(monitorPointMap);
}
- resultMap.put("manageRoles",monitorPointtList);
+ resultMap.put("monitorPoints",monitorPointtList);
resultMap.put("totalNumber",totalNumber);
resultMap.put("current",current);
int totalPageNumber = totalNumber/size;
--
Gitblit v1.8.0