修复sonarqube异味

src/main/java/com/sooka/sponest/data/app/controller/AppDigitalForestController.java

@@ -35,26 +35,26 @@ public class AppDigitalForestController {
 
     @PostMapping("HeZuoShePoint")
     public R<List<AgricultureBO>> heZuoShePoint(@RequestBody AgricultureBO agricultureBO) {
-        return R.ok(appDigitalForestService.HeZuoShePoint(agricultureBO));
+        return R.ok(appDigitalForestService.heZuoShePoint(agricultureBO));
     }
 
     @PostMapping("ZhiBaoPoint")
     public R<List<AgricultureBO>> zhiBaoPoint(@RequestBody AgricultureBO agricultureBO) {
-        return R.ok(appDigitalForestService.ZhiBaoPoint(agricultureBO));
+        return R.ok(appDigitalForestService.zhiBaoPoint(agricultureBO));
     }
 
     @PostMapping("XuBaoPoint")
     public R<List<AgricultureBO>> xuBaoPoint(@RequestBody AgricultureBO agricultureBO) {
-        return R.ok(appDigitalForestService.XuBaoPoint(agricultureBO));
+        return R.ok(appDigitalForestService.xuBaoPoint(agricultureBO));
     }
 
     @PostMapping("NongJiZhanPoint")
     public R<List<AgricultureBO>> nongJiZhanPoint(@RequestBody AgricultureBO agricultureBO) {
-        return R.ok(appDigitalForestService.NongJiZhanPoint(agricultureBO));
+        return R.ok(appDigitalForestService.nongJiZhanPoint(agricultureBO));
     }
 
     @PostMapping("YangZhiPoint")
     public R<List<AgricultureBO>> yangZhiPoint(@RequestBody AgricultureBO agricultureBO) {
-        return R.ok(appDigitalForestService.YangZhiPoint(agricultureBO));
+        return R.ok(appDigitalForestService.yangZhiPoint(agricultureBO));
     }
 }

src/main/java/com/sooka/sponest/data/app/mapper/AppDigitalForestMapper.java

@@ -17,73 +17,66 @@ public interface AppDigitalForestMapper {
 
 
     /**
-     *水鹤
+     * 水鹤
      */
     List<AppWatercraneBO> forestWatercraneList(AppDigitalForestVO vo);
 
 
     /**
-     *取水口
+     * 取水口
      */
     List<AppWatercraneBO> forestWaterintakeList(AppDigitalForestVO vo);
 
 
-
     /**
-     *消火栓
+     * 消火栓
      */
     List<AppWatercraneBO> forestFirehydrantList(AppDigitalForestVO vo);
 
 
-
     /**
-     *防火检查站
+     * 防火检查站
      */
     List<AppWatercraneBO> forestCheckpointList(AppDigitalForestVO vo);
 
 
     /**
-     *水源渠道信息
+     * 水源渠道信息
      */
     List<AppWatercraneBO> forestChannelList(AppDigitalForestVO vo);
 
 
-
     /**
-     *起降点
+     * 起降点
      */
     List<AppWatercraneBO> forestLandinglList(AppDigitalForestVO vo);
 
 
     /**
-     *林场
+     * 林场
      */
     List<AppWatercraneBO> forestFarmlList(AppDigitalForestVO vo);
 
 
-
-
-
     /**
-     *气象站
+     * 气象站
      */
     List<AppWatercraneBO> forestWeatherstationList(AppDigitalForestVO vo);
 
 
-
     /**
-     *防火检查队
+     * 防火检查队
      */
     List<AppWatercraneBO> forestFireteamList(AppDigitalForestVO vo);
 
 
-    List<AgricultureBO> HeZuoShePoint(AgricultureBO agricultureBO);
-    List<AgricultureBO> ZhiBaoPoint(AgricultureBO agricultureBO);
-    List<AgricultureBO> XuBaoPoint(AgricultureBO agricultureBO);
-    List<AgricultureBO> NongJiZhanPoint(AgricultureBO agricultureBO);
-    List<AgricultureBO> YangZhiPoint(AgricultureBO agricultureBO);
+    List<AgricultureBO> heZuoShePoint(AgricultureBO agricultureBO);
 
+    List<AgricultureBO> zhiBaoPoint(AgricultureBO agricultureBO);
 
+    List<AgricultureBO> xuBaoPoint(AgricultureBO agricultureBO);
 
+    List<AgricultureBO> nongJiZhanPoint(AgricultureBO agricultureBO);
 
+    List<AgricultureBO> yangZhiPoint(AgricultureBO agricultureBO);
 }

