0722隐患功能修改

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java

@@ -69,4 +69,19 @@ public class AuthController {
         }
         return ServerResponse.error("无用户信息");
     }
+
+    /*
+    用户信息查询
+ */
+    @GetMapping("/getOperatorInformation")
+    public ServerResponse<?> getInformation(@RequestParam String nuserid){
+        // 获取要修改的用户信息
+        Operator operatorById = operatorMapper.getOperatorById(nuserid);
+        if(operatorById != null){
+            return ServerResponse.ok(operatorById);
+        }else{
+            return ServerResponse.error("未查询到用户信息");
+        }
+    }
+
 }

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java

@@ -92,18 +92,36 @@ public class HighDangerController {
             Date pcEndTime = base.getPcEndTime();
             if(pcEndTime != null){
                 long diff = nowDate.getTime() - pcEndTime.getTime();
-                // 时间差
+                // 时间差，天数
                 long diffDays = diff / (24 * 60 * 60 * 1000);
                 diffDays = Math.abs(diffDays);
 
+                // 小时
+                long remainingHours = (diff % (24 * 60 * 60 * 1000)) / (60 * 60 * 1000);
+                remainingHours = Math.abs(remainingHours);
+
+                // 判断不足一小时
+                long diffHours = diff / (60 * 60 * 1000);
+                diffHours = Math.abs(diffHours);
+
                 int comparison = nowDate.compareTo(pcEndTime);
                 if(comparison < 0) { // 超期
+                    if(diffHours < 1){
+                        base.setDeadlineStatus("超期不足一小时");
+                        base.setDeadlineType("1");
+                        continue;
+                    }
                     base.setDeadline(diffDays);
-                    base.setDeadlineStatus("超期" + diffDays + "天");
+                    base.setDeadlineStatus("超期" + diffDays + "天" + remainingHours + "小时");
                     base.setDeadlineType("1");
                 } else if(comparison > 0 && diffDays <= 3) { // 临期
+                    if(diffHours < 1){
+                        base.setDeadlineStatus("临期不足一小时");
+                        base.setDeadlineType("2");
+                        continue;
+                    }
                     base.setDeadline(diffDays);
-                    base.setDeadlineStatus("临期" + diffDays + "天");
+                    base.setDeadlineStatus("临期" + diffDays + "天" + remainingHours + "小时");
                     base.setDeadlineType("2");
                 } else { // 正常
                     base.setDeadline(diffDays);
@@ -421,6 +439,10 @@ public class HighDangerController {
 
         log.info("/getImportDangers（查询重点排查选项）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(),"无");
         List<ImportDangerDTO> importDanger = highDangerMapper.getImportDanger();
+        for (ImportDangerDTO importDangerDTO : importDanger){
+            List<ThtDangerItems> importDangerItems = highDangerMapper.getImportDangerItems(importDangerDTO.getNid());
+            importDangerDTO.setDangerItems(importDangerItems);
+        }
         log.info("/getImportDangers（查询重点排查选项）接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), importDanger);
         if(importDanger != null){
             return ServerResponse.ok(importDanger);
@@ -593,9 +615,11 @@ public class HighDangerController {
         排查第三页--重点排查新增标签详情数据
      */
     @GetMapping("/getImportDangerDisplayDetail")
-    public ServerResponse<?> getImportDangerDisplayDetail(@RequestParam String businessId, HttpServletRequest request){
+    public ServerResponse<?> getImportDangerDisplayDetail(@RequestParam String businessId,
+                                                          @RequestParam String dangerId,
+                                                          HttpServletRequest request){
         log.info("/getImportDangerDisplayDetail（排查第三页--重点排查新增标签详情数据）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(),businessId);
-        List<ThtHiddenDataCollectConfigExtra> importDangerList = highDangerMapper.getImportDangerDisplay(businessId);
+        List<ThtHiddenDataCollectConfigExtra> importDangerList = highDangerMapper.getImportDangerDisplay(businessId,dangerId);
         log.info("/getImportDangerDisplayDetail（排查第三页--重点排查新增标签详情数据）接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), importDangerList);
         if(importDangerList != null){
             return ServerResponse.ok(importDangerList);

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java

@@ -77,10 +77,12 @@ public interface HighDangerMapper extends BaseMapper<HighDangerBase>{
 
     void saveThtHiddenDataCollectConfigExtra(ThtHiddenDataCollectConfigExtra extra);
 
-    List<ThtHiddenDataCollectConfigExtra> getImportDangerDisplay(String businessId);
+    List<ThtHiddenDataCollectConfigExtra> getImportDangerDisplay(String businessId, String dangerId);
 
     List<ImportDangerDTO> getImportDangerDisplayItem(String businessId);
 
+    List<ThtDangerItems> getImportDangerItems(String nid);
+
     List<HiddenDangerDTO> getUserHiddenDangerList(String businessId);
 
     String getDangerProblem(String id);

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java

@@ -16,4 +16,6 @@ public interface OperatorMapper {
     Operator getOperatorById(@Param("nuserid") String nuserid);
 
     String updateByPrimaryKeySelective(@Param("nuserid") String nuserid,@Param("cuserpwd") String cuserpwd);
+
+    Operator getInformation(String nuserid);
 }

hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml

@@ -215,7 +215,7 @@
 
     <select id="getRoadInfo" resultType="com.hisense.hiatmp.model.common.HighDangerRoad">
 
-    SELECT DISTINCT thdb.*,thdr.address, thdr.coordinate
+    SELECT DISTINCT thdb.*,thdr.address,thdr.section_code,thdr.point_type, thdr.coordinate
     from
         tht_hidden_danger_base thdb
     left join tht_hidden_danger_road thdr on thdr.business_id = thdb.business_id
@@ -375,9 +375,9 @@
 
     <insert id="saveDangerExtra">
         INSERT INTO tht_hidden_danger_road_info (nid, business_id, big_category, small_category, hd_term, hd_desc,
-                                             pc_count,hd_pic,hd_info)
+                                             pc_count,hd_pic,hd_info,pc_type)
         VALUES (#{nid}, #{businessId}, #{bigCategory}, #{smallCategory}, #{hdTerm},
-                #{hdDesc}, #{pcCount},#{hdPic},#{hdInfo})
+                #{hdDesc}, #{pcCount},#{hdPic},#{hdInfo},#{pcType})
     </insert>
 
 
@@ -396,13 +396,13 @@
     <insert id="saveThtHiddenDataCollectConfigExtra">
         insert into
             tht_hidden_data_collect_config_extra
-            ("nid","itemid","order","type","name","standar","unit","business_id","scenes_id","pc_count")
+            ("nid","itemid","order","type","name","standar","unit","business_id","scenes_id","pc_count","danger_id")
         values
-            (nextval('test_id_seq2'),#{itemid},#{order},#{type},#{name},#{standar},#{unit},#{businessId},#{scenesId},#{pcCount})
+            (nextval('test_id_seq2'),#{itemid},#{order},#{type},#{name},#{standar},#{unit},#{businessId},#{scenesId},#{pcCount},#{dangerId})
     </insert>
 
     <select id="getImportDangerDisplay" resultType="com.hisense.hiatmp.model.common.ThtHiddenDataCollectConfigExtra">
-        select * from tht_hidden_data_collect_config_extra where business_id = #{businessId}
+        select * from tht_hidden_data_collect_config_extra where business_id = #{businessId} and danger_id = #{dangerId}
     </select>
 
     <select id="getImportDangerDisplayItem" resultType="com.hisense.hiatmp.model.common.ImportDangerDTO">
@@ -412,6 +412,13 @@
         where e.business_id = #{businessId}
     </select>
 
+    <select id="getImportDangerItems" resultType="com.hisense.hiatmp.model.common.ThtDangerItems">
+        SELECT *
+        FROM tht_danger_items tdi
+                 LEFT JOIN tht_scenes_danger_relation tsir ON TRIM(LEADING '0' FROM tsir.dangerid) = tdi.id
+        WHERE tsir.scenesid = #{nid}
+    </select>
+
     <select id="getUserHiddenDangerList" resultType="com.hisense.hiatmp.model.common.HiddenDangerDTO">
         SELECT
             *

hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml

@@ -19,4 +19,5 @@
         update operator set cuserpwd = #{cuserpwd} where nuserid = #{nuserid} RETURNING nuserid;
     </select>
 
+
 </mapper>

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HiddenDangerDTO.java

@@ -24,4 +24,5 @@ public class HiddenDangerDTO implements Serializable {
     private String hdPic;
     private String hdInfo;
     private String dangerProblem;
+    private String pcType;
 }

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerRoad.java

@@ -49,6 +49,10 @@ public class HighDangerRoad implements Serializable {
 
     private String deptId;
 
+    private String sectionCode;
+
+    private String pointType;
+
     /**
      * pc_start_time
      */

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ImportDangerDTO.java

@@ -3,6 +3,8 @@ package com.hisense.hiatmp.model.common;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 @Data
 public class ImportDangerDTO implements Serializable {
@@ -14,4 +16,6 @@ public class ImportDangerDTO implements Serializable {
     private String measure;
     private String description;
 
-}
+    List<ThtDangerItems> dangerItems;
+
+}

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Operator.java

@@ -18,8 +18,13 @@ public class Operator implements Serializable {
     private String cuserpwd;
     // 客户端ip
     private String ip;
+    // 身份证号
     private String cdescription;
+    // 电话
     private String phone;
+    // 部门
     private String cdepartmentid;
+    // 警号
+    String policeid;
 
 }

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtDangerItems.java

@@ -1,6 +1,8 @@
 package com.hisense.hiatmp.model.common;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.Data;
 
 import javax.security.auth.Subject;
@@ -21,6 +23,7 @@ public class ThtDangerItems implements Serializable {
     private String nlevel;
 
     @TableField(exist = false)
+    @JsonIgnore
     private List<ThtDangerItems> children;
 
 

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDataCollectConfigExtra.java

@@ -42,5 +42,7 @@ public class ThtHiddenDataCollectConfigExtra implements Serializable {
     
     private String pcCount;
 
+    private String dangerId;
+
     public ThtHiddenDataCollectConfigExtra() {}
 }