From f2710a490b9e1642d9b4d32c8bcf1e0461b1cd3e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 14 九月 2023 11:00:33 +0800
Subject: [PATCH] 修改栅格分析的图层名
---
src/main/java/com/moon/server/service/data/ShuJianService.java | 3 +--
src/main/java/com/moon/server/controller/data/RasterAnalysisController.java | 12 +++++++-----
src/main/resources/mapper/data/PublishMapper.xml | 5 ++++-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/data/RasterAnalysisController.java b/src/main/java/com/moon/server/controller/data/RasterAnalysisController.java
index 3da5c79..c5b3f69 100644
--- a/src/main/java/com/moon/server/controller/data/RasterAnalysisController.java
+++ b/src/main/java/com/moon/server/controller/data/RasterAnalysisController.java
@@ -30,6 +30,8 @@
private final static List<Integer> PIXELS = new ArrayList<>(Arrays.asList(1, 2, 4, 8, 16, 32, 64, 128, 256));
+ private final static List<Integer> NODES = new ArrayList<>(Arrays.asList(16, 32, 64, 96, 128, 192, 256, 384, 512, 768, 1024));
+
@SysLog()
@ApiOperation(value = "鏌ヨ鐐瑰垎鏋�")
@ApiImplicitParams({
@@ -62,10 +64,10 @@
@ApiOperation(value = "鏌ヨ绾垮垎鏋�")
@ApiImplicitParams({
@ApiImplicitParam(name = "wkt", value = "绾縒KT", dataType = "String", example = "LINESTRING(165.680851 31.333443,166.383982 31.283475,166.016355 30.908709)"),
- @ApiImplicitParam(name = "pixel", value = "鍍忕礌鍊�", dataType = "Integer", example = "1")
+ @ApiImplicitParam(name = "nodes", value = "鑺傜偣鏁�", dataType = "Integer", example = "16")
})
@GetMapping(value = "/selectByPolyline")
- public ResponseMsg<Object> selectByPolyline(String wkt, Integer pixel) {
+ public ResponseMsg<Object> selectByPolyline(String wkt, Integer nodes) {
try {
if (StringHelper.isEmpty(wkt)) {
return fail("WKT瀛楃涓蹭笉鑳戒负绌�");
@@ -74,11 +76,11 @@
if (null == geo || geo.GetGeometryType() != ogr.wkbLineString) {
return fail("WKT瀛楃涓蹭笉姝ｇ‘");
}
- if (null == pixel || !PIXELS.contains(pixel)) {
- return fail("鍍忕礌鍊煎彧鑳戒负锛�" + StringHelper.join(PIXELS, ", "));
+ if (null == nodes || !NODES.contains(nodes)) {
+ return fail("鑺傜偣鏁板彧鑳戒负锛�" + StringHelper.join(NODES, ", "));
}
- List<?> rs = rasterService.analysis(geo, pixel);
+ List<?> rs = rasterService.analysis(geo, nodes);
return success(rs.size(), rs);
} catch (Exception ex) {
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 75c88b2..62a775d 100644
--- a/src/main/java/com/moon/server/service/data/ShuJianService.java
+++ b/src/main/java/com/moon/server/service/data/ShuJianService.java
@@ -654,10 +654,9 @@
return 0;
}
- Integer imgId = 0;
List<ImageResultEntity.Image> itemList = ir.getResult().getItem_list();
for (ImageResultEntity.Image image : itemList) {
- imgId = updateImageLayerStretch(image.getData_id(), entity);
+ Integer imgId = updateImageLayerStretch(image.getData_id(), entity);
}
pub.setUpdateUser(entity.getUserId());
diff --git a/src/main/resources/mapper/data/PublishMapper.xml b/src/main/resources/mapper/data/PublishMapper.xml
index fe1b636..1dab65b 100644
--- a/src/main/resources/mapper/data/PublishMapper.xml
+++ b/src/main/resources/mapper/data/PublishMapper.xml
@@ -103,7 +103,10 @@
</select>
<select id="selectRaster" resultType="com.moon.server.entity.data.PublishEntity">
- select * from lf.sys_publish where status = 3 and type in ('DOM', 'DEM');
+ select c.cn_name "name", a.*
+ from lf.sys_publish a inner join lf.sys_res b on a.id = b.pubid
+ inner join lf.sys_layer c on b.id = c.resid
+ where a.type in ('DOM', 'DEM') and a.status = 3 and c.status = 1;
</select>
<select id="selectByLayerId" resultType="com.moon.server.entity.data.PublishEntity">
--
Gitblit v1.9.3