From 13301ea21fe2a1c5878050780d6bd946871e27c3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 12 六月 2023 10:16:30 +0800
Subject: [PATCH] 数据统计修改数据量统计接口,添加按文件类型统计、按项目统计数据接口

---
 src/main/java/com/lf/server/mapper/sys/ReportMapper.java             |   14 +++++++
 src/main/resources/mapper/sys/ReportMapper.xml                       |   19 +++++++++
 src/main/java/com/lf/server/controller/data/DataCountController.java |   26 +++++++++++++
 data/update.sql                                                      |    8 +++
 src/main/java/com/lf/server/service/sys/ReportService.java           |   10 +++++
 src/main/resources/application.yml                                   |    8 ++--
 6 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/data/update.sql b/data/update.sql
index 0fce38e..c2adf2f 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -225,8 +225,13 @@
 	(select sum(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 name "m1", (select sum(sizes) from lf.sys_meta b where b.dircode like a.code || '%') "sizes",
+	(select count(*) from lf.sys_meta b where b.dircode like a.code || '%') "count"	
+from lf.sys_dir a where pid = 0 order by a.code;
+
+-- 鎸夋枃浠剁被鍨嬬粺璁� *
 select type,count(*),sum(sizes) from lf.sys_meta group by type;
+select type "m1", cast(sum(sizes) as decimal(18, 3)) "sizes", count(*) "count" from lf.sys_meta group by type order by type;
 
 -- type绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠¢亾鍒嗘瀽锛�6-缁熻鎶ュ憡
 select * from lf.sys_download;
@@ -314,6 +319,7 @@
 from lf.sys_dir d
 where pid = 0
 order by d.code;
+
 --------------------------------------------------------- 02.閫掑綊鏌ヨ
 with recursive rs as(
   select * from lf.sys_menu where cn_name='绠¢亾鍩虹澶ф暟鎹钩鍙�'
diff --git a/src/main/java/com/lf/server/controller/data/DataCountController.java b/src/main/java/com/lf/server/controller/data/DataCountController.java
index b5e416b..8b29e51 100644
--- a/src/main/java/com/lf/server/controller/data/DataCountController.java
+++ b/src/main/java/com/lf/server/controller/data/DataCountController.java
@@ -81,6 +81,19 @@
     }
 
     @SysLog()
+    @ApiOperation(value = "鎸夋枃浠剁被鍨嬬粺璁�")
+    @GetMapping(value = "/countSizesByType")
+    public ResponseMsg<Object> countSizesByType() {
+        try {
+            List<CountEntity> list = reportService.countSizesByType();
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
     @ApiOperation(value = "鏌ヨ鏈嶅姟璋冪敤閲忕粺璁�")
     @GetMapping(value = "/selectCountServices")
     public ResponseMsg<Object> selectCountServices() {
@@ -107,6 +120,19 @@
     }
 
     @SysLog()
+    @ApiOperation(value = "鎸夐」鐩粺璁℃暟鎹�")
+    @GetMapping(value = "/countSizesByPrj")
+    public ResponseMsg<Object> countSizesByPrj() {
+        try {
+            List<CountEntity> list = reportService.countSizesByPrj();
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
     @ApiOperation(value = "涓嬭浇鎶ュ憡")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "鎶ュ憡ID", dataType = "Integer", paramType = "7")
diff --git a/src/main/java/com/lf/server/mapper/sys/ReportMapper.java b/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
index 3b03c0a..d402a69 100644
--- a/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
@@ -105,6 +105,13 @@
     public List<CountEntity> countSizes();
 
     /**
+     * 鎸夋枃浠剁被鍨嬬粺璁�
+     *
+     * @return
+     */
+    public List<CountEntity> countSizesByType();
+
+    /**
      * 鏈嶅姟璋冪敤閲忕粺璁�
      *
      * @return
@@ -117,4 +124,11 @@
      * @return
      */
     public List<CountEntity> countOperates();
+
+    /**
+     * 鎸夐」鐩粺璁℃暟鎹�
+     *
+     * @return
+     */
+    public List<CountEntity> countSizesByPrj();
 }
diff --git a/src/main/java/com/lf/server/service/sys/ReportService.java b/src/main/java/com/lf/server/service/sys/ReportService.java
index 2f662dd..ced9c23 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -94,6 +94,11 @@
     }
 
     @Override
+    public List<CountEntity> countSizesByType() {
+        return reportMapper.countSizesByType();
+    }
+
+    @Override
     public List<CountEntity> countServices() {
         return reportMapper.countServices();
     }
@@ -103,6 +108,11 @@
         return reportMapper.countOperates();
     }
 
+    @Override
+    public List<CountEntity> countSizesByPrj() {
+        return reportMapper.countSizesByPrj();
+    }
+
     /**
      * 鍒涘缓鎶ュ憡
      */
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2e972c2..90cf8c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -43,11 +43,11 @@
     name: prod
     # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
     #url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
-    #url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
-    url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
+    url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
+    #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
     username : postgres
-    #password: Postgres!_14_Lf
-    password: postgres
+    password: Postgres!_14_Lf
+    #password: postgres
     driver-class-name: org.postgresql.Driver
     platform: POSTGRESQL
     type: com.alibaba.druid.pool.DruidDataSource
diff --git a/src/main/resources/mapper/sys/ReportMapper.xml b/src/main/resources/mapper/sys/ReportMapper.xml
index 93e50bc..987534b 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -80,10 +80,18 @@
 
     <!-- 鏁版嵁閲忕粺璁� -->
     <select id="countSizes" resultType="com.lf.server.entity.ctrl.CountEntity">
-        select fn_get_fullname(depcode, 1) "m1", cast(sum(sizes) as decimal(18, 3)) "sizes"
+        select fn_get_fullname(depcode, 1) "m1", cast(sum(sizes) as decimal(18, 3)) "sizes", count(*) "count"
         from lf.sys_meta
         group by depcode
         order by depcode;
+    </select>
+
+    <!-- 鎸夋枃浠剁被鍨嬬粺璁� -->
+    <select id="countSizesByType" resultType="com.lf.server.entity.ctrl.CountEntity">
+        select type "m1", cast(sum(sizes) as decimal(18, 3)) "sizes", count(*) "count"
+        from lf.sys_meta
+        group by type
+        order by type;
     </select>
 
     <!-- 鏈嶅姟璋冪敤閲忕粺璁� -->
@@ -101,4 +109,13 @@
         group by modular1,modular2
         order by modular1 desc,modular2;
     </select>
+
+    <!-- 鎸夐」鐩粺璁℃暟鎹� -->
+    <select id="countSizesByPrj" resultType="com.lf.server.entity.ctrl.CountEntity">
+        select name "m1", coalesce((select sum(sizes) from lf.sys_meta b where b.dircode like a.code || '%'), 0) "sizes",
+	        (select count(*) from lf.sys_meta b where b.dircode like a.code || '%') "count"
+        from lf.sys_dir a
+        where pid = 0
+        order by a.code;
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3