From 26d835757ba7134db69557c23efe1215e4bf978e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 06 三月 2024 14:07:42 +0800
Subject: [PATCH] 开发一张图的按大类统计数据功能

---
 src/main/java/com/lf/server/controller/show/OneMapController.java |   75 +++++++++++-------
 src/main/java/com/lf/server/mapper/show/OneMapMapper.java         |    8 ++
 src/main/java/com/lf/server/service/sys/DepService.java           |    1 
 src/main/java/com/lf/server/service/show/OneMapService.java       |   67 +++++++++-------
 src/main/resources/mapper/show/OneMapMapper.xml                   |   40 +++++----
 5 files changed, 110 insertions(+), 81 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 8221b56..789daa5 100644
--- a/src/main/java/com/lf/server/controller/show/OneMapController.java
+++ b/src/main/java/com/lf/server/controller/show/OneMapController.java
@@ -4,6 +4,7 @@
 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;
@@ -27,9 +28,8 @@
 @RestController
 @RequestMapping("/oneMap")
 public class OneMapController extends BaseController {
-
     @Autowired
-    OneMapService aMapOfPipelineService;
+    OneMapService oneMapService;
 
     //============[椤圭洰缁熻 project Statistics]==================
 
@@ -41,7 +41,7 @@
     @ApiOperation(value = "椤圭洰绫诲埆")
     @GetMapping("/countProjectCategory")
     public ResponseMsg<Object> projectCategoryCount() {
-        List<String> resList = aMapOfPipelineService.projectCategoryCount();
+        List<String> resList = oneMapService.projectCategoryCount();
         return success(resList);
     }
 
@@ -53,7 +53,7 @@
     @ApiOperation(value = "椤圭洰浣嶇疆鍒嗗竷鎺ュ彛")
     @GetMapping("/countProjectLocation")
     public ResponseMsg<Object> projectLocationCount() {
-        List<String> resList = aMapOfPipelineService.projectLocationCount();
+        List<String> resList = oneMapService.projectLocationCount();
         return success(resList);
     }
 
@@ -65,7 +65,7 @@
     @ApiOperation(value = "鍥藉缁村害-鏁伴噺缁熻")
     @GetMapping("/countCountryDimension")
     public ResponseMsg<Object> countryDimensionCount() {
-        List<String> resList = aMapOfPipelineService.countryDimensionCount();
+        List<String> resList = oneMapService.countryDimensionCount();
         return success(resList);
     }
 
@@ -77,7 +77,7 @@
     @ApiOperation(value = "鐪佺淮搴�-鏁伴噺缁熻")
     @GetMapping("/countProvinceDimension")
     public ResponseMsg<Object> provinceDimensionCount() {
-        List<String> resList = aMapOfPipelineService.provinceDimensionCount();
+        List<String> resList = oneMapService.provinceDimensionCount();
         return success(resList);
     }
 
@@ -89,7 +89,7 @@
     @ApiOperation(value = "鍏ㄥ浗缁村害-鎸夌収椤硅嚜绫诲瀷缁熻涓嶅悓椤圭洰涓暟")
     @GetMapping("/countProjectTypeNumber")
     public ResponseMsg<Object> countProjectTypeNumber() {
-        List<String> resList = aMapOfPipelineService.countProjectTypeNumber();
+        List<String> resList = oneMapService.countProjectTypeNumber();
         return success(resList);
     }
 
@@ -104,7 +104,7 @@
     @ApiOperation(value = "鏁版嵁瀛樺偍缁熻")
     @GetMapping("/countDataStorage")
     public ResponseMsg<Object> dataStorageCount() {
-        List<String> resList = aMapOfPipelineService.dataStorageCount();
+        List<String> resList = oneMapService.dataStorageCount();
         return success(resList);
     }
 
@@ -116,7 +116,7 @@
     @ApiOperation(value = "鏁版嵁澶х被缁熻")
     @GetMapping("/countLargeCategories")
     public ResponseMsg<Object> statisticalDataCategories() {
-        List<String> resList = aMapOfPipelineService.statisticalDataCategories();
+        List<String> resList = oneMapService.statisticalDataCategories();
         return success(resList);
     }
 
@@ -128,7 +128,7 @@
     @ApiOperation(value = "鏁版嵁鏈嶅姟绫诲瀷缁熻")
     @GetMapping("/countDataServiceType")
     public ResponseMsg<Object> statisticalDataServiceType() {
-        List<String> resList = aMapOfPipelineService.statisticalDataServiceType();
+        List<String> resList = oneMapService.statisticalDataServiceType();
         return success(resList);
     }
 
@@ -140,7 +140,7 @@
     @ApiOperation(value = "鐧诲綍娆℃暟缁熻")
     @GetMapping("/countLoginNumber")
     public ResponseMsg<Object> loginNumberStatistics() {
-        List<String> resList = aMapOfPipelineService.loginNumberStatistics();
+        List<String> resList = oneMapService.loginNumberStatistics();
         return success(resList);
     }
 
@@ -153,7 +153,7 @@
     @ApiOperation(value = "鏂囦欢鏍煎紡缁村害-鏂囦欢涓暟")
     @GetMapping("/countFileFormat")
     public ResponseMsg<Object> fileFormatCount() {
-        List<String> resList = aMapOfPipelineService.fileFormatCount();
+        List<String> resList = oneMapService.fileFormatCount();
         return success(resList);
     }
 
@@ -166,7 +166,7 @@
     @ApiOperation(value = "鏁版嵁鐢宠")
     @GetMapping("/countDataApply")
     public ResponseMsg<Object> dataApplyCount() {
-        List<String> resList = aMapOfPipelineService.dataApplyCount();
+        List<String> resList = oneMapService.dataApplyCount();
         return success(resList);
     }
 
@@ -179,7 +179,7 @@
     @ApiOperation(value = "璁块棶娆℃暟")
     @GetMapping("/countDataVisit")
     public ResponseMsg<Object> dataVisitCount() {
-        List<String> resList = aMapOfPipelineService.dataVisitCount();
+        List<String> resList = oneMapService.dataVisitCount();
         return success(resList);
     }
 
@@ -192,7 +192,7 @@
     @ApiOperation(value = "涓嬭浇閲忕粺璁�")
     @GetMapping("/countDownloads")
     public ResponseMsg<Object> countDownloads() {
-        List<String> resList = aMapOfPipelineService.countDownloads();
+        List<String> resList = oneMapService.countDownloads();
         return success(resList);
     }
 
@@ -204,7 +204,7 @@
     @ApiOperation(value = "椤圭洰宸ョ▼灞曠ず")
     @GetMapping("/countProjectDisplay")
     public ResponseMsg<Object> countProjectDisplay() {
-        List<String> resList = aMapOfPipelineService.countProjectDisplay();
+        List<String> resList = oneMapService.countProjectDisplay();
         return success(resList);
     }
 
@@ -216,7 +216,7 @@
     @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);
     }
