From d29863abcfc8166d3b0e2f82a6a6eea9e41b9fcc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 30 十二月 2022 09:55:10 +0800
Subject: [PATCH] 12.30.1
---
src/main/java/com/lf/server/mapper/show/PipelineMapper.java | 9 ---------
data/ts.sql | 4 ++--
src/main/java/com/lf/server/entity/all/StaticData.java | 2 +-
src/main/java/com/lf/server/service/show/PipelineService.java | 5 -----
src/main/resources/mapper/show/PipelineMapper.xml | 9 +--------
5 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/data/ts.sql b/data/ts.sql
index b67e578..2b2b4f1 100644
--- a/data/ts.sql
+++ b/data/ts.sql
@@ -125,13 +125,13 @@
WHERE segname = 'DD' ) AS b
WHERE ST_Intersects(a.geom, b.geom)
-select a.name as acrossName, b.segname as segName, b.remarks, b.pipename as pipeName,
+select row_number() over() as gid, a.name as acrossName, b.segname as segName, b.remarks, b.pipename as pipeName,
cast( st_length( st_geographyfromtext( st_astext( st_intersection(ST_MakeValid(a.geom), ST_MakeValid(b.geom) ) ) ) ) as decimal(12, 3) ) AS acrossLength,
st_astext( st_intersection( ST_MakeValid(a.geom), ST_MakeValid(b.geom) ) ) as wkt
from bd.dlg_25w_hyda as a, (select segname, remarks, pipename, geom from bs.m_pipesegment where gid = 24) as b
where ST_Intersects(a.geom, b.geom)
-select * from lf.sys_download where type=4;
+select * from lf.sys_download where type = 5;
select * from bs.m_pipesegment;
diff --git a/src/main/java/com/lf/server/entity/all/StaticData.java b/src/main/java/com/lf/server/entity/all/StaticData.java
index 070b97e..0918b23 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -117,5 +117,5 @@
/**
* 绠＄嚎鎺掗櫎瀛楁
*/
- public final static List<String> PIPE_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("serialVersionUID", "tabs", "pwd", "wkt"));
+ public final static List<String> PIPE_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("serialVersionUID", "tabs", "pwd", "gid", "wkt"));
}
diff --git a/src/main/java/com/lf/server/mapper/show/PipelineMapper.java b/src/main/java/com/lf/server/mapper/show/PipelineMapper.java
index caf67dc..ff9975e 100644
--- a/src/main/java/com/lf/server/mapper/show/PipelineMapper.java
+++ b/src/main/java/com/lf/server/mapper/show/PipelineMapper.java
@@ -28,13 +28,4 @@
* @return 绠＄嚎瀹炰綋绫婚泦鍚�
*/
public List<PipelineEntity> selectPipeAnalysis(String tab, Integer gid);
-
- /**
- * 鏌ヨ鍒嗘瀽缁撴灉
- *
- * @param tab 琛ㄥ悕
- * @param gid ID
- * @return 绠＄嚎瀹炰綋绫婚泦鍚�
- */
- public List<PipelineEntity> selectAnalysisResult(String tab, Integer gid);
}
diff --git a/src/main/java/com/lf/server/service/show/PipelineService.java b/src/main/java/com/lf/server/service/show/PipelineService.java
index 903bf58..529c7cd 100644
--- a/src/main/java/com/lf/server/service/show/PipelineService.java
+++ b/src/main/java/com/lf/server/service/show/PipelineService.java
@@ -58,11 +58,6 @@
return pipelineMapper.selectPipeAnalysis(tab, gid);
}
- @Override
- public List<PipelineEntity> selectAnalysisResult(String tab, Integer gid) {
- return pipelineMapper.selectAnalysisResult(tab, gid);
- }
-
/**
* 鍒涘缓Zip鍖�
*
diff --git a/src/main/resources/mapper/show/PipelineMapper.xml b/src/main/resources/mapper/show/PipelineMapper.xml
index 7f60dac..0332d3f 100644
--- a/src/main/resources/mapper/show/PipelineMapper.xml
+++ b/src/main/resources/mapper/show/PipelineMapper.xml
@@ -6,14 +6,7 @@
</select>
<select id="selectPipeAnalysis" resultType="com.lf.server.entity.show.PipelineEntity">
- select a.name as acrossName, b.segname as segName, b.remarks, b.pipename as pipeName,
- cast( st_length( st_geographyfromtext( st_astext( st_intersection(ST_MakeValid(a.geom), ST_MakeValid(b.geom) ) ) ) ) as decimal(12, 2) ) AS acrossLength
- from ${tab} as a, (select segname, remarks, pipename, geom from bs.m_pipesegment where gid = #{gid} ) as b
- where ST_Intersects(a.geom, b.geom)
- </select>
-
- <select id="selectAnalysisResult" resultType="com.lf.server.entity.show.PipelineEntity">
- select a.name as acrossName, b.segname as segName, b.remarks, b.pipename as pipeName,
+ select row_number() over() as gid, a.name as acrossName, b.segname as segName, b.remarks, b.pipename as pipeName,
cast( st_length( st_geographyfromtext( st_astext( st_intersection(ST_MakeValid(a.geom), ST_MakeValid(b.geom) ) ) ) ) as decimal(12, 2) ) AS acrossLength,
st_astext( st_intersection( ST_MakeValid(a.geom), ST_MakeValid(b.geom) ) ) as wkt
from ${tab} as a, (select segname, remarks, pipename, geom from bs.m_pipesegment where gid = #{gid} ) as b
--
Gitblit v1.9.3