Merge remote-tracking branch 'origin/master'

pom.xml

@@ -67,12 +67,6 @@
             <artifactId>sooka-sponest-common-datascope</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.dahuatech.icc</groupId>
-            <artifactId>java-sdk-oauth</artifactId>
-            <version>1.0.9</version>
-        </dependency>
-
         <!--websocket-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -80,13 +74,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.hikvision.ga</groupId>
-            <artifactId>artemis-http-client</artifactId>
-            <version>1.1.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>sooka-sponest-api-evaluation</artifactId>
             <version>3.4.0</version>
@@ -139,5 +126,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/CenterEventReportController.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.event.centereventteventcatalogue.controller;
 
-import com.dahuatech.hutool.core.map.MapUtil;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.bo.VisuForestCloudCalendarBO;
@@ -67,7 +66,7 @@ public class CenterEventReportController extends BaseController {
         List<Map<String, Object>> result = centerEventReportService.getEventTypeRadar(visuForestCloudMapVO);
         List<Long> numList = new ArrayList<>();
         for (Map<String, Object> map : result) {
-            numList.add(MapUtil.getLong(map, "value"));
+            numList.add(MapUtils.getLong(map, "value"));
         }
         Map<String, List> resultMap = new HashMap<>();
         resultMap.put("eventtype", result);
@@ -81,7 +80,7 @@ public class CenterEventReportController extends BaseController {
         List<Map<String, Object>> result = centerEventReportService.getEventCountGroupByFireSource(visuForestCloudMapVO);
         List<Long> numList = new ArrayList<>();
         for (Map<String, Object> map : result) {
-            numList.add(MapUtil.getLong(map, "value"));
+            numList.add(MapUtils.getLong(map, "value"));
         }
         Map<String, List> resultMap = new HashMap<>();
         resultMap.put("firesource", result);
@@ -205,8 +204,8 @@ public class CenterEventReportController extends BaseController {
         List<String> latLng = null;
         for (Map<String, Object> map : latLngs) {
             latLng = new ArrayList<>();
-            latLng.add(MapUtil.getStr(map, "latitude"));
-            latLng.add(MapUtil.getStr(map, "longitude"));
+            latLng.add(MapUtils.getString(map, "latitude"));
+            latLng.add(MapUtils.getString(map, "longitude"));
             latLng.add("1");
             result.add(latLng);
         }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/CenterEventCommandCenterServiceImpl.java

@@ -1,12 +1,12 @@
 package com.sooka.sponest.event.centereventteventcatalogue.service.impl;
 
-import com.dahuatech.hutool.core.date.DateUtil;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
 import com.sooka.sponest.event.centereventteventcatalogue.mapper.CenterEventCommandCenterMapper;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICenterEventCommandCenterService;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.http.client.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -270,8 +270,8 @@ public class CenterEventCommandCenterServiceImpl extends BaseService implements
         bmList = dataFilter(bmList);
         // 返回值
         Map<String, String> resultMap = new HashMap<>();
-        resultMap.put("start", DateUtil.format(DateUtil.parseDate(MapUtils.getString(centereventTDeptEvent.getParams(), "start")), "yyyy年MM月dd日 HH时mm分ss秒"));
-        resultMap.put("end", DateUtil.format(DateUtil.parseDate(MapUtils.getString(centereventTDeptEvent.getParams(), "end")), "yyyy年MM月dd日 HH时mm分ss秒"));
+        resultMap.put("start", DateUtils.formatDate(DateUtils.parseDate(MapUtils.getString(centereventTDeptEvent.getParams(), "start")), "yyyy年MM月dd日 HH时mm分ss秒"));
+        resultMap.put("end", DateUtils.formatDate(DateUtils.parseDate(MapUtils.getString(centereventTDeptEvent.getParams(), "end")), "yyyy年MM月dd日 HH时mm分ss秒"));
         Long num = 0L;
         Long processed = 0L;
         Long processing = 0L;

src/main/java/com/sooka/sponest/event/emergency/dangerprocess/service/impl/CentereventTEmergencyDangerprocessServiceImpl.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.event.emergency.dangerprocess.service.impl;
 
-import com.dahuatech.hutool.core.map.MapUtil;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
@@ -12,6 +11,7 @@ import com.sooka.sponest.event.emergency.dangerprocess.domain.DayBody;
 import com.sooka.sponest.event.emergency.dangerprocess.mapper.CentereventTEmergencyDangerprocessMapper;
 import com.sooka.sponest.event.emergency.dangerprocess.service.ICentereventTEmergencyDangerprocessService;
 import com.sooka.sponest.event.utils.RemoteApiUtil;
+import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -127,8 +127,8 @@ public class CentereventTEmergencyDangerprocessServiceImpl extends BaseService i
         List list = new ArrayList();
         for (Map<String, Object> map : latLngs) {
             latLng = new ArrayList<>();
-            latLng.add(MapUtil.getLong(map, "latitude"));
-            latLng.add(MapUtil.getLong(map, "longitude"));
+            latLng.add(MapUtils.getLong(map, "latitude"));
+            latLng.add(MapUtils.getLong(map, "longitude"));
             latLng.add(1L);
             list.add(latLng);
         }