From 9ca3c6ef60688f0231b75698afaafc10b12435a7 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 10:04:19 +0800
Subject: [PATCH] 20230221@xingjs@提交官网一张图相关内容接口

---
 src/main/java/com/lf/server/controller/show/OneMapController.java |   56 ++++++++++++++++-----------
 src/main/java/com/lf/server/mapper/show/OneMapMapper.java         |   16 ++++----
 src/main/java/com/lf/server/service/show/OneMapService.java       |   32 ++++++++--------
 src/main/resources/mapper/show/OneMapMapper.xml                   |   16 ++++----
 4 files changed, 65 insertions(+), 55 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 1137f68..0638eda 100644
--- a/src/main/java/com/lf/server/controller/show/OneMapController.java
+++ b/src/main/java/com/lf/server/controller/show/OneMapController.java
@@ -1,6 +1,7 @@
 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.service.show.OneMapService;
@@ -23,7 +24,7 @@
 
 @Api(tags = "绠$綉涓�寮犲浘")
 @RestController
-@RequestMapping("/one_Map")
+@RequestMapping("/one_map")
 public class OneMapController extends BaseController {
 
     @Autowired
@@ -43,10 +44,11 @@
      * 椤圭洰绫诲埆
      * Project category
      */
+    @SysLog()
     @ApiOperation(value = "椤圭洰绫诲埆")
     @GetMapping("/countProjectCategory")
-    public ResponseMsg<Object> projectCategoryConut() {
-        List<String> resList = aMapOfPipelineService.projectCategoryConut();
+    public ResponseMsg<Object> projectCategoryCount() {
+        List<String> resList = aMapOfPipelineService.projectCategoryCount();
         return success(resList);
     }
 
@@ -54,10 +56,11 @@
      * 椤圭洰浣嶇疆鍒嗗竷鎺ュ彛
      * Project location
      */
+    @SysLog()
     @ApiOperation(value = "椤圭洰浣嶇疆鍒嗗竷鎺ュ彛")
     @GetMapping("/countProjectLocation")
-    public ResponseMsg<Object> projectLocationConut() {
-        List<String> resList = aMapOfPipelineService.projectLocationConut();
+    public ResponseMsg<Object> projectLocationCount() {
+        List<String> resList = aMapOfPipelineService.projectLocationCount();
         return success(resList);
     }
 
@@ -66,10 +69,11 @@
      * 鍥藉缁村害-鏁伴噺缁熻
      * Country dimension
      */
+    @SysLog()
     @ApiOperation(value = "鍥藉缁村害-鏁伴噺缁熻")
-    @GetMapping("/conutCountryDimension")
-    public ResponseMsg<Object> countryDimensionConut() {
-        List<String> resList = aMapOfPipelineService.countryDimensionConut();
+    @GetMapping("/countCountryDimension")
+    public ResponseMsg<Object> countryDimensionCount() {
+        List<String> resList = aMapOfPipelineService.countryDimensionCount();
         return success(resList);
     }
 
@@ -77,10 +81,11 @@
      * 鐪佺淮搴�-鏁伴噺缁熻
      * Province dimension - quantity
      */
+    @SysLog()
     @ApiOperation(value = "鐪佺淮搴�-鏁伴噺缁熻")
-    @GetMapping("/conutProvinceDimension")
-    public ResponseMsg<Object> provinceDimensionConut() {
-        List<String> resList = aMapOfPipelineService.provinceDimensionConut();
+    @GetMapping("/countProvinceDimension")
+    public ResponseMsg<Object> provinceDimensionCount() {
+        List<String> resList = aMapOfPipelineService.provinceDimensionCount();
         return success(resList);
     }
 
@@ -92,10 +97,11 @@
      * 鏁版嵁瀛樺偍
      * data storage
      */
+    @SysLog()
     @ApiOperation(value = "鏁版嵁瀛樺偍缁熻")
     @GetMapping("/countDataStorage")
-    public ResponseMsg<Object> dataStorageConut() {
-        List<String> resList = aMapOfPipelineService.dataStorageConut();
+    public ResponseMsg<Object> dataStorageCount() {
+        List<String> resList = aMapOfPipelineService.dataStorageCount();
         return success(resList);
     }
 
@@ -104,10 +110,11 @@
      * 鏂囦欢鏍煎紡缁村害-鏂囦欢涓暟
      * File format dimension
      */
+    @SysLog()
     @ApiOperation(value = "鏂囦欢鏍煎紡缁村害-鏂囦欢涓暟")
-    @GetMapping("/conutFileFormat")
-    public ResponseMsg<Object> fileFormatConut() {
-        List<String> resList = aMapOfPipelineService.fileFormatConut();
+    @GetMapping("/countFileFormat")
+    public ResponseMsg<Object> fileFormatCount() {
+        List<String> resList = aMapOfPipelineService.fileFormatCount();
         return success(resList);
     }
 
@@ -116,10 +123,11 @@
      * 鏁版嵁鐢宠
      * Data application
      */
+    @SysLog()
     @ApiOperation(value = "鏁版嵁鐢宠")
-    @GetMapping("/conutDataApply")
-    public ResponseMsg<Object> dataApplyConut() {
-        List<String> resList = aMapOfPipelineService.dataApplyConut();
+    @GetMapping("/countDataApply")
+    public ResponseMsg<Object> dataApplyCount() {
+        List<String> resList = aMapOfPipelineService.dataApplyCount();
         return success(resList);
     }
 
@@ -128,10 +136,11 @@
      * 璁块棶娆℃暟
      * Number of visits
      */
+    @SysLog()
     @ApiOperation(value = "璁块棶娆℃暟")
-    @GetMapping("/conutDataVisit")
-    public ResponseMsg<Object> dataVisitConut() {
-        List<String> resList = aMapOfPipelineService.dataVisitConut();
+    @GetMapping("/countDataVisit")
+    public ResponseMsg<Object> dataVisitCount() {
+        List<String> resList = aMapOfPipelineService.dataVisitCount();
         return success(resList);
     }
 
@@ -141,10 +150,11 @@
      * 璁块棶娆℃暟
      * Number of visits
      */
+    @SysLog()
     @ApiOperation(value = "璁块棶娆℃暟")
     @GetMapping("data_visit1")
     public ResponseMsg<Object> dataVisitConut1() {
-        List<String> resList = aMapOfPipelineService.dataVisitConut();
+        List<String> resList = aMapOfPipelineService.dataVisitCount();
         return success(resList);
     }
 
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 1f845fd..31268c7 100644
--- a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
+++ b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
@@ -16,56 +16,56 @@
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> projectCategoryConut();
+    public List<String> projectCategoryCount();
 
     /**
      * 椤圭洰浣嶇疆conut
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> projectLocationConut();
+    public List<String> projectLocationCount();
 
     /**
      * 鍥藉缁村害conut
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> countryDimensionConut();
+    public List<String> countryDimensionCount();
 
     /**
      * 鐪佺淮conut
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> provinceDimensionConut();
+    public List<String> provinceDimensionCount();
 
     /**
      * 鏁版嵁瀛樺偍conut
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> dataStorageConut();
+    public List<String> dataStorageCount();
 
     /**
      * 鏂囦欢鏍煎紡conut
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> fileFormatConut();
+    public List<String> fileFormatCount();
 
     /**
      * 鏁版嵁鐢宠conut
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> dataApplyConut();
+    public List<String> dataApplyCount();
 
     /**
      * 鏁版嵁璁块棶conut
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> dataVisitConut();
+    public List<String> dataVisitCount();
 
 
 }
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 f0e2117..123bdaa 100644
--- a/src/main/java/com/lf/server/service/show/OneMapService.java
+++ b/src/main/java/com/lf/server/service/show/OneMapService.java
@@ -15,8 +15,8 @@
     /**
      * 椤圭洰绫诲埆conut
      */
-    public List<String> projectCategoryConut() {
-        return aMapOfPipelineMapper.projectCategoryConut();
+    public List<String> projectCategoryCount() {
+        return aMapOfPipelineMapper.projectCategoryCount();
     }
 
     /**
@@ -24,16 +24,16 @@
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> projectLocationConut() {
-        return aMapOfPipelineMapper.projectLocationConut();
+    public List<String> projectLocationCount() {
+        return aMapOfPipelineMapper.projectLocationCount();
     }
 
 
     /**
      * 鍥藉缁村害conut
      */
-    public List<String> countryDimensionConut() {
-        return aMapOfPipelineMapper.countryDimensionConut();
+    public List<String> countryDimensionCount() {
+        return aMapOfPipelineMapper.countryDimensionCount();
     }
 
 
@@ -42,8 +42,8 @@
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> provinceDimensionConut() {
-        return aMapOfPipelineMapper.provinceDimensionConut();
+    public List<String> provinceDimensionCount() {
+        return aMapOfPipelineMapper.provinceDimensionCount();
     }
 
     /**
@@ -51,8 +51,8 @@
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> dataStorageConut() {
-        return aMapOfPipelineMapper.dataStorageConut();
+    public List<String> dataStorageCount() {
+        return aMapOfPipelineMapper.dataStorageCount();
     }
 
     /**
@@ -60,8 +60,8 @@
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> fileFormatConut() {
-        return aMapOfPipelineMapper.fileFormatConut();
+    public List<String> fileFormatCount() {
+        return aMapOfPipelineMapper.fileFormatCount();
     }
 
     /**
@@ -69,12 +69,12 @@
      *
      * @return {@link List}<{@link String}>
      */
-    public List<String> dataApplyConut() {
-        return aMapOfPipelineMapper.dataApplyConut();
+    public List<String> dataApplyCount() {
+        return aMapOfPipelineMapper.dataApplyCount();
     }
 
-    public List<String> dataVisitConut() {
-        return aMapOfPipelineMapper.dataVisitConut();
+    public List<String> dataVisitCount() {
+        return aMapOfPipelineMapper.dataVisitCount();
     }
 
 
diff --git a/src/main/resources/mapper/show/OneMapMapper.xml b/src/main/resources/mapper/show/OneMapMapper.xml
index 4de1b0a..6200e9f 100644
--- a/src/main/resources/mapper/show/OneMapMapper.xml
+++ b/src/main/resources/mapper/show/OneMapMapper.xml
@@ -6,45 +6,45 @@
 
 
     <!--  椤圭洰绫诲埆 select * from bs.bs_project;  -->
-    <select id="projectCategoryConut" resultType="java.util.Map">
+    <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="projectLocationConut" resultType="java.util.Map">
+    <select id="projectLocationCount" resultType="java.util.Map">
         select a.*,st_astext(geom) from bs.bs_project a;
     </select>
 
     <!--  椤圭洰绫诲埆 鍥藉缁村害-鏁伴噺  -->
-    <select id="countryDimensionConut" resultType="java.util.Map">
+    <select id="countryDimensionCount" resultType="java.util.Map">
         select country,count(*) from bs.bs_project group by country;
     </select>
 
     <!--  椤圭洰绫诲埆 鐪佺淮搴�-鏁伴噺  -->
-    <select id="provinceDimensionConut" resultType="java.util.Map">
+    <select id="provinceDimensionCount" resultType="java.util.Map">
         select province,count(*) from bs.bs_project where country like '%涓浗%' group by province ;
     </select>
 
     <!--  鏁版嵁缁熻 鏁版嵁瀛樺偍  -->
-    <select id="dataStorageConut" resultType="java.util.Map">
+    <select id="dataStorageCount" resultType="java.util.Map">
         select name "鍚嶇О", (select count(*) from lf.sys_meta b where b.dircode like a.code || '%') "鏂囦欢鏁�",
                (select count(sizes) from lf.sys_meta b where b.dircode like a.code || '%') "鏁伴噺(MB)"
         from lf.sys_dir a where id > 1 and pid = 0;
     </select>
 
     <!--  鏁版嵁缁熻 鏂囦欢鏍煎紡缁村害-鏂囦欢涓暟  -->
-    <select id="fileFormatConut" resultType="java.util.Map">
+    <select id="fileFormatCount" resultType="java.util.Map">
         select type,count(*),count(sizes) from lf.sys_meta group by type;
     </select>
 
     <!--  鏁版嵁缁熻 鏁版嵁鐢宠  -->
-    <select id="dataApplyConut" resultType="java.util.Map">
+    <select id="dataApplyCount" resultType="java.util.Map">
         select * from lf.sys_apply a inner join lf.sys_user b on a.userid = b.id;
     </select>
 
     <!--  鏁版嵁缁熻 璁块棶缁熻  -->
-    <select id="dataVisitConut" resultType="java.util.Map">
+    <select id="dataVisitCount" resultType="java.util.Map">
         select modular1,count(*) from lf.sys_operate group by modular1 order by modular1;
     </select>
 

--
Gitblit v1.9.3