diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java index f5d5d8d..e3c4933 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java +++ b/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("未查询到用户信息"); + } + } + } \ No newline at end of file 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 f29ee4b..0541b1a 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 @@ -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 importDanger = highDangerMapper.getImportDanger(); + for (ImportDangerDTO importDangerDTO : importDanger){ + List 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 importDangerList = highDangerMapper.getImportDangerDisplay(businessId); + List importDangerList = highDangerMapper.getImportDangerDisplay(businessId,dangerId); log.info("/getImportDangerDisplayDetail（排查第三页--重点排查新增标签详情数据）接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), importDangerList); if(importDangerList != null){ return ServerResponse.ok(importDangerList); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java index 5a583e1..00a70ae 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java @@ -77,10 +77,12 @@ public interface HighDangerMapper extends BaseMapper{ void saveThtHiddenDataCollectConfigExtra(ThtHiddenDataCollectConfigExtra extra); - List getImportDangerDisplay(String businessId); + List getImportDangerDisplay(String businessId, String dangerId); List getImportDangerDisplayItem(String businessId); + List getImportDangerItems(String nid); + List getUserHiddenDangerList(String businessId); String getDangerProblem(String id); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java index 66ad3a8..33fbd28 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java +++ b/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); } 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 045d7ee..26fb87f 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 @@ -215,7 +215,7 @@ - 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} + + + \ No newline at end of file diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HiddenDangerDTO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HiddenDangerDTO.java index bc2430a..1466346 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HiddenDangerDTO.java +++ b/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; } diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerRoad.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerRoad.java index 7904c3f..9bd5dd9 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerRoad.java +++ b/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 */ diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ImportDangerDTO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ImportDangerDTO.java index 146aa7b..558b70c 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ImportDangerDTO.java +++ b/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 dangerItems; + +} \ No newline at end of file diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Operator.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Operator.java index 47cfcdf..b6b8007 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Operator.java +++ b/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; } diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtDangerItems.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtDangerItems.java index c6d578f..dac1bd0 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtDangerItems.java +++ b/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 children; diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDataCollectConfigExtra.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDataCollectConfigExtra.java index 826af05..ebbcd0f 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDataCollectConfigExtra.java +++ b/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() {} } \ No newline at end of file diff --git a/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/Operator.class b/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/Operator.class index 9b8e993..1bc8c77 100644 Binary files a/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/Operator.class and b/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/Operator.class differ