重点排查二级页面查询修改

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();
+    }
+
 }

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) {

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">

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>