src/main/java/com/sooka/sponest/data/app/service/AppDigitalForestService.java

@@ -12,9 +12,9 @@ public interface AppDigitalForestService {
 
     public AjaxResult resourceList(AppDigitalForestVO vo);
     public  AppDigitalForestWeather selectWeather(AppDigitalForestWeather appDigitalForestWeather);
-    public List<AgricultureBO> HeZuoShePoint(AgricultureBO agricultureBO);
-    public List<AgricultureBO> ZhiBaoPoint(AgricultureBO agricultureBO);
-    public List<AgricultureBO> XuBaoPoint(AgricultureBO agricultureBO);
-    public List<AgricultureBO> NongJiZhanPoint(AgricultureBO agricultureBO);
-    public List<AgricultureBO> YangZhiPoint(AgricultureBO agricultureBO);
+    public List<AgricultureBO> heZuoShePoint(AgricultureBO agricultureBO);
+    public List<AgricultureBO> zhiBaoPoint(AgricultureBO agricultureBO);
+    public List<AgricultureBO> xuBaoPoint(AgricultureBO agricultureBO);
+    public List<AgricultureBO> nongJiZhanPoint(AgricultureBO agricultureBO);
+    public List<AgricultureBO> yangZhiPoint(AgricultureBO agricultureBO);
 }

src/main/java/com/sooka/sponest/data/app/service/impl/AppDigitalForestServiceImpl.java

@@ -52,28 +52,28 @@ public class AppDigitalForestServiceImpl extends BaseServiceImpl implements AppD
     }
 
     @Override
-    public List<AgricultureBO> HeZuoShePoint(AgricultureBO agricultureBO) {
+    public List<AgricultureBO> heZuoShePoint(AgricultureBO agricultureBO) {
         setSookaDataBase(agricultureBO);
-        return appDigitalForestMapper.HeZuoShePoint(agricultureBO);
+        return appDigitalForestMapper.heZuoShePoint(agricultureBO);
     }
 
     @Override
-    public List<AgricultureBO> ZhiBaoPoint(AgricultureBO agricultureBO) {
+    public List<AgricultureBO> zhiBaoPoint(AgricultureBO agricultureBO) {
         setSookaDataBase(agricultureBO);
-        return appDigitalForestMapper.ZhiBaoPoint(agricultureBO);    }
+        return appDigitalForestMapper.zhiBaoPoint(agricultureBO);    }
 
     @Override
-    public List<AgricultureBO> XuBaoPoint(AgricultureBO agricultureBO) {
+    public List<AgricultureBO> xuBaoPoint(AgricultureBO agricultureBO) {
         setSookaDataBase(agricultureBO);
-        return appDigitalForestMapper.XuBaoPoint(agricultureBO);    }
+        return appDigitalForestMapper.xuBaoPoint(agricultureBO);    }
 
     @Override
-    public List<AgricultureBO> NongJiZhanPoint(AgricultureBO agricultureBO) {
+    public List<AgricultureBO> nongJiZhanPoint(AgricultureBO agricultureBO) {
         setSookaDataBase(agricultureBO);
-        return appDigitalForestMapper.NongJiZhanPoint(agricultureBO);    }
+        return appDigitalForestMapper.nongJiZhanPoint(agricultureBO);    }
 
     @Override
-    public List<AgricultureBO> YangZhiPoint(AgricultureBO agricultureBO) {
+    public List<AgricultureBO> yangZhiPoint(AgricultureBO agricultureBO) {
         setSookaDataBase(agricultureBO);
-        return appDigitalForestMapper.YangZhiPoint(agricultureBO);     }
+        return appDigitalForestMapper.yangZhiPoint(agricultureBO);     }
 }

src/main/java/com/sooka/sponest/data/digitalemergency/domain/CenterdataTEmergencyInspectionitem.java

