From 00092d0c03b3fec006734e2211fa04c8a0e04b36 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 29 六月 2023 09:35:24 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/OneMapController.java | 15 +--------------
src/main/resources/mapper/show/OneMapMapper.xml | 4 +++-
2 files changed, 4 insertions(+), 15 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 9b66f49..8221b56 100644
--- a/src/main/java/com/lf/server/controller/show/OneMapController.java
+++ b/src/main/java/com/lf/server/controller/show/OneMapController.java
@@ -1,6 +1,5 @@
package com.lf.server.controller.show;
-
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
@@ -24,7 +23,6 @@
* @author xing
* @date 2023/02/13
*/
-
@Api(tags = "缁煎悎灞曠ず\\绠＄綉涓�寮犲浘")
@RestController
@RequestMapping("/oneMap")
@@ -32,7 +30,6 @@
@Autowired
OneMapService aMapOfPipelineService;
-
//============[椤圭洰缁熻 project Statistics]==================
@@ -59,7 +56,6 @@
List<String> resList = aMapOfPipelineService.projectLocationCount();
return success(resList);
}
-
/**
* 鍥藉缁村害-鏁伴噺缁熻
@@ -96,7 +92,6 @@
List<String> resList = aMapOfPipelineService.countProjectTypeNumber();
return success(resList);
}
-
//============[鏁版嵁缁熻 data Statistics]==================
@@ -148,7 +143,6 @@
List<String> resList = aMapOfPipelineService.loginNumberStatistics();
return success(resList);
}
-
/**
* 鏁版嵁缁熻
@@ -202,7 +196,6 @@
return success(resList);
}
-
/**
* 椤圭洰宸ョ▼灞曠ず
* Project engineering display
@@ -224,6 +217,7 @@
@GetMapping("/countProjectTour")
public ResponseMsg<Object> countProjectTour(MpipelineEntity mpipelineEntity) {
List<String> resList = aMapOfPipelineService.countProjectTour(mpipelineEntity);
+
return success("hello! 鎮ㄥ凡缁忔垚鍔熻闂�-椤圭洰宸ョ▼宸¤", resList);
}
@@ -238,7 +232,6 @@
List<String> resList = aMapOfPipelineService.selectProjectTour();
return success(resList);
}
-
/**
* 宸ョ▼椤圭洰鐩綍
@@ -262,7 +255,6 @@
List<String> resList = aMapOfPipelineService.queryTableInfo(tableName);
return success(resList);
}
-
//============[涓撻灞曠ず Thematic presentations]==================
@@ -326,7 +318,6 @@
return success(resList);
}
-
//============[宸ョ▼灞曠ず Engineering Showcase]==================
/**
@@ -381,7 +372,6 @@
return success(resList);
}
-
/**
* 缁熻椤圭洰涓�
* 鍗曚釜椤圭洰涓嬭浇閲�
@@ -396,7 +386,4 @@
List<String> resList = aMapOfPipelineService.countProjectDown(projectCode);
return success(resList);
}
-
-
-
}
diff --git a/src/main/resources/mapper/show/OneMapMapper.xml b/src/main/resources/mapper/show/OneMapMapper.xml
index 3803030..88c2c39 100644
--- a/src/main/resources/mapper/show/OneMapMapper.xml
+++ b/src/main/resources/mapper/show/OneMapMapper.xml
@@ -128,7 +128,9 @@
<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>
+ <if test="pipename != null and pipename != ''">
+ pipename = #{pipename}
+ </if>
</where>
</select>
--
Gitblit v1.9.3