@@ -229,7 +229,7 @@
     @ApiOperation(value = "椤圭洰宸ョ▼宸¤鍒楄〃")
     @GetMapping("/selectProjectTour")
     public ResponseMsg<Object> selectProjectTour() {
-        List<String> resList = aMapOfPipelineService.selectProjectTour();
+        List<String> resList = oneMapService.selectProjectTour();
         return success(resList);
     }
 
@@ -241,7 +241,7 @@
     @ApiOperation(value = "宸ョ▼椤圭洰鐩綍")
     @GetMapping("/selectProjectType")
     public ResponseMsg<Object> selectProjectType() {
-        List<OneMapEntity> resList = aMapOfPipelineService.selectProjectType1();
+        List<OneMapEntity> resList = oneMapService.selectProjectType1();
         return success(resList);
     }
 
@@ -252,7 +252,7 @@
     @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);
     }
 
@@ -266,7 +266,7 @@
     @ApiOperation(value = "鍏ㄧ悆绠＄綉鍥�")
     @GetMapping("/countGlobalPipeMap")
     public ResponseMsg<Object> countGlobalPipeMap() {
-        List<String> resList = aMapOfPipelineService.countGlobalPipeMap();
+        List<String> resList = oneMapService.countGlobalPipeMap();
         return success(resList);
     }
 
@@ -278,7 +278,7 @@
     @ApiOperation(value = "鍏ㄥ浗绠＄綉鍥�")
     @GetMapping("/countNationalPipeMap")
     public ResponseMsg<Object> countNationalPipeMap() {
-        List<String> resList = aMapOfPipelineService.countNationalPipeMap();
+        List<String> resList = oneMapService.countNationalPipeMap();
         return success(resList);
     }
 
@@ -290,7 +290,7 @@
     @ApiOperation(value = "鍏ㄥ浗绠＄綉鍥捐緭閫佷粙璐ㄩ暱搴�")
     @GetMapping("/countZhPipeMapLength")
     public ResponseMsg<Object> countZhPipeMapLenByMed() {
-        List<String> resList = aMapOfPipelineService.countZhPipeMapLenByMed();
+        List<String> resList = oneMapService.countZhPipeMapLenByMed();
         return success(resList);
     }
 
