Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/JXDZExecute.java

@@ -28,13 +28,13 @@ public class JXDZExecute {
     JXDZUtils jxdzUtils;
     @Autowired
     JXDZFactory jxdzFactory;
-    @Value("${scheduledEnable:false}")
-    private Boolean scheduledEnable;
+    @Value("${jxdzScheduledEnable:false}")
+    private Boolean jxdzScheduledEnable;
 
 
     @Scheduled(cron = "0 0 */1 * * ?")
     public void hourInterface() {
-        if (!scheduledEnable) {
+        if (!jxdzScheduledEnable) {
             return;
         }
         log.info("开始执行小时任务");
@@ -57,16 +57,16 @@ public class JXDZExecute {
         fdzsbjcService.backupData(windDeviceDataVOList, needDataVO.getDateTime());
         gfdzsbjcService.backupData(pvDeviceDataVOList, needDataVO.getDateTime());
         //发送请求
-        fdzjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, windStationDataVOList);
-        gfdzjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, pvStationDataVOList);
-        fdzsbjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, windDeviceDataVOList);
-        gfdzsbjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, pvDeviceDataVOList);
+//        fdzjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, windStationDataVOList);
+//        gfdzjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, pvStationDataVOList);
+//        fdzsbjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, windDeviceDataVOList);
+//        gfdzsbjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, pvDeviceDataVOList);
         log.info("小时任务执行成功");
     }
 
     @Scheduled(cron = "0 0 1 * * ?")
     public void dayInterface() {
-        if (!scheduledEnable) {
+        if (!jxdzScheduledEnable) {
             return;
         }
         log.info("开始执行天任务");

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application-dev1.properties

@@ -167,8 +167,8 @@ coreIp=iiet-jepcc.powerchina.cn:8088
 jxdzIp=122.70.153.215:9003
 jxdzTokenUserName=jiangxi_epc
 jxdzTokenPassword=123456
-publicKey=04508e9c4df8463c784df2dde2536e792851a8f3fd0e5ff29b7bf1a5d9e3f566aa49a7a5fe7683e3dc4dc30dd7bc8773838a9e4fbcf7dfac53461c8777a6aed691
-scheduledEnable=false
+jxdzPublicKey=04508e9c4df8463c784df2dde2536e792851a8f3fd0e5ff29b7bf1a5d9e3f566aa49a7a5fe7683e3dc4dc30dd7bc8773838a9e4fbcf7dfac53461c8777a6aed691
+jxdzScheduledEnable=false