From c52d9f3658e69741dff953a8cdaffc824347ecff Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 27 五月 2023 09:25:01 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/PublishController.java |   20 ++++++++++++--------
 1 files changed, 12 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 6131a48..d7d48b2 100644
--- a/src/main/java/com/lf/server/controller/data/PublishController.java
+++ b/src/main/java/com/lf/server/controller/data/PublishController.java
@@ -77,6 +77,8 @@
         switch (type) {
             case "DOM":
                 return "type in ('tif', 'tiff', 'img')";
+            case "DEM":
+                return "type in ('tif', 'tiff')";
             case "MPT":
                 return "type = 'mpt'";
             case "3DML":
@@ -136,8 +138,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);
@@ -153,7 +155,7 @@
             }
 
             String method = getConvertMethod(entity.getType());
-            int count = publishService.postForPub(entity, method, req);
+            long count = publishService.postForPub(entity, method, req);
 
             return success(count);
         } catch (Exception ex) {
@@ -167,12 +169,14 @@
     private String getConvertMethod(String type) throws Exception {
         switch (type) {
             case "DOM":
-                return "Convert/ToTiles";
+                return "/Convert/ToTiles";
+            case "DEM":
+                return "/Convert/ToTerra";
             case "MPT":
             case "3DML":
-                return "Convert/ToSG";
+                return "/Convert/ToSG";
             case "BIM":
-                return "Convert/ToTileset";
+                return "/Convert/ToTileset";
             default:
                 throw new Exception("鏁版嵁绫诲瀷涓嶅尮閰�");
         }
@@ -184,13 +188,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