From 209ac4c1f4c7dcb6837e19c14db061b5d61a7bd2 Mon Sep 17 00:00:00 2001 From: xiaowuler Date: Tue, 22 Mar 2022 10:06:38 +0800 Subject: [PATCH] modify some codes --- .../jobhandler/TianQingCLDASDataHandler.java | 33 ++++++++---------- .../jobhandler/TianQingCMPADataHandler.java | 34 +++++++++---------- .../jobhandler/TianQingRadarDataHandler.java | 34 +++++++++---------- .../jobhandler/TianQingSCMOCDataHandler.java | 34 +++++++++---------- .../jobhandler/TianQingSPCCDataHandler.java | 34 +++++++++---------- .../custom/impl/CustomRadarInputStream.java | 1 - .../core/weather/domain/RadialBlock.java | 1 - .../radartest/RadarTestApplicationTests.java | 2 +- 8 files changed, 80 insertions(+), 93 deletions(-) diff --git a/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingCLDASDataHandler.java b/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingCLDASDataHandler.java index f765507..4f5e798 100644 --- a/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingCLDASDataHandler.java +++ b/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingCLDASDataHandler.java @@ -96,28 +96,25 @@ public class TianQingCLDASDataHandler { XxlJobHelper.log("read job end"); } - public TianQingResponse> request(String timeRang, Map params) throws JsonProcessingException { - synchronized (this){ - if (results.containsKey(timeRang)){ - return results.get(timeRang); - } + public synchronized TianQingResponse> request(String timeRang, Map params) throws JsonProcessingException { + if (results.containsKey(timeRang)){ + return results.get(timeRang); + } - results.clear(); - params.put("timeRange", timeRang); - int index = 0; - while (index < 3){ - String result = WebUtil.get(applicationCommon.getUrl(), params); - TianQingResponse> tianQingResponse = objectMapper.readValue(result, new TypeReference<>() {}); - if (tianQingResponse.getReturnCode() == 0){ - results.put(timeRang, tianQingResponse); - return tianQingResponse; - } - - index++; + results.clear(); + params.put("timeRange", timeRang); + int index = 0; + while (index < 3){ + String result = WebUtil.get(applicationCommon.getUrl(), params); + TianQingResponse> tianQingResponse = objectMapper.readValue(result, new TypeReference<>() {}); + if (tianQingResponse.getReturnCode() == 0){ + results.put(timeRang, tianQingResponse); + return tianQingResponse; } - return null; + index++; } + return null; } private Map> download(List tianQingFileVOs, String elementCode, List dealInfos){ diff --git a/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingCMPADataHandler.java b/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingCMPADataHandler.java index 9d57e7c..211eb03 100644 --- a/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingCMPADataHandler.java +++ b/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingCMPADataHandler.java @@ -91,28 +91,26 @@ public class TianQingCMPADataHandler { XxlJobHelper.log("read job end"); } - public TianQingResponse> request(String timeRang, Map params) throws JsonProcessingException { - synchronized (this){ - if (results.containsKey(timeRang)){ - return results.get(timeRang); - } + public synchronized TianQingResponse> request(String timeRang, Map params) throws JsonProcessingException { + if (results.containsKey(timeRang)){ + return results.get(timeRang); + } - results.clear(); - params.put("timeRange", timeRang); - int index = 0; - while (index < 3){ - String result = WebUtil.get(applicationCommon.getUrl(), params); - TianQingResponse> tianQingResponse = objectMapper.readValue(result, new TypeReference<>() {}); - if (tianQingResponse.getReturnCode() == 0){ - results.put(timeRang, tianQingResponse); - return tianQingResponse; - } - - index++; + results.clear(); + params.put("timeRange", timeRang); + int index = 0; + while (index < 3){ + String result = WebUtil.get(applicationCommon.getUrl(), params); + TianQingResponse> tianQingResponse = objectMapper.readValue(result, new TypeReference<>() {}); + if (tianQingResponse.getReturnCode() == 0){ + results.put(timeRang, tianQingResponse); + return tianQingResponse; } - return null; + index++; } + + return null; } private Map> download(List tianQingFileVOs, String elementCode, List dealInfos){ diff --git a/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingRadarDataHandler.java b/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingRadarDataHandler.java index e758b9c..939c565 100644 --- a/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingRadarDataHandler.java +++ b/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingRadarDataHandler.java @@ -94,28 +94,26 @@ public class TianQingRadarDataHandler { XxlJobHelper.log("read job end"); } - public TianQingResponse> request(String timeRang, Map params) throws JsonProcessingException { - synchronized (this){ - if (results.containsKey(timeRang)){ - return results.get(timeRang); - } + public synchronized TianQingResponse> request(String timeRang, Map params) throws JsonProcessingException { + if (results.containsKey(timeRang)){ + return results.get(timeRang); + } - results.clear(); - params.put("timeRange", timeRang); - int index = 0; - while (index < 3){ - String result = WebUtil.get(applicationCommon.getUrl(), params); - TianQingResponse> tianQingResponse = objectMapper.readValue(result, new TypeReference<>() {}); - if (tianQingResponse.getReturnCode() == 0){ - results.put(timeRang, tianQingResponse); - return tianQingResponse; - } - - index++; + results.clear(); + params.put("timeRange", timeRang); + int index = 0; + while (index < 3){ + String result = WebUtil.get(applicationCommon.getUrl(), params); + TianQingResponse> tianQingResponse = objectMapper.readValue(result, new TypeReference<>() {}); + if (tianQingResponse.getReturnCode() == 0){ + results.put(timeRang, tianQingResponse); + return tianQingResponse; } - return null; + index++; } + + return null; } private Map> download(List tianQingFileVOs, String memberCode, List dealInfos){ diff --git a/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingSCMOCDataHandler.java b/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingSCMOCDataHandler.java index 8df8d85..7bbc34c 100644 --- a/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingSCMOCDataHandler.java +++ b/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingSCMOCDataHandler.java @@ -96,28 +96,26 @@ public class TianQingSCMOCDataHandler { XxlJobHelper.log("read job end"); } - public TianQingResponse> request(String timeRang, Map params) throws JsonProcessingException { - synchronized (this){ - if (results.containsKey(timeRang)){ - return results.get(timeRang); - } + public synchronized TianQingResponse> request(String timeRang, Map params) throws JsonProcessingException { + if (results.containsKey(timeRang)){ + return results.get(timeRang); + } - results.clear(); - params.put("timeRange", timeRang); - int index = 0; - while (index < 3){ - String result = WebUtil.get(applicationCommon.getUrl(), params); - TianQingResponse> tianQingResponse = objectMapper.readValue(result, new TypeReference<>() {}); - if (tianQingResponse.getReturnCode() == 0){ - results.put(timeRang, tianQingResponse); - return tianQingResponse; - } - - index++; + results.clear(); + params.put("timeRange", timeRang); + int index = 0; + while (index < 3){ + String result = WebUtil.get(applicationCommon.getUrl(), params); + TianQingResponse> tianQingResponse = objectMapper.readValue(result, new TypeReference<>() {}); + if (tianQingResponse.getReturnCode() == 0){ + results.put(timeRang, tianQingResponse); + return tianQingResponse; } - return null; + index++; } + + return null; } private Map> download(List tianQingFileVOs, String elementCode, List dealInfos){ diff --git a/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingSPCCDataHandler.java b/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingSPCCDataHandler.java index 2df3e22..2f54d8c 100644 --- a/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingSPCCDataHandler.java +++ b/04.系统编码/01.xxl-job/xxl-job-executor/src/main/java/com/ping/chuan/ahpmsdp/xxljobexecutor/jobhandler/TianQingSPCCDataHandler.java @@ -96,28 +96,26 @@ public class TianQingSPCCDataHandler { XxlJobHelper.log("read job end"); } - public TianQingResponse> request(String timeRang, Map params) throws JsonProcessingException { - synchronized (this){ - if (results.containsKey(timeRang)){ - return results.get(timeRang); - } + public synchronized TianQingResponse> request(String timeRang, Map params) throws JsonProcessingException { + if (results.containsKey(timeRang)){ + return results.get(timeRang); + } - results.clear(); - params.put("timeRange", timeRang); - int index = 0; - while (index < 3){ - String result = WebUtil.get(applicationCommon.getUrl(), params); - TianQingResponse> tianQingResponse = objectMapper.readValue(result, new TypeReference<>() {}); - if (tianQingResponse.getReturnCode() == 0){ - results.put(timeRang, tianQingResponse); - return tianQingResponse; - } - - index++; + results.clear(); + params.put("timeRange", timeRang); + int index = 0; + while (index < 3){ + String result = WebUtil.get(applicationCommon.getUrl(), params); + TianQingResponse> tianQingResponse = objectMapper.readValue(result, new TypeReference<>() {}); + if (tianQingResponse.getReturnCode() == 0){ + results.put(timeRang, tianQingResponse); + return tianQingResponse; } - return null; + index++; } + + return null; } private Map> download(List tianQingFileVOs, String elementCode, List dealInfos){ diff --git a/04.系统编码/03.radar-resolver/radar-core/src/main/java/com/xiaowuler/radar/core/custom/impl/CustomRadarInputStream.java b/04.系统编码/03.radar-resolver/radar-core/src/main/java/com/xiaowuler/radar/core/custom/impl/CustomRadarInputStream.java index 8aa3e71..1d2fdbc 100644 --- a/04.系统编码/03.radar-resolver/radar-core/src/main/java/com/xiaowuler/radar/core/custom/impl/CustomRadarInputStream.java +++ b/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 diff --git a/04.系统编码/03.radar-resolver/radar-core/src/main/java/com/xiaowuler/radar/core/weather/domain/RadialBlock.java b/04.系统编码/03.radar-resolver/radar-core/src/main/java/com/xiaowuler/radar/core/weather/domain/RadialBlock.java index c4129e4..f8dc33a 100644 --- a/04.系统编码/03.radar-resolver/radar-core/src/main/java/com/xiaowuler/radar/core/weather/domain/RadialBlock.java +++ b/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){ - } } } diff --git a/04.系统编码/03.radar-resolver/radar-test/src/test/java/com/xiaowuler/radartest/RadarTestApplicationTests.java b/04.系统编码/03.radar-resolver/radar-test/src/test/java/com/xiaowuler/radartest/RadarTestApplicationTests.java index 3c9b75c..6914360 100644 --- a/04.系统编码/03.radar-resolver/radar-test/src/test/java/com/xiaowuler/radartest/RadarTestApplicationTests.java +++ b/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(""); }