From befdcdd0e9c89bc9be3a69fc3033c3cf7afd2ee2 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 07 九月 2023 16:15:56 +0800
Subject: [PATCH] 修改图层获取接口、数据发布接口

---
 src/main/java/com/moon/server/controller/data/PublishController.java |   42 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 35 insertions(+), 7 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 eb1240b..0e136f7 100644
--- a/src/main/java/com/moon/server/controller/data/PublishController.java
+++ b/src/main/java/com/moon/server/controller/data/PublishController.java
@@ -136,13 +136,13 @@
 
         switch (type) {
             case "DOM":
-                return "type = 'DOM'";
+                return "a.type = 'DOM'";
             case "DEM":
-                return "type = 'DEM'";
+                return "a.type = 'DEM'";
             case "Vector":
-                return "type = 'Vector'";
+                return "a.type = 'Vector'";
             case "Model":
-                return "type = 'Model'";
+                return "a.type = 'Model'";
             default:
                 throw new Exception("鏁版嵁绫诲瀷涓嶅尮閰�");
         }
@@ -193,15 +193,19 @@
             if (StringHelper.isEmpty(entity.getType())) {
                 return fail("鍙戝竷绫诲埆涓虹┖", null);
             }
+            if (!ShuJianService.TYPES.contains(entity.getType())) {
+                return fail("鍙戝竷绫诲埆涓嶆敮鎸�", null);
+            }
 
             UserEntity ue = tokenService.getCurrentUser(req);
             if (null != ue) {
                 entity.setUserId(ue.getId());
                 entity.setDepcode(ue.getDepcode());
             }
+            entity.setDefault();
 
             permsService.clearPermsCache();
-            Integer rows = shuJianService.insertSjService(entity, req, res);
+            Integer rows = shuJianService.insertSjService(entity);
 
             return success(rows);
         } catch (Exception ex) {
@@ -230,9 +234,10 @@
                 entity.setUserId(ue.getId());
                 entity.setDepcode(ue.getDepcode());
             }
+            entity.setDefault();
 
             permsService.clearPermsCache();
-            Integer rows = shuJianService.updateSjService(entity, req, res);
+            Integer rows = shuJianService.updateSjService(entity);
 
             return success(rows);
         } catch (Exception ex) {
@@ -245,7 +250,7 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", allowMultiple = true, example = "1")
     })
-    @GetMapping(value = "/deletes")
+    @GetMapping(value = "/deletesSjServices")
     public ResponseMsg<Integer> deletesSjServices(@RequestParam List<Integer> ids) {
         try {
             if (null == ids || ids.isEmpty()) {
@@ -260,4 +265,27 @@
             return fail(ex.getMessage(), -1);
         }
     }
+
+    @SysLog()
+    @ApiOperation(value = "鏇存柊涓�鏉�")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "PublishEntity", paramType = "body")
+    })
+    @ResponseBody
+    @PostMapping(value = "/update", produces = "application/json; charset=UTF-8")
+    public ResponseMsg<Integer> update(@RequestBody PublishEntity entity, HttpServletRequest req) {
+        try {
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue != null) {
+                entity.setUpdateUser(ue.getId());
+            }
+
+            permsService.clearPermsCache();
+            int count = publishService.update(entity);
+
+            return success(count);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), -1);
+        }
+    }
 }

--
Gitblit v1.9.3