From b6b0cb226fcf184525ee7b36af3a09471e9c0057 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 三月 2024 11:29:33 +0800
Subject: [PATCH] 修改数据统计的查询条件
---
src/main/java/com/lf/server/controller/show/OneMapController.java | 295 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 269 insertions(+), 26 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 3cc217f..79718e5 100644
--- a/src/main/java/com/lf/server/controller/show/OneMapController.java
+++ b/src/main/java/com/lf/server/controller/show/OneMapController.java
@@ -1,18 +1,22 @@
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;
+import com.lf.server.entity.bs.MpipelineEntity;
+import com.lf.server.entity.ctrl.CountEntity;
+import com.lf.server.entity.show.OneMapEntity;
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;
+import java.util.Map;
/**
* 绠＄綉涓�寮犲浘
@@ -21,18 +25,15 @@
* @author xing
* @date 2023/02/13
*/
-
@Api(tags = "缁煎悎灞曠ず\\绠＄綉涓�寮犲浘")
@RestController
@RequestMapping("/oneMap")
public class OneMapController extends BaseController {
-
@Autowired
- OneMapService aMapOfPipelineService;
-
-
+ OneMapService oneMapService;
//============[椤圭洰缁熻 project Statistics]==================
+
/**
* 椤圭洰绫诲埆
* Project category
@@ -41,7 +42,7 @@
@ApiOperation(value = "椤圭洰绫诲埆")
@GetMapping("/countProjectCategory")
public ResponseMsg<Object> projectCategoryCount() {
- List<String> resList = aMapOfPipelineService.projectCategoryCount();
+ List<String> resList = oneMapService.projectCategoryCount();
return success(resList);
}
@@ -53,10 +54,9 @@
@ApiOperation(value = "椤圭洰浣嶇疆鍒嗗竷鎺ュ彛")
@GetMapping("/countProjectLocation")
public ResponseMsg<Object> projectLocationCount() {
- List<String> resList = aMapOfPipelineService.projectLocationCount();
+ List<String> resList = oneMapService.projectLocationCount();
return success(resList);
}
-
/**
* 鍥藉缁村害-鏁伴噺缁熻
@@ -66,7 +66,7 @@
@ApiOperation(value = "鍥藉缁村害-鏁伴噺缁熻")
@GetMapping("/countCountryDimension")
public ResponseMsg<Object> countryDimensionCount() {
- List<String> resList = aMapOfPipelineService.countryDimensionCount();
+ List<String> resList = oneMapService.countryDimensionCount();
return success(resList);
}
@@ -78,10 +78,21 @@
@ApiOperation(value = "鐪佺淮搴�-鏁伴噺缁熻")
@GetMapping("/countProvinceDimension")
public ResponseMsg<Object> provinceDimensionCount() {
- List<String> resList = aMapOfPipelineService.provinceDimensionCount();
+ List<String> resList = oneMapService.provinceDimensionCount();
return success(resList);
}
+ /**
+ * 鍏ㄥ浗缁村害-鎸夌収椤硅嚜绫诲瀷缁熻涓嶅悓椤圭洰涓暟
+ * Count the number of different items according to their type
+ */
+ @SysLog()
+ @ApiOperation(value = "鍏ㄥ浗缁村害-鎸夌収椤硅嚜绫诲瀷缁熻涓嶅悓椤圭洰涓暟")
+ @GetMapping("/countProjectTypeNumber")
+ public ResponseMsg<Object> countProjectTypeNumber() {
+ List<String> resList = oneMapService.countProjectTypeNumber();
+ return success(resList);
+ }
//============[鏁版嵁缁熻 data Statistics]==================
@@ -94,7 +105,43 @@
@ApiOperation(value = "鏁版嵁瀛樺偍缁熻")
@GetMapping("/countDataStorage")
public ResponseMsg<Object> dataStorageCount() {
- List<String> resList = aMapOfPipelineService.dataStorageCount();
+ List<String> resList = oneMapService.dataStorageCount();
+ return success(resList);
+ }
+
+ /**
+ * 鏁版嵁澶х被缁熻
+ * Statistics of large categories of data
+ */
+ @SysLog()
+ @ApiOperation(value = "鏁版嵁澶х被缁熻")
+ @GetMapping("/countLargeCategories")
+ public ResponseMsg<Object> statisticalDataCategories() {
+ List<String> resList = oneMapService.statisticalDataCategories();
+ return success(resList);
+ }
+
+ /**
+ * 鏁版嵁鏈嶅姟绫诲瀷缁熻
+ * Data service type statistics
+ */
+ @SysLog()
+ @ApiOperation(value = "鏁版嵁鏈嶅姟绫诲瀷缁熻")
+ @GetMapping("/countDataServiceType")
+ public ResponseMsg<Object> statisticalDataServiceType() {
+ List<String> resList = oneMapService.statisticalDataServiceType();
+ return success(resList);
+ }
+
+ /**
+ * 鐧诲綍娆℃暟缁熻
+ * Number of logins
+ */
+ @SysLog()
+ @ApiOperation(value = "鐧诲綍娆℃暟缁熻")
+ @GetMapping("/countLoginNumber")
+ public ResponseMsg<Object> loginNumberStatistics() {
+ List<String> resList = oneMapService.loginNumberStatistics();
return success(resList);
}
@@ -107,7 +154,7 @@
@ApiOperation(value = "鏂囦欢鏍煎紡缁村害-鏂囦欢涓暟")
@GetMapping("/countFileFormat")
public ResponseMsg<Object> fileFormatCount() {
- List<String> resList = aMapOfPipelineService.fileFormatCount();
+ List<String> resList = oneMapService.fileFormatCount();
return success(resList);
}
@@ -120,7 +167,7 @@
@ApiOperation(value = "鏁版嵁鐢宠")
@GetMapping("/countDataApply")
public ResponseMsg<Object> dataApplyCount() {
- List<String> resList = aMapOfPipelineService.dataApplyCount();
+ List<String> resList = oneMapService.dataApplyCount();
return success(resList);
}
@@ -133,10 +180,22 @@
@ApiOperation(value = "璁块棶娆℃暟")
@GetMapping("/countDataVisit")
public ResponseMsg<Object> dataVisitCount() {
- List<String> resList = aMapOfPipelineService.dataVisitCount();
+ List<String> resList = oneMapService.dataVisitCount();
return success(resList);
}
+ /**
+ * 涓嬭浇閲忕粺璁�
+ * Download statistics
+ * <p>type绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡<p/>
+ */
+ @SysLog()
+ @ApiOperation(value = "涓嬭浇閲忕粺璁�")
+ @GetMapping("/countDownloads")
+ public ResponseMsg<Object> countDownloads() {
+ List<String> resList = oneMapService.countDownloads();
+ return success(resList);
+ }
/**
* 椤圭洰宸ョ▼灞曠ず
@@ -146,7 +205,7 @@
@ApiOperation(value = "椤圭洰宸ョ▼灞曠ず")
@GetMapping("/countProjectDisplay")
public ResponseMsg<Object> countProjectDisplay() {
- List<String> resList = aMapOfPipelineService.countProjectDisplay();
+ List<String> resList = oneMapService.countProjectDisplay();
return success(resList);
}
@@ -157,22 +216,206 @@
@SysLog()
@ApiOperation(value = "椤圭洰宸ョ▼宸¤")
@GetMapping("/countProjectTour")
- public ResponseMsg<Object> countProjectTour() {
- return success("hello! 鎮ㄥ凡缁忔垚鍔熻闂�-椤圭洰宸ョ▼宸¤");
+ public ResponseMsg<Object> countProjectTour(MpipelineEntity mpipelineEntity) {
+ List<String> resList = oneMapService.countProjectTour(mpipelineEntity);
+
+ return success("hello! 鎮ㄥ凡缁忔垚鍔熻闂�-椤圭洰宸ョ▼宸¤", resList);
}
+ /**
+ * 椤圭洰宸ョ▼宸¤鍒楄〃
+ * Project inspection tour
+ */
+ @SysLog()
+ @ApiOperation(value = "椤圭洰宸ョ▼宸¤鍒楄〃")
+ @GetMapping("/selectProjectTour")
+ public ResponseMsg<Object> selectProjectTour() {
+ List<String> resList = oneMapService.selectProjectTour();
+ return success(resList);
+ }
/**
- * 椤圭洰宸ョ▼绫诲瀷
- * Project type
+ * 宸ョ▼椤圭洰鐩綍
+ * Project Catalog
*/
- /*@SysLog()
- @ApiOperation(value = "椤圭洰宸ョ▼绫诲瀷")
- @GetMapping("/countProjectType")
- public ResponseMsg<Object> countProjectType() {
- List<String> resList = aMapOfPipelineService.countProjectType1();
+ @SysLog()
+ @ApiOperation(value = "宸ョ▼椤圭洰鐩綍")
+ @GetMapping("/selectProjectType")
+ public ResponseMsg<Object> selectProjectType() {
+ List<OneMapEntity> resList = oneMapService.selectProjectType1();
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 = oneMapService.queryTableInfo(tableName);
+ return success(resList);
+ }
+ //============[涓撻灞曠ず Thematic presentations]==================
+
+ /**
+ * 鍏ㄧ悆绠＄綉鍥�
+ * Global pipe network map
+ */
+ @SysLog()
+ @ApiOperation(value = "鍏ㄧ悆绠＄綉鍥�")
+ @GetMapping("/countGlobalPipeMap")
+ public ResponseMsg<Object> countGlobalPipeMap() {
+ List<String> resList = oneMapService.countGlobalPipeMap();
+ return success(resList);
+ }
+
+ /**
+ * 鍏ㄥ浗绠＄綉鍥�
+ * National pipe network map
+ */
+ @SysLog()
+ @ApiOperation(value = "鍏ㄥ浗绠＄綉鍥�")
+ @GetMapping("/countNationalPipeMap")
+ public ResponseMsg<Object> countNationalPipeMap() {
+ List<String> resList = oneMapService.countNationalPipeMap();
+ return success(resList);
+ }
+
+ /**
+ * 鍏ㄥ浗绠＄綉鍥捐緭閫佷粙璐ㄩ暱搴�
+ * National pipe network diagram conveying medium length
+ */
+ @SysLog()
+ @ApiOperation(value = "鍏ㄥ浗绠＄綉鍥捐緭閫佷粙璐ㄩ暱搴�")
+ @GetMapping("/countZhPipeMapLength")
+ public ResponseMsg<Object> countZhPipeMapLenByMed() {
+ List<String> resList = oneMapService.countZhPipeMapLenByMed();
+ return success(resList);
+ }
+
+ /**
+ * 缁熻鍏ㄥ浗绔欏満搴ф暟
+ * Number of station seats nationwide
+ */
+ @SysLog()
+ @ApiOperation(value = "鍏ㄥ浗绔欏満搴ф暟銆侀榾瀹ゃ�佺閬撴暟绛�")
+ @GetMapping("/countZhPipeStations")
+ public ResponseMsg<Object> countZhPipeStations() {
+ List<String> resList = oneMapService.countZhPipeStations();
+ return success(resList);
+ }
+
+ /**
+ * 鎸夐」鐩粺璁￠」鐩瓨鍌ㄩ噺
+ * Count the amount of project storage by project
+ */
+ @SysLog()
+ @ApiOperation(value = "鎸夐」鐩粺璁￠」鐩瓨鍌ㄩ噺")
+ @GetMapping("/countStorageByProject")
+ public ResponseMsg<Object> countStorageByProject() {
+ List<String> resList = oneMapService.countStorageByProject();
+ return success(resList);
+ }
+
+ //============[宸ョ▼灞曠ず Engineering Showcase]==================
+
+ /**
+ * 椤圭洰淇℃伅鏌ヨ
+ * Project information query
+ */
+ @SysLog()
+ @ApiOperation(value = "椤圭洰淇℃伅鏌ヨ")
+ @GetMapping("/selectProjectInfo")
+ public ResponseMsg<Object> selectProjectInfo(@RequestParam("projectCode") String projectCode) {
+ List<String> resList = oneMapService.selectProjectInfo(projectCode);
+ return success(resList);
+ }
+ /**
+ * 椤圭洰鏂囦欢鍒楄〃鏌ヨ
+ * Project file list query
+ */
+ @SysLog()
+ @ApiOperation(value = "椤圭洰鏂囦欢鍒楄〃鏌ヨ")
+ @GetMapping("/selectProjectFileList")
+ public ResponseMsg<Object> selectProjectFileList() {
+ List<String> resList = oneMapService.selectProjectFileList();
+ return success(resList);
+ }
+
+ /**
+ * 鍗曚釜椤圭洰瀛樺偍閲�
+ *
+ * @param projectCode 椤圭洰浠ｇ爜
+ * @return {@link ResponseMsg}<{@link Object}>
+ */
+ @SysLog()
+ @ApiOperation(value = "鍗曚釜椤圭洰瀛樺偍閲�")
+ @GetMapping("/countProjectStorage")
+ public ResponseMsg<Object> countProjectStorage(@RequestParam("projectCode") String projectCode) {
+ List<String> resList = oneMapService.countProjectStorage(projectCode);
+ return success(resList);
+ }
+
+ /**
+ * 鍗曚釜椤圭洰鏂囦欢鏁伴噺
+ * The number of individual project files
+ *
+ * @param projectCode 椤圭洰浠ｇ爜
+ * @return {@link ResponseMsg}<{@link Object}>
+ */
+ @SysLog()
+ @ApiOperation(value = "鍗曚釜椤圭洰鏂囦欢绫诲瀷鏁伴噺")
+ @GetMapping("/countProjectType")
+ public ResponseMsg<Object> countProjectType(@RequestParam("projectCode") String projectCode) {
+ List<Map<String, Object>> resList = oneMapService.countProjectType(projectCode);
+
+ return success(resList);
+ }
+
+ /**
+ * 缁熻椤圭洰涓�
+ * 鍗曚釜椤圭洰涓嬭浇閲�
+ *
+ * @param projectCode 椤圭洰浠ｇ爜
+ * @return {@link ResponseMsg}<{@link Object}>
+ */
+ @SysLog()
+ @ApiOperation(value = "鍗曚釜椤圭洰涓嬭浇閲�")
+ @GetMapping("/countProjectDown")
+ public ResponseMsg<Object> countProjectDown(@RequestParam("projectCode") String projectCode) {
+ List<String> resList = oneMapService.countProjectDown(projectCode);
+ return success(resList);
+ }
+
+ //============[鏁版嵁缁熻 - 2024-03-06]==================
+
+ @SysLog()
+ @ApiOperation(value = "鏁版嵁缁熻(鎸夊ぇ绫荤粺璁�)")
+ @GetMapping("/countByMajor")
+ public ResponseMsg<Object> countByMajor(){
+ try {
+ List<CountEntity> list = oneMapService.countByMajor();
+
+ return success(list);
+ }catch (Exception ex){
+ log.error(ex.getMessage(), ex);
+ return fail(ex.getMessage());
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ璁＄畻鏁版嵁")
+ @GetMapping("/selectCalcData")
+ public ResponseMsg<Object> selectCalcData(){
+ try {
+ String rs = oneMapService.calcData();
+
+ return success(rs);
+ }catch (Exception ex){
+ log.error(ex.getMessage(), ex);
+ return fail(ex.getMessage());
+ }
+ }
}
--
Gitblit v1.9.3