@@ -27,12 +27,6 @@ public class CenterdataTEmergencyInspectionitem extends BaseBusinessEntity {
     private String deleteBy;
 
     /**
-     * 数据所属部门(政或党的id)
-     */
-    @Excel(name = "数据所属部门(政或党的id)")
-    private Long dataDeptId;
-
-    /**
      * 数据状态(1-可用 2-不可用 ) - 字典
      */
     @Excel(name = "数据状态(1-可用 2-不可用 ) - 字典")
@@ -78,14 +72,6 @@ public class CenterdataTEmergencyInspectionitem extends BaseBusinessEntity {
         return deleteBy;
     }
 
-    public void setDataDeptId(Long dataDeptId) {
-        this.dataDeptId = dataDeptId;
-    }
-
-    public Long getDataDeptId() {
-        return dataDeptId;
-    }
-
     public void setDataStatus(String dataStatus) {
         this.dataStatus = dataStatus;
     }

src/main/java/com/sooka/sponest/data/digitalemergency/domain/CenterdataTEmergencyMaterialcategorymap.java

@@ -60,12 +60,6 @@ public class CenterdataTEmergencyMaterialcategorymap extends BaseBusinessEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long owndeptid;
 
-    /**
-     * 数据所属部门(政或党的id)
-     */
-    @Excel(name = "数据所属部门(政或党的id)")
-    private Long dataDeptId;
-
     public void setId(String id) {
         this.id = id;
     }
@@ -122,14 +116,6 @@ public class CenterdataTEmergencyMaterialcategorymap extends BaseBusinessEntity
         return owndeptid;
     }
 
