From 5826bfa3f502f47f46b37b2e18f0b2f90af691a0 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 30 十月 2024 17:00:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/se/simu/service/SimuService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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..e888c5c 100644
--- a/src/main/java/com/se/simu/service/SimuService.java
+++ b/src/main/java/com/se/simu/service/SimuService.java
@@ -24,6 +24,8 @@
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;
@@ -134,11 +136,18 @@
}
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.setCreateTime(new Timestamp(now.getTime()));
int rows = simuMapper.insert(simu);
if (rows > 0) {
@@ -204,10 +213,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 +224,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