From d7816be295950b4bf9fb35ba28bd75c508ea537b Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 01 Jun 2021 10:17:00 +0800
Subject: [PATCH] 站点更新接口参数名驼峰转换，站点名判断为空和重复
---
screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 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 0c047cd..63a8175 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
@@ -6,13 +6,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
+import com.moral.api.entity.SysArea;
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.mapper.SysAreaMapper;
import com.moral.api.service.MonitorPointService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
@@ -21,10 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -43,6 +43,9 @@
@Autowired(required = false)
private OrganizationMapper organizationMapper;
+
+ @Autowired(required = false)
+ private SysAreaMapper sysAreaMapper;
@Autowired
LogUtils logUtils;
@@ -115,6 +118,14 @@
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);
+ }
monitorPointtList.add(monitorPointMap);
}
resultMap.put("monitorPoints",monitorPointtList);
@@ -130,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());
@@ -146,19 +161,21 @@
resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
return resultMap;
}
- if (updateMap.get("name")==null||updateMap.get("name")==""){
+ if (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();
@@ -264,6 +281,11 @@
monitorPointMap.put("createTime",createTime);
monitorPointMap.put("updateTime",updateTime);
monitorPointMap.put("key",monitorPoint.getId());
+ 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);
+ }
monitorPointtList.add(monitorPointMap);
}
resultMap.put("monitorPoints",monitorPointtList);
@@ -276,4 +298,19 @@
resultMap.put("totalPageNumber",totalPageNumber);
return resultMap;
}
+
+ /**
+ * @Description: ���������������
+ * @Param: [areaArr, menu]menuMap���key���menuid���value���menu
+ * @return: Array
+ * @Author: lizijie
+ * @Date: 2021/4/7
+ */
+ private String[] getAreaArr(String areaCode) {
+ QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
+ wrapper.eq("area_code",areaCode);
+ SysArea sysArea = sysAreaMapper.selectOne(wrapper);
+ String[] arr = {areaCode,sysArea.getAreaName()};
+ return arr;
+ }
}
--
Gitblit v1.8.0