From ac20dc99bf1f463365dba071973e08fffbd294b4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 14 七月 2023 14:12:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/PublishController.java | 84 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/PublishController.java b/src/main/java/com/lf/server/controller/data/PublishController.java
index 46c4406..b28ab65 100644
--- a/src/main/java/com/lf/server/controller/data/PublishController.java
+++ b/src/main/java/com/lf/server/controller/data/PublishController.java
@@ -56,7 +56,7 @@
return fail("鏁版嵁绫诲埆涓虹┖", null);
}
- String types = getType(type);
+ String types = getType(dircode, type);
int count = publishService.selectMetasByCount(depcode, dircode, verid, types, name);
if (count == 0) {
return success(0, null);
@@ -73,19 +73,55 @@
/**
* 鑾峰彇绫诲瀷
*/
- private String getType(String type) throws Exception {
+ private String getType(String dircode, String type) throws Exception {
switch (type) {
case "DOM":
- return "type in ('tif', 'tiff', 'img')";
+ return "type in ('tif', 'tiff', 'img')" + getFilter(dircode, type);
+ case "DEM":
+ return "type in ('tif', 'tiff')" + getFilter(dircode, type);
case "MPT":
return "type = 'mpt'";
case "3DML":
return "type = '3dml'";
+ case "CPT":
+ return "type = 'cpt'";
case "BIM":
return "type in ('ifc', 'fbx', 'rvt')";
+ case "LAS":
+ return "type in ('las', 'laz')";
+ case "OSGB":
+ return "type = 'osgb'";
default:
throw new Exception("鏁版嵁绫诲瀷涓嶅尮閰�");
}
+ }
+
+ /**
+ * 鑾峰彇杩囨护鏉′欢
+ */
+ private String getFilter(String dircode, String type) {
+ dircode = StringHelper.isEmpty(dircode) ? "" : StringHelper.getRightLike(dircode);
+
+ List<String> list = null;
+ switch (type) {
+ case "DOM":
+ list = publishService.selectCodesForDir(dircode, 0);
+ break;
+ case "DEM":
+ list = publishService.selectCodesForDir(dircode, 1);
+ break;
+ default:
+ break;
+ }
+ if (null == list || list.isEmpty()) {
+ return "";
+ }
+
+ for (int i = 0, c = list.size(); i < c; i++) {
+ list.set(i, "'" + list.get(i) + "'");
+ }
+
+ return " and dircode not in (" + StringHelper.join(list, ",") + ")";
}
@SysLog()
@@ -136,8 +172,8 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "PubEntity", paramType = "body")
})
- @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertForPub(@RequestBody PubEntity entity, HttpServletRequest req) {
+ @PostMapping(value = "/insertForPub", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Object> insertForPub(@RequestBody PubEntity entity, HttpServletRequest req) {
try {
if (null == entity || null == entity.getIds() || entity.getIds().isEmpty()) {
return fail("瀹炰綋绫讳负绌烘垨鎵句笉鍒板厓鏁版嵁ID", 0);
@@ -152,11 +188,36 @@
entity.setToken(WebHelper.getToken(req));
}
- int count = publishService.insertForPub(entity);
+ String method = getConvertMethod(entity.getType());
+ long count = publishService.postForPub(entity, method, req);
return success(count);
} catch (Exception ex) {
return fail(ex.getMessage(), -1);
+ }
+ }
+
+ /**
+ * 鑾峰彇杞崲鏂规硶
+ */
+ private String getConvertMethod(String type) throws Exception {
+ switch (type) {
+ case "DOM":
+ return "/Convert/ToTiles";
+ case "DEM":
+ return "/Convert/ToTerra";
+ case "MPT":
+ case "3DML":
+ case "CPT":
+ return "/Convert/ToSG";
+ case "BIM":
+ return "/Convert/ToTileset";
+ case "LAS":
+ return "/Convert/ToLas";
+ case "OSGB":
+ return "/Convert/ToOsgb";
+ default:
+ throw new Exception("鏁版嵁绫诲瀷涓嶅尮閰�");
}
}
@@ -166,13 +227,20 @@
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", allowMultiple = true, example = "1")
})
@GetMapping(value = "/deletes")
- public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids) {
+ public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids, HttpServletRequest req) {
try {
if (ids == null || ids.isEmpty()) {
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
- int count = publishService.deletes(StringHelper.join(ids, ","));
+ String strs = StringHelper.join(ids, ",");
+ List<PublishEntity> list = publishService.selectByIds(strs);
+ if (null == list || list.isEmpty()) {
+ return fail("娌℃湁鎵惧埌瑕佸垹闄ょ殑鏁版嵁", -1);
+ }
+
+ publishService.deleteFiles(list);
+ int count = publishService.deletes(ids, req);
return success(count);
} catch (Exception ex) {
--
Gitblit v1.9.3