From 169fd773b42398e14bef43c24a1b6712da51e95d Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 01 Jun 2021 10:38:58 +0800
Subject: [PATCH] 日志操作判断更新字段是否为null
---
screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 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 b533329..18a3c5a 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
@@ -15,6 +15,7 @@
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.ConvertUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -140,8 +141,12 @@
@Override
@Transactional
- public Map<String, Object> updateMonitorPoint(Map<String,Object> updateMap) {
+ public Map<String, Object> updateMonitorPoint(Map<String,Object> parameterMap) {
Map resultMap = new HashMap();
+ Map<String,Object> updateMap = new HashMap<>();
+ for (String key : parameterMap.keySet()) {
+ updateMap.put(ConvertUtils.toLine(key),parameterMap.get(key));
+ }
if(!updateMap.containsKey("id")){
resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -156,49 +161,51 @@
resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
return resultMap;
}
- if (updateMap.get("name")==null||updateMap.get("name")==""){
+ 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;
}
- QueryWrapper<MonitorPoint> wapper_name = new QueryWrapper<>();
- wapper_name.eq("name",updateMap.get("name"));
- wapper_name.eq("is_delete",Constants.NOT_DELETE);
- MonitorPoint monitorPoint_name = monitorPointMapper.selectOne(wapper_name);
- 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;
+ if (updateMap.get("name")!=null){
+ QueryWrapper<MonitorPoint> wapper_name = new QueryWrapper<>();
+ wapper_name.eq("name",updateMap.get("name"));
+ wapper_name.eq("is_delete",Constants.NOT_DELETE);
+ MonitorPoint monitorPoint_name = monitorPointMapper.selectOne(wapper_name);
+ 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;
+ }
}
monitorPointMapper.updateMonitorPoint(updateMap);
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)+";";
}
}
--
Gitblit v1.8.0