From 53d68348f21c33e846ba1dd9ef483468d13f3228 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 02 九月 2023 15:11:01 +0800
Subject: [PATCH] 添加查询数简颜色表接口

---
 src/main/java/com/moon/server/entity/ctrl/PubEntity.java             |   13 +++++++++++++
 src/main/java/com/moon/server/service/data/ShuJianService.java       |   19 ++++++++++++++++++-
 src/main/java/com/moon/server/controller/data/PublishController.java |   19 +++++++++++++++++++
 src/main/resources/application.yml                                   |    2 +-
 4 files changed, 51 insertions(+), 2 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 b6a5678..6ef2f9f 100644
--- a/src/main/java/com/moon/server/controller/data/PublishController.java
+++ b/src/main/java/com/moon/server/controller/data/PublishController.java
@@ -11,6 +11,7 @@
 import com.moon.server.helper.WebHelper;
 import com.moon.server.service.all.PermsService;
 import com.moon.server.service.data.PublishService;
+import com.moon.server.service.data.ShuJianService;
 import com.moon.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -20,6 +21,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 
@@ -39,6 +41,9 @@
 
     @Resource
     PermsService permsService;
+
+    @Resource
+    ShuJianService shuJianService;
 
     @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
@@ -162,6 +167,20 @@
     }
 
     @SysLog()
+    @ApiOperation(value = "鍒嗛〉鏌ヨ鏁扮畝鐨勯鑹茶〃")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "int", paramType = "query", example = "10"),
+            @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "int", paramType = "query", example = "1")
+    })
+    @GetMapping(value = "/selectColorTables")
+    public void selectColorTables(int pageSize, int pageIndex, HttpServletRequest req, HttpServletResponse res) {
+        pageIndex = Math.max(pageIndex, 1);
+        pageSize = Math.max(pageSize, 5);
+
+        shuJianService.selectColorTables(pageSize, pageIndex, req, res);
+    }
+
+    @SysLog()
     @ApiOperation(value = "鎻掑叆鍙戝竷鏁版嵁")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "PubEntity", paramType = "body")
diff --git a/src/main/java/com/moon/server/entity/ctrl/PubEntity.java b/src/main/java/com/moon/server/entity/ctrl/PubEntity.java
index 93464d5..8478e99 100644
--- a/src/main/java/com/moon/server/entity/ctrl/PubEntity.java
+++ b/src/main/java/com/moon/server/entity/ctrl/PubEntity.java
@@ -21,6 +21,11 @@
     }
 
     /**
+     * 鍙戝竷ID
+     */
+    private Integer pubid;
+
+    /**
      * 绫诲瀷锛欴OM锛孌EM锛孷ector锛孧odel
      */
     private String type;
@@ -75,6 +80,14 @@
      */
     private List<GradientColorTableEntity> gradientColorTable;
 
+    public Integer getPubid() {
+        return pubid;
+    }
+
+    public void setPubid(Integer pubid) {
+        this.pubid = pubid;
+    }
+
     public String getType() {
         return type;
     }
diff --git a/src/main/java/com/moon/server/service/data/ShuJianService.java b/src/main/java/com/moon/server/service/data/ShuJianService.java
index ec2b4b7..f05fe4c 100644
--- a/src/main/java/com/moon/server/service/data/ShuJianService.java
+++ b/src/main/java/com/moon/server/service/data/ShuJianService.java
@@ -5,12 +5,15 @@
 import com.moon.server.entity.shujian.CreateLayerEntity;
 import com.moon.server.entity.shujian.CreateServiceEntity;
 import com.moon.server.entity.shujian.DeleteEntity;
+import com.moon.server.helper.HttpHelper;
 import com.moon.server.helper.StringHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -25,7 +28,21 @@
     private String ak;
 
     @Value("${shujian.url}")
-    private String url;
+    private String sjUrl;
+
+    /**
+     * 鍒嗛〉鏌ヨ鏁扮畝鐨勯鑹茶〃
+     */
+    public void selectColorTables(Integer pageSize, Integer pageIndex, HttpServletRequest req, HttpServletResponse res) {
+        try {
+            String url = String.format("%s/sj_raster/v6/api/color_table?%s&page_count=%d&page_num=%d&key=", sjUrl, ak, pageSize, pageIndex);
+
+            HttpHelper httpHelper = new HttpHelper();
+            httpHelper.service(req, res, null, url);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+        }
+    }
 
     /**
      * 鍒涘缓鏁扮畝鍥惧眰
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9a1cffe..9c606a6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -121,7 +121,7 @@
 
 shujian:
   ak: ak=mf72ff9295c740ec0f37e61433e8a3ad8d
-  url: http://172.16.2.10:50001/
+  url: http://172.16.2.10:50001
 
 # 绯荤粺閰嶇疆
 sys:

--
Gitblit v1.9.3