From 7cba4e1dd5575c57c0a6544a35d17fb03d57cf89 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 16:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/controller/show/OneMapController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 c41bf3a..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,12 +4,14 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -22,7 +24,7 @@
* @date 2023/02/13
*/
-@Api(tags = "绠＄綉涓�寮犲浘")
+@Api(tags = "缁煎悎灞曠ず\\绠＄綉涓�寮犲浘")
@RestController
@RequestMapping("/oneMap")
public class OneMapController extends BaseController {
@@ -31,8 +33,8 @@
OneMapService aMapOfPipelineService;
-
//============[椤圭洰缁熻 project Statistics]==================
+
/**
* 椤圭洰绫诲埆
* Project category
@@ -157,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);
}
@@ -174,5 +189,16 @@
return success(resList);
}*/
+ /**
+ * 鏍规嵁琛ㄥ悕鏌ヨ琛ㄥ瓧娈典俊鎭�
+ * Query table field information according to table name
+ */
+ @ApiOperation(value = "鏍规嵁琛ㄥ悕鏌ヨ琛ㄥ瓧娈典俊鎭�")
+ @GetMapping("/selectTableInfo")
+ public ResponseMsg<Object> selectTableInfo(@RequestParam("tableName") String tableName) {
+ List<String> resList = aMapOfPipelineService.queryTableInfo(tableName);
+ return success(resList);
+ }
+
}
--
Gitblit v1.9.3