From 2fcbeffa30bc674cffdd0147da271754468073a3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 02 九月 2023 10:58:06 +0800
Subject: [PATCH] 修改发布服务控制器-1
---
src/main/java/com/moon/server/controller/data/PublishController.java | 125 +++++------------------------------------
1 files changed, 16 insertions(+), 109 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/data/PublishController.java b/src/main/java/com/moon/server/controller/data/PublishController.java
index e0d15fe..9bc4efc 100644
--- a/src/main/java/com/moon/server/controller/data/PublishController.java
+++ b/src/main/java/com/moon/server/controller/data/PublishController.java
@@ -61,7 +61,7 @@
return fail("鏁版嵁绫诲埆涓虹┖", null);
}
- String types = getType(dircode, type);
+ String types = getType(type);
int count = publishService.selectMetasByCount(depcode, dircode, verid, types, name);
if (count == 0) {
return success(0, null);
@@ -78,55 +78,19 @@
/**
* 鑾峰彇绫诲瀷
*/
- private String getType(String dircode, String type) throws Exception {
+ private String getType(String type) throws Exception {
switch (type) {
case "DOM":
- return "type in ('tif', 'tiff', 'img')" + getFilter(dircode, type);
+ return "type in ('tif', 'tiff', 'img', 'jp2', 'jpg') and mata_type in (1, 3, 4, 5)";
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'";
+ return "type in ('tif', 'tiff', 'dem') and mata_type = 2";
+ case "Vector":
+ return "type in ('shp', 'gdb') and mata_type = 6";
+ case "Model":
+ return "type in ('ifc', 'gdb') and mata_type = 7";
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()
@@ -162,7 +126,7 @@
/**
* 鑾峰彇鍙戝竷绫诲瀷
*/
- private String getPubType(String type) {
+ private String getPubType(String type) throws Exception {
if (StringHelper.isEmpty(type)) {
return null;
}
@@ -172,20 +136,12 @@
return "type = 'DOM'";
case "DEM":
return "type = 'DEM'";
- 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'";
+ case "Vector":
+ return "type = 'Vector'";
+ case "Model":
+ return "type = 'Model'";
default:
- return null;
+ throw new Exception("鏁版嵁绫诲瀷涓嶅尮閰�");
}
}
@@ -200,31 +156,6 @@
PublishEntity entity = publishService.selectById(id);
return success(entity);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏌ヨLas鏂囦欢鍧愭爣绯籌D")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "鍏冩暟鎹甀D闆嗗悎", dataType = "Integer[]", paramType = "query", example = "10483,10481,10456,10285")
- })
- @GetMapping(value = "/selectLasCs")
- public ResponseMsg<Object> selectLasCs(Integer[] ids, HttpServletRequest req) {
- try {
- if (null == ids || ids.length == 0) {
- return fail("鍏冩暟鎹甀D闆嗗悎涓嶈兘涓虹┖");
- }
-
- PubEntity entity = new PubEntity();
- entity.setIds(Arrays.asList(ids));
- entity.setDircode("00");
- entity.setToken(WebHelper.getToken(req));
-
- List<Integer> list = publishService.selectLasCs(entity, "/Convert/ReadLasCs", req);
-
- return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -252,36 +183,12 @@
}
permsService.clearPermsCache();
- String method = getConvertMethod(entity.getType());
- long count = publishService.postForPub(entity, method, req);
+ // String method = getConvertMethod(entity.getType())
+ long count = publishService.postForPub(entity, "", 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/ToLasByPy";
- case "OSGB":
- return "/Convert/ToOsgb";
- default:
- throw new Exception("鏁版嵁绫诲瀷涓嶅尮閰�");
}
}
--
Gitblit v1.9.3