优化

tongfei_river_data_collection/src/main/java/com/ublinkage/datacollection/service/QxybDataCollectionTask.java

@@ -294,8 +294,9 @@ public class QxybDataCollectionTask implements InitializingBean {
             List<PublishInfo> publishInfoList = json.getJSONObject("data").getJSONArray("publishInfoList").toJavaList(PublishInfo.class);
             //查询1小时的降雨和温度
             for (PublishInfo publishInfo : publishInfoList) {
-                //获取这个批次的每个时间点数据，根据publishTime的次日0时开始算192个小时
-                int duration = Integer.parseInt(publishInfo.getPublishDT().split("_")[2]);
+                //获取这个批次的每个时间点数据，根据publishTime的次日0时开始算240个小时
+//                int duration = Integer.parseInt(publishInfo.getPublishDT().split("_")[2]);
+                int duration = 240;
                 LocalDateTime publishTime = LocalDateTime.parse(publishInfo.getPublishTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 //                LocalDateTime st = publishTime.plusHours(12);
                 //网格降水和温度都是从次日1时开始
@@ -304,13 +305,13 @@ public class QxybDataCollectionTask implements InitializingBean {
                 try {
                     //1小时雨量
                     for (int i = 0; i <= duration; i++) {
-                        int hour = 1;
-                        String content = "precipitation";
+//                        int hour = 1;
+//                        String content = "precipitation";
                         LocalDateTime dateTime = st.plusHours(i);
                         String dt1 = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH_mm_ss"));
-                        String dt2 = dateTime.plusHours(hour).format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH_mm_ss"));
-                        String result = HttpUtil.get("http://111.198.2.202:6657/getForecastMatrixByWrfRDField?RDField=" + RDField + "&publishDT=" + publishInfo.getPublishDT() + "&ensemble=" + publishInfo.getEnsemble() + "&domain=" + domain + "&content=" + content + "&DT1=" + dt1 + "&DT2=" + dt2 + "&step=" + hour);
-                        FileUtil.writeUtf8String(result, downloadFilePath + "RainGrid," + publishInfo.getPublishDT() + "," + dt1 + "," + hour + "," + ensemble + "," + System.currentTimeMillis() + ".json");
+                        String dt2 = dateTime.plusHours(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH_mm_ss"));
+                        String result = HttpUtil.get("http://111.198.2.202:6657/getForecastMatrixByWrfRDField?RDField=" + RDField + "&publishDT=" + publishInfo.getPublishDT() + "&ensemble=" + publishInfo.getEnsemble() + "&domain=" + domain + "&content=precipitation&DT1=" + dt1 + "&DT2=" + dt2 + "&step=" + 1);
+                        FileUtil.writeUtf8String(result, downloadFilePath + "RainGrid," + publishInfo.getPublishDT() + "," + dt1 + "," + 1 + "," + ensemble + "," + System.currentTimeMillis() + ".json");
                     }
                 } catch (Exception e) {
                     log.error("e:{}", e.getMessage());
@@ -319,14 +320,13 @@ public class QxybDataCollectionTask implements InitializingBean {
                     LocalDateTime st24 = LocalDateTime.of(publishTime.getYear(), publishTime.getMonthValue(), publishTime.getDayOfMonth(), 0, 0, 0).plusDays(1);
                     //24小时雨量
                     for (int i = 0; i <= duration / 24; i++) {
-                        int hour = 24;
-                        String content = "precipitation";
+//                        int hour = 24;
+//                        String content = "precipitation";
                         LocalDateTime dateTime = st24.plusDays(i);
-
                         String dt1 = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH_mm_ss"));
-                        String dt2 = dateTime.plusHours(hour).format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH_mm_ss"));
-                        String result = HttpUtil.get("http://111.198.2.202:6657/getForecastMatrixByWrfRDField?RDField=" + RDField + "&publishDT=" + publishInfo.getPublishDT() + "&ensemble=" + publishInfo.getEnsemble() + "&domain=" + domain + "&content=" + content + "&DT1=" + dt1 + "&DT2=" + dt2 + "&step=" + hour);
-                        FileUtil.writeUtf8String(result, downloadFilePath + "RainGrid," + publishInfo.getPublishDT() + "," + dt1 + "," + hour + "," + ensemble + "," + System.currentTimeMillis() + ".json");
+                        String dt2 = dateTime.plusHours(24).format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH_mm_ss"));
+                        String result = HttpUtil.get("http://111.198.2.202:6657/getForecastMatrixByWrfRDField?RDField=" + RDField + "&publishDT=" + publishInfo.getPublishDT() + "&ensemble=" + publishInfo.getEnsemble() + "&domain=" + domain + "&content=precipitation&DT1=" + dt1 + "&DT2=" + dt2 + "&step=" + 24);
+                        FileUtil.writeUtf8String(result, downloadFilePath + "RainGrid," + publishInfo.getPublishDT() + "," + dt1 + "," + 24 + "," + ensemble + "," + System.currentTimeMillis() + ".json");
                     }
                 } catch (Exception e) {
                     log.error("e:{}", e.getMessage());
@@ -335,12 +335,12 @@ public class QxybDataCollectionTask implements InitializingBean {
                 try {
                     //1小时温度
                     for (int i = 0; i <= duration; i++) {
-                        int hour = 1;
-                        String content = "2mTC";
+//                        int hour = 1;
+//                        String content = "2mTC";
                         LocalDateTime dateTime = st.plusHours(i);
                         String dt1 = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH_mm_ss"));
-                        String result = HttpUtil.get("http://111.198.2.202:6657/getForecastMatrixByWrfRDField?RDField=" + RDField + "&publishDT=" + publishInfo.getPublishDT() + "&ensemble=" + publishInfo.getEnsemble() + "&domain=" + domain + "&content=" + content + "&DT1=" + dt1 + "&step=" + hour);
-                        FileUtil.writeUtf8String(result, downloadFilePath + "TempGrid," + publishInfo.getPublishDT() + "," + dt1 + "," + hour + "," + ensemble + "," + System.currentTimeMillis() + ".json");
+                        String result = HttpUtil.get("http://111.198.2.202:6657/getForecastMatrixByWrfRDField?RDField=" + RDField + "&publishDT=" + publishInfo.getPublishDT() + "&ensemble=" + publishInfo.getEnsemble() + "&domain=" + domain + "&content=2mTC&DT1=" + dt1 + "&step=" + 1);
+                        FileUtil.writeUtf8String(result, downloadFilePath + "TempGrid," + publishInfo.getPublishDT() + "," + dt1 + "," + 1 + "," + ensemble + "," + System.currentTimeMillis() + ".json");
                     }
                 } catch (Exception e) {
                     log.error("e:{}", e.getMessage());