From 7f1e2732b38bbed37355e822f4267abccfec3583 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 06 三月 2024 16:39:44 +0800
Subject: [PATCH] 解决空值错误
---
src/main/java/com/lf/server/controller/show/OneMapController.java | 86 ++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 42 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..789daa5 100644
--- a/src/main/java/com/lf/server/controller/show/OneMapController.java
+++ b/src/main/java/com/lf/server/controller/show/OneMapController.java
@@ -1,10 +1,10 @@
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;
@@ -24,15 +24,12 @@
* @author xing
* @date 2023/02/13
*/
-
@Api(tags = "缁煎悎灞曠ず\\绠＄綉涓�寮犲浘")
@RestController
@RequestMapping("/oneMap")
public class OneMapController extends BaseController {
-
@Autowired
- OneMapService aMapOfPipelineService;
-
+ OneMapService oneMapService;
//============[椤圭洰缁熻 project Statistics]==================
@@ -44,7 +41,7 @@
@ApiOperation(value = "椤圭洰绫诲埆")
@GetMapping("/countProjectCategory")
public ResponseMsg<Object> projectCategoryCount() {
- List<String> resList = aMapOfPipelineService.projectCategoryCount();
+ List<String> resList = oneMapService.projectCategoryCount();
return success(resList);
}
@@ -56,10 +53,9 @@
@ApiOperation(value = "椤圭洰浣嶇疆鍒嗗竷鎺ュ彛")
@GetMapping("/countProjectLocation")
public ResponseMsg<Object> projectLocationCount() {
- List<String> resList = aMapOfPipelineService.projectLocationCount();
+ List<String> resList = oneMapService.projectLocationCount();
return success(resList);
}
-
/**
* 鍥藉缁村害-鏁伴噺缁熻
@@ -69,7 +65,7 @@
@ApiOperation(value = "鍥藉缁村害-鏁伴噺缁熻")
@GetMapping("/countCountryDimension")
public ResponseMsg<Object> countryDimensionCount() {
- List<String> resList = aMapOfPipelineService.countryDimensionCount();
+ List<String> resList = oneMapService.countryDimensionCount();
return success(resList);
}
@@ -81,7 +77,7 @@
@ApiOperation(value = "鐪佺淮搴�-鏁伴噺缁熻")
@GetMapping("/countProvinceDimension")
public ResponseMsg<Object> provinceDimensionCount() {
- List<String> resList = aMapOfPipelineService.provinceDimensionCount();
+ List<String> resList = oneMapService.provinceDimensionCount();
return success(resList);
}
@@ -93,10 +89,9 @@
@ApiOperation(value = "鍏ㄥ浗缁村害-鎸夌収椤硅嚜绫诲瀷缁熻涓嶅悓椤圭洰涓暟")
@GetMapping("/countProjectTypeNumber")
public ResponseMsg<Object> countProjectTypeNumber() {
- List<String> resList = aMapOfPipelineService.countProjectTypeNumber();
+ List<String> resList = oneMapService.countProjectTypeNumber();
return success(resList);
}
-
//============[鏁版嵁缁熻 data Statistics]==================
@@ -109,7 +104,7 @@
@ApiOperation(value = "鏁版嵁瀛樺偍缁熻")
@GetMapping("/countDataStorage")
public ResponseMsg<Object> dataStorageCount() {
- List<String> resList = aMapOfPipelineService.dataStorageCount();
+ List<String> resList = oneMapService.dataStorageCount();
return success(resList);
}
@@ -121,7 +116,7 @@
@ApiOperation(value = "鏁版嵁澶х被缁熻")
@GetMapping("/countLargeCategories")
public ResponseMsg<Object> statisticalDataCategories() {
- List<String> resList = aMapOfPipelineService.statisticalDataCategories();
+ List<String> resList = oneMapService.statisticalDataCategories();
return success(resList);
}
@@ -133,7 +128,7 @@
@ApiOperation(value = "鏁版嵁鏈嶅姟绫诲瀷缁熻")
@GetMapping("/countDataServiceType")
public ResponseMsg<Object> statisticalDataServiceType() {
- List<String> resList = aMapOfPipelineService.statisticalDataServiceType();
+ List<String> resList = oneMapService.statisticalDataServiceType();
return success(resList);
}
@@ -145,10 +140,9 @@
@ApiOperation(value = "鐧诲綍娆℃暟缁熻")
@GetMapping("/countLoginNumber")
public ResponseMsg<Object> loginNumberStatistics() {
- List<String> resList = aMapOfPipelineService.loginNumberStatistics();
+ List<String> resList = oneMapService.loginNumberStatistics();
return success(resList);
}
-
/**
* 鏁版嵁缁熻
@@ -159,7 +153,7 @@
@ApiOperation(value = "鏂囦欢鏍煎紡缁村害-鏂囦欢涓暟")
@GetMapping("/countFileFormat")
public ResponseMsg<Object> fileFormatCount() {
- List<String> resList = aMapOfPipelineService.fileFormatCount();
+ List<String> resList = oneMapService.fileFormatCount();
return success(resList);
}
@@ -172,7 +166,7 @@
@ApiOperation(value = "鏁版嵁鐢宠")
@GetMapping("/countDataApply")
public ResponseMsg<Object> dataApplyCount() {
- List<String> resList = aMapOfPipelineService.dataApplyCount();
+ List<String> resList = oneMapService.dataApplyCount();
return success(resList);
}
@@ -185,7 +179,7 @@
@ApiOperation(value = "璁块棶娆℃暟")
@GetMapping("/countDataVisit")
public ResponseMsg<Object> dataVisitCount() {
- List<String> resList = aMapOfPipelineService.dataVisitCount();
+ List<String> resList = oneMapService.dataVisitCount();
return success(resList);
}
@@ -198,10 +192,9 @@
@ApiOperation(value = "涓嬭浇閲忕粺璁�")
@GetMapping("/countDownloads")
public ResponseMsg<Object> countDownloads() {
- List<String> resList = aMapOfPipelineService.countDownloads();
+ List<String> resList = oneMapService.countDownloads();
return success(resList);
}
-
/**
* 椤圭洰宸ョ▼灞曠ず
@@ -211,7 +204,7 @@
@ApiOperation(value = "椤圭洰宸ョ▼灞曠ず")
@GetMapping("/countProjectDisplay")
public ResponseMsg<Object> countProjectDisplay() {
- List<String> resList = aMapOfPipelineService.countProjectDisplay();
+ List<String> resList = oneMapService.countProjectDisplay();
return success(resList);
}
@@ -223,7 +216,8 @@
@ApiOperation(value = "椤圭洰宸ョ▼宸¤")
@GetMapping("/countProjectTour")
public ResponseMsg<Object> countProjectTour(MpipelineEntity mpipelineEntity) {
- List<String> resList = aMapOfPipelineService.countProjectTour(mpipelineEntity);
+ List<String> resList = oneMapService.countProjectTour(mpipelineEntity);
+
return success("hello! 鎮ㄥ凡缁忔垚鍔熻闂�-椤圭洰宸ョ▼宸¤", resList);
}
@@ -235,10 +229,9 @@
@ApiOperation(value = "椤圭洰宸ョ▼宸¤鍒楄〃")
@GetMapping("/selectProjectTour")
public ResponseMsg<Object> selectProjectTour() {
- List<String> resList = aMapOfPipelineService.selectProjectTour();
+ List<String> resList = oneMapService.selectProjectTour();
return success(resList);
}
-
/**
* 宸ョ▼椤圭洰鐩綍
@@ -248,7 +241,7 @@
@ApiOperation(value = "宸ョ▼椤圭洰鐩綍")
@GetMapping("/selectProjectType")
public ResponseMsg<Object> selectProjectType() {
- List<OneMapEntity> resList = aMapOfPipelineService.selectProjectType1();
+ List<OneMapEntity> resList = oneMapService.selectProjectType1();
return success(resList);
}
@@ -259,10 +252,9 @@
@ApiOperation(value = "鏍规嵁琛ㄥ悕鏌ヨ琛ㄥ瓧娈典俊鎭�")
@GetMapping("/selectTableInfo")
public ResponseMsg<Object> selectTableInfo(@RequestParam("tableName") String tableName) {
- List<String> resList = aMapOfPipelineService.queryTableInfo(tableName);
+ List<String> resList = oneMapService.queryTableInfo(tableName);
return success(resList);
}
-
//============[涓撻灞曠ず Thematic presentations]==================
@@ -274,7 +266,7 @@
@ApiOperation(value = "鍏ㄧ悆绠＄綉鍥�")
@GetMapping("/countGlobalPipeMap")
public ResponseMsg<Object> countGlobalPipeMap() {
- List<String> resList = aMapOfPipelineService.countGlobalPipeMap();
+ List<String> resList = oneMapService.countGlobalPipeMap();
return success(resList);
}
@@ -286,7 +278,7 @@
@ApiOperation(value = "鍏ㄥ浗绠＄綉鍥�")
@GetMapping("/countNationalPipeMap")
public ResponseMsg<Object> countNationalPipeMap() {
- List<String> resList = aMapOfPipelineService.countNationalPipeMap();
+ List<String> resList = oneMapService.countNationalPipeMap();
return success(resList);
}
@@ -298,7 +290,7 @@
@ApiOperation(value = "鍏ㄥ浗绠＄綉鍥捐緭閫佷粙璐ㄩ暱搴�")
@GetMapping("/countZhPipeMapLength")
public ResponseMsg<Object> countZhPipeMapLenByMed() {
- List<String> resList = aMapOfPipelineService.countZhPipeMapLenByMed();
+ List<String> resList = oneMapService.countZhPipeMapLenByMed();
return success(resList);
}
@@ -310,7 +302,7 @@
@ApiOperation(value = "鍏ㄥ浗绔欏満搴ф暟銆侀榾瀹ゃ�佺閬撴暟绛�")
@GetMapping("/countZhPipeStations")
public ResponseMsg<Object> countZhPipeStations() {
- List<String> resList = aMapOfPipelineService.countZhPipeStations();
+ List<String> resList = oneMapService.countZhPipeStations();
return success(resList);
}
@@ -322,10 +314,9 @@
@ApiOperation(value = "鎸夐」鐩粺璁￠」鐩瓨鍌ㄩ噺")
@GetMapping("/countStorageByProject")
public ResponseMsg<Object> countStorageByProject() {
- List<String> resList = aMapOfPipelineService.countStorageByProject();
+ List<String> resList = oneMapService.countStorageByProject();
return success(resList);
}
-
//============[宸ョ▼灞曠ず Engineering Showcase]==================
@@ -337,7 +328,7 @@
@ApiOperation(value = "椤圭洰淇℃伅鏌ヨ")
@GetMapping("/selectProjectInfo")
public ResponseMsg<Object> selectProjectInfo(@RequestParam("projectCode") String projectCode) {
- List<String> resList = aMapOfPipelineService.selectProjectInfo(projectCode);
+ List<String> resList = oneMapService.selectProjectInfo(projectCode);
return success(resList);
}
/**
@@ -348,7 +339,7 @@
@ApiOperation(value = "椤圭洰鏂囦欢鍒楄〃鏌ヨ")
@GetMapping("/selectProjectFileList")
public ResponseMsg<Object> selectProjectFileList() {
- List<String> resList = aMapOfPipelineService.selectProjectFileList();
+ List<String> resList = oneMapService.selectProjectFileList();
return success(resList);
}
@@ -362,7 +353,7 @@
@ApiOperation(value = "鍗曚釜椤圭洰瀛樺偍閲�")
@GetMapping("/countProjectStorage")
public ResponseMsg<Object> countProjectStorage(@RequestParam("projectCode") String projectCode) {
- List<String> resList = aMapOfPipelineService.countProjectStorage(projectCode);
+ List<String> resList = oneMapService.countProjectStorage(projectCode);
return success(resList);
}
@@ -377,10 +368,9 @@
@ApiOperation(value = "鍗曚釜椤圭洰鏂囦欢绫诲瀷鏁伴噺")
@GetMapping("/countProjectType")
public ResponseMsg<Object> countProjectType(@RequestParam("projectCode") String projectCode) {
- List<String> resList = aMapOfPipelineService.countProjectType(projectCode);
+ List<String> resList = oneMapService.countProjectType(projectCode);
return success(resList);
}
-
/**
* 缁熻椤圭洰涓�
@@ -393,10 +383,22 @@
@ApiOperation(value = "鍗曚釜椤圭洰涓嬭浇閲�")
@GetMapping("/countProjectDown")
public ResponseMsg<Object> countProjectDown(@RequestParam("projectCode") String projectCode) {
- List<String> resList = aMapOfPipelineService.countProjectDown(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());
+ }
+ }
}
--
Gitblit v1.9.3