@@ -302,7 +302,7 @@
     @ApiOperation(value = "鍏ㄥ浗绔欏満搴ф暟銆侀榾瀹ゃ�佺閬撴暟绛�")
     @GetMapping("/countZhPipeStations")
     public ResponseMsg<Object> countZhPipeStations() {
-        List<String> resList = aMapOfPipelineService.countZhPipeStations();
+        List<String> resList = oneMapService.countZhPipeStations();
         return success(resList);
     }
 
@@ -314,7 +314,7 @@
     @ApiOperation(value = "鎸夐」鐩粺璁￠」鐩瓨鍌ㄩ噺")
     @GetMapping("/countStorageByProject")
     public ResponseMsg<Object> countStorageByProject() {
-        List<String> resList = aMapOfPipelineService.countStorageByProject();
+        List<String> resList = oneMapService.countStorageByProject();
         return success(resList);
     }
 
@@ -328,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);
     }
     /**
@@ -339,7 +339,7 @@
     @ApiOperation(value = "椤圭洰鏂囦欢鍒楄〃鏌ヨ")
     @GetMapping("/selectProjectFileList")
     public ResponseMsg<Object> selectProjectFileList() {
-        List<String> resList = aMapOfPipelineService.selectProjectFileList();
+        List<String> resList = oneMapService.selectProjectFileList();
         return success(resList);
     }
 
@@ -353,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);
     }
 
@@ -368,7 +368,7 @@
     @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);
     }
 
@@ -383,7 +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());
+        }
+    }
 }
diff --git a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
index f800310..84962bf 100644
--- a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
+++ b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
@@ -1,6 +1,7 @@
 package com.lf.server.mapper.show;
 
 import com.lf.server.entity.bs.MpipelineEntity;
+import com.lf.server.entity.ctrl.CountEntity;
 import com.lf.server.entity.show.OneMapEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -226,4 +227,11 @@
      * @return {@link List}<{@link String}>
      */
     public List<String> countProjectDown(String projectCode);
+
+    /**
+     * 鎸夊ぇ绫荤粺璁� - 鏁版嵁缁熻
+     *
+     * @return
+     */
+    public List<CountEntity> countByMajor();
 }