-    public void setDataDeptId(Long dataDeptId) {
-        this.dataDeptId = dataDeptId;
-    }
-
-    public Long getDataDeptId() {
-        return dataDeptId;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

src/main/java/com/sooka/sponest/data/digitalfirecontrol/service/impl/FireControlViewServiceImpl.java

@@ -93,17 +93,17 @@ public class FireControlViewServiceImpl extends BaseServiceImpl implements IFire
         Map<String, Object> newMap = null;
         for (Map<String, Object> map : pointList) {
             newMap = new HashMap<>();
-            for (String key : map.keySet()) {
-                if ("create_time".equals(key)) {
-                    newMap.put("create_time", MapUtils.getString(map, key).replace('T', ' '));
-                } else if ("principal".equals(key) || "person".equals(key) || key.contains("_person")) {
-                    newMap.put("contacts", map.get(key));
-                    newMap.put(key, map.get(key));
-                } else if ("contact".equals(key) || "contacts_phone".equals(key) || key.contains("_tel")) {
-                    newMap.put("phone", map.get(key));
-                    newMap.put(key, map.get(key));
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                if ("create_time".equals(entry.getKey())) {
+                    newMap.put("create_time", MapUtils.getString(map, entry.getKey()).replace('T', ' '));
+                } else if ("principal".equals(entry.getKey()) || "person".equals(entry.getKey()) || entry.getKey().contains("_person")) {
+                    newMap.put("contacts", entry.getValue());
+                    newMap.put(entry.getKey(), entry.getValue());
+                } else if ("contact".equals(entry.getKey()) || "contacts_phone".equals(entry.getKey()) || entry.getKey().contains("_tel")) {
+                    newMap.put("phone", entry.getValue());
+                    newMap.put(entry.getKey(), entry.getValue());
                 } else {
-                    newMap.put(key, map.get(key));
+                    newMap.put(entry.getKey(), entry.getValue());
                 }
             }
             newList.add(newMap);
@@ -113,15 +113,15 @@ public class FireControlViewServiceImpl extends BaseServiceImpl implements IFire
 
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public  Map<String,Object> getRyList(DataVisuFireCloudMapVO dataVisuFireCloudMapVO) {
+    public Map<String, Object> getRyList(DataVisuFireCloudMapVO dataVisuFireCloudMapVO) {
         setSookaDataBase(dataVisuFireCloudMapVO);
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         VisuForestCloudMapVO vo = new VisuForestCloudMapVO();
         setSookaDataBase(vo);
         List ryList = centerdataTFirecontrolPersonMapper.selectVisualResourcesRy(vo);
         List<String> userIdList = fireControlViewMapper.selectFireUerId(dataVisuFireCloudMapVO);
-        map.put("ryList",ryList);
-        map.put("userIdList",userIdList);
+        map.put("ryList", ryList);
+        map.put("userIdList", userIdList);
         return map;
     }
 }

src/main/java/com/sooka/sponest/data/digitalwater/domain/CenterdataTWaterDataEarlyWarning.java

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotBlank;
  * @author ruoyi
  * @date 2023-03-02
  */
-@ApiModel(value = "监测预警报警对象",description = "监测预警报警对象")
+@ApiModel(value = "监测预警报警对象", description = "监测预警报警对象")
 public class CenterdataTWaterDataEarlyWarning extends BaseBusinessEntity {
 
     private static final long serialVersionUID = 1L;
@@ -85,8 +85,6 @@ public class CenterdataTWaterDataEarlyWarning extends BaseBusinessEntity {
         return this.turbidityMin + " ~ " + turbidityMax;
     }
 
-
-
     /**
      * 溶解氧上限
      */
@@ -200,24 +198,10 @@ public class CenterdataTWaterDataEarlyWarning extends BaseBusinessEntity {
     private String deptName;
 
     /**
-     * 创建人名称
-     */
-    @Excel(name = "创建人名称")
-    @ApiModelProperty(value = "创建人名称", required = false,hidden = true)
-    private String createName;
-
-    /**
-     * 更新人名称
-     */
-    @Excel(name = "更新人名称")
-    @ApiModelProperty(value = "更新人名称", required = false,hidden = true)
-    private String updateName;
-
-    /**
      * 数据状态
      */
     @Excel(name = "数据状态")
-    @ApiModelProperty(value = "数据状态", required = false,hidden = true)
+    @ApiModelProperty(value = "数据状态", required = false, hidden = true)
     private String dataStatus;
 
     /**
@@ -379,22 +363,6 @@ public class CenterdataTWaterDataEarlyWarning extends BaseBusinessEntity {
         return deptName;
     }
 
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setUpdateName(String updateName) {
-        this.updateName = updateName;
-    }
-
-    public String getUpdateName() {
-        return updateName;
-    }
-
     public void setDataStatus(String dataStatus) {
         this.dataStatus = dataStatus;
     }

src/main/java/com/sooka/sponest/data/digitalwater/domain/CenterdataTWaterDataGather.java

@@ -19,7 +19,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Getter
 @Setter
-@ApiModel(value = "监测数据采集对象",description = "监测数据采集对象")
+@ApiModel(value = "监测数据采集对象", description = "监测数据采集对象")
 public class CenterdataTWaterDataGather extends BaseBusinessEntity {
 
     private static final long serialVersionUID = 1L;
@@ -110,23 +110,9 @@ public class CenterdataTWaterDataGather extends BaseBusinessEntity {
     private String deptName;
 
     /**
-     * 创建人名称
-     */
-    @Excel(name = "创建人名称")
-    @ApiModelProperty(value = "创建人名称", required = false,hidden = true)
-    private String createName;
-
-    /**
-     * 更新人名称
-     */
-    @Excel(name = "更新人名称")
-    @ApiModelProperty(value = "更新人名称", required = false,hidden = true)
-    private String updateName;
-
-    /**
      * 数据状态
      */
-    @ApiModelProperty(value = "数据状态", required = false,hidden = true)
+    @ApiModelProperty(value = "数据状态", required = false, hidden = true)
     @Excel(name = "数据状态")
     private String dataStatus;
 
@@ -242,22 +228,6 @@ public class CenterdataTWaterDataGather extends BaseBusinessEntity {
         return deptName;
     }
 
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setUpdateName(String updateName) {
-        this.updateName = updateName;
-    }
-
-    public String getUpdateName() {
-        return updateName;
-    }
-
     public void setDataStatus(String dataStatus) {
         this.dataStatus = dataStatus;
     }

src/main/java/com/sooka/sponest/data/generalbusiness/service/impl/CenterdataTForestImportareaServiceImpl.java

@@ -11,7 +11,6 @@ import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalforest.domain.bo.VisuForestCloudEventTypeBO;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestImportarea;
 import com.sooka.sponest.data.generalbusiness.domain.bo.LatLng;
-import com.sooka.sponest.data.generalbusiness.domain.bo.LatLngAndFlagType;
 import com.sooka.sponest.data.generalbusiness.mapper.CenterdataTForestImportareaMapper;
 import com.sooka.sponest.data.generalbusiness.service.ICenterdataTForestImportareaService;
 import com.sooka.sponest.data.system.areamarking.domain.RegionalFlag;
@@ -144,43 +143,31 @@ public class CenterdataTForestImportareaServiceImpl extends BaseServiceImpl impl
     @Override
     public AjaxResult addRegionalFlag(RegionalFlag regionalFlag) {
         String type = regionalFlag.getType();
-            if (StringUtils.isNotEmpty(regionalFlag.getLatLngs())) {
-                List<LatLng> list = JSONArray.parseArray(regionalFlag.getLatLngs(), LatLng.class);
-                // 删除区域标记
-                centerdataTAreaMarkingService.delRegionalFlag(regionalFlag.getEventId());
-                for (int i = 0; i < list.size(); i++) {
-                    RegionalFlag regionalFlag1 = new RegionalFlag();
-                    regionalFlag1.setId(IdUtils.simpleUUID());
-                    regionalFlag1.setEventId(regionalFlag.getEventId());
-                    regionalFlag1.setFlag(i);
-                    regionalFlag1.setType(type);
-                    regionalFlag1.setLatitude(list.get(i).getLat());
-                    regionalFlag1.setLongitude(list.get(i).getLng());
-                    centerdataTAreaMarkingService.addRegionalFlag(regionalFlag1);
-                }
-            }else {
-                return AjaxResult.error("您未标记区域");
+        if (StringUtils.isNotEmpty(regionalFlag.getLatLngs())) {
+            List<LatLng> list = JSONArray.parseArray(regionalFlag.getLatLngs(), LatLng.class);
+            // 删除区域标记
+            centerdataTAreaMarkingService.delRegionalFlag(regionalFlag.getEventId());
+            for (int i = 0; i < list.size(); i++) {
+                RegionalFlag regionalFlag1 = new RegionalFlag();
+                regionalFlag1.setId(IdUtils.simpleUUID());
+                regionalFlag1.setEventId(regionalFlag.getEventId());
+                regionalFlag1.setFlag(i);
+                regionalFlag1.setType(type);
+                regionalFlag1.setLatitude(list.get(i).getLat());
+                regionalFlag1.setLongitude(list.get(i).getLng());
+                centerdataTAreaMarkingService.addRegionalFlag(regionalFlag1);
             }
-
+        } else {
+            return AjaxResult.error("您未标记区域");
+        }
         return AjaxResult.success();
     }
+
     // 查询区域标记
     @Override
     public AjaxResult selectRegionalFlagByEventId(String eventId) {
-
         List<RegionalFlag> regionalFlags = centerdataTAreaMarkingService.selectRegionalFlagByEventId(eventId);
-        /*List<LatLng> latLngs = new ArrayList<>();
-        for (RegionalFlag regionalFlag : regionalFlags) {
-            LatLng latLng = new LatLng();
-            latLng.setLng(regionalFlag.getLongitude());
-            latLng.setLat(regionalFlag.getLatitude());
-            latLngs.add(latLng);
-        }
-        String latLng = JSONObject.toJSONString(latLngs);
-        regionalFlagnew.setLatLngs(latLng);
-        regionalFlagnew.setEventId(eventId);*/
-        List<LatLngAndFlagType> list = RegionalFlagUtil.getRegionalFlag(regionalFlags,eventId);
-        return AjaxResult.success(list);
+        return AjaxResult.success(RegionalFlagUtil.getRegionalFlag(regionalFlags, eventId));
     }
 
     // 删除区域标记

src/main/java/com/sooka/sponest/data/utils/DataAttachUtil.java

@@ -10,12 +10,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-
 public class DataAttachUtil {
 
-    public static void dataAttachUpload(String busId, String newAttachPaths, String busIndx, String busSource){
+    private DataAttachUtil() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static void dataAttachUpload(String busId, String newAttachPaths, String busIndx, String busSource) {
         ICenterdataTAttachService bean = SpringUtils.getBean(ICenterdataTAttachService.class);
-        if (newAttachPaths != null){
+        if (newAttachPaths != null) {
             String[] pathArray = newAttachPaths.split(",");
             List<String> pathList = new ArrayList<>();
             for (String path : pathArray) {
@@ -33,43 +36,34 @@ public class DataAttachUtil {
                     }
                 }
             }
-
             List<String> oldAttachList = bean.selectDataAttachPathByBusId(busId);
-
             // 计算新增加的列表
-            List<String> addList = pathList.stream()
-                    .filter(id -> !oldAttachList.contains(id))
-                    .collect(Collectors.toList());
+            List<String> addList = pathList.stream().filter(id -> !oldAttachList.contains(id)).collect(Collectors.toList());
             // 计算删除的列表
-            List<String> delList = oldAttachList.stream()
-                    .filter(id -> !pathList.contains(id))
-                    .collect(Collectors.toList());
-
+            List<String> delList = oldAttachList.stream().filter(id -> !pathList.contains(id)).collect(Collectors.toList());
             // 批量添加附件地址
-            if (StringUtils.isNotEmpty(addList)){
+            if (StringUtils.isNotEmpty(addList)) {
                 List<CenterdataTAttach> attachList = toAttachList(busId, addList, busIndx, busSource);
                 bean.insertListCenterdataTAttach(attachList);
             }
             // 批量删除附件地址
-            if (StringUtils.isNotEmpty(delList)){
+            if (StringUtils.isNotEmpty(delList)) {
                 List<CenterdataTAttach> attachList = toAttachList(busId, delList, busIndx, busSource);
-                bean.deleteListCenterdataTAttach(busId,attachList);
+                bean.deleteListCenterdataTAttach(busId, attachList);
             }
-
-
         }
     }
 
     private static List<CenterdataTAttach> toAttachList(String busId, List<String> addList, String busIndx, String busSource) {
         List<CenterdataTAttach> list = new ArrayList<>();
-        for (String addPath : addList){
+        for (String addPath : addList) {
             CenterdataTAttach centerdataTAttach = new CenterdataTAttach();
             centerdataTAttach.setBusId(busId);
             centerdataTAttach.setAttachPath(addPath);
             centerdataTAttach.setBusIndx(busIndx);
-            if (StringUtils.isNotEmpty(busSource)){
+            if (StringUtils.isNotEmpty(busSource)) {
                 centerdataTAttach.setBusSource(busSource);
-            }else {
+            } else {
                 centerdataTAttach.setBusSource("PC");
             }
             centerdataTAttach.setFileName(null);
@@ -79,18 +73,15 @@ public class DataAttachUtil {
         return list;
     }
 
-    public static String getDataAttachUpload(String busId){
+    public static String getDataAttachUpload(String busId) {
         ICenterdataTAttachService bean = SpringUtils.getBean(ICenterdataTAttachService.class);
         List<String> list = bean.selectDataAttachPathByBusId(busId);
         String fileUrl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey("fileUrl").getData();
         String delimiter = ",";
-
         StringBuilder sb = new StringBuilder();
-
         for (String item : list) {
             sb.append(fileUrl).append(item).append(delimiter);
         }
-
         // 移除最后一个逗号
         if (sb.length() > 0) {
             sb.deleteCharAt(sb.length() - 1);

src/main/java/com/sooka/sponest/data/utils/DictUtil.java

@@ -1,69 +0,0 @@
-package com.sooka.sponest.data.utils;
-
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.security.utils.DictUtils;
-import com.ruoyi.system.api.domain.SysDictData;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class DictUtil {
-    @PostMapping("getLabel")
-    public AjaxResult getLabel(@RequestBody Map dict){
-        AjaxResult ajax = new AjaxResult();
-        ajax.put("label", getLabels((String)dict.get("key"), (String)dict.get("value")));
-        return AjaxResult.success(ajax);
-    }
-
-    @PostMapping("getDict")
-    public AjaxResult getDict(@RequestBody Map dict){
-        AjaxResult ajax = new AjaxResult();
-        ajax.put("dict", getDict((String)dict.get("key")));
-        return AjaxResult.success(ajax);
-    }
-
-    public List<List<Map>> getDict(String keys){
-        List<List<Map>> list = new ArrayList();
-        String[] keyArr = keys.split(",");
-        for (String key :keyArr) {
-            List<Map> dictList = new ArrayList();
-            List<SysDictData> dataList = DictUtils.getDictCache(key);
-            for (SysDictData dict :dataList) {
-                Map map = new HashMap();
-                map.put("value", dict.getDictValue());
-                map.put("label", dict.getDictLabel());
-                dictList.add(map);
-            }
-            list.add(dictList);
-        }
-        return list;
-    }
-
-    public static String getLabel(String key, String value){
-        List<SysDictData> list =  DictUtils.getDictCache(key);
-        if(list == null || list.size() == 0){
-            return "";
-        }else {
-            for(SysDictData dictData: list){
-                if(dictData.getDictValue().equals(value)){
-                    return dictData.getDictLabel();
-                }
-            }
-        }
-        return "";
-    }
-
-    public static String getLabels(String key, String values){
-        String[] valueArr = values.split(",");
-        String[] labelArr = new String[valueArr.length];
-        for (int i = 0; i < valueArr.length; i++) {
-            labelArr[i] = DictUtil.getLabel(key, valueArr[i]);
-        }
-        return String.join(",", labelArr);
-    }
-
-}

src/main/java/com/sooka/sponest/data/utils/ScheduleAtachUtil.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.data.utils;
 
-import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.file.FilePrefixUtils;
 import com.ruoyi.common.redis.service.RedisService;
@@ -18,7 +17,6 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.File;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -36,7 +34,7 @@ public class ScheduleAtachUtil {
 
     @Autowired
     private ICenterdataTAttachService centerdataTAttachService;
-    @Resource
+    @Autowired
     private RedisService redisService;
 
     // 文件前缀
@@ -48,35 +46,24 @@ public class ScheduleAtachUtil {
 
     @GetMapping("/attach")
     public void runAtach() {
-        logger.info("执行定时任务大华图片本地上传开始=>{}", DateUtils.dateTimeNow());
         Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(FILE_PREFIX_LOCAL, FILE_PREFIX_HIK1, FILE_PREFIX_HIK2, FILE_PREFIX_DH1, FILE_PREFIX_DH2)).getData();
 //        paramMap.put("token", redisService.getCacheObject("DH_TOKEN"));// 大华token
         List<Map<String, Object>> list = centerdataTAttachService.selectFailUpattah();
-        int i = 0;
-        for (Map map : list) {
+        for (Map<String, Object> map : list) {
             paramMap.put("czlx", "AI");
             paramMap.put("busId", MapUtils.getString(map, "busId"));
-            logger.info("event_name-------------->" + MapUtils.getString(map, "event_name"));
-            logger.info("create_time-------------->" + MapUtils.getString(map, "create_time"));
-            logger.info("==================>大华图片远程接口之前" + MapUtils.getString(map, "busId") + "当前序号" + i);
             centerdataTAttachService.updateEventAttach(paramMap);
             logger.info("延时1分钟");
-            i++;
         }
-        logger.info("执行定时任务大华图片本地上传结束=====>{}", DateUtils.dateTimeNow());
     }
 
     //每周的周日晚上8点开始运行
     @Scheduled(cron = "0 0 20 ? * 1")
     @GetMapping("/urlToMultipartFile")
     public void urlToMultipartFile() {
-        logger.info("执行定时任务大华图片本地上传开始=>{}", DateUtils.dateTimeNow());
         Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(FILE_PREFIX_LOCAL, FILE_PREFIX_HIK1, FILE_PREFIX_HIK2, FILE_PREFIX_DH1, FILE_PREFIX_DH2)).getData();
         List<Map<String, Object>> attaches = centerdataTAttachService.selectFailUpattah();
-        logger.info("此次需要更新的图片的总数==================>" + attaches.size());
-        int i = 0;
         for (Map<String, Object> item : attaches) {
-            logger.info("busId==================>" + MapUtils.getString(item, "busId") + "当前序号" + i);
             paramMap.put("token", redisService.getCacheObject("DH_TOKEN"));// 大华token
             File file = null;
             MultipartFile multipartFile = null;

src/main/java/com/sooka/sponest/data/utils/TreeUtil.java

@@ -7,6 +7,8 @@ import org.springframework.util.MultiValueMap;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.sooka.sponest.data.utils.DataConstants.TITLE;
+
 public class TreeUtil {
 
     private TreeUtil() {
@@ -16,7 +18,7 @@ public class TreeUtil {
     public static List<Map<String, Object>> listToTree(List<Map<String, Object>> personList, List<Map<String, Object>> deptList) {
         Map<String, Map<String, Object>> map = new HashMap<>();// 使用Map来存储所有查询结果，以id为key
         for (Map<String, Object> item : deptList) {
-            item.put("title", "");// 初始化title为空
+            item.put(TITLE, "");// 初始化title为空
             item.put("children", new ArrayList<>());// 初始化children空数组
             map.put(String.valueOf(item.get("id")), item);// 将单个查询结果以id为键加入map
         }
@@ -27,7 +29,7 @@ public class TreeUtil {
         for (Map.Entry<String, List<Map<String, Object>>> entry : groupMap.entrySet()) {
             Map<String, Object> result = map.get(entry.getKey());
             if (result != null) {
-                result.put("title", entry.getValue());
+                result.put(TITLE, entry.getValue());
             }
         }
         // 构建树形结构
@@ -37,7 +39,7 @@ public class TreeUtil {
     public static List<Map<String, Object>> getAllTreeNew(List<Map<String, Object>> personList, List<Map<String, Object>> deptList) {
         Map<String, Map<String, Object>> map = new HashMap<>();// 使用Map来存储所有查询结果，以id为key
         for (Map<String, Object> item : deptList) {
-            item.put("title", "");// 初始化title为空
+            item.put(TITLE, "");// 初始化title为空
             item.put("children", new ArrayList<>());// 初始化children空数组
             map.put(String.valueOf(item.get("id")), item);// 将单个查询结果以id为键加入map
         }
@@ -49,7 +51,7 @@ public class TreeUtil {
         for (Map.Entry<String, List<Map<String, Object>>> entry : groupMap.entrySet()) {
             Map<String, Object> result = map.get(entry.getKey());
             if (result != null) {
-                result.put("title", entry.getValue());
+                result.put(TITLE, entry.getValue());
                 grids.add(entry.getKey());
                 grids.addAll(Arrays.asList(String.valueOf(result.get("ancestors")).split(",")));
             }

src/main/resources/mapper/appbigdata/AppDigitalForestMapper.xml

@@ -242,7 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="HeZuoShePoint" parameterType="com.sooka.sponest.data.app.domain.AgricultureBO" resultType="com.sooka.sponest.data.app.domain.AgricultureBO">
+    <select id="heZuoShePoint" parameterType="com.sooka.sponest.data.app.domain.AgricultureBO" resultType="com.sooka.sponest.data.app.domain.AgricultureBO">
         SELECT
         a.name as watercraneName,
         a.longitude,
@@ -262,7 +262,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LIMIT 10
     </select>
 
-    <select id="ZhiBaoPoint" parameterType="com.sooka.sponest.data.app.domain.AgricultureBO" resultType="com.sooka.sponest.data.app.domain.AgricultureBO">
+    <select id="zhiBaoPoint" parameterType="com.sooka.sponest.data.app.domain.AgricultureBO" resultType="com.sooka.sponest.data.app.domain.AgricultureBO">
         SELECT
         a.name as watercraneName,
         a.longitude,
@@ -286,7 +286,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <select id="XuBaoPoint" parameterType="com.sooka.sponest.data.app.domain.AgricultureBO" resultType="com.sooka.sponest.data.app.domain.AgricultureBO">
+    <select id="xuBaoPoint" parameterType="com.sooka.sponest.data.app.domain.AgricultureBO" resultType="com.sooka.sponest.data.app.domain.AgricultureBO">
         SELECT
         a.name as watercraneName,
         a.longitude,
@@ -309,7 +309,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <select id="NongJiZhanPoint" parameterType="com.sooka.sponest.data.app.domain.AgricultureBO" resultType="com.sooka.sponest.data.app.domain.AgricultureBO">
+    <select id="nongJiZhanPoint" parameterType="com.sooka.sponest.data.app.domain.AgricultureBO" resultType="com.sooka.sponest.data.app.domain.AgricultureBO">
         SELECT
         a.name as watercraneName,
         a.longitude,
@@ -330,7 +330,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="YangZhiPoint" parameterType="com.sooka.sponest.data.app.domain.AgricultureBO" resultType="com.sooka.sponest.data.app.domain.AgricultureBO">
+    <select id="yangZhiPoint" parameterType="com.sooka.sponest.data.app.domain.AgricultureBO" resultType="com.sooka.sponest.data.app.domain.AgricultureBO">
         SELECT
         a.name as watercraneName,
         a.longitude,