init

src/main/java/com/sooka/sponest/middleground/controller/MonitorController.java

@@ -3,8 +3,10 @@ package com.sooka.sponest.middleground.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.middleground.remoteapi.service.center.monitor.RemoteMonitorService;
+import com.sooka.sponest.middleground.remoteapi.service.center.dahuaLog.RemoteDahuaLogService;
+import com.sooka.sponest.middleground.remoteapi.service.center.gpsTank.RemoteGpsTankService;
 import com.sooka.sponest.middleground.scheduleTask.StaticScheduleTask;
 import com.sooka.sponest.middleground.scheduleTask.entity.GasTankDevices;
 import com.sooka.sponest.middleground.util.LoginUtil;
@@ -54,7 +56,24 @@ public class MonitorController {
     @Value("${sooka.equip_gps.username:}")
     public String username;
     @Resource
-    public RemoteMonitorService remoteMonitorService;
+    public RemoteGpsTankService remoteGpsTankService;
+    @Resource
+    public RemoteDahuaLogService remoteDahuaLogService;
+
+
+    /**
+     * 执行每1小时对接大华云台日志定时任务
+     *
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/getDHLog", method = GET)
+    @ResponseBody
+    private void configureBlackTasks() {
+        logger.info("执行每1小时对接大华云台日志定时任务=>{}", DateUtils.dateTimeNow());
+        remoteDahuaLogService.configureWhiteTasks();
+    }
+
 
     /**
      * 根据用户名查询设备列表,新增煤气罐设备信息
@@ -73,7 +92,7 @@ public class MonitorController {
             String requestBody = "{\r\n\t\"username\": \"" + username + "\"}";
             JSONObject jsonObject = getJsonObject(requestBody, httpPost);
             if (jsonObject != null) {
-                ajaxResult = remoteMonitorService.gpsTankInsertBatch(jsonObject);
+                ajaxResult = remoteGpsTankService.gpsTankInsertBatch(jsonObject);
                 return ajaxResult;
             }
         } catch (Exception e) {
@@ -99,7 +118,7 @@ public class MonitorController {
         String token = LoginUtil.login(ip, loginName, password);
         //获取设备id列表
         List<GasTankDevices> deviceList = new ArrayList<>();
-        AjaxResult resultOne = remoteMonitorService.selectGasTankDevicesNewEndTime();
+        AjaxResult resultOne = remoteGpsTankService.selectGasTankDevicesNewEndTime();
         if (resultOne.get("code").equals(200)) {
             deviceList = JSON.parseArray(JSON.toJSONString(resultOne.get("data")), GasTankDevices.class);
         } else {
@@ -120,12 +139,12 @@ public class MonitorController {
             String requestBody = "{\r\n\t\"deviceid\": \"" + device.getDeviceid() + "\",\r\n\t\"begintime\": \"" + startOfDay + "\",\r\n\t\"endtime\": \"" + endOfDay + "\",\r\n\t\"timezone\": \"8\"}";
             JSONObject trajectoryObj = getJsonObject(requestBody, trajectoriesHttpPost);
 
-            AjaxResult trajectoryResult = remoteMonitorService.remoteTrajectoryInsertBatch(trajectoryObj);
+            AjaxResult trajectoryResult = remoteGpsTankService.remoteTrajectoryInsertBatch(trajectoryObj);
             if (!trajectoryResult.get("code").equals(200)) {
                 logger.info("北斗卫星定位车辆gps历史轨迹对接,数据新增失败");
             }
             JSONObject mileageObject = getJsonObject(requestBody, travelHttpPost);
-            AjaxResult mileageResult = remoteMonitorService.remoteMileageInsertBatch(mileageObject);
+            AjaxResult mileageResult = remoteGpsTankService.remoteMileageInsertBatch(mileageObject);
             if (!mileageResult.get("code").equals(200)) {
                 logger.info("北斗卫星定位车辆gps历史行程对接,数据新增失败");
             }

src/main/java/com/sooka/sponest/middleground/monitoringEquipment/chenganshengbang/service/impl/WaterPressureServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.middleground.monitoringEquipment.chenganshengbang.service.WaterPressureService;
-import com.sooka.sponest.middleground.remoteapi.service.center.monitor.RemoteMonitorService;
+import com.sooka.sponest.middleground.remoteapi.service.center.iot.RemoteIotService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -18,7 +18,7 @@ public class WaterPressureServiceImpl implements WaterPressureService {
     private static final Logger log = LoggerFactory.getLogger(WaterPressureServiceImpl.class);
 
     @Resource
-    public RemoteMonitorService remoteMonitorService;
+    public RemoteIotService remoteIotService;
 
     /**水压传感器指令地址**/
     @Value("${monitoringEquipment.waterPressure.commandURL:}")
@@ -31,7 +31,7 @@ public class WaterPressureServiceImpl implements WaterPressureService {
         AjaxResult res;
         try {
             object = JSONObject.parseObject(data);
-            res = remoteMonitorService.saveWaterPressureDeviceData(object);
+            res = remoteIotService.saveWaterPressureDeviceData(object);
             log.info("WaterPressure 数据推送成功! data ===> {} , result ===> {}",data, res);
         }catch(Exception e){
             e.printStackTrace();

src/main/java/com/sooka/sponest/middleground/monitoringEquipment/inserctpests/controller/PlantDiseasesAndInsectPestsController.java

@@ -2,7 +2,10 @@ package com.sooka.sponest.middleground.monitoringEquipment.inserctpests.controll
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.middleground.monitoringEquipment.inserctpests.service.PlantDiseasesAndInsectPestsService;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 

src/main/java/com/sooka/sponest/middleground/monitoringEquipment/inserctpests/service/PlantDiseasesAndInsectPestsService.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.middleground.monitoringEquipment.inserctpests.service;
 
-import com.alibaba.fastjson.JSONArray;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 
 public interface PlantDiseasesAndInsectPestsService {

src/main/java/com/sooka/sponest/middleground/monitoringEquipment/inserctpests/service/impl/PlantDiseasesAndInsectPestsServiceImpl.java

@@ -1,15 +1,13 @@
 package com.sooka.sponest.middleground.monitoringEquipment.inserctpests.service.impl;
 
 import cn.hutool.http.HttpRequest;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.system.api.domain.SysFile;
 import com.sooka.sponest.middleground.monitoringEquipment.inserctpests.service.PlantDiseasesAndInsectPestsService;
 import com.sooka.sponest.middleground.monitoringEquipment.sennor.api.API;
-import com.sooka.sponest.middleground.remoteapi.service.center.monitor.RemoteMonitorService;
+import com.sooka.sponest.middleground.remoteapi.service.center.iot.RemoteIotService;
 import com.sooka.sponest.middleground.util.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,8 +28,9 @@ public class PlantDiseasesAndInsectPestsServiceImpl implements PlantDiseasesAndI
 
     private static final Logger log = LoggerFactory.getLogger(PlantDiseasesAndInsectPestsServiceImpl.class);
 
+
     @Resource
-    public RemoteMonitorService remoteMonitorService;
+    public RemoteIotService remoteIotService;
 
     /**病虫害token**/
     @Value("${monitoringEquipment.insect.insectToken:}")
@@ -100,7 +99,7 @@ public class PlantDiseasesAndInsectPestsServiceImpl implements PlantDiseasesAndI
             System.out.println("taggingImgUrl:" + updatedTaggingImgUrl);
             System.out.println("-------------------------------------------------------------");
             if (object.get("state") != null && object.getString("state").equals("success")) {
-                AjaxResult ajaxResult = remoteMonitorService.saveInsectPestsDeviceData(object);
+                AjaxResult ajaxResult = remoteIotService.saveInsectPestsDeviceData(object);
                 log.info("数据推送成功! data ===> {} , result ===> {}", result, ajaxResult);
                 return AjaxResult.success("数据推送成功!", ajaxResult);
             }
@@ -135,7 +134,7 @@ public class PlantDiseasesAndInsectPestsServiceImpl implements PlantDiseasesAndI
             //关闭输出流
             outStream.close();
             MultipartFile multipartFile = FileUtils.getMultipartFile(imageFile);
-            R<SysFile> r = remoteMonitorService.upload(multipartFile);
+            R<SysFile> r = remoteIotService.upload(multipartFile);
             return JSONObject.parseObject(JSONObject.toJSONString(r));
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/sooka/sponest/middleground/monitoringEquipment/sennor/service/impl/SennorServiceImpl.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.middleground.monitoringEquipment.sennor.api.API;
 import com.sooka.sponest.middleground.monitoringEquipment.sennor.service.SennorService;
-import com.sooka.sponest.middleground.remoteapi.service.center.monitor.RemoteMonitorService;
+import com.sooka.sponest.middleground.remoteapi.service.center.iot.RemoteIotService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,7 +30,7 @@ public class SennorServiceImpl implements SennorService {
     public String sennorUrl;
 
     @Resource
-    public RemoteMonitorService remoteMonitorService;
+    public RemoteIotService remoteIotService;
 
 
 
@@ -50,7 +50,7 @@ public class SennorServiceImpl implements SennorService {
         String res;
         try {
             object = JSONObject.parseObject(result);
-            AjaxResult ajaxResult = remoteMonitorService.saveSennorDeviceData(object);
+            AjaxResult ajaxResult = remoteIotService.saveSennorDeviceData(object);
             log.info("数据推送成功! data ===> {} , result ===> {}",result, ajaxResult);
             return AjaxResult.success("数据推送成功!",ajaxResult);
         }catch(Exception e){
@@ -64,7 +64,7 @@ public class SennorServiceImpl implements SennorService {
     @Override
     public JSONArray getDevideCodeMapByTypes(String types) {
         //先请求
-        AjaxResult ajaxResult = remoteMonitorService.getDevideCodeMapByTypes(types);
+        AjaxResult ajaxResult = remoteIotService.getDevideCodeMapByTypes(types);
         try {
             if(ajaxResult.get("code").equals(HttpStatus.SUCCESS)){
                 return JSONUtil.parseArray(ajaxResult.get("data"));

src/main/java/com/sooka/sponest/middleground/monitoringEquipment/shuicejia/TcpServer.java

@@ -4,12 +4,10 @@ import cn.hutool.core.io.BufferUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpRequest;
 import cn.hutool.socket.nio.NioServer;
 import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.middleground.remoteapi.service.center.monitor.RemoteMonitorService;
+import com.sooka.sponest.middleground.remoteapi.service.center.iot.RemoteIotService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -37,7 +35,7 @@ public class TcpServer extends Thread implements CommandLineRunner {
     public Integer port;
 
     @Resource
-    public RemoteMonitorService remoteMonitorService;
+    public RemoteIotService remoteIotService;
 
 
     @Override
@@ -70,7 +68,7 @@ public class TcpServer extends Thread implements CommandLineRunner {
         try {
             object = JSONObject.parseObject(response);
             //推送数据到监控中心
-            result = remoteMonitorService.saveWaterMonitoringData(object);
+            result = remoteIotService.saveWaterMonitoringData(object);
             log.info("TCPServer 数据推送成功! result ===> {}", result);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/sooka/sponest/middleground/remoteapi/fallback/center/dahuaLog/RemoteDahuaLogBaseServiceFallbackFactory.java

@@ -0,0 +1,41 @@
+package com.sooka.sponest.middleground.remoteapi.fallback.center.dahuaLog;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
+import com.sooka.sponest.middleground.remoteapi.service.center.dahuaLog.RemoteDahuaLogService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @program: ruoyi
+ * @description: yy
+ * @author: yy
+ * @create: 2022-06-16 11:05
+ **/
+@Component
+public class RemoteDahuaLogBaseServiceFallbackFactory implements FallbackFactory<RemoteDahuaLogService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+
+    @Override
+    public RemoteDahuaLogService create(Throwable cause) {
+        log.error("摄像头操作日志对接-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteDahuaLogService() {
+
+            @Override
+            public AjaxResult configureBlackTasks() {
+                return null;
+            }
+
+            @Override
+            public AjaxResult configureWhiteTasks() {
+                return null;
+            }
+
+
+        };
+    }
+}

src/main/java/com/sooka/sponest/middleground/remoteapi/fallback/center/gpsTank/RemoteGpsTankBaseServiceFallbackFactory.java

@@ -0,0 +1,49 @@
+package com.sooka.sponest.middleground.remoteapi.fallback.center.gpsTank;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
+import com.sooka.sponest.middleground.remoteapi.service.center.gpsTank.RemoteGpsTankService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @program: ruoyi
+ * @description: yy
+ * @author: yy
+ * @create: 2022-06-16 11:05
+ **/
+@Component
+public class RemoteGpsTankBaseServiceFallbackFactory implements FallbackFactory<RemoteGpsTankService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+
+    @Override
+    public RemoteGpsTankService create(Throwable cause) {
+        log.error("北斗卫星定位设备车辆轨迹和行程任务任务模块-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteGpsTankService() {
+
+            @Override
+            public AjaxResult selectGasTankDevicesNewEndTime() {  return null; }
+
+            @Override
+            public AjaxResult remoteTrajectoryInsertBatch(JSONObject obj) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult remoteMileageInsertBatch(JSONObject obj) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult gpsTankInsertBatch(JSONObject obj) {
+                return null;
+            }
+
+        };
+    }
+}

src/main/java/com/sooka/sponest/middleground/remoteapi/fallback/center/iot/RemoteIotBaseServiceFallbackFactory.java

@@ -0,0 +1,73 @@
+package com.sooka.sponest.middleground.remoteapi.fallback.center.iot;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.domain.SysFile;
+import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
+import com.sooka.sponest.middleground.remoteapi.service.center.iot.RemoteIotService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @program: ruoyi
+ * @description: yy
+ * @author: yy
+ * @create: 2022-06-16 11:05
+ **/
+@Component
+public class RemoteIotBaseServiceFallbackFactory implements FallbackFactory<RemoteIotService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+
+    @Override
+    public RemoteIotService create(Throwable cause) {
+        log.error("IOT传感器设备任务-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteIotService() {
+
+
+            @Override
+            public AjaxResult saveWaterMonitoringData(@RequestBody JSONObject json) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult saveWaterPressureDeviceData(@RequestBody JSONObject json){
+                return null;
+            }
+
+            @Override
+            public AjaxResult saveSennorDeviceData(@RequestBody JSONObject json){
+                return null;
+            }
+
+            @Override
+            public AjaxResult getDevideCodeMapByTypes(@RequestBody String types){
+                return null;
+            }
+
+            @Override
+            public AjaxResult saveInsectPestsDeviceData(@RequestBody JSONObject json){
+                return null;
+            }
+
+            @Override
+            public R<SysFile> upload(MultipartFile file){
+                return null;
+            }
+
+            @Override
+            public AjaxResult updateDeviceStatusQuartz() {
+                return null;
+            }
+
+
+
+        };
+    }
+}

src/main/java/com/sooka/sponest/middleground/remoteapi/fallback/center/lineCharts/RemoteLineChartsBaseServiceFallbackFactory.java

@@ -0,0 +1,49 @@
+package com.sooka.sponest.middleground.remoteapi.fallback.center.lineCharts;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.middleground.remoteapi.service.center.lineCharts.RemoteLineChartsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @program: ruoyi
+ * @description: yy
+ * @author: yy
+ * @create: 2022-06-16 11:05
+ **/
+@Component
+public class RemoteLineChartsBaseServiceFallbackFactory implements FallbackFactory<RemoteLineChartsService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteLineChartsService.class);
+
+    @Override
+    public RemoteLineChartsService create(Throwable cause) {
+        log.error("监控中心首页折线图缓存任务模块-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteLineChartsService() {
+
+            @Override
+            public AjaxResult selectDayLineChartCountTask() {
+                return null;
+            }
+
+            @Override
+            public AjaxResult selectMonthlyLineChartCountTask() {
+                return null;
+            }
+
+            @Override
+            public AjaxResult quarterlineChartTask() {
+                return null;
+            }
+
+            @Override
+            public AjaxResult yearlineChartTask() {
+                return null;
+            }
+
+        };
+    }
+}

src/main/java/com/sooka/sponest/middleground/remoteapi/fallback/center/monitor/RemoteMonitorBaseServiceFallbackFactory.java

@@ -1,136 +0,0 @@
-package com.sooka.sponest.middleground.remoteapi.fallback.center.monitor;
-
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.domain.SysFile;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
-import com.sooka.sponest.middleground.remoteapi.service.center.monitor.RemoteMonitorService;
-import com.sooka.sponest.middleground.remoteapi.service.center.system.RemoteSystemService;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-/**
- * @program: ruoyi
- * @description: yy
- * @author: yy
- * @create: 2022-06-16 11:05
- **/
-@Component
-public class RemoteMonitorBaseServiceFallbackFactory implements FallbackFactory<RemoteMonitorService> {
-
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteMonitorService create(Throwable cause) {
-        log.error("监控中心-服务调用失败:{}", cause.getMessage());
-
-        return new RemoteMonitorService() {
-
-            @Override
-            public AjaxResult saveWaterMonitoringData(@RequestBody JSONObject json) {
-                return null;
-            }
-
-            @Override
-            public AjaxResult saveWaterPressureDeviceData(@RequestBody JSONObject json){
-                return null;
-            }
-
-            @Override
-            public AjaxResult saveSennorDeviceData(@RequestBody JSONObject json){
-                return null;
-            }
-
-            @Override
-            public AjaxResult getDevideCodeMapByTypes(@RequestBody String types){
-                return null;
-            }
-
-            @Override
-            public AjaxResult saveInsectPestsDeviceData(@RequestBody JSONObject json){
-                return null;
-            }
-
-            @Override
-            public R<SysFile> upload(MultipartFile file){
-                return null;
-            }
-
-            @Override
-            public AjaxResult configureBlackTasks() {
-                return null;
-            }
-
-            @Override
-            public AjaxResult configureWhiteTasks() {
-                return null;
-            }
-
-            @Override
-            public AjaxResult configureGpsTank() {
-                return null;
-            }
-
-            @Override
-            public AjaxResult selectGasTankDevicesNewEndTime() {
-                return null;
-            }
-
-            @Override
-            public AjaxResult remoteTrajectoryInsertBatch(JSONObject obj) {
-                return null;
-            }
-
-            @Override
-            public AjaxResult remoteMileageInsertBatch(JSONObject obj) {
-                return null;
-            }
-
-            @Override
-            public AjaxResult gpsTankInsertBatch(JSONObject obj) {
-                return null;
-            }
-
-            @Override
-            public AjaxResult getLongPollingPositionMsg() {
-                return null;
-            }
-
-            @Override
-            public AjaxResult updateDeviceStatusQuartz() {
-                return null;
-            }
-
-            @Override
-            public AjaxResult selectDayLineChartCountTask() {
-                return null;
-            }
-
-            @Override
-            public AjaxResult selectMonthlyLineChartCountTask() {
-                return null;
-            }
-
-            @Override
-            public AjaxResult quarterlineChartTask() {
-                return null;
-            }
-
-            @Override
-            public AjaxResult yearlineChartTask() {
-                return null;
-            }
-
-        };
-    }
-}

src/main/java/com/sooka/sponest/middleground/remoteapi/fallback/center/pollingPositionMsg/RemotePollingPositionMsgBaseServiceFallbackFactory.java

@@ -0,0 +1,36 @@
+package com.sooka.sponest.middleground.remoteapi.fallback.center.pollingPositionMsg;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
+import com.sooka.sponest.middleground.remoteapi.service.center.pollingPositionMsg.RemotePollingPositionMsgService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @program: ruoyi
+ * @description: yy
+ * @author: yy
+ * @create: 2022-06-16 11:05
+ **/
+@Component
+public class RemotePollingPositionMsgBaseServiceFallbackFactory implements FallbackFactory<RemotePollingPositionMsgService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+
+    @Override
+    public RemotePollingPositionMsgService create(Throwable cause) {
+        log.error("对接大华根据组织获取执法记录仪、单兵设备在线状态任务任务模块-服务调用失败:{}", cause.getMessage());
+
+        return new RemotePollingPositionMsgService() {
+
+            @Override
+            public AjaxResult getLongPollingPositionMsg() {
+                return null;
+            }
+
+
+        };
+    }
+}

src/main/java/com/sooka/sponest/middleground/remoteapi/service/ModulesServiceNameContants.java

@@ -43,4 +43,29 @@ public class ModulesServiceNameContants extends ServiceNameConstants {
      */
     public static final String SYSTEM_SERVICE = "sooka-sponest-system";
 
+    /**
+     * 摄像头操作日志对接服务
+     */
+    public static final String CENTER_MONITOR_DAHUALOG = "sooka-sponest-center-monitor-dahuaLog";
+
+    /**
+     * IOT传感器设备任务
+     */
+    public static final String CENTER_MONITOR_IOT = "sooka-sponest-center-monitor-iot";
+
+    /**
+     * 对接大华根据组织获取执法记录仪、单兵设备在线状态任务任务模块
+     */
+    public static final String CENTER_MONITOR_POLLINGPOSITIONMSG = "sooka-sponest-center-monitor-pollingPositionMsg";
+
+    /**
+     * 监控中心首页折线图缓存任务模块
+     */
+    public static final String CENTER_MONITOR_LINECHARTS = "sooka-sponest-center-monitor-lineCharts";
+
+     /**
+      * 北斗卫星定位设备车辆轨迹和行程任务任务模块
+      */
+     public static final String CENTER_MONITOR_GPSTANK = "sooka-sponest-center-monitor-gpsTank";
+
 }

src/main/java/com/sooka/sponest/middleground/remoteapi/service/center/dahuaLog/RemoteDahuaLogService.java

@@ -0,0 +1,33 @@
+package com.sooka.sponest.middleground.remoteapi.service.center.dahuaLog;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.middleground.remoteapi.fallback.center.dahuaLog.RemoteDahuaLogBaseServiceFallbackFactory;
+import com.sooka.sponest.middleground.remoteapi.service.ModulesServiceNameContants;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@FeignClient(
+        contextId = "remoteDahuaLogService"
+        , value = ModulesServiceNameContants.CENTER_MONITOR_DAHUALOG
+        , fallbackFactory = RemoteDahuaLogBaseServiceFallbackFactory.class
+        ,url = "${sooka.service.monitor-dahuaLog}"
+)
+public interface RemoteDahuaLogService {
+
+    /**
+     * 对接大华黑天云台日志定时任务
+     */
+    @ApiOperation(value = "对接大华黑天云台日志定时任务", notes = "对接大华黑天云台日志定时任务")
+    @PostMapping("/dahuaBlackOperateLog/configureBlackTasks")
+    public AjaxResult configureBlackTasks();
+
+    /**
+     * 对接大华白天云台日志定时任务
+     */
+    @ApiOperation(value = "对接大华白天云台日志定时任务", notes = "对接大华白天云台日志定时任务")
+    @PostMapping("/dahuaWhiteOperateLog/configureWhiteTasks")
+    public AjaxResult configureWhiteTasks();
+
+
+}

src/main/java/com/sooka/sponest/middleground/remoteapi/service/center/gpsTank/RemoteGpsTankService.java

@@ -0,0 +1,50 @@
+package com.sooka.sponest.middleground.remoteapi.service.center.gpsTank;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.middleground.remoteapi.fallback.center.gpsTank.RemoteGpsTankBaseServiceFallbackFactory;
+import com.sooka.sponest.middleground.remoteapi.service.ModulesServiceNameContants;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(
+        contextId = "remoteGpsTankService"
+        , value = ModulesServiceNameContants.CENTER_MONITOR_GPSTANK
+        , fallbackFactory = RemoteGpsTankBaseServiceFallbackFactory.class
+        ,url = "${sooka.service.monitor-gpsTank}"
+)
+public interface RemoteGpsTankService {
+
+    /**
+     * 获取最新一次行动轨迹时间的设备id列表
+     */
+    @ApiOperation(value = "获取最新一次行动轨迹时间的设备id列表", notes = "获取最新一次行动轨迹时间的设备id列表")
+    @GetMapping("/gps/devices/selectGasTankDevicesNewEndTime")
+    public AjaxResult selectGasTankDevicesNewEndTime();
+
+    /**
+     * 新增北斗卫星定位车辆gps历史轨迹
+     */
+    @ApiOperation(value = "新增北斗卫星定位车辆gps历史轨迹", notes = "新增北斗卫星定位车辆gps历史轨迹")
+    @PostMapping("/gps/trajectory/remoteInsertBatch")
+    public AjaxResult remoteTrajectoryInsertBatch(@RequestBody JSONObject obj);
+
+    /**
+     * 新增北斗卫星定位车辆gps历史行程
+     */
+    @ApiOperation(value = "新增北斗卫星定位车辆gps历史行程", notes = "新增北斗卫星定位车辆gps历史行程")
+    @PostMapping("/gps/mileage/remoteInsertBatch")
+    public AjaxResult remoteMileageInsertBatch(@RequestBody JSONObject obj);
+
+    /**
+     * 新增煤气罐设备信息
+     */
+    @ApiOperation(value = "新增煤气罐设备信息", notes = "新增煤气罐设备信息")
+    @PostMapping("/gps/devices/gpsTankInsertBatch")
+    public AjaxResult gpsTankInsertBatch(@RequestBody JSONObject obj);
+
+
+}

src/main/java/com/sooka/sponest/middleground/remoteapi/service/center/iot/RemoteIotService.java

@@ -0,0 +1,78 @@
+package com.sooka.sponest.middleground.remoteapi.service.center.iot;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.domain.SysFile;
+import com.sooka.sponest.middleground.remoteapi.fallback.center.iot.RemoteIotBaseServiceFallbackFactory;
+import com.sooka.sponest.middleground.remoteapi.service.ModulesServiceNameContants;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.multipart.MultipartFile;
+
+@FeignClient(
+        contextId = "remoteIotService"
+        , value = ModulesServiceNameContants.CENTER_MONITOR_IOT
+        , fallbackFactory = RemoteIotBaseServiceFallbackFactory.class
+        ,url = "${sooka.service.monitor-iot}"
+)
+public interface RemoteIotService {
+
+
+    /**
+     * 【水流速推送】向监控中心推送水流速采集数据
+     *
+     * @param json
+     * @return AjaxResult
+     * @author limeng
+     * @date 2023/7/31 16:27
+     **/
+    @PostMapping("/device/saveWaterMonitoringData")
+    public AjaxResult saveWaterMonitoringData(@RequestBody JSONObject json);
+
+
+    /**
+     * 【水压】接收城安盛邦 水压传感器数据方法
+     */
+    @PostMapping("/device/saveWaterPressureDeviceData")
+    public AjaxResult saveWaterPressureDeviceData(@RequestBody JSONObject json);
+
+    /**
+     * 【物联网】接收精讯传感器：大气、水质、土壤墒情数据通用方法
+     */
+    @ApiOperation(value = "接收精讯传感器数据通用方法", notes = "接收精讯传感器数据通用方法")
+    @PostMapping("/device/saveSennorDeviceData")
+    public AjaxResult saveSennorDeviceData(@RequestBody JSONObject json);
+
+    /**
+     * 【水流速】根据设备类型查询监控设备Map
+     */
+    @ApiOperation(value = "接收传感器水质数据", notes = "接收传感器水质数据")
+    @PostMapping("/device/getDevideCodeMapByTypes")
+    public AjaxResult getDevideCodeMapByTypes(@RequestBody String types);
+
+    /**
+     * 【病虫害】接收病虫害传感器数据方法
+     */
+    @ApiOperation(value = "接收病虫害传感器数据", notes = "接收病虫害传感器数据")
+    @PostMapping("/device/saveInsectPestsDeviceData")
+    public AjaxResult saveInsectPestsDeviceData(@RequestBody JSONObject json);
+
+    /**
+     * 病虫害文件上传
+     */
+    @PostMapping(value = "/centerMonitorFeign/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<SysFile> upload(MultipartFile file);
+
+    /**
+     * 传感器设备定时任务
+     */
+    @ApiOperation(value = "传感器设备定时任务", notes = "传感器设备定时任务")
+    @GetMapping("/device/quartz/updateDeviceStatusQuartz")
+    public AjaxResult updateDeviceStatusQuartz();
+
+}

src/main/java/com/sooka/sponest/middleground/remoteapi/service/center/lineCharts/RemoteLineChartsService.java

@@ -0,0 +1,46 @@
+package com.sooka.sponest.middleground.remoteapi.service.center.lineCharts;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.middleground.remoteapi.fallback.center.lineCharts.RemoteLineChartsBaseServiceFallbackFactory;
+import com.sooka.sponest.middleground.remoteapi.service.ModulesServiceNameContants;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(
+        contextId = "remoteLineCharService"
+        , value = ModulesServiceNameContants.CENTER_MONITOR_LINECHARTS
+        , fallbackFactory = RemoteLineChartsBaseServiceFallbackFactory.class
+        ,url = "${sooka.service.monitor-lineCharts}"
+)
+public interface RemoteLineChartsService {
+
+    /**
+     * 监控中心首页-离线设备日折线图缓存
+     */
+    @ApiOperation(value = "监控中心首页-离线设备日折线图缓存", notes = "监控中心首页-离线设备日折线图缓存")
+    @GetMapping("/camera/quartz/selectDayLineChartCountTask")
+    public AjaxResult selectDayLineChartCountTask();
+
+    /**
+     * 监控中心首页-离线设备月折线图缓存
+     */
+    @ApiOperation(value = "监控中心首页-离线设备月折线图缓存", notes = "监控中心首页-离线设备月折线图缓存")
+    @GetMapping("/camera/quartz/selectMonthlyLineChartCountTask")
+    public AjaxResult selectMonthlyLineChartCountTask();
+
+    /**
+     * 监控中心首页-离线设备季度折线图缓存
+     */
+    @ApiOperation(value = "监控中心首页-离线设备季度折线图缓存", notes = "监控中心首页-离线设备季度折线图缓存")
+    @GetMapping("/camera/quartz/quarterlineChartTask")
+    public AjaxResult quarterlineChartTask();
+
+    /**
+     * 监控中心首页-离线设备年折线图缓存
+     */
+    @ApiOperation(value = "监控中心首页-离线设备年折线图缓存", notes = "监控中心首页-离线设备年折线图缓存")
+    @GetMapping("/camera/quartz/yearlineChartTask")
+    public AjaxResult yearlineChartTask();
+
+}

src/main/java/com/sooka/sponest/middleground/remoteapi/service/center/monitor/RemoteMonitorService.java

@@ -1,164 +0,0 @@
-package com.sooka.sponest.middleground.remoteapi.service.center.monitor;
-
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.domain.SysFile;
-import com.ruoyi.system.api.domain.SysUser;
-import com.sooka.sponest.middleground.remoteapi.fallback.center.monitor.RemoteMonitorBaseServiceFallbackFactory;
-import com.sooka.sponest.middleground.remoteapi.fallback.center.system.RemoteSystemBaseServiceFallbackFactory;
-import com.sooka.sponest.middleground.remoteapi.service.ModulesServiceNameContants;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-@FeignClient(
-        contextId = "remoteMonitorService"
-        ,value = ModulesServiceNameContants.MONITOR_SERVICE
-        ,fallbackFactory = RemoteMonitorBaseServiceFallbackFactory.class
-        ,url = "${sooka.service.monitor}"
-)
-public interface RemoteMonitorService {
-    /**
-     * 【水流速推送】向监控中心推送水流速采集数据
-     * @param json
-     * @return AjaxResult
-     * @author limeng
-     * @date 2023/7/31 16:27
-     **/
-    @PostMapping("/device/saveWaterMonitoringData")
-    public AjaxResult saveWaterMonitoringData(@RequestBody JSONObject json);
-
-
-    /**
-     * 【水压】接收城安盛邦 水压传感器数据方法
-     * */
-    @PostMapping("/device/saveWaterPressureDeviceData")
-    public AjaxResult saveWaterPressureDeviceData(@RequestBody JSONObject json);
-
-    /**
-     * 【物联网】接收精讯传感器：大气、水质、土壤墒情数据通用方法
-     * */
-    @ApiOperation(value = "接收精讯传感器数据通用方法", notes = "接收精讯传感器数据通用方法")
-    @PostMapping("/device/saveSennorDeviceData")
-    public AjaxResult saveSennorDeviceData(@RequestBody JSONObject json);
-
-    /**
-     * 【水流速】根据设备类型查询监控设备Map
-     * */
-    @ApiOperation(value = "接收传感器水质数据", notes = "接收传感器水质数据")
-    @PostMapping("/device/getDevideCodeMapByTypes")
-    public AjaxResult getDevideCodeMapByTypes(@RequestBody String types);
-
-    /**
-     * 【病虫害】接收病虫害传感器数据方法
-     * */
-    @ApiOperation(value = "接收病虫害传感器数据", notes = "接收病虫害传感器数据")
-    @PostMapping("/device/saveInsectPestsDeviceData")
-    public AjaxResult saveInsectPestsDeviceData(@RequestBody JSONObject json);
-
-    /**
-     * 病虫害文件上传
-     */
-    @PostMapping (value = "/centerMonitorFeign/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<SysFile> upload(MultipartFile file);
-
-    /**
-     * 对接大华黑天云台日志定时任务
-     * */
-    @ApiOperation(value = "对接大华黑天云台日志定时任务", notes = "对接大华黑天云台日志定时任务")
-    @PostMapping("/dahuaOperateLog/configureBlackTasks")
-    public AjaxResult configureBlackTasks();
-
-    /**
-     * 对接大华白天云台日志定时任务
-     * */
-    @ApiOperation(value = "对接大华白天云台日志定时任务", notes = "对接大华白天云台日志定时任务")
-    @PostMapping("/dahuaOperateLog/configureWhiteTasks")
-    public AjaxResult configureWhiteTasks();
-
-    /**
-     * 对接定位设备车辆gps定时任务
-     * */
-    @ApiOperation(value = "对接定位设备车辆gps定时任务", notes = "对接定位设备车辆gps定时任务")
-    @GetMapping("/gps/gasTank/queryTracks")
-    public AjaxResult configureGpsTank();
-
-    /**
-     * 获取最新一次行动轨迹时间的设备id列表
-     * */
-    @ApiOperation(value = "获取最新一次行动轨迹时间的设备id列表", notes = "获取最新一次行动轨迹时间的设备id列表")
-    @GetMapping("/gps/devices/selectGasTankDevicesNewEndTime")
-    public AjaxResult selectGasTankDevicesNewEndTime();
-
-    /**
-     * 新增北斗卫星定位车辆gps历史轨迹
-     * */
-    @ApiOperation(value = "新增北斗卫星定位车辆gps历史轨迹", notes = "新增北斗卫星定位车辆gps历史轨迹")
-    @PostMapping("/gps/trajectory/remoteInsertBatch")
-    public AjaxResult remoteTrajectoryInsertBatch(@RequestBody JSONObject obj);
-
-    /**
-     * 新增北斗卫星定位车辆gps历史行程
-     * */
-    @ApiOperation(value = "新增北斗卫星定位车辆gps历史行程", notes = "新增北斗卫星定位车辆gps历史行程")
-    @PostMapping("/gps/mileage/remoteInsertBatch")
-    public AjaxResult remoteMileageInsertBatch(@RequestBody JSONObject obj);
-
-    /**
-     * 新增煤气罐设备信息
-     * */
-    @ApiOperation(value = "新增煤气罐设备信息", notes = "新增煤气罐设备信息")
-    @PostMapping("/gps/devices/gpsTankInsertBatch")
-    public AjaxResult gpsTankInsertBatch(@RequestBody JSONObject obj);
-
-
-    /**
-     * 对接大华根据组织获取执法记录仪、单兵设备在线状态定时任务
-     * */
-    @ApiOperation(value = "对接大华根据组织获取执法记录仪、单兵设备在线状态定时任务", notes = "对接大华根据组织获取执法记录仪、单兵设备在线状态定时任务")
-    @GetMapping("/equipmentStatus/quartz/getLongPollingPositionMsg")
-    public AjaxResult getLongPollingPositionMsg();
-
-    /**
-     * 传感器设备定时任务
-     * */
-    @ApiOperation(value = "传感器设备定时任务", notes = "传感器设备定时任务")
-    @GetMapping("/device/quartz/updateDeviceStatusQuartz")
-    public AjaxResult updateDeviceStatusQuartz();
-
-    /**
-     * 监控中心首页-离线设备日折线图缓存
-     * */
-    @ApiOperation(value = "监控中心首页-离线设备日折线图缓存", notes = "监控中心首页-离线设备日折线图缓存")
-    @GetMapping("/camera/quartz/selectDayLineChartCountTask")
-    public AjaxResult selectDayLineChartCountTask();
-
-    /**
-     * 监控中心首页-离线设备月折线图缓存
-     * */
-    @ApiOperation(value = "监控中心首页-离线设备月折线图缓存", notes = "监控中心首页-离线设备月折线图缓存")
-    @GetMapping("/camera/quartz/selectMonthlyLineChartCountTask")
-    public AjaxResult selectMonthlyLineChartCountTask();
-
-    /**
-     * 监控中心首页-离线设备季度折线图缓存
-     * */
-    @ApiOperation(value = "监控中心首页-离线设备季度折线图缓存", notes = "监控中心首页-离线设备季度折线图缓存")
-    @GetMapping("/camera/quartz/quarterlineChartTask")
-    public AjaxResult quarterlineChartTask();
-
-    /**
-     * 监控中心首页-离线设备年折线图缓存
-     * */
-    @ApiOperation(value = "监控中心首页-离线设备年折线图缓存", notes = "监控中心首页-离线设备年折线图缓存")
-    @GetMapping("/camera/quartz/yearlineChartTask")
-    public AjaxResult yearlineChartTask();
-
-}

src/main/java/com/sooka/sponest/middleground/remoteapi/service/center/pollingPositionMsg/RemotePollingPositionMsgService.java

@@ -0,0 +1,25 @@
+package com.sooka.sponest.middleground.remoteapi.service.center.pollingPositionMsg;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.middleground.remoteapi.fallback.center.pollingPositionMsg.RemotePollingPositionMsgBaseServiceFallbackFactory;
+import com.sooka.sponest.middleground.remoteapi.service.ModulesServiceNameContants;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(
+        contextId = "remotePollingPositionMsgService"
+        , value = ModulesServiceNameContants.CENTER_MONITOR_POLLINGPOSITIONMSG
+        , fallbackFactory = RemotePollingPositionMsgBaseServiceFallbackFactory.class
+        ,url = "${sooka.service.monitor-pollingPositionMsg}"
+)
+public interface RemotePollingPositionMsgService {
+
+    /**
+     * 对接大华根据组织获取执法记录仪、单兵设备在线状态定时任务
+     */
+    @ApiOperation(value = "对接大华根据组织获取执法记录仪、单兵设备在线状态定时任务", notes = "对接大华根据组织获取执法记录仪、单兵设备在线状态定时任务")
+    @GetMapping("/equipmentStatus/quartz/getLongPollingPositionMsg")
+    public AjaxResult getLongPollingPositionMsg();
+
+}

src/main/java/com/sooka/sponest/middleground/scheduleTask/StaticScheduleTask.java

@@ -6,7 +6,10 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.sooka.sponest.middleground.controller.MonitorController;
 import com.sooka.sponest.middleground.monitoringEquipment.inserctpests.service.PlantDiseasesAndInsectPestsService;
 import com.sooka.sponest.middleground.monitoringEquipment.sennor.service.SennorService;
-import com.sooka.sponest.middleground.remoteapi.service.center.monitor.RemoteMonitorService;
+import com.sooka.sponest.middleground.remoteapi.service.center.dahuaLog.RemoteDahuaLogService;
+import com.sooka.sponest.middleground.remoteapi.service.center.iot.RemoteIotService;
+import com.sooka.sponest.middleground.remoteapi.service.center.lineCharts.RemoteLineChartsService;
+import com.sooka.sponest.middleground.remoteapi.service.center.pollingPositionMsg.RemotePollingPositionMsgService;
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,11 +52,17 @@ public class StaticScheduleTask {
      **/
     @Value("${monitoringEquipment.insect.sennorInsectDeviceType:}")
     public String sennorInsectDeviceType;
-
-    @Resource
-    public RemoteMonitorService remoteMonitorService;
+;
     @Resource
     public MonitorController monitorController;
+    @Resource
+    public RemoteDahuaLogService remoteDahuaLogService;
+    @Resource
+    public RemoteIotService remoteIotService;
+    @Resource
+    public RemoteLineChartsService remoteLineCharService;
+    @Resource
+    public RemotePollingPositionMsgService remotePollingPositionMsgService;
 
 
     @Scheduled(cron = "0 0 0/2 * * ?")//添加定时任务 每2小时执行
@@ -79,16 +88,17 @@ public class StaticScheduleTask {
         }
     }
 
-    @Scheduled(cron = "0 0 1 * * ?")//添加定时任务 每天1点执行
+    @Scheduled(cron = "0 0/30 1 * * ?")//添加定时任务 每天1点半执行
     private void configureBlackTasks() {
-        logger.info("执行凌晨1点对接大华云台日志定时任务=>{}", DateUtils.dateTimeNow());
-        remoteMonitorService.configureBlackTasks();
+        logger.info("执行凌晨1点半对接大华云台日志定时任务=>{}", DateUtils.dateTimeNow());
+        remoteDahuaLogService.configureBlackTasks();
     }
 
-    @Scheduled(cron = "0 0/10 * * * ?")//添加定时任务 每10分钟执行
+
+    @Scheduled(cron = "0 0 0/1 * * ?")//添加定时任务 每1小时执行
     private void configureWhiteTasks() {
-        logger.info("执行每10分钟对接大华云台日志定时任务务=>{}", DateUtils.dateTimeNow());
-        remoteMonitorService.configureWhiteTasks();
+        logger.info("执行每1小时对接大华云台日志定时任务=>{}", DateUtils.dateTimeNow());
+        remoteDahuaLogService.configureWhiteTasks();
     }
 
 
@@ -98,40 +108,42 @@ public class StaticScheduleTask {
         monitorController.configureGpsTank();
     }
 
-    @Scheduled(cron = "0 0/5 * * * ?")//添加定时任务 每5分钟执行一次
+
+    @Scheduled(cron = "0 0/2 * * * ?")//添加定时任务 每2分钟执行一次
     private void getLongPollingPositionMsg() {
         logger.info("对接大华根据组织获取执法记录仪、单兵设备在线状态定时任务定时任务=>{}", DateUtils.dateTimeNow());
-        remoteMonitorService.getLongPollingPositionMsg();
+        remotePollingPositionMsgService.getLongPollingPositionMsg();
     }
 
-    @Scheduled(cron = "0 0 */2 * * ?")//添加定时任务 每两小时执行一次
+
+    @Scheduled(cron = "0 0 0/1 * * ?")//添加定时任务 每1小时执行一次
     private void updateDeviceStatusQuartz() {
-        logger.info("传感器设备定时任务=>{}", DateUtils.dateTimeNow());
-        remoteMonitorService.updateDeviceStatusQuartz();
+        logger.info("IOT传感器设备定时任务=>{}", DateUtils.dateTimeNow());
+        remoteIotService.updateDeviceStatusQuartz();
     }
 
-    @Scheduled(cron = "0 0 */2 * * ?")//添加定时任务 每两小时执行一次
+    @Scheduled(cron = "0 0 0/2 * * ?")//添加定时任务 每两小时执行一次
     private void selectDayLineChartCountTask() {
         logger.info("监控中心首页-离线设备日折线图缓存定时任务=>{}", DateUtils.dateTimeNow());
-        remoteMonitorService.selectDayLineChartCountTask();
+        remoteLineCharService.selectDayLineChartCountTask();
     }
 
-    @Scheduled(cron = "0 0 */2 * * ?")//添加定时任务 每两小时执行一次
+    @Scheduled(cron = "0 0 0/2 * * ?")//添加定时任务 每两小时执行一次
     private void selectMonthlyLineChartCountTask() {
         logger.info("监控中心首页-离线设备月折线图缓存存定时任务=>{}", DateUtils.dateTimeNow());
-        remoteMonitorService.selectMonthlyLineChartCountTask();
+        remoteLineCharService.selectMonthlyLineChartCountTask();
     }
 
-    @Scheduled(cron = "0 0 */2 * * ?")//添加定时任务 每两小时执行一次
+    @Scheduled(cron = "0 0 0/2 * * ?")//添加定时任务 每两小时执行一次
     private void quarterlineChartTask() {
         logger.info("监控中心首页-离线设备季度折线图缓存定时任务=>{}", DateUtils.dateTimeNow());
-        remoteMonitorService.quarterlineChartTask();
+        remoteLineCharService.quarterlineChartTask();
     }
 
-    @Scheduled(cron = "0 0 */2 * * ?")//添加定时任务 每两小时执行一次
+    @Scheduled(cron = "0 0 0/2 * * ?")//添加定时任务 每两小时执行一次
     private void yearlineChartTask() {
         logger.info("监控中心首页-离线设备年折线图缓存定时任务=>{}", DateUtils.dateTimeNow());
-        remoteMonitorService.yearlineChartTask();
+        remoteLineCharService.yearlineChartTask();
     }
 
 

src/main/java/com/sooka/sponest/middleground/util/CacheUtils.java

@@ -6,6 +6,7 @@ import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.cache.ehcache.EhCacheManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import java.util.Iterator;
 import java.util.Set;
 

src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 43000 #市场演示服务器端口，外网端口一致
+  port: 15002
 #  port: 41000
 # Spring
 spring: