From 7a67ec6c30991a5ebc136e0459996ae7c0b3e141 Mon Sep 17 00:00:00 2001 From: Zangzhipeng Date: Sat, 27 Jul 2024 18:35:17 +0800 Subject: [PATCH] =?UTF-8?q?727=E9=97=AE=E9=A2=98=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 | 9 ++- .../controller/HighDangerController.java | 76 ++++++++++++++++-- .../server_api/mapper/ConfigureMapper.java | 13 +++ .../server_api/mapper/HighDangerMapper.java | 2 +- .../server_api/mapper/OperatorMapper.java | 2 +- .../resources/sql-mapper/ConfigureMapper.xml | 12 +++ .../resources/sql-mapper/HighDangerMapper.xml | 2 +- .../resources/sql-mapper/OperatorMapper.xml | 21 ++++- .../hiatmp/model/common/HighDangerBase.java | 4 +- .../com/hisense/hiatmp/model/dmr/Point.class | Bin 1615 -> 2094 bytes 10 files changed, 125 insertions(+), 16 deletions(-) create mode 100644 hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigureMapper.java create mode 100644 hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigureMapper.xml 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 625aad4..9b14004 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 @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.HashMap; +import java.util.List; import java.util.Map; @Slf4j @@ -31,7 +32,7 @@ public class AuthController { @PostMapping("/login") public ServerResponse login(@RequestBody OperatorDTO operator) { - HashMap authMap = new HashMap<>(); + HashMap authMap = new HashMap<>(); // 判断是否有该用户，取出该用户信息 Operator operatorById = operatorMapper.getOperatorById(operator.getNuserid()); @@ -39,10 +40,12 @@ public class AuthController { // 密码加密 String encrypt = authService.encrypt(operator.getCuserpwd()+ operator.getNuserid()); if (operatorById.getNuserid().equals(operator.getNuserid()) && operatorById.getCuserpwd().equals(encrypt)) { -// authMap.put("nuserid", operator.getNuserid()); + authMap.put("nuserid", operator.getNuserid()); + List roleById = operatorMapper.getRoleById(operator.getNuserid()); + authMap.put("role", roleById); // authMap.put("department", operatorById.getCdepartmentid()); // String token = JwtUtil.createToken(operatorById); - return ServerResponse.ok("登录成功",operator.getNuserid()); + return ServerResponse.ok("登录成功",authMap); } }else{ return ServerResponse.error("用户不存在"); 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 6ffdee5..2b22c01 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 @@ -3,6 +3,7 @@ package com.hisense.hiatmp.server_api.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hisense.hiatmp.model.common.*; +import com.hisense.hiatmp.server_api.mapper.ConfigureMapper; import com.hisense.hiatmp.server_api.mapper.HighDangerMapper; import com.hisense.hiatmp.server_api.mapper.OperatorMapper; import com.hisense.hiatmp.model.common.DangerProblem; @@ -35,6 +36,9 @@ public class HighDangerController { @Autowired HighDangerService highDangerService; + @Autowired + ConfigureMapper configureMapper; + /* 查询各个状态的数据情况 */ @@ -75,6 +79,8 @@ public class HighDangerController { return ServerResponse.error("未找到当前用户"); } + int termTime = Integer.parseInt(configureMapper.getTermTime()); + //Page page = new Page<>(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize); // 将要查询的状态和部门id查询数据库，获得隐患排查表 @@ -88,7 +94,8 @@ public class HighDangerController { for (HighDangerBase base : statusCounts) { Date nowDate = new Date(); - Date pcEndTime = base.getPcEndTime(); + Date pcEndTime = base.getRoadPcEndTime(); + Date pcStartTime = base.getPcStartTime(); if (pcEndTime != null) { long diff = nowDate.getTime() - pcEndTime.getTime(); // 时间差，天数 @@ -122,7 +129,7 @@ public class HighDangerController { base.setDeadline(diffDays); base.setDeadlineStatus("超期" + diffDays + "天" + remainingHours + "小时"); base.setDeadlineType("1"); - } else if (comparison > 0 && diffDays <= 3) { // 临期 + } else if (comparison > 0 && diffDays <= termTime) { // 临期 if (diffHours < 1) { base.setDeadlineStatus("临期不足一小时"); base.setDeadlineType("2"); @@ -145,9 +152,68 @@ public class HighDangerController { base.setDeadlineStatus("正常"); base.setDeadlineType("3"); } - } else { - base.setDeadlineStatus("无排查结束时间"); - base.setDeadlineType("3"); + } else if(pcStartTime != null){ + // 无排查结束时间，根据开始时间判断 + long diff = nowDate.getTime() - pcStartTime.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(pcStartTime); + if (comparison < 0) { // 超期 + if (diffHours < 1) { + base.setDeadlineStatus("超期不足一小时"); + base.setDeadlineType("1"); + continue; + } + if(diffDays == 0){ + base.setDeadlineStatus("超期" + remainingHours + "小时"); + base.setDeadlineType("2"); + continue; + }else if(remainingHours == 0){ + base.setDeadlineStatus("超期" + diffDays + "天"); + base.setDeadlineType("2"); + continue; + } + base.setDeadline(diffDays); + base.setDeadlineStatus("超期" + diffDays + "天" + remainingHours + "小时"); + base.setDeadlineType("1"); + } else if (comparison > 0 && diffDays <= termTime) { // 临期 + if (diffHours < 1) { + base.setDeadlineStatus("临期不足一小时"); + base.setDeadlineType("2"); + continue; + } + base.setDeadline(diffDays); + if (diffDays == 0) { + base.setDeadlineStatus("临期" + remainingHours + "小时"); + base.setDeadlineType("2"); + continue; + } else if (remainingHours == 0) { + base.setDeadlineStatus("临期" + diffDays + "天"); + base.setDeadlineType("2"); + continue; + } + base.setDeadlineStatus("临期" + diffDays + "天" + remainingHours + "小时"); + base.setDeadlineType("2"); + }else{ + base.setDeadlineStatus("正常"); + base.setDeadlineType("3"); + } +// base.setDeadlineStatus("无排查结束时间"); +// base.setDeadlineType("3"); + }else{ + base.setDeadlineStatus("无排查结束和开始时间"); + base.setDeadlineType("3"); } } PageInfo pageInfo = new PageInfo<>(statusCounts); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigureMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigureMapper.java new file mode 100644 index 0000000..b405287 --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigureMapper.java @@ -0,0 +1,13 @@ +package com.hisense.hiatmp.server_api.mapper; + +import com.hisense.hiatmp.model.common.Operator; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ConfigureMapper { + + String getTermTime(); +} 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 7bce952..6d08f4b 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 @@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; import java.util.List; @Repository -public interface HighDangerMapper extends BaseMapper{ +public interface HighDangerMapper{ // String getHighDangerStatusNum(@Param("postId") String postId); // 主页获取各类型数据 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 33fbd28..a24b91e 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 @@ -17,5 +17,5 @@ public interface OperatorMapper { String updateByPrimaryKeySelective(@Param("nuserid") String nuserid,@Param("cuserpwd") String cuserpwd); - Operator getInformation(String nuserid); + List getRoleById(String nuserid); } diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigureMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigureMapper.xml new file mode 100644 index 0000000..3d706c2 --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigureMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file 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 4d46a49..ff82bf5 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 @@ -114,7 +114,7 @@ - select * from operator where cusername = #{cusername} + select * + from operator + where cusername = #{cusername} + + diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java index 74e17b0..e34770e 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java @@ -75,7 +75,7 @@ public class HighDangerBase implements Serializable { /** * pc_start_time */ - private String pcStartTime; + private Date pcStartTime; /** * pc_end_time @@ -83,6 +83,8 @@ public class HighDangerBase implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pcEndTime; + private Date roadPcEndTime; + /** * zl_start_time */ diff --git a/hiatmp-model/target/classes/com/hisense/hiatmp/model/dmr/Point.class b/hiatmp-model/target/classes/com/hisense/hiatmp/model/dmr/Point.class index 3f6e2555d9d5e187a3e9bceee8ec55d7432cd80c..71d01c37f1dfbed617fe8dd31dc4f3089f7ba668 100644 GIT binary patch literal 2094 zcma)7ZBrXn6n<{9%WlFJ(pW%RRBS;*0*$r!!dq1+Q8c7j5ZkJ?OIS&2lEuy9v_D0E zfSqxej?UP$qce_v(HTGbd(`@z-6g!mu`}en-Fu#U&U5Zv{`lv|p8-r_BZ&blB%tH6 zh(!?v18*m(-x0Bt#JhM;tfGiz*L+Sr=m>TI=9^)D&JGh^!t+Jd|3DD)Pq z4X3nI-*CJ&d!xoky6Bee+Pdvk#gBrTU#T_~Mv7&(o~P+Fnhv$?*SGU^0@d=HbuYi- zRvSK#(zYD`T5u366NiN+s8*x;PG!bARj4(CG%Zt*0#nP5UvW2AY|pMczT@$D*&t9< zdr*Cu<4BU-<$SSY*O+r?!)C!_)_r$7i zmp@;&w*!7S*I*cC*={V#xe8{*ZdO8y$@darSFSECFY;X4U7pk2srd><8_@LKa8e4% zRd>fLJB6xDBN=ddUgl}x89Zy@X$)F8E#eG@6wdztL@Z3)a5@B;BLtnOx+D7)Kfl3FHfzg_3T5a?}Kf_lwDzv zaDWxrXK{`mpAAMS4=4YC*nKX>FiaUH8y%B5sSe5UqseB+WKOt4vi9APlM@}2$B<=x zQuZ`;OzO;@dw^Kyru)Mk2%DCkgiVDU^K?ZgMQ6M-Wc*1XWiV~X(*fiJ&L68X_W;_H zLduNWkY@r&K8XnOPimbFlyli{pliFiU!i{uJ-(a!1^V)MwuP?1rD2To_Xy@!vP?fg zKXJfMmKaD*YZJetdr`!(V!d6A&Jv`UXv7x-^7s{DNN&xygwUv`QZuvK+)!$!A~ZdMb!*QdKXe#P zmSmaKn5o=77!xg=;HJ)$WJA!Xia48{#T<{+Ny8;tF}}Axyb(|$M3AJ%WKAOxN|6F6 z^_Xn!`!OXinxCww?wf>=7e4tDdagf2Z#vb&Nh!UBbo!~#PKbRfw3AfnK8hClkG`ys RxbTB88I`Q?7SUsv{}*ypP+tH5 literal 1615 zcma)5+in|G6kW%j@l4D#F(zrbgp$w;W5=zzv_R{mkdzn#b{jQSMR|b}dx)plGiE$S z?Pu@^AHY+DK!UU?5`tI038Ah%Gf7Hf31s=~%Q<_mz1BJN*FTSc2XF~Dizwsr6b!sA z%R3g{Ez(|*K+)*&Dhh0x$rsW6TjqzaHi*D=fJ~QQ3*wOtvI`SpXl1AL~M+#?Kop4a6>jfi^ zR>y;3eZWTjdUp`jH$y*&8|=N~#h)fX#FpSL%_zwkZd1@pZ7=SH-Ax_offsubd&>cy zD|lazb)WH^+q$Q}(e=I#cIr2`?|GfLQTdEqLYeW{mVz0^Jugx?u@&piS8Y8^W~YV< zc1H*6(wA;ek9sM03bDbm&08Dob@ruSh`iCbAM;ckZpD!w>?q8-m8a0sEIAgp!g18` zn!adOOqgGkp&XpVDF@GC*1;TR6<+;s$s8=0EM6e3T!MTxA;vkYXMRO)^4uqRMwp~?izh#RPqfvg>JKoD-K9Tad=E3fyYvT)cCESxGYRPwYWzQf^_^@pwi(;| zv9Zf0c^ti%g|ztr!Bw2cYn)~dHMqR294f4HU|ROyn6^-znb{|Qo|78#m1L7%VVS69 z%7}uNJBF6ZX&#`N#1OPhPB-CR!v&_~ZG6ra!hNySST