From 427948b7d9b5df305ac6bf0045081773006a5448 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 08 九月 2023 14:54:52 +0800
Subject: [PATCH] 添加查询数简图层服务
---
src/main/java/com/moon/server/service/data/ShuJianService.java | 44 ++++++++++++++--------
src/main/java/com/moon/server/controller/data/PublishController.java | 15 ++++++-
src/main/resources/application.yml | 4 +-
3 files changed, 43 insertions(+), 20 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 0e136f7..58a524f 100644
--- a/src/main/java/com/moon/server/controller/data/PublishController.java
+++ b/src/main/java/com/moon/server/controller/data/PublishController.java
@@ -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()
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 9de98b2..000489c 100644
--- a/src/main/java/com/moon/server/service/data/ShuJianService.java
+++ b/src/main/java/com/moon/server/service/data/ShuJianService.java
@@ -9,7 +9,6 @@
import com.moon.server.entity.shujian.*;
import com.moon.server.entity.sys.ResEntity;
import com.moon.server.helper.HttpHelper;
-import com.moon.server.helper.PathHelper;
import com.moon.server.helper.RestHelper;
import com.moon.server.helper.StringHelper;
import com.moon.server.service.sys.ResService;
@@ -35,17 +34,14 @@
@Value("${shujian.ak}")
String ak;
- @Value("${shujian.url}")
- String sjUrl;
+ @Value("${shujian.url1}")
+ String sjUrl1;
- @Value("${shujian.ctUrl}")
- String ctUrl;
+ @Value("${shujian.url5}")
+ String sjUrl5;
@Value("${shujian.path}")
String sjPath;
-
- @Resource
- PathHelper pathHelper;
@Resource
ResService resService;
@@ -64,14 +60,30 @@
private final static String DEM_FORMAT = "%s/sj_raster/v6/terrain_mesh/service/system/%d/%s";
+ private final static String API_LAYER = "%s/sj_raster/v6/api/layer?%s&sort=name%%20asc";
+
private final static String COLOR_TABLE = "%s/sj_raster/v6/api/color_table?%s&page_count=%d&page_num=%d&key=";
/**
* 鍒嗛〉鏌ヨ鏁扮畝鐨勯鑹茶〃
*/
- public void selectSjColorTables(Integer pageSize, Integer pageIndex, HttpServletRequest req, HttpServletResponse res) {
+ public void selectSjColorTables(Integer port, Integer pageSize, Integer pageIndex, HttpServletRequest req, HttpServletResponse res) {
try {
- String url = String.format(COLOR_TABLE, ctUrl, ak, pageSize, pageIndex);
+ String url = String.format(COLOR_TABLE, null == port || 50001 == port ? sjUrl1 : sjUrl5, ak, pageSize, pageIndex);
+
+ HttpHelper httpHelper = new HttpHelper();
+ httpHelper.service(req, res, null, url);
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+
+ /**
+ * 鏌ヨ鏁扮畝鍥惧眰
+ */
+ public void selectSjLayers(Integer port, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ String url = String.format(API_LAYER, null == port || 50001 == port ? sjUrl1 : sjUrl5, ak);
HttpHelper httpHelper = new HttpHelper();
httpHelper.service(req, res, null, url);
@@ -196,7 +208,7 @@
*/
public Integer postLayerEntity(CreateLayerEntity layerEntity) {
Map<String, Object> map = getMapData(layerEntity);
- String url = String.format("%s/sj_raster/v6/api/layer?op=create_ex&%s", sjUrl, ak);
+ String url = String.format("%s/sj_raster/v6/api/layer?op=create_ex&%s", sjUrl5, ak);
LayerResultEntity rs = postForRest(url, map, LayerResultEntity.class);
boolean flag = null == rs || !StaticData.SUCCESS.equals(rs.getStatus()) || null == rs.getResult().getLayer_id();
@@ -234,7 +246,7 @@
*/
public Integer postServiceEntity(CreateServiceEntity serviceEntity) {
Map<String, Object> map = getMapData(serviceEntity);
- String url = String.format("%s/sj_raster/v6/api/service?op=create_ex&%s", sjUrl, ak);
+ String url = String.format("%s/sj_raster/v6/api/service?op=create_ex&%s", sjUrl5, ak);
ServiceResultEntity rs = postForRest(url, map, ServiceResultEntity.class);
boolean flag = null == rs || !StaticData.SUCCESS.equals(rs.getStatus()) || null == rs.getResult();
@@ -251,7 +263,7 @@
entity.setServiceid(serviceId);
entity.setEventid(pub.getUuid());
entity.setName(pub.getName());
- entity.setUrl(String.format(TYPES.get(0).equals(pub.getType()) ? DOM_FORMAT : DEM_FORMAT, sjUrl, serviceId, StaticData.I0));
+ entity.setUrl(String.format(TYPES.get(0).equals(pub.getType()) ? DOM_FORMAT : DEM_FORMAT, sjUrl5, serviceId, StaticData.I0));
entity.setPath(null);
entity.setType(pub.getType());
entity.setStatus(3);
@@ -373,7 +385,7 @@
entity.setServiceid(serviceId);
entity.setEventid(pub.getUuid());
entity.setUpdateUser(pub.getUserId());
- entity.setUrl(String.format(TYPES.get(0).equals(pub.getType()) ? DOM_FORMAT : DEM_FORMAT, sjUrl, serviceId, StaticData.I0));
+ entity.setUrl(String.format(TYPES.get(0).equals(pub.getType()) ? DOM_FORMAT : DEM_FORMAT, sjUrl5, serviceId, StaticData.I0));
if (StringHelper.isEmpty(entity.getGeom())) {
entity.setGeom(StaticData.NULL);
}
@@ -447,7 +459,7 @@
entity.getId_list().add(id);
Map<String, Object> map = getMapData(entity);
- String url = String.format("%s/sj_raster/v6/api/layer?%s", sjUrl, ak);
+ String url = String.format("%s/sj_raster/v6/api/layer?%s", sjUrl5, ak);
DeleteResultEntity rs = deleteForRest(url, map);
@@ -467,7 +479,7 @@
entity.getId_list().add(id);
Map<String, Object> map = getMapData(entity);
- String url = String.format("%s/sj_raster/v6/api/service?%s", sjUrl, ak);
+ String url = String.format("%s/sj_raster/v6/api/service?%s", sjUrl5, ak);
DeleteResultEntity rs = deleteForRest(url, map);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ed23e50..f5840a0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -121,9 +121,9 @@
shujian:
ak: ak=mf72ff9295c740ec0f37e61433e8a3ad8d
- url: http://172.16.2.10:50005
+ url1: http://172.16.2.10:50001
+ url5: http://172.16.2.10:50005
path: share/YQData/upload/
- ctUrl: http://172.16.2.10:50001
# 绯荤粺閰嶇疆
sys:
--
Gitblit v1.9.3