Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-02 a52b9c0e0f708b36d35dbc95c591645d249d7db7

 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)+";";
            }
        }