727问题修改

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<String, String> authMap = new HashMap<>();
+        HashMap<String, Object> 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<String> 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("用户不存在");

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<HighDangerBase> 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,8 +152,67 @@ public class HighDangerController {
                     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.setDeadlineStatus("无排查结束和开始时间");
                     base.setDeadlineType("3");
             }
         }

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

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<HighDangerBase>{
+public interface HighDangerMapper{
 
 //    String getHighDangerStatusNum(@Param("postId") String postId);
     // 主页获取各类型数据

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<String> getRoleById(String nuserid);
 }

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.hisense.hiatmp.server_api.mapper.ConfigureMapper">
+
+    <select id="getTermTime" resultType="String">
+        select t.param_value
+        from tht_param_config t
+        where t.param_code = 'THT_PC_ROAD_XT'
+    </select>
+
+</mapper>

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

@@ -114,7 +114,7 @@
     </select>
 
     <select id="getHigDangerDealt" resultType="com.hisense.hiatmp.model.common.HighDangerBase">
-        SELECT hdb.*,hdr.pc_type
+        SELECT hdb.*,hdr.pc_type,hdr.pc_end_time as road_pc_end_time
         FROM tht_hidden_danger_base hdb
         LEFT JOIN tht_hidden_danger_road hdr ON hdb.business_id = hdr.business_id
         -- AND hdb.pc_count = hdr.pc_count

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

@@ -4,19 +4,32 @@
 <mapper namespace="com.hisense.hiatmp.server_api.mapper.OperatorMapper">
 
     <select id="getOperatorByName" resultType="com.hisense.hiatmp.model.common.Operator">
-        select * from operator where cusername = #{cusername}
+        select *
+        from operator
+        where cusername = #{cusername}
     </select>
 
     <select id="getOperatorById" resultType="com.hisense.hiatmp.model.common.Operator">
-        select * from operator where nuserid = #{nuserid}
+        select *
+        from operator
+        where nuserid = #{nuserid}
     </select>
 
     <select id="getAllOperator" resultType="com.hisense.hiatmp.model.common.Operator">
-        select * from operator;
+        select *
+        from operator;
     </select>
 
     <select id="updateByPrimaryKeySelective" resultType="String">
-        update operator set cuserpwd = #{cuserpwd} where nuserid = #{nuserid} RETURNING nuserid;
+        update operator
+        set cuserpwd = #{cuserpwd}
+        where nuserid = #{nuserid} RETURNING nuserid;
+    </select>
+
+    <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'
     </select>
 
 

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
      */