diff --git a/src/main/java/com/lf/server/service/show/OneMapService.java b/src/main/java/com/lf/server/service/show/OneMapService.java
index b01311f..6125021 100644
--- a/src/main/java/com/lf/server/service/show/OneMapService.java
+++ b/src/main/java/com/lf/server/service/show/OneMapService.java
@@ -1,6 +1,7 @@
 package com.lf.server.service.show;
 
 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.mapper.show.OneMapMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +18,7 @@
 @Service
 public class OneMapService implements OneMapMapper {
     @Autowired
-    OneMapMapper aMapOfPipelineMapper;
+    OneMapMapper oneMapMapper;
 
     /**
      * 娴嬬粯
@@ -41,7 +42,7 @@
      */
     @Override
     public List<String> projectCategoryCount() {
-        return aMapOfPipelineMapper.projectCategoryCount();
+        return oneMapMapper.projectCategoryCount();
     }
 
     /**
@@ -51,7 +52,7 @@
      */
     @Override
     public List<String> projectLocationCount() {
-        return aMapOfPipelineMapper.projectLocationCount();
+        return oneMapMapper.projectLocationCount();
     }
 
     /**
@@ -59,7 +60,7 @@
      */
     @Override
     public List<String> countryDimensionCount() {
-        return aMapOfPipelineMapper.countryDimensionCount();
+        return oneMapMapper.countryDimensionCount();
     }
 
     /**
@@ -69,7 +70,7 @@
      */
     @Override
     public List<String> provinceDimensionCount() {
-        return aMapOfPipelineMapper.provinceDimensionCount();
+        return oneMapMapper.provinceDimensionCount();
     }
 
     /**
@@ -79,7 +80,7 @@
      */
     @Override
     public List<String> countProjectTypeNumber() {
-        return aMapOfPipelineMapper.countProjectTypeNumber();
+        return oneMapMapper.countProjectTypeNumber();
     }
 
     /**
@@ -89,7 +90,7 @@
      */
     @Override
     public List<String> dataStorageCount() {
-        return aMapOfPipelineMapper.dataStorageCount();
+        return oneMapMapper.dataStorageCount();
     }
 
     /**
@@ -99,7 +100,7 @@
      */
     @Override
     public List<String> statisticalDataCategories() {
-        return aMapOfPipelineMapper.statisticalDataCategories();
+        return oneMapMapper.statisticalDataCategories();
     }
 
     /**
@@ -109,7 +110,7 @@
      */
     @Override
     public List<String> statisticalDataServiceType() {
-        return aMapOfPipelineMapper.statisticalDataServiceType();
+        return oneMapMapper.statisticalDataServiceType();
     }
 
     /**
@@ -119,7 +120,7 @@
      */
     @Override
     public List<String> loginNumberStatistics() {
-        return aMapOfPipelineMapper.loginNumberStatistics();
+        return oneMapMapper.loginNumberStatistics();
     }
 
     /**
@@ -129,7 +130,7 @@
      */
     @Override
     public List<String> fileFormatCount() {
-        return aMapOfPipelineMapper.fileFormatCount();
+        return oneMapMapper.fileFormatCount();
     }
 
     /**
@@ -139,7 +140,7 @@
      */
     @Override
     public List<String> dataApplyCount() {
-        return aMapOfPipelineMapper.dataApplyCount();
+        return oneMapMapper.dataApplyCount();
     }
 
     /**
@@ -149,7 +150,7 @@
      */
     @Override
     public List<String> dataVisitCount() {
-        return aMapOfPipelineMapper.dataVisitCount();
+        return oneMapMapper.dataVisitCount();
     }
 
     /**
@@ -159,7 +160,7 @@
      */
     @Override
     public List<String> countDownloads() {
-        return aMapOfPipelineMapper.countDownloads();
+        return oneMapMapper.countDownloads();
     }
 
     /**
@@ -169,7 +170,7 @@
      */
     @Override
     public List<String> countProjectDisplay() {
-        return aMapOfPipelineMapper.countProjectDisplay();
+        return oneMapMapper.countProjectDisplay();
     }
 
     /**
@@ -179,7 +180,7 @@
      */
     @Override
     public List<String> countProjectTour(MpipelineEntity mpipelineEntity) {
-        return aMapOfPipelineMapper.countProjectTour(mpipelineEntity);
+        return oneMapMapper.countProjectTour(mpipelineEntity);
     }
 
     /**
@@ -189,7 +190,7 @@
      */
     @Override
     public List<String> selectProjectTour() {
-        return aMapOfPipelineMapper.selectProjectTour();
+        return oneMapMapper.selectProjectTour();
     }
 
 
@@ -201,7 +202,7 @@
     @Override
     public List<OneMapEntity> selectProjectType1() {
         List<OneMapEntity> resList = new ArrayList<>();
-        List<OneMapEntity> resInfo = aMapOfPipelineMapper.selectProjectType1();
+        List<OneMapEntity> resInfo = oneMapMapper.selectProjectType1();
         for (OneMapEntity oneMapEntity : resInfo) {
             if (MEASUREMENT.equals(oneMapEntity.getValue())) {
                 resList.addAll(queryDirectory(oneMapEntity));
@@ -239,7 +240,7 @@
             endSql = " where dircode like " + one.substring(0, one.toString().length() - 15);
             System.out.println("endSql = " + endSql);
         }
-        return aMapOfPipelineMapper.selectProjectTypeOne(endSql);
+        return oneMapMapper.selectProjectTypeOne(endSql);
     }
 
     /**
@@ -261,7 +262,7 @@
      */
     @Override
     public List<String> queryTableInfo(String tableName) {
-        return aMapOfPipelineMapper.queryTableInfo(tableName);
+        return oneMapMapper.queryTableInfo(tableName);
     }
 
     /**
@@ -271,7 +272,7 @@
      */
     @Override
     public List<String> countGlobalPipeMap() {
-        return aMapOfPipelineMapper.countGlobalPipeMap();
+        return oneMapMapper.countGlobalPipeMap();
     }
 
     /**
@@ -281,7 +282,7 @@
      */
     @Override
     public List<String> countNationalPipeMap() {
-        return aMapOfPipelineMapper.countNationalPipeMap();
+        return oneMapMapper.countNationalPipeMap();
     }
 
     /**
@@ -291,7 +292,7 @@
      */
     @Override
     public List<String> countZhPipeMapLenByMed() {
-        return aMapOfPipelineMapper.countZhPipeMapLenByMed();
+        return oneMapMapper.countZhPipeMapLenByMed();
     }
 
     /**
@@ -301,7 +302,7 @@
      */
     @Override
     public List<String> countZhPipeStations() {
-        return aMapOfPipelineMapper.countZhPipeStations();
+        return oneMapMapper.countZhPipeStations();
     }
 
     /**
@@ -311,19 +312,19 @@
      */
     @Override
     public List<String> countStorageByProject() {
-        return aMapOfPipelineMapper.countStorageByProject();
+        return oneMapMapper.countStorageByProject();
     }
 
     /**
      * 閫夋嫨椤圭洰淇℃伅
      * 鏌ヨ椤圭洰淇℃伅
      *
-     * @param projectName 椤圭洰鍚嶇О
+     * @param projectCode 椤圭洰鍚嶇О
      * @return {@link List}<{@link String}>
      */
     @Override
     public List<String> selectProjectInfo(String projectCode) {
-        return aMapOfPipelineMapper.selectProjectInfo(projectCode);
+        return oneMapMapper.selectProjectInfo(projectCode);
     }
 
     /**
@@ -333,7 +334,7 @@
      */
     @Override
     public List<String> selectProjectFileList() {
-        return aMapOfPipelineMapper.selectProjectFileList();
+        return oneMapMapper.selectProjectFileList();
     }
 
     /**
@@ -344,7 +345,7 @@
      */
     @Override
     public List<String> countProjectStorage(String projectCode) {
-        return aMapOfPipelineMapper.countProjectStorage(projectCode);
+        return oneMapMapper.countProjectStorage(projectCode);
     }
 
     /**
@@ -355,7 +356,7 @@
      */
     @Override
     public List<String> countProjectType(String projectCode) {
-        return aMapOfPipelineMapper.countProjectType(projectCode);
+        return oneMapMapper.countProjectType(projectCode);
     }
 
     /**
@@ -366,7 +367,11 @@
      */
     @Override
     public List<String> countProjectDown(String projectCode) {
-        return aMapOfPipelineMapper.countProjectDown(projectCode);
+        return oneMapMapper.countProjectDown(projectCode);
     }
 
+    @Override
+    public List<CountEntity> countByMajor() {
+        return oneMapMapper.countByMajor();
+    }
 }
diff --git a/src/main/java/com/lf/server/service/sys/DepService.java b/src/main/java/com/lf/server/service/sys/DepService.java
index 7595c0f..61cdddf 100644
--- a/src/main/java/com/lf/server/service/sys/DepService.java
+++ b/src/main/java/com/lf/server/service/sys/DepService.java
@@ -2,7 +2,6 @@
 
 import com.lf.server.entity.all.RedisCacheKey;
 import com.lf.server.entity.ctrl.IdNameEntity;
-import com.lf.server.entity.data.LayerEntity;
 import com.lf.server.entity.sys.DepEntity;
 import com.lf.server.mapper.sys.DepMapper;
 import com.lf.server.service.all.RedisService;
diff --git a/src/main/resources/mapper/show/OneMapMapper.xml b/src/main/resources/mapper/show/OneMapMapper.xml
index 88c2c39..5aa2b89 100644
--- a/src/main/resources/mapper/show/OneMapMapper.xml
+++ b/src/main/resources/mapper/show/OneMapMapper.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lf.server.mapper.show.OneMapMapper">
-
     <resultMap type="com.lf.server.entity.show.OneMapEntity" id="OneMapResult">
-        <result property="value"       column="value"    />
-        <result property="key"     column="key"     />
+        <result property="value" column="value" />
+        <result property="key" column="key" />
     </resultMap>
-
 
     <!--  椤圭洰绫诲埆 select * from bs.bs_project;  -->
     <select id="projectCategoryCount" resultType="java.util.Map">
         select projtype,count(*) from bs.bs_project group by projtype;
     </select>
-
 
     <!--  椤圭洰浣嶇疆鍒嗗竷 select a.*,st_astext(geom) from bs.bs_project a  -->
     <select id="projectLocationCount" resultType="java.util.Map">
@@ -67,23 +62,22 @@
         ORDER BY  name;
     </select>
 
-
     <!--  缁熻鏁版嵁鏈嶅姟绫诲瀷  -->
     <select id="statisticalDataServiceType" resultType="java.util.Map">
         SELECT COUNT(*),TYPE FROM lf.sys_serve_log GROUP BY TYPE;
     </select>
 
-    <!--  鐧诲綍娆℃暟缁熻  -->
+    <!-- 鐧诲綍娆℃暟缁熻 -->
     <select id="loginNumberStatistics" resultType="java.util.Map">
         select b.uname, count(*) from lf.sys_login a inner join lf.sys_user b on a.userid = b.id group by uname;
     </select>
 
-    <!--  鏁版嵁缁熻 鏂囦欢鏍煎紡缁村害-鏂囦欢涓暟 select type,count(*),count(sizes) from lf.sys_meta group by type;  -->
+    <!-- 鏁版嵁缁熻 鏂囦欢鏍煎紡缁村害-鏂囦欢涓暟 select type,count(*),count(sizes) from lf.sys_meta group by type; -->
     <select id="fileFormatCount" resultType="java.util.Map">
         select type,count(type) AS number,sum(sizes) AS capacity from lf.sys_meta group by type;
     </select>
 
-    <!--  鏁版嵁缁熻 鏁版嵁鐢宠 select * from lf.sys_apply a inner join lf.sys_user b on a.userid = b.id;  -->
+    <!-- 鏁版嵁缁熻 鏁版嵁鐢宠 select * from lf.sys_apply a inner join lf.sys_user b on a.userid = b.id; -->
     <select id="dataApplyCount" resultType="java.util.Map">
         SELECT
             count(c.name) AS number,
@@ -139,7 +133,6 @@
         SELECT DISTINCT pipename  FROM bs.m_pipeline;
     </select>
 
-
     <!--  缁熻椤圭洰绫诲瀷 1  -->
     <!-- select (select string_agg(code, ',') from lf.sys_dir where name = a.name) "key", name "value" from lf.sys_dir a
     where name in ('娴嬬粯锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�') group by name order by name;-->
@@ -165,7 +158,6 @@
         select modular1,count(*) from lf.sys_operate group by modular1 order by modular1;
     </select>
 
-
     <!--  鏌ヨ琛ㄤ俊鎭�  -->
     <select id="queryTableInfo" resultType="java.util.Map">
         SELECT a.attnum,
@@ -180,7 +172,6 @@
           AND d.objoid=a.attrelid
           AND d.objsubid=a.attnum;
     </select>
-
 
     <!--  缁熻璁＄畻鍏ㄧ悆绠￠亾鍥�  -->
     <select id="countGlobalPipeMap" resultType="java.util.Map">
@@ -274,7 +265,7 @@
     </select>
 
     <!--  鍗曚釜椤圭洰鐨勪笅杞戒釜鏁般�佷笅杞芥鏁板拰鏁版嵁閲�-->
-    <!--    select count(*) "number", sum(c.dcount) "count", sum(c.sizes) "size"
+    <!--  select count(*) "number", sum(c.dcount) "count", sum(c.sizes) "size"
             from lf.sys_meta a inner join lf.sys_meta_down b on a.id = b.metaid
                                inner join lf.sys_download c on b.downid = c.id
             where dircode like '${projectCode}%';  -->
@@ -297,7 +288,18 @@
         where pid = 0 AND d.code like '${projectCode}%'
     </select>
 
-
-
-
+    <!-- 鎸夊ぇ绫荤粺璁� -->
+    <select id="countByMajor" resultType="com.lf.server.entity.ctrl.CountEntity">
+        select '娴嬬粯锛圗SV锛�' "m1", '鏁板瓧绾垮垝鍥�' "m2", '骞虫柟鍗冪背' "m3", 0.0 "sizes"
+        union all
+        select '娴嬬粯锛圗SV锛�' "m1", '鏁板瓧姝ｅ皠褰卞儚鍥�' "m2", '骞虫柟鍗冪背' "m3", 0.0 "sizes"
+        union all
+        select '娴嬬粯锛圗SV锛�' "m1", '绠＄嚎鏁版嵁' "m2", '鍗冪背' "m3", cast( sum( st_length( st_geographyfromtext( st_astext(geom) ) ) ) / 1000 as decimal(12, 2) ) "sizes" from bs.m_pipeline
+        union all
+        select '鍕樺療锛圗GE锛�' "m1", '鍕樻帰鐐�' "m2", '涓�' "m3", count(*) "sizes" from bs.s_explorationpoint
+        union all
+        select '鍕樺療锛圗GE锛�' "m1", '涓夌淮鍦拌川妯″瀷' "m2", '骞虫柟绫�' "m3", 0.0 "sizes"
+        union all
+        select '鍦扮伨锛圗GD锛�' "m1", '鍦扮伨鐐�' "m2", '涓�' "m3", count(*) "sizes" from bd.b_geologic_hazard;
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3