Merge remote-tracking branch 'origin/master'

src/main/java/com/yunfeiyun/agmp/iots/task/YbqScheduler.java

@@ -61,8 +61,6 @@ public class YbqScheduler {
     };
 
 
-
-
     /**
      * 同步预测数据
      * 步骤：
@@ -107,7 +105,7 @@ public class YbqScheduler {
         try {
             String code = iotDevice.getDevCode();
             String devBid = iotDevice.getDevBid();
-            JSONArray jsonArrayDevs = ((YbqCmbService)httpManager.getHttpClientByDevice(iotDevice)).getPredictedData( code, startDate, endTime,ybqTypeConst.getCode());
+            JSONArray jsonArrayDevs = ((YbqCmbService) httpManager.getHttpClientByDevice(iotDevice)).getPredictedData(code, startDate, endTime, ybqTypeConst.getCode());
             if (jsonArrayDevs == null || jsonArrayDevs.size() == 0) {
                 log.error("【预测数据同步】【{}}】暂无设备数据，无需导入", ybqTypeConst.getMessage());
                 return;
@@ -214,7 +212,7 @@ public class YbqScheduler {
             String code = iotDevice.getDevCode();
             String devBid = iotDevice.getDevBid();
             // 临时时间写成过去的，把数据拉起过来
-            JSONArray jsonArrayDevs = ((YbqCmbService)httpManager.getHttpClientByDevice(iotDevice)).getReportData( code, startTime, endTime);
+            JSONArray jsonArrayDevs = ((YbqCmbService) httpManager.getHttpClientByDevice(iotDevice)).getReportData(code, startTime, endTime);
             if (jsonArrayDevs == null || jsonArrayDevs.size() == 0) {
                 log.error("【上报数据同步】【{}}】暂无设备数据，无需导入", ybqTypeConst.getMessage());
                 return;
@@ -273,11 +271,12 @@ public class YbqScheduler {
         try {
 
 
-            String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addDays(new Date(), -30*3));
+            String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addDays(new Date(), -30 * 3));
             String endTime = DateUtils.dateTimeNow();
 
             //预测数据的时间，20200101格式
-            String startDate = DateUtils.dateTime();
+            String startDate = DateUtils.parseDateToStr("yyyyMMdd", DateUtils.addDays(new Date(), -30 * 3));
+            String endDate = DateUtils.dateTime();
 
             // 处理赤霉病
             if (IotDeviceDictConst.TYPE_HS_YBQ_CMB.equals(iotDevice.getDevtypeBid())) {
@@ -285,7 +284,7 @@ public class YbqScheduler {
                 // 更新监测环境数据
                 dealEnvDataByDevice(iotDevice, YbqTypeConst.YBQ_XM_CMB, startTime, endTime);
                 // 更新预测数据
-                delaYbqPredictedData(iotDevice, YbqTypeConst.YBQ_XM_CMB, startDate, startDate);
+                delaYbqPredictedData(iotDevice, YbqTypeConst.YBQ_XM_CMB, startDate, endDate);
             }
             // 处理稻瘟病
             else if (IotDeviceDictConst.TYPE_HS_YBQ_DWB.equals(iotDevice.getDevtypeBid())) {
@@ -293,14 +292,14 @@ public class YbqScheduler {
                 // 更新检测环境数据
                 dealEnvDataByDevice(iotDevice, YbqTypeConst.YBQ_SD_DWB, startTime, endTime);
                 // 更新预测数据
-                delaYbqPredictedData(iotDevice, YbqTypeConst.YBQ_SD_DWB, startDate, startDate);
+                delaYbqPredictedData(iotDevice, YbqTypeConst.YBQ_SD_DWB, startDate, endDate);
             }  // 处理玉米大斑病
             else if (IotDeviceDictConst.TYPE_HS_YBQ_DBB.equals(iotDevice.getDevtypeBid())) {
                 log.info("处理设备ID [{}] 类型 [{}] 的监测环境数据和预测数据更新", devId, IotDeviceDictConst.TYPE_HS_YBQ_DBB);
                 // 更新检测环境数据
                 dealEnvDataByDevice(iotDevice, YbqTypeConst.YBQ_YM_DBB, startTime, endTime);
                 // 更新预测数据
-                delaYbqPredictedData(iotDevice, YbqTypeConst.YBQ_YM_DBB, startDate, startDate);
+                delaYbqPredictedData(iotDevice, YbqTypeConst.YBQ_YM_DBB, startDate, endDate);
             } else {
                 log.warn("设备ID [{}] 的设备类型未知，无法识别处理", devId);
             }