modify some codes

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

@@ -96,8 +96,7 @@ public class TianQingCLDASDataHandler {
         XxlJobHelper.log("read job end");
     }
 
-    public TianQingResponse<List<TianQingFileVO>> request(String timeRang, Map<String, Object> params) throws JsonProcessingException {
-        synchronized (this){
+    public synchronized TianQingResponse<List<TianQingFileVO>> request(String timeRang, Map<String, Object> params) throws JsonProcessingException {
         if (results.containsKey(timeRang)){
             return results.get(timeRang);
         }
@@ -115,10 +114,8 @@ public class TianQingCLDASDataHandler {
 
             index++;
         }
-
         return null;
     }
-    }
 
     private Map<DealInfo, Map.Entry<MetaInfo, Coordinate>> download(List<TianQingFileVO> tianQingFileVOs, String elementCode, List<DealInfo> dealInfos){
         Date afterTime = Date.from(LocalDateTime.now().minusMinutes(10).atZone(ZoneId.systemDefault()).toInstant());

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

@@ -91,8 +91,7 @@ public class TianQingCMPADataHandler {
         XxlJobHelper.log("read job end");
     }
 
-    public TianQingResponse<List<TianQingFileVO>> request(String timeRang, Map<String, Object> params) throws JsonProcessingException {
-        synchronized (this){
+    public synchronized TianQingResponse<List<TianQingFileVO>> request(String timeRang, Map<String, Object> params) throws JsonProcessingException {
         if (results.containsKey(timeRang)){
             return results.get(timeRang);
         }
@@ -113,7 +112,6 @@ public class TianQingCMPADataHandler {
 
         return null;
     }
-    }
 
     private Map<DealInfo, Map.Entry<MetaInfo, Coordinate>> download(List<TianQingFileVO> tianQingFileVOs, String elementCode, List<DealInfo> dealInfos){
         Date afterTime = Date.from(LocalDateTime.now().minusMinutes(10).atZone(ZoneId.systemDefault()).toInstant());

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

@@ -94,8 +94,7 @@ public class TianQingRadarDataHandler {
         XxlJobHelper.log("read job end");
     }
 
-    public TianQingResponse<List<TianQingFileVO>> request(String timeRang, Map<String, Object> params) throws JsonProcessingException {
-        synchronized (this){
+    public synchronized TianQingResponse<List<TianQingFileVO>> request(String timeRang, Map<String, Object> params) throws JsonProcessingException {
         if (results.containsKey(timeRang)){
             return results.get(timeRang);
         }
@@ -116,7 +115,6 @@ public class TianQingRadarDataHandler {
 
         return null;
     }
-    }
 
     private Map<DealInfo, Map.Entry<MetaInfo, Coordinate>> download(List<TianQingFileVO> tianQingFileVOs, String memberCode, List<DealInfo> dealInfos){
         Date afterTime = Date.from(LocalDateTime.now().minusMinutes(10).atZone(ZoneId.systemDefault()).toInstant());

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

@@ -96,8 +96,7 @@ public class TianQingSCMOCDataHandler {
         XxlJobHelper.log("read job end");
     }
 
-    public TianQingResponse<List<TianQingFileVO>> request(String timeRang, Map<String, Object> params) throws JsonProcessingException {
-        synchronized (this){
+    public synchronized TianQingResponse<List<TianQingFileVO>> request(String timeRang, Map<String, Object> params) throws JsonProcessingException {
         if (results.containsKey(timeRang)){
             return results.get(timeRang);
         }
@@ -118,7 +117,6 @@ public class TianQingSCMOCDataHandler {
 
         return null;
     }
-    }
 
     private Map<DealInfo, Map.Entry<MetaInfo, Coordinate>> download(List<TianQingFileVO> tianQingFileVOs, String elementCode, List<DealInfo> dealInfos){
         Date afterTime = Date.from(LocalDateTime.now().minusMinutes(10).atZone(ZoneId.systemDefault()).toInstant());

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

@@ -96,8 +96,7 @@ public class TianQingSPCCDataHandler {
         XxlJobHelper.log("read job end");
     }
 
-    public TianQingResponse<List<TianQingFileVO>> request(String timeRang, Map<String, Object> params) throws JsonProcessingException {
-        synchronized (this){
+    public synchronized TianQingResponse<List<TianQingFileVO>> request(String timeRang, Map<String, Object> params) throws JsonProcessingException {
         if (results.containsKey(timeRang)){
             return results.get(timeRang);
         }
@@ -118,7 +117,6 @@ public class TianQingSPCCDataHandler {
 
         return null;
     }
-    }
 
     private Map<DealInfo, Map.Entry<MetaInfo, Coordinate>> download(List<TianQingFileVO> tianQingFileVOs, String elementCode, List<DealInfo> dealInfos){
         Date afterTime = Date.from(LocalDateTime.now().minusMinutes(10).atZone(ZoneId.systemDefault()).toInstant());

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

@@ -49,7 +49,6 @@ public class CustomRadarInputStream implements ICustomInputStream, Closeable{
         fileInputStream = new FileInputStream(filepath);
 //        available = new File(filepath).length();
         inputStream = clazz.getConstructor(InputStream.class).newInstance(fileInputStream);
-        System.out.println(inputStream.readAllBytes());
     }
 
     @Override

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

@@ -25,7 +25,6 @@ public class RadialBlock {
                 this.radials.add(new Radial(ICustomInputStream));
             }
         }catch (EOFException e){
-
         }
     }
 }

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.bz2");
+        radarReader.read("C:\\Users\\xiaowuler\\Desktop\\Z_RADR_I_Z9559_20220321094351_O_DOR_SAD_CAP_FMT.bin.bz2");
         System.out.println("");
     }