From 0890b7861feae74bdcfd1851e577db6b9f31d484 Mon Sep 17 00:00:00 2001
From: xingjinshuang <xingjs@qq.com>
Date: 星期四, 20 二月 2025 14:40:39 +0800
Subject: [PATCH] @xingjs@20250220@添加处理sww相关接口类
---
src/main/java/com/se/simu/service/SimuService.java | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/se/simu/service/SimuService.java b/src/main/java/com/se/simu/service/SimuService.java
index 6e049e8..435d1e5 100644
--- a/src/main/java/com/se/simu/service/SimuService.java
+++ b/src/main/java/com/se/simu/service/SimuService.java
@@ -20,20 +20,15 @@
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.io.File;
+import java.sql.Timestamp;
+import java.util.Date;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-/**
- * 浠跨湡鏈嶅姟绫�
- *
- * @author WWW
- * @date 2024-09-18
- */
@Slf4j
@Service
@SuppressWarnings("ALL")
@@ -53,9 +48,6 @@
@Resource
ResultService resultService;
- /**
- * 鑾峰彇
- */
public IPage<SimuPo> get(SimuVo vo) {
QueryWrapper<SimuPo> wrapper = getPageWrapper(vo);
@@ -78,7 +70,7 @@
if (null != vo.getNum()) {
wrapper.eq("num", vo.getNum());
}
- if (!StringUtils.isEmpty(vo.getName())) {
+ if (!StringHelper.isEmpty(vo.getName())) {
wrapper.like("lower(name)", vo.getName().trim().toLowerCase());
}
if (!CollUtil.isEmpty(vo.getStatus())) {
@@ -88,9 +80,6 @@
return wrapper;
}
- /**
- * 鍒犻櫎
- */
public int del(List<Integer> ids) {
List<SimuPo> list = simuMapper.selectBatchIds(ids);
if (null != list && list.size() > 0) {
@@ -103,6 +92,7 @@
delDir(config.getInPath() + File.separator + dp.getInPath());
delDir(config.getOutPath() + File.separator + dp.getOutPath());
+ FileUtil.del(config.getInPath() + File.separator + dp.getInPath() + ".json");
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
@@ -132,13 +122,36 @@
return simuMapper.selectOne(wrapper);
}
+ public SimuPo getSimuById(Integer id) {
+ return simuMapper.selectById(id);
+ }
+
+ public SimuPo getSimuByServiceName(String serviceName) {
+ if (StringHelper.isEmpty(serviceName)) {
+ return null;
+ }
+
+ QueryWrapper<SimuPo> wrapper = new QueryWrapper<>();
+ wrapper.eq("service_name", serviceName);
+ wrapper.last("limit 1");
+
+ return simuMapper.selectOne(wrapper);
+ }
public boolean create(CreateSimuVo vo) {
+ Date now = new Date();
+ String date = StringHelper.YMDHMS2_FORMAT.format(now);
+ if (StringHelper.isEmpty(vo.getName())) {
+ vo.setName(date);
+ }
+
DataPo data = BeanUtil.copyProperties(vo, DataPo.class);
- data.setPath(vo.getName(), vo.getName());
+ data.setPath(date, date);
initPath(data);
SimuPo simu = new SimuPo(vo.getNum(), vo.getPid(), vo.getName(), JSONUtil.toJsonStr(data), 0, vo.getBak());
+ simu.setServiceName(date);
+ simu.setCreateTime(new Timestamp(now.getTime()));
int rows = simuMapper.insert(simu);
if (rows > 0) {
@@ -173,12 +186,6 @@
executor.shutdown();
}
- /**
- * 澶勭悊鏁版嵁锛岀姸鎬佹爣璇嗭細
- * 0-鍒涘缓浠跨湡浠诲姟锛�1-杩炴帴GEDB搴擄紝2-涓嬭浇绌洪棿鏁版嵁锛�3-涓嬭浇楂樼▼鏁版嵁锛�
- * 4-鐢熸垚闄嶉洦鏂囦欢锛�5-鐢熸垚閰嶇疆鏂囦欢锛�6-妯℃嫙鍐呮稘浠跨湡锛�7-澶勭悊姘翠綅鏂囦欢锛�
- * 8-澶勭悊鎺掓按鏂囦欢锛�9-澶勭悊浠跨湡缁撴灉锛�10-瀹屾垚锛�-10-鍑洪敊
- */
private void cope(SimuPo simu) {
try {
DataPo data = JSONUtil.toBean(simu.getData(), DataPo.class);
@@ -204,10 +211,10 @@
uwService.callExe(data);
update(simu, 7, null);
- uwService.copeWaterFiles();
+ //uwService.copeWaterFiles();
update(simu, 8, null);
- uwService.copeDrainFiles();
+ uwService.copeDrainFiles(data);
update(simu, 9, null);
resultService.process(data);
@@ -215,7 +222,7 @@
update(simu, 10, "瀹屾垚");
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
- update(simu, -10, ex.getMessage());
+ update(simu, -simu.getStatus(), ex.getMessage());
}
}
--
Gitblit v1.9.3