From e6a222fea235eb4ebb3fc47d95c61a07a2db5e15 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 九月 2023 15:23:33 +0800
Subject: [PATCH] 修改栅格分析的面方法

---
 src/main/java/com/moon/server/controller/data/PublishController.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 46 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 6e3c324..7cec1ee 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("鏁版嵁绫诲瀷涓嶅尮閰�");
         }
@@ -167,15 +167,26 @@
     @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ鏁扮畝鐨勯鑹茶〃")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "port", value = "绔彛", dataType = "int", paramType = "query", example = "50001"),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "int", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "int", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectSjColorTables")
-    public void selectSjColorTables(int pageSize, int pageIndex, HttpServletRequest req, HttpServletResponse res) {
+    public void selectSjColorTables(Integer port, int pageSize, int pageIndex, HttpServletRequest req, HttpServletResponse res) {
         pageIndex = Math.max(pageIndex, 1);
         pageSize = Math.max(pageSize, 5);
 
-        shuJianService.selectSjColorTables(pageSize, pageIndex, req, res);
+        shuJianService.selectSjColorTables(port, pageSize, pageIndex, req, res);
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ鏁扮畝鍥惧眰")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "port", value = "绔彛", dataType = "int", paramType = "query", example = "50001")
+    })
+    @GetMapping(value = "/selectSjLayers")
+    public void selectSjLayers(Integer port, HttpServletRequest req, HttpServletResponse res) {
+        shuJianService.selectSjLayers(port, req, res);
     }
 
     @SysLog()
@@ -202,6 +213,7 @@
                 entity.setUserId(ue.getId());
                 entity.setDepcode(ue.getDepcode());
             }
+            entity.setDefault();
 
             permsService.clearPermsCache();
             Integer rows = shuJianService.insertSjService(entity);
@@ -233,6 +245,7 @@
                 entity.setUserId(ue.getId());
                 entity.setDepcode(ue.getDepcode());
             }
+            entity.setDefault();
 
             permsService.clearPermsCache();
             Integer rows = shuJianService.updateSjService(entity);
@@ -248,7 +261,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()) {
@@ -263,4 +276,30 @@
             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());
+            }
+            if (StringHelper.isEmpty(entity.getGeom())) {
+                entity.setGeom("null");
+            }
+
+            permsService.clearPermsCache();
+            int count = publishService.update(entity);
+
+            return success(count);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), -1);
+        }
+    }
 }

--
Gitblit v1.9.3