From ab69ebc575d4d9225d15e0e174ebd9978cf1c217 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 16:28:49 +0800
Subject: [PATCH] 20230221@xingjs@提交官网一张图相关内容接口
---
src/main/java/com/lf/server/controller/show/OneMapController.java | 20 ++++++++-
src/main/java/com/lf/server/mapper/show/OneMapMapper.java | 15 +++++++
src/main/java/com/lf/server/service/show/OneMapService.java | 21 ++++++++++
src/main/resources/mapper/show/OneMapMapper.xml | 13 ++++++
4 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/OneMapController.java b/src/main/java/com/lf/server/controller/show/OneMapController.java
index 5a11ffe..cd74df9 100644
--- a/src/main/java/com/lf/server/controller/show/OneMapController.java
+++ b/src/main/java/com/lf/server/controller/show/OneMapController.java
@@ -4,6 +4,7 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.bs.MpipelineEntity;
import com.lf.server.service.show.OneMapService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,8 +33,8 @@
OneMapService aMapOfPipelineService;
-
//============[椤圭洰缁熻 project Statistics]==================
+
/**
* 椤圭洰绫诲埆
* Project category
@@ -158,8 +159,21 @@
@SysLog()
@ApiOperation(value = "椤圭洰宸ョ▼宸¤")
@GetMapping("/countProjectTour")
- public ResponseMsg<Object> countProjectTour() {
- return success("hello! 鎮ㄥ凡缁忔垚鍔熻闂�-椤圭洰宸ョ▼宸¤");
+ public ResponseMsg<Object> countProjectTour(MpipelineEntity mpipelineEntity) {
+ List<String> resList = aMapOfPipelineService.countProjectTour(mpipelineEntity);
+ return success("hello! 鎮ㄥ凡缁忔垚鍔熻闂�-椤圭洰宸ョ▼宸¤", resList);
+ }
+
+ /**
+ * 椤圭洰宸ョ▼宸¤鍒楄〃
+ * Project inspection tour
+ */
+ @SysLog()
+ @ApiOperation(value = "椤圭洰宸ョ▼宸¤鍒楄〃")
+ @GetMapping("/selectProjectTour")
+ public ResponseMsg<Object> selectProjectTour() {
+ List<String> resList = aMapOfPipelineService.selectProjectTour();
+ return success(resList);
}
diff --git a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
index c66738a..2bd6dfe 100644
--- a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
+++ b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
@@ -1,5 +1,6 @@
package com.lf.server.mapper.show;
+import com.lf.server.entity.bs.MpipelineEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -77,6 +78,20 @@
public List<String> countProjectDisplay();
/**
+ * 缁熻椤圭洰鍙傝
+ *
+ * @return {@link List}<{@link String}>
+ */
+ public List<String> countProjectTour(MpipelineEntity mpipelineEntity);
+
+ /**
+ * 閫夋嫨椤圭洰鍙傝鍒楄〃
+ *
+ * @return {@link List}<{@link String}>
+ */
+ public List<String> selectProjectTour();
+
+ /**
* 缁熻椤圭洰绫诲瀷
*
* @return {@link List}<{@link String}>
diff --git a/src/main/java/com/lf/server/service/show/OneMapService.java b/src/main/java/com/lf/server/service/show/OneMapService.java
index d4f7371..62b5b4c 100644
--- a/src/main/java/com/lf/server/service/show/OneMapService.java
+++ b/src/main/java/com/lf/server/service/show/OneMapService.java
@@ -1,5 +1,6 @@
package com.lf.server.service.show;
+import com.lf.server.entity.bs.MpipelineEntity;
import com.lf.server.mapper.show.OneMapMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -102,6 +103,26 @@
}
/**
+ * 缁熻椤圭洰鍙傝
+ *
+ * @return {@link List}<{@link String}>
+ */
+ @Override
+ public List<String> countProjectTour(MpipelineEntity mpipelineEntity) {
+ return aMapOfPipelineMapper.countProjectTour(mpipelineEntity);
+ }
+
+ /**
+ * 閫夋嫨椤圭洰鍙傝鍒楄〃
+ *
+ * @return {@link List}<{@link String}>
+ */
+ @Override
+ public List<String> selectProjectTour() {
+ return aMapOfPipelineMapper.selectProjectTour();
+ }
+
+ /**
* 缁熻椤圭洰绫诲瀷
*
* @return {@link List}<{@link String}>
diff --git a/src/main/resources/mapper/show/OneMapMapper.xml b/src/main/resources/mapper/show/OneMapMapper.xml
index 8ae6c87..43c4e50 100644
--- a/src/main/resources/mapper/show/OneMapMapper.xml
+++ b/src/main/resources/mapper/show/OneMapMapper.xml
@@ -53,6 +53,19 @@
select PROJNAME,* from bs.bs_project WHERE PROJNAME IS NOT NULL;
</select>
+ <!-- 宸ョ▼宸¤ -->
+ <select id="countProjectTour" resultType="java.util.Map">
+ SELECT st_astext(geom) AS wkt,* FROM bs.m_pipeline
+ <where>
+ <if test="pipename != null and pipename != ''"> and pipename = #{pipename}</if>
+ </where>
+ </select>
+
+ <!-- 宸ョ▼宸¤鍒楄〃 -->
+ <select id="selectProjectTour" resultType="java.util.Map">
+ SELECT DISTINCT pipename FROM bs.m_pipeline;
+ </select>
+
<!-- 缁熻椤圭洰绫诲瀷 1 -->
<select id="countProjectType1" resultType="java.util.Map">
--
Gitblit v1.9.3