修改林洋下午短期上送minio文件名

in-cloud/src/main/java/com/jiayue/insu/incloud/pulldata/PullCorrectDataForLx.java

@@ -18,7 +18,6 @@ import com.jiayue.insu.incloud.service.ForecastDataService;
 import com.jiayue.insu.incloud.service.IntegrationCompanyService;
 import com.jiayue.insu.incloud.service.RecordService;
 import com.jiayue.insu.incloud.service.StationService;
-import com.jiayue.insu.incloud.utils.JsonResultUtil;
 import com.jiayue.insu.incloud.utils.SystermUtils;
 import com.jiayue.insu.minio.util.MinioUtilService;
 import lombok.Data;
@@ -35,6 +34,7 @@ import java.io.*;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -113,6 +113,8 @@ public class PullCorrectDataForLx implements IPullInitCorrectDataForSH {
             queryString.append("&version=").append(day);
             queryString.append("&type=").append("E1".equals(station.getType()) ? 2 : 1);
             String url = "http://112.2.27.84:4220/forecast/changeData?" + queryString.toString();
+            // 测试地址
+//          String url = "https://113.219.237.106:33631/forecast/changeData?" + queryString.toString();
             // 发送请求
             HttpRequest httpRequest = HttpRequest.get(url)
                     .header("Content-Type", "application/json");
@@ -327,8 +329,15 @@ public class PullCorrectDataForLx implements IPullInitCorrectDataForSH {
             if (!fileUrl.exists()) {// 判断目录是否存在
                 fileUrl.mkdirs();
             }
+            String fileName = "";
 
-            String fileName = "DQ_" + DateUtil.format(DateUtil.beginOfDay(new Date()), "yyyyMMddHHmmss") + "0.RB";
+            // 文件名区分（上午、下午）
+            LocalTime now = LocalTime.now();
+            if (now.getHour() <= 12) {
+                fileName = "DQ_" + DateUtil.format(DateUtil.beginOfDay(new Date()), "yyyyMMddHHmmss") + "0.RB";
+            } else {
+                fileName = "DQ_" + new SimpleDateFormat("yyyy-MM-dd").format(new Date())+"1200000.RB";
+            }
 
             file = new File(fUrl + File.separatorChar + fileName);
 

in-cloud/src/main/java/com/jiayue/insu/incloud/pushdata/PushDataForLX.java

@@ -270,6 +270,8 @@ public class PushDataForLX implements IPushInitForecastData {
         try {
             String response;
             HttpRequest httpRequest = HttpRequest.post("http://112.2.27.84:4220/forecast/reportData")
+             // 测试地址
+//            HttpRequest httpRequest = HttpRequest.post("https://113.219.237.106:33631/forecast/reportData")
 //            HttpRequest httpRequest = HttpRequest.post("http://112.2.27.4/forecast")
                     .header("Content-Type", "application/json");
             httpRequest.setGlobalTimeout(20000);