From fe487bbf0cd12e1f424afc99c461f6c1907e62f5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 30 十月 2024 09:59:24 +0800
Subject: [PATCH] 修改 创建 方法
---
src/main/java/com/se/simu/service/GedbService.java | 7 +++++--
src/main/java/com/se/simu/config/Knife4jConfig.java | 2 +-
src/main/java/com/se/simu/service/SimuService.java | 13 +++++++++++--
src/main/java/com/se/simu/controller/SimuController.java | 20 +++++++++-----------
4 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/se/simu/config/Knife4jConfig.java b/src/main/java/com/se/simu/config/Knife4jConfig.java
index cd7659a..4074d08 100644
--- a/src/main/java/com/se/simu/config/Knife4jConfig.java
+++ b/src/main/java/com/se/simu/config/Knife4jConfig.java
@@ -76,7 +76,7 @@
.description("鎺ュ彛鏂囨。")
.contact(new Contact("WuWeiwei", "http://127.0.0.1:" + serverPort + contextPath + "/doc.html", "252740454@qq.com"))
.version("0.2")
- .title("AI鍚庡彴鏈嶅姟鎺ュ彛鏂囨。")
+ .title("鍐呮稘浠跨湡鏈嶅姟鏈嶅姟鎺ュ彛鏂囨。")
.build();
}
}
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index f0c40b4..265cb39 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -66,9 +66,6 @@
if (null == vo.getPid() || vo.getPid() < 0) {
vo.setPid(0);
}
- if (StringHelper.isEmpty(vo.getName())) {
- vo.setName(StringHelper.YMDHMS2_FORMAT.format(new Date()));
- }
if (null == vo.getNum() || vo.getNum() < 1) {
vo.setNum(simuService.getMaxId() + 1);
}
@@ -207,16 +204,15 @@
}
}
-
/**
* 浣跨敤绌洪棿鑼冨洿鏌ヨ 绠＄偣,绠＄嚎,寤虹瓚鐗� 3涓浘灞傦紝涓旀瘡涓浘灞傜殑鏁伴噺澶т簬0锛岃繑鍥� true銆�
*/
@ApiOperation(value = "闄嶆按鑼冨洿鏍￠獙")
- @GetMapping("/rangeVerif")
- public R<Object> rangeVerif(@RequestParam @ApiParam("鏈�灏廥") Double minx,
- @RequestParam @ApiParam("鏈�灏弝") Double miny,
- @RequestParam @ApiParam("鏈�澶") Double maxx,
- @RequestParam @ApiParam("鏈�澶") Double maxy) {
+ @GetMapping("/rangeVerify")
+ public R<Object> rangeVerify(@RequestParam @ApiParam("鏈�灏廥") double minx,
+ @RequestParam @ApiParam("鏈�灏弝") double miny,
+ @RequestParam @ApiParam("鏈�澶") double maxx,
+ @RequestParam @ApiParam("鏈�澶") double maxy) {
try {
DataPo data = new DataPo();
data.setMinx(minx);
@@ -224,12 +220,14 @@
data.setMaxx(maxx);
data.setMaxy(maxy);
data.setEpsg(4326);
+
String token = gedbService.getToken();
GeDb db = gedbService.connectGedb(token, data);
List<GeLayer> layers = gedbService.getLayers(token, db);
- return success(gedbService.queryBboxCount(token,db, layers));
+
+ return success(gedbService.queryBboxCount(token, db, layers));
} catch (Exception ex) {
- return fail(ex, null);
+ return fail(ex, false);
}
}
}
diff --git a/src/main/java/com/se/simu/service/GedbService.java b/src/main/java/com/se/simu/service/GedbService.java
index f1d9111..47e7584 100644
--- a/src/main/java/com/se/simu/service/GedbService.java
+++ b/src/main/java/com/se/simu/service/GedbService.java
@@ -176,13 +176,16 @@
}
}
}
- public boolean queryBboxCount(String token, GeDb db, List<GeLayer> layers) throws Exception {
+
+ public boolean queryBboxCount(String token, GeDb db, List<GeLayer> layers) {
for (GeLayer layer : layers) {
int count = getCount(token, db, layer);
- if (0 == count) throw new Exception(layer.getName() + "锛屽浘灞傛暟鎹负绌�");
+ if (0 == count) return false;
}
+
return true;
}
+
private int getCount(String token, GeDb db, GeLayer layer) {
Map<String, Object> map = new HashMap<>(6);
map.put("token", token);
diff --git a/src/main/java/com/se/simu/service/SimuService.java b/src/main/java/com/se/simu/service/SimuService.java
index 4a1b312..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) {
@@ -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