From add610e6b5a726475c8cf744c25a7f11dc17450c Mon Sep 17 00:00:00 2001
From: Zangzhipeng <lybluers@163.com>
Date: Mon, 29 Jul 2024 11:03:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E6=8E=92=E6=9F=A5=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ConfigController.java          | 28 +++++++++++++++++++
 .../controller/HighDangerController.java      |  4 ++-
 .../resources/sql-mapper/HighDangerMapper.xml | 20 +++++++++----
 .../resources/sql-mapper/OperatorMapper.xml   |  2 +-
 4 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java
index ab5c123..9fc6323 100644
--- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java
+++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java
@@ -5,6 +5,7 @@ import com.hisense.hiatmp.server_api.service.IConfigService;
 import com.hisense.hiatmp.common.controller.HiatmpController;
 import com.hisense.hiatmp.model.common.ServerResponse;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,8 +17,35 @@ import java.util.List;
 public class ConfigController extends HiatmpController {
     @Autowired
     private IConfigService configService;
+
     @RequestMapping(value = "/getModuleCustomConfigList", method = RequestMethod.POST)
     public ServerResponse<List<ModuleCustomConfig>> getModuleCustomConfigList() {
         return ServerResponse.ok(configService.getModuleCustomConfigList());
     }
+
+    /*
+        基础信息预留展示接口
+     */
+    @GetMapping("/showDangerBaseData")
+    public ServerResponse<?> showBaseData(){
+
+
+
+
+        return ServerResponse.ok();
+    }
+
+
+    /*
+       统计数据预留展示接口
+    */
+    @GetMapping("/showDangerStatisticsData")
+    public ServerResponse<?> showStatisticsData(){
+
+
+
+
+        return ServerResponse.ok();
+    }
+
 }
diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
index 02293ff..c75f64b 100644
--- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
+++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
@@ -724,7 +724,9 @@ public class HighDangerController {
         }
     }
 
-    // 保存 & 暂存人工排查
+    /*
+        保存 & 暂存人工排查
+     */
     @Transactional
     @PostMapping("/saveManualInvestigation")
     public ServerResponse<?> saveManualInvestigation(@RequestBody ManualInvestigation manualInvestigation, HttpServletRequest request) {
diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
index a11c35d..f9c5d29 100644
--- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
+++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
@@ -269,11 +269,21 @@
     </update>
 
     <select id="getImportDangerInfo" resultType="com.hisense.hiatmp.model.common.ImportDangerInfoDTO">
-        SELECT b.*
-        FROM tht_hidden_scenes a
-                 JOIN tht_scenes_items_relations c ON c.scenesid = a.nid
-                 JOIN tht_hidden_data_collect_config b ON c.itemid = b.itemid
-        WHERE a.nid = #{nid};
+            SELECT
+                C.nid,
+                C.itemid,
+                C.order,
+                C.type,
+                C.name,
+                C.standar,
+                C.unit
+            FROM
+                tht_danger_item_relation rr
+                    LEFT JOIN tht_hidden_data_collect_config C ON C.nid = rr.itemid
+            WHERE
+                rr.dangerid = #{nid}
+            ORDER BY
+                rr.ORDER
     </select>
 
     <select id="setApproval" resultType="String">
diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml
index 5424621..2d6ce2d 100644
--- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml
+++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml
@@ -29,7 +29,7 @@
     <select id="getRoleById" resultType="String">
         select r.rolename from role_operation_relation ror
                             LEFT JOIN "public"."role" r on ror.roleid = r.roleid
-        where ror.operationid = 'ld0001'
+        where ror.operationid = #{nuserid}
     </select>