From 74661c2a73f1a5be9e600c3922530bbe5e01c313 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期日, 29 九月 2024 14:17:42 +0800 Subject: [PATCH] 1 --- docker/init/init.sql | 2 +- src/main/java/com/se/simu/domain/po/SimuPo.java | 2 +- src/main/java/com/se/simu/service/ResultService.java | 19 +++++++++++++++++++ src/main/java/com/se/simu/service/SimuService.java | 15 +++++++++------ src/main/java/com/se/simu/service/UwService.java | 12 ++++++++++++ 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/docker/init/init.sql b/docker/init/init.sql index da96107..0f952a7 100644 --- a/docker/init/init.sql +++ b/docker/init/init.sql @@ -23,7 +23,7 @@ comment on column bs.simu.num is '搴忓彿'; comment on column bs.simu.name is '鍚嶇О'; comment on column bs.simu.data is '鏁版嵁(JSON)'; -comment on column bs.simu.status is '鐘舵�侊細0-鍒涘缓浠跨湡锛�1-杩炴帴GEDB搴擄紝2-涓嬭浇绌洪棿鏁版嵁锛�3-涓嬭浇楂樼▼鏁版嵁锛�4-妯℃嫙鍐呮稘浠跨湡锛�5-澶勭悊浠跨湡鏁版嵁锛�10-瀹屾垚锛�-10-鍑洪敊'; +comment on column bs.simu.status is '鐘舵�侊細0-鍒涘缓浠跨湡浠诲姟锛�1-杩炴帴GEDB搴擄紝2-涓嬭浇绌洪棿鏁版嵁锛�3-涓嬭浇楂樼▼鏁版嵁锛�4-鐢熸垚闄嶉洦鏂囦欢锛�5-鐢熸垚閰嶇疆鏂囦欢锛�6-妯℃嫙鍐呮稘浠跨湡锛�7-澶勭悊姘翠綅鏂囦欢锛�8-澶勭悊鎺掓按鏂囦欢锛�9-澶勭悊浠跨湡缁撴灉锛�10-瀹屾垚锛�-10-鍑洪敊'; comment on column bs.simu.result is '缁撴灉'; comment on column bs.simu.create_time is '鍒涘缓鏃堕棿'; comment on column bs.simu.update_time is '鏇存柊鏃堕棿'; diff --git a/src/main/java/com/se/simu/domain/po/SimuPo.java b/src/main/java/com/se/simu/domain/po/SimuPo.java index c9d1d27..6eaf338 100644 --- a/src/main/java/com/se/simu/domain/po/SimuPo.java +++ b/src/main/java/com/se/simu/domain/po/SimuPo.java @@ -32,7 +32,7 @@ @ApiModelProperty("鏁版嵁(JSON)") private String data; - @ApiModelProperty("鐘舵�侊細0-鍒涘缓浠跨湡锛�1-杩炴帴GEDB搴擄紝2-涓嬭浇绌洪棿鏁版嵁锛�3-涓嬭浇楂樼▼鏁版嵁锛�4-妯℃嫙鍐呮稘浠跨湡锛�5-澶勭悊浠跨湡鏁版嵁锛�10-瀹屾垚锛�-10-鍑洪敊") + @ApiModelProperty("鐘舵�侊細0-鍒涘缓浠跨湡浠诲姟锛�1-杩炴帴GEDB搴擄紝2-涓嬭浇绌洪棿鏁版嵁锛�3-涓嬭浇楂樼▼鏁版嵁锛�4-鐢熸垚闄嶉洦鏂囦欢锛�5-鐢熸垚閰嶇疆鏂囦欢锛�6-妯℃嫙鍐呮稘浠跨湡锛�7-澶勭悊姘翠綅鏂囦欢锛�8-澶勭悊鎺掓按鏂囦欢锛�9-澶勭悊浠跨湡缁撴灉锛�10-瀹屾垚锛�-10-鍑洪敊") private Integer status; @ApiModelProperty("缁撴灉") diff --git a/src/main/java/com/se/simu/service/ResultService.java b/src/main/java/com/se/simu/service/ResultService.java new file mode 100644 index 0000000..1905ce2 --- /dev/null +++ b/src/main/java/com/se/simu/service/ResultService.java @@ -0,0 +1,19 @@ +package com.se.simu.service; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 澶勭悊缁撴灉鏈嶅姟绫� + * + * @author WWW + * @date 2024-09-29 + */ +@Slf4j +@Service +@SuppressWarnings("ALL") +public class ResultService { + public void process() { + // + } +} diff --git a/src/main/java/com/se/simu/service/SimuService.java b/src/main/java/com/se/simu/service/SimuService.java index 85fd6f1..084ce18 100644 --- a/src/main/java/com/se/simu/service/SimuService.java +++ b/src/main/java/com/se/simu/service/SimuService.java @@ -50,6 +50,9 @@ @Resource UwService uwService; + @Resource + ResultService resultService; + /** * 鑾峰彇 */ @@ -164,7 +167,7 @@ @Override @SneakyThrows public void run() { - scope(simu); + cope(simu); } }); executor.shutdown(); @@ -176,7 +179,7 @@ * 4-鐢熸垚闄嶉洦鏂囦欢锛�5-鐢熸垚閰嶇疆鏂囦欢锛�6-妯℃嫙鍐呮稘浠跨湡锛�7-澶勭悊姘翠綅鏂囦欢锛� * 8-澶勭悊鎺掓按鏂囦欢锛�9-澶勭悊浠跨湡缁撴灉锛�10-瀹屾垚锛�-10-鍑洪敊 */ - private void scope(SimuPo simu) { + private void cope(SimuPo simu) { try { DataPo data = JSONUtil.toBean(simu.getData(), DataPo.class); @@ -192,7 +195,7 @@ gedbService.copeDem(token, data); update(simu, 4, null); - // 鐢熸垚闄嶉洦鏂囦欢 + uwService.createRainFile(); update(simu, 5, null); uwService.createConfig(); @@ -201,13 +204,13 @@ uwService.callExe(); update(simu, 7, null); - // 澶勭悊姘翠綅鏂囦欢 + uwService.copeWaterFiles(); update(simu, 8, null); - // 澶勭悊鎺掓按鏂囦欢 + uwService.copeDrainFiles(); update(simu, 9, null); - // 澶勭悊浠跨湡缁撴灉 + resultService.process(); //update(simu, 10, "瀹屾垚"); } catch (Exception ex) { diff --git a/src/main/java/com/se/simu/service/UwService.java b/src/main/java/com/se/simu/service/UwService.java index 7e6ea0b..7df5101 100644 --- a/src/main/java/com/se/simu/service/UwService.java +++ b/src/main/java/com/se/simu/service/UwService.java @@ -19,6 +19,10 @@ @Resource PropertiesConfig config; + public void createRainFile() { + // + } + public void createConfig() { // } @@ -26,4 +30,12 @@ public void callExe() { // } + + public void copeWaterFiles() { + // + } + + public void copeDrainFiles() { + // + } } -- Gitblit v1.9.3