From 9f040231dfba9238ea101b4fe9978f38c319bbf0 Mon Sep 17 00:00:00 2001 From: panbaolin <13071138970@163.com> Date: Fri, 14 Nov 2025 13:32:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E4=BA=8B=E4=BB=B6=E6=A8=A1?= =?UTF-8?q?=E6=8B=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../properties/EventServerProperties.java | 2 +- .../impl/DiffusionDataServiceImpl.java | 4 +- .../jeecg/runProcess/controller/TestMain.java | 162 +++++++++--------- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/EventServerProperties.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/EventServerProperties.java index eded9a3..9c736eb 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/EventServerProperties.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/EventServerProperties.java @@ -40,7 +40,7 @@ public class EventServerProperties { private String resultFilePrefix; /** - * 气象文件存放目录 + * 剂量py存放目录 */ private String pythonPath; diff --git a/jeecg-module-event/src/main/java/org/jeecg/diffusion/service/impl/DiffusionDataServiceImpl.java b/jeecg-module-event/src/main/java/org/jeecg/diffusion/service/impl/DiffusionDataServiceImpl.java index b4456e3..4ba6a2f 100644 --- a/jeecg-module-event/src/main/java/org/jeecg/diffusion/service/impl/DiffusionDataServiceImpl.java +++ b/jeecg-module-event/src/main/java/org/jeecg/diffusion/service/impl/DiffusionDataServiceImpl.java @@ -46,11 +46,11 @@ public class DiffusionDataServiceImpl implements DiffusionDataService { Wrf wrf = wrfMapper.selectOne(new LambdaQueryWrapper().eq(Wrf::getEnginId, enginId)); String resultFilePath = baseAPIService.buildEngineeringFilePath(eventServerProperties.getResultFilePrefix(), engineering.getCreateBy(), engineering.getEngineeringName()); - String startTime = wrf.getStartTime().substring(0, 10); + String startTime = wrf.getStartTime().substring(0, 10).replace("-", "");; try (NetcdfFile wrfNcFile = getWrfNetcdfFile(resultFilePath, startTime); NetcdfFile cmaqNcFile = getCmaqNetcdfFile(resultFilePath, startTime)) { DiffusionResultVO diffusionResultVO = new DiffusionResultVO(); - + System.out.println(hour); List> values = NcUtil.get2DNCByName(cmaqNcFile, "CO", layer, hour); List> xlats = NcUtil.get2DNCByName(wrfNcFile, "XLAT", layer, hour); List> xlons = NcUtil.get2DNCByName(wrfNcFile, "XLONG", layer, hour); diff --git a/jeecg-module-event/src/main/java/org/jeecg/runProcess/controller/TestMain.java b/jeecg-module-event/src/main/java/org/jeecg/runProcess/controller/TestMain.java index 180a667..1444bc9 100644 --- a/jeecg-module-event/src/main/java/org/jeecg/runProcess/controller/TestMain.java +++ b/jeecg-module-event/src/main/java/org/jeecg/runProcess/controller/TestMain.java @@ -10,92 +10,92 @@ public class TestMain { public static void main(String[] args) { - String[] cmd_dep = { - "python", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\py\\sum_dry_wet_to_nc.py", - "ASIJ", - "D:\\hky_word\\Projectlibrary\\resultFile\\admin\\1113", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\1113", - "out_dep_20181113", - "20181113", - "20181114" - }; - ProcessBuilder depBuilder = new ProcessBuilder(cmd_dep); - ExecutePyUtils.executePythonProcess(depBuilder, "dep"); - - String[] cmd_wrf = { - "python", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\py\\merge_results_to_nc.py", - "XLAT,XLONG,HGT,U,V,W", - "D:\\hky_word\\Projectlibrary\\resultFile\\admin\\1113", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\1113", - "out_wrf_20181113", - "20181113", - "20181114", - "wrfout_d03_{YYYY-MM-DD}_00_00_00" // 使用占位符 - }; - ProcessBuilder wrfBuilder = new ProcessBuilder(cmd_wrf); - ExecutePyUtils.executePythonProcess(wrfBuilder, "wrf"); - - String[] cmd_cmaq = { - "python", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\py\\merge_results_to_nc.py", - "CO,ASIJ", - "D:\\hky_word\\Projectlibrary\\resultFile\\admin\\1113", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\1113", - "out_conc_20181113", - "20181113", - "20181114", - "CCTM.CONC.d03.{YYYYMMDD}" // 使用占位符 - }; - ProcessBuilder concBuilder = new ProcessBuilder(cmd_cmaq); - ExecutePyUtils.executePythonProcess(concBuilder, "conc"); - - String[] cmd_metcr03d = { - "python", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\py\\merge_results_to_nc.py", - "TA,PRES", - "D:\\hky_word\\Projectlibrary\\resultFile\\admin\\1113", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\1113", - "out_metcr03d_20181113", - "20181113", - "20181114", - "METCRO3D_d03_{YYYYMMDD}" // 使用占位符 - }; - ProcessBuilder metcr03dBuilder = new ProcessBuilder(cmd_metcr03d); - ExecutePyUtils.executePythonProcess(metcr03dBuilder, "metcr03d"); - - String[] cmd_emis = { - "python", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\py\\merge_results_to_nc.py", - "CO,PSI", - "D:\\hky_word\\Projectlibrary\\resultFile\\admin\\1113", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\1113", - "out_emis_20181113", - "20181113", - "20181114", - "emis_{YYYYMMDD}" // 使用占位符 - }; - ProcessBuilder emisBuilder = new ProcessBuilder(cmd_emis); - ExecutePyUtils.executePythonProcess(emisBuilder, "emis"); +// String[] cmd_dep = { +// "python", +// "E:\\runtimeEnv\\fileSystem\\event\\python\\sum_dry_wet_to_nc.py", +// "ASIJ", +// "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", +// "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", +// "out_dep_20160701", +// "20160701", +// "20160702" +// }; +// ProcessBuilder depBuilder = new ProcessBuilder(cmd_dep); +// ExecutePyUtils.executePythonProcess(depBuilder, "dep"); +// +// String[] cmd_wrf = { +// "python", +// "E:\\runtimeEnv\\fileSystem\\event\\python\\merge_results_to_nc.py", +// "XLAT,XLONG,HGT,U,V,W", +// "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", +// "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", +// "out_wrf_20160701", +// "20160701", +// "20160702", +// "wrfout_d03_{YYYY-MM-DD}_00_00_00" // 使用占位符 +// }; +// ProcessBuilder wrfBuilder = new ProcessBuilder(cmd_wrf); +// ExecutePyUtils.executePythonProcess(wrfBuilder, "wrf"); +// +// String[] cmd_cmaq = { +// "python", +// "E:\\runtimeEnv\\fileSystem\\event\\python\\merge_results_to_nc.py", +// "CO,ASIJ", +// "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", +// "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", +// "out_conc_20160701", +// "20160701", +// "20160702", +// "CCTM.CONC.d03.{YYYYMMDD}" // 使用占位符 +// }; +// ProcessBuilder concBuilder = new ProcessBuilder(cmd_cmaq); +// ExecutePyUtils.executePythonProcess(concBuilder, "conc"); +// +// String[] cmd_metcr03d = { +// "python", +// "E:\\runtimeEnv\\fileSystem\\event\\python\\merge_results_to_nc.py", +// "TA,PRES", +// "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", +// "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", +// "out_metcr03d_20160701", +// "20160701", +// "20160702", +// "METCRO3D_d03_{YYYYMMDD}" // 使用占位符 +// }; +// ProcessBuilder metcr03dBuilder = new ProcessBuilder(cmd_metcr03d); +// ExecutePyUtils.executePythonProcess(metcr03dBuilder, "metcr03d"); +// +// String[] cmd_emis = { +// "python", +// "E:\\runtimeEnv\\fileSystem\\event\\python\\merge_results_to_nc.py", +// "CO,PSI", +// "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", +// "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", +// "out_emis_20160701", +// "20160701", +// "20160702", +// "emis_{YYYYMMDD}" // 使用占位符 +// }; +// ProcessBuilder emisBuilder = new ProcessBuilder(cmd_emis); +// ExecutePyUtils.executePythonProcess(emisBuilder, "emis"); String[] cmd_dose = { "python", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\py\\convert_conc_to_dose.py", - "20181113", - "20181114", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\1113", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\1113", - "D:\\hky_word\\Projectlibrary\\resultFile\\dose\\data_48.xlsx", - "out_dep_20181113", - "out_wrf_20181113", - "out_conc_20181113", - "out_metcr03d_20181113", - "out_emis_20181113", - "out_dose_20181113", + "E:\\runtimeEnv\\fileSystem\\event\\python\\convert_conc_to_dose.py", + "20160701", + "20160702", + "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", + "E:\\runtimeEnv\\fileSystem\\event\\admin\\002\\", + "E:\\runtimeEnv\\fileSystem\\event\\python\\data_48.xlsx", + "out_dep_20160701", + "out_wrf_20160701", + "out_conc_20160701", + "out_metcr03d_20160701", + "out_emis_20160701", + "out_dose_20160701", }; ProcessBuilder doseBuilder = new ProcessBuilder(cmd_dose); - ExecutePyUtils.executePythonProcess(doseBuilder, "emis"); + ExecutePyUtils.executePythonProcess(doseBuilder, "dose"); }