modify some codes

04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingRadarDataHandler.java

@@ -1,5 +1,6 @@
 package com.ping.chuan.ahpmsdp.xxljobexecutor.jobhandler;
 
+import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.nio.file.Files;
@@ -67,7 +68,7 @@ public class TianQingRadarDataHandler {
         String param = XxlJobHelper.getJobParam();
         ParamInfo paramInfo = objectMapper.readValue(param, ParamInfo.class);
         Map<String, Object> params = applicationCommon.prepareParams(paramInfo.getModeCode().toLowerCase());
-        LocalDateTime startTime = LocalDateTime.now().minusHours(8).minusHours(paramInfo.getTimeLength());
+        LocalDateTime startTime = LocalDateTime.now().minusHours(8).minusMinutes(paramInfo.getTimeLength());
         LocalDateTime endTime = LocalDateTime.now().minusHours(8);
         TianQingResponse<List<TianQingFileVO>> tianQingResponse = request(String.format("[%s,%s]", startTime.format(TimeConstant.YYYYMMDDHHMM00), endTime.format(TimeConstant.YYYYMMDDHHMM00)), params);
         if (Objects.isNull(tianQingResponse)){
@@ -168,11 +169,16 @@ public class TianQingRadarDataHandler {
         XxlJobHelper.log("开始下载文件：{}", dealInfo.getFileName());
         boolean result = FileUtil.downloadByNetwork(dealInfo.getUrl(), dealInfo.getLocalPath());
         if (result){
+            File file = new File(dealInfo.getLocalPath());
+            if (file.length() > 0){
                 XxlJobHelper.log("文件：{} 下载完成", dealInfo.getFileName());
                 targetDealInfos.put(dealInfo, entry);
                 return;
             }
 
+            file.delete();
+        }
+
         dealInfo.setState(StateConstant.FAILED);
         XxlJobHelper.log("文件：{} 下载失败", dealInfo.getFileName());
         dealInfo.setMessage(String.format("下载文件：%s失败",dealInfo.getFileName()));

04.系统编码/03.radar-resolver/radar-core/radar-core.iml

@@ -5,8 +5,6 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

04.系统编码/03.radar-resolver/radar-core/src/main/java/com/xiaowuler/radar/core/custom/impl/CustomRadarInputStream.java

@@ -30,12 +30,14 @@ public class CustomRadarInputStream implements ICustomInputStream, Closeable{
 
     public CustomRadarInputStream(String filepath) throws FileNotFoundException, InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
         String fileSuffix = filepath.substring(filepath.lastIndexOf(".") + 1).trim().toLowerCase(Locale.ROOT);
+
         switch (fileSuffix){
             case BIN_SUFFIX:
                 customRadarInputStream(filepath, DataInputStream.class);
                 break;
             case BZIP_SUFFIX:
                 customRadarInputStream(filepath, BZip2CompressorInputStream.class);
+                break;
             default:
                 throw new IllegalAccessException("无效的文件格式类型");
         }

04.系统编码/03.radar-resolver/radar-core/src/main/java/com/xiaowuler/radar/core/weather/resolver/RadarReader.java

@@ -1,16 +1,17 @@
 package com.xiaowuler.radar.core.weather.resolver;
 
+import com.xiaowuler.radar.core.custom.impl.CustomRadarInputStream;
+import com.xiaowuler.radar.core.exceptions.RadarReadException;
+import com.xiaowuler.radar.core.weather.domain.CommonBlock;
+import com.xiaowuler.radar.core.weather.domain.RadarBlock;
+import com.xiaowuler.radar.core.weather.domain.RadialBlock;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.python.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
-
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import com.xiaowuler.radar.core.custom.impl.CustomRadarInputStream;
-import com.xiaowuler.radar.core.exceptions.RadarReadException;
-import com.xiaowuler.radar.core.weather.domain.*;
 
 /**
  * @describe: radar reader
@@ -82,4 +83,12 @@ public class RadarReader implements Serializable {
 //        return result;
         return null;
     }
+
+    public RadarBlock getRadarBlock() {
+        return radarBlock;
+    }
+
+    public void setRadarBlock(RadarBlock radarBlock) {
+        this.radarBlock = radarBlock;
+    }
 }

04.系统编码/03.radar-resolver/radar-test/src/test/java/com/xiaowuler/radartest/RadarTestApplicationTests.java

@@ -11,7 +11,7 @@ class RadarTestApplicationTests {
     @Test
     void contextLoads() throws RadarReadException {
         RadarReader radarReader = new RadarReader();
-        radarReader.read("C:\\Users\\xiaowuler\\Desktop\\test\\Z_RADR_I_Z9551_20210712000134_O_DOR_SA_CAP_FMT.bin\\Z_RADR_I_Z9551_20210712000134_O_DOR_SA_CAP_FMT.bin");
+        radarReader.read("C:\\SaveFile\\Source\\202203\\RADAR\\SAD\\CAP\\Z_RADR_I_Z9558_20220321065017_O_DOR_SAD_CAP_FMT.bin.bz2");
         System.out.println("");
     }