From 007da15aef3c8c4887bae335d1df7e4bd21e6995 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 23 四月 2023 16:07:49 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/PublishController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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..0393871 100644
--- a/src/main/java/com/lf/server/controller/data/PublishController.java
+++ b/src/main/java/com/lf/server/controller/data/PublishController.java
@@ -76,7 +76,7 @@
private String getType(String type) throws Exception {
switch (type) {
case "DOM":
- return "type in ('tif', 'tiff', 'img')";
+ return "type in ('tif', 'tiff', 'img', 'png', 'jpg')";
case "MPT":
return "type = 'mpt'";
case "3DML":
@@ -136,8 +136,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 +152,29 @@
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 "MPT":
+ case "3DML":
+ return "/Convert/ToSG";
+ case "BIM":
+ return "/Convert/ToTileset";
+ default:
+ throw new Exception("鏁版嵁绫诲瀷涓嶅尮閰�");
}
}
@@ -166,13 +184,13 @@
@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, ","));
+ int count = publishService.deletes(ids, req);
return success(count);
} catch (Exception ex) {
--
Gitblit v1.9.3