From 72fdbd4810a212f6868273b24424a1fb368c5db8 Mon Sep 17 00:00:00 2001 From: Zangzhipeng Date: Mon, 22 Jul 2024 16:13:25 +0800 Subject: [PATCH] =?UTF-8?q?0722=E9=9A=90=E6=82=A3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server_api/controller/AuthController.java | 15 ++++++++ .../controller/HighDangerController.java | 34 +++++++++++++++--- .../server_api/mapper/HighDangerMapper.java | 4 ++- .../server_api/mapper/OperatorMapper.java | 2 ++ .../resources/sql-mapper/HighDangerMapper.xml | 19 ++++++---- .../resources/sql-mapper/OperatorMapper.xml | 1 + .../hiatmp/model/common/HiddenDangerDTO.java | 1 + .../hiatmp/model/common/HighDangerRoad.java | 4 +++ .../hiatmp/model/common/ImportDangerDTO.java | 6 +++- .../hisense/hiatmp/model/common/Operator.java | 5 +++ .../hiatmp/model/common/ThtDangerItems.java | 3 ++ .../ThtHiddenDataCollectConfigExtra.java | 2 ++ .../hiatmp/model/common/Operator.class | Bin 4345 -> 4810 bytes 13 files changed, 83 insertions(+), 13 deletions(-) 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 9b8e99349608cdd8677a33c85049f7f13c5f5979..1bc8c776075808149cb0b7f128f8a480a332f3f7 100644 GIT binary patch literal 4810 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 JS1sX*{{ZEPRe=Bi literal 4345 zcmbVO-E$jP75}ZQ)vn~#hZQ^SwgDV!27gASl#i~H(l$+6r*RVE)}`gEYk6aBDy>v$ z)t2&AC=@7A+NaL&z$2MqGDBggGs8!RzLXiBd4ebY3SJ21ckZsFm9k|#jOBCBJ?D4M z-h0mP-rc|c=lAabxCd_(uz+?Rd2~cPE21l+Cn6Nl7xA2d=L;NP5b-q$dQr5mi};3! zZ;JSqh;NH{Ng&@b@ZADt(Khk2jNdcyeG{*k_<@NZn)s24S55p_JU=n;Qv2Y5ZqIKAk8eJtK|80Rc)A_*LN^F^+-Bd?U)lXraQ3Y?cQqJ6Un2H2RL@^^pL1(X zH`uRjhh0C|-_Ve+i#u>zo(5Cto#%q#yXvbPxh$#u z;*e`aWgg8-%AMd^IRYds#Suj9rIbJ@gP{OICNpx0Iuk{W?X?<5ju{II7}IV#Ld3J` zAV;z!M}|p~*5YT-WRM zn;}u7$`lq8HONO3wcV*j*FJ_ ze+!?$-4;HMB@4?URz$3eI3c1Y;w~&{SdvqIm{Vlot2k%jv$)s7rf8068zN4MI3?mf z5uX$BG+YhylULD$eZRRUM4A~acPS>*DGNWt>txv4!mv`OG)%`+)`~NIZNcwwEYq53 zJ1yqgf~pwRigJ!>Mw7N|p^1Cx8!af}wuV_{^4qm-b>sRkMpsYH?R30=ch!2@p}plC z#~a(gabEfh&^Vg79UsM=)ED`R$>3xBXG4_Eo~V&+p?{Tnj^moLu}f-XqtwV=sgdpC zc!W6imhzLF)i`P#^_3gYexqRbP)agz0iU9@A^<*(&v2$m11ZOYe}~LlbY}P>90Xgb z!R&cT@YG~*DK(f}NeRwQ23J#q$+47ReKL49HJIE?3C>Lh&!q;F(<#BmWbo0{V4j7P zU~@8fJ~jA$Jiwkvs~nCQ>CMXO+sLFh`e=lR8!delwrO~fak|Dyg_G0iDW?vbQiwZD zxvWw?l%6ts*p$&3h*!CyQl3dqsUJ3_9HHSV*Hy~1=_zxEO(~~wnDT^5`EYtl5wPijGc5(aG7mU~=!FdJRQew{rDcE@d6=G1{E+jw|XPTgjW7*RJvSJXm1Zc)75;WtK?4p25 zF{o&l5}>M6CaCIE?6QC=F{o@;2B7S9o|vh`T^L=Y*Q4SM&X;x^kK#P5J*QdN;^ms* zJ%1AyXq)2e_FuS2EsKZocU+>T6Z1EGo?4EtqPKCGnt?8UjcsZs-oWd4j9MOV;#E9O zt$+hOgB@zq_#-?#LCwNHa28*nR>VJXKc1vk;$43nPf;stIoyFSQmf!g+`|*N%`pFs zl7TPZ#8CrZ;m_1=(yG+_|EmtJlt=lTtb7(k1XEX?+)}zQONy9$p+rTDE-8IbL{%0k zVto9!6lMACKojr1%x{^Zz(ns>Hcn(#`*z{JT3O3lNE=ZjXkE2 zHFA|4UAf3p6=d4_z*Tl~%9R_s$lfTb;uy+B;>J5r>$!gp8uneQ{tuEpQb3f$liG@B!hY4F3zkBy1l)H6#AwHMUSb#rFPy z*(Yycu6pzU^Fm_|)!QPyD7qc#yr|}@w?}$e^gAM*chh|JSftO0{-H>(ivD4W1AJui Rn