From 3b55584efb14459e4343972253080f90f9084154 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 26 二月 2024 11:31:35 +0800
Subject: [PATCH] 按项目统计钻孔数据

---
 src/main/java/com/lf/server/mapper/sys/ReportMapper.java             |    7 +++++++
 src/main/resources/mapper/sys/ReportMapper.xml                       |   15 +++++++++++++++
 src/main/java/com/lf/server/controller/data/DataCountController.java |   13 +++++++++++++
 src/main/java/com/lf/server/service/sys/ReportService.java           |    5 +++++
 src/main/resources/application.yml                                   |    6 +++---
 5 files changed, 43 insertions(+), 3 deletions(-)

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 8b29e51..0c2248e 100644
--- a/src/main/java/com/lf/server/controller/data/DataCountController.java
+++ b/src/main/java/com/lf/server/controller/data/DataCountController.java
@@ -133,6 +133,19 @@
     }
 
     @SysLog()
+    @ApiOperation(value = "鎸夐」鐩粺璁￠捇瀛旀暟鎹�")
+    @GetMapping(value = "/countExplorationPoints")
+    public ResponseMsg<Object> countExplorationPoints() {
+        try {
+            List<CountEntity> list = reportService.countExplorationPoints();
+
+            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 d402a69..b508c70 100644
--- a/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
@@ -131,4 +131,11 @@
      * @return
      */
     public List<CountEntity> countSizesByPrj();
+
+    /**
+     * 鎸夐」鐩粺璁￠捇瀛旀暟鎹�
+     *
+     * @return
+     */
+    public List<CountEntity> countExplorationPoints();
 }
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 ced9c23..af00af8 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -113,6 +113,11 @@
         return reportMapper.countSizesByPrj();
     }
 
+    @Override
+    public List<CountEntity> countExplorationPoints() {
+        return reportMapper.countExplorationPoints();
+    }
+
     /**
      * 鍒涘缓鎶ュ憡
      */
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2ddf761..e7ed2e6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,8 +45,8 @@
   datasource:
     name: prod
     # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
-    #url: jdbc:postgresql://106.120.22.35:5433/langfang?useAffectedRows=true
-    url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
+    #url: jdbc:postgresql://103.135.160.14:5433/langfang?useAffectedRows=true
+    url: jdbc:postgresql://192.168.11.205:5433/langfang?useAffectedRows=true
     #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
     username: postgres
     password: Postgres!_14_Lf
@@ -134,7 +134,7 @@
   iisHost: 127.0.0.1
   # FME鏈嶅姟鍦板潃
   #fmeUrl: http://106.120.22.35:8051/
-  fmeUrl: http://192.168.20.205:88/
+  fmeUrl: http://192.168.11.205:88/
   # 鍑哄浘鏈嶅姟
   exportServer: http://127.0.0.1/ExportMap
   #exportServer: http://103.85.165.99:8050/ExportMap
diff --git a/src/main/resources/mapper/sys/ReportMapper.xml b/src/main/resources/mapper/sys/ReportMapper.xml
index 987534b..5fe8dc2 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -118,4 +118,19 @@
         where pid = 0
         order by a.code;
     </select>
+
+    <!-- 鎸夐」鐩粺璁￠捇瀛旀暟鎹� -->
+    <select id="countExplorationPoints" resultType="com.lf.server.entity.ctrl.CountEntity">
+        select
+            name "m1",
+            (select count(*) from bs.s_explorationpoint b where dirid like a.code || '%') "count",
+            (select coalesce(round(sum(sizes)::numeric, 3), 0)
+                from bs.s_explorationpoint b
+                inner join lf.sys_meta c
+                on b.parentid = c.eventid
+                where b.dirid like a.code || '%') "sizes"
+        from lf.sys_dir a
+        where pid = 0
+        order by code;
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3