From cf547f4d9c56cf2d86ae60132aa7496bee93bf9c Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 17:12:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/controller/show/OneMapController.java | 87 +++++++++++++++++++++++++++++++++++--------
1 files changed, 71 insertions(+), 16 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 18d441b..b5665fa 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,20 +24,13 @@
* @date 2023/02/13
*/
-@Api(tags = "绠＄綉涓�寮犲浘")
+@Api(tags = "缁煎悎灞曠ず\\绠＄綉涓�寮犲浘")
@RestController
@RequestMapping("/oneMap")
public class OneMapController extends BaseController {
@Autowired
OneMapService aMapOfPipelineService;
-
- //@SysLog()
- @GetMapping("/hello")
- public ResponseMsg<Object> hello() {
- System.out.println("log = " + log);
- return success("hello! 鎮ㄥ凡缁忔垚鍔熻闂�", 1);
- }
//============[椤圭洰缁熻 project Statistics]==================
@@ -144,17 +139,77 @@
return success(resList);
}
-
/**
- * 鏁版嵁缁熻
- * 璁块棶娆℃暟
- * Number of visits
+ * 涓嬭浇閲忕粺璁�
+ * Download statistics
+ * <p>type绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡<p/>
*/
@SysLog()
- @ApiOperation(value = "璁块棶娆℃暟")
- @GetMapping("data_visit1")
- public ResponseMsg<Object> dataVisitConut1() {
- List<String> resList = aMapOfPipelineService.dataVisitCount();
+ @ApiOperation(value = "涓嬭浇閲忕粺璁�")
+ @GetMapping("/countDownloads")
+ public ResponseMsg<Object> countDownloads() {
+ List<String> resList = aMapOfPipelineService.countDownloads();
+ return success(resList);
+ }
+
+
+ /**
+ * 椤圭洰宸ョ▼灞曠ず
+ * Project engineering display
+ */
+ @SysLog()
+ @ApiOperation(value = "椤圭洰宸ョ▼灞曠ず")
+ @GetMapping("/countProjectDisplay")
+ public ResponseMsg<Object> countProjectDisplay() {
+ List<String> resList = aMapOfPipelineService.countProjectDisplay();
+ return success(resList);
+ }
+
+ /**
+ * 椤圭洰宸ョ▼宸¤
+ * Project inspection tour
+ */
+ @SysLog()
+ @ApiOperation(value = "椤圭洰宸ョ▼宸¤")
+ @GetMapping("/countProjectTour")
+ 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);
+ }
+
+
+ /**
+ * 椤圭洰宸ョ▼绫诲瀷
+ * Project type
+ */
+ /*@SysLog()
+ @ApiOperation(value = "椤圭洰宸ョ▼绫诲瀷")
+ @GetMapping("/countProjectType")
+ public ResponseMsg<Object> countProjectType() {
+ List<String> resList = aMapOfPipelineService.countProjectType1();
+ 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