From 3d4e14a8ee14658591fc9ea38ce8c9a789149fe4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 01 三月 2024 10:45:48 +0800
Subject: [PATCH] 解决空指针异常

---
 src/main/resources/mapper/sys/ReportMapper.xml                       |    2 +-
 src/main/java/com/lf/server/controller/data/DataCountController.java |    2 +-
 src/main/resources/application.yml                                   |    8 ++++----
 3 files changed, 6 insertions(+), 6 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 0c2248e..6f0bd88 100644
--- a/src/main/java/com/lf/server/controller/data/DataCountController.java
+++ b/src/main/java/com/lf/server/controller/data/DataCountController.java
@@ -148,7 +148,7 @@
     @SysLog()
     @ApiOperation(value = "涓嬭浇鎶ュ憡")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "鎶ュ憡ID", dataType = "Integer", paramType = "7")
+            @ApiImplicitParam(name = "id", value = "鎶ュ憡ID", dataType = "Integer", paramType = "query", example = "18")
     })
     @GetMapping(value = "/downloadReport")
     public void downloadReport(Integer id, HttpServletRequest req, HttpServletResponse res) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d78e38c..e8e3faf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -46,11 +46,11 @@
     name: prod
     # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
     #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
+    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
-    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 4bd3d62..d72151f 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -122,7 +122,7 @@
     <!-- 鎸夐」鐩粺璁¢捇瀛旀暟鎹� -->
     <select id="countExplorationPoints" resultType="com.lf.server.entity.ctrl.CountEntity">
         select
-            name "m1", a.code "m3",
+            name "m1", a.code "m3", 0.0 "area",
             (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

--
Gitblit v1.9.3