人员管控

securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java

@@ -86,6 +86,8 @@ public class Constant {
     public final static String TYPE = "1";
     /**安全帽*/
     public final static String AQM = "1804";
+    /**施工人员区域管控告警*/
+    public final static Integer SPORT_WARN = 9995;
 
     public final static String[] BUILD_ARR = {"12A0,合肥","12B0,马鞍山","12C0,芜湖","12D0,安庆","12F0,淮南",
     "12G0,宣城","12H0,阜阳","12J0,铜陵","12L0,蚌埠","12M0,滁州","12N0,六安","12P0,淮北","12Q0,宿州","12R0,池州",

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java

@@ -85,9 +85,6 @@ public class HumanManageController extends BaseController {
             String[] timeArr = dto.getTime().split(" - ");
             dto.setStartTime(timeArr[0]);
             dto.setEndTime(timeArr[1]);
-        }else {
-            dto.setStartTime(DateTimeHelper.getNowDate());
-            dto.setEndTime(DateTimeHelper.getNowDate());
         }
         startPage();
         List<UserAccessVo> list = new ArrayList<>();

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java

@@ -101,9 +101,6 @@ public class VehicleServiceImpl implements VehicleService {
             String[] arr = date.split("@");
             dto.setStartDate(arr[0]);
             dto.setEndDate(arr[1]);
-        }else{
-            dto.setStartDate(DateTimeHelper.getNowDate());
-            dto.setEndDate(DateTimeHelper.getNowDate());
         }
         try {
             dto.setTypeCode(Constant.PERSON_CAR_TYPE);

securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml

@@ -158,7 +158,10 @@
         SELECT thdv.source_type AS value
         FROM tb_bd_device tbd
         INNER JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id AND tdd.del_flag = 0
-        INNER JOIN tb_his_device_value thdv ON tdd.id = thdv.attribute_id AND thdv.val = #{id} AND thdv.create_time BETWEEN CONCAT(#{startTime},' 00:00:00') AND CONCAT(#{endTime},' 23:59:59')
+        INNER JOIN tb_his_device_value thdv ON tdd.id = thdv.attribute_id AND thdv.val = #{id}
+        <if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''">
+            AND thdv.create_time BETWEEN CONCAT(#{startTime},' 00:00:00') AND CONCAT(#{endTime},' 23:59:59')
+        </if>
         WHERE tbd.devic_type = #{typeCode} AND tdd.mode_name = #{modeName} AND tbd.del_flag = 0
     </select>
     <select id="getBindHis" resultType="java.lang.Integer">

securitycontrol-model/securitycontrol-background/src/main/resources/mapper/VehicleMapper.xml

@@ -23,7 +23,10 @@
         SELECT thdv.source_type AS value
         FROM tb_bd_device tbd
         INNER JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id AND tdd.del_flag = 0
-        INNER JOIN tb_his_device_value thdv ON tdd.id = thdv.attribute_id AND thdv.create_time BETWEEN CONCAT(#{startDate},' 00:00:00') AND CONCAT(#{endDate},' 23:59:59')
+        INNER JOIN tb_his_device_value thdv ON tdd.id = thdv.attribute_id
+        <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
+            AND thdv.create_time BETWEEN CONCAT(#{startDate},' 00:00:00') AND CONCAT(#{endDate},' 23:59:59')
+        </if>
         INNER JOIN tb_car tc ON tc.car_num = thdv.val AND tc.id = #{id}
         WHERE tbd.devic_type = #{typeCode} AND tdd.mode_name = #{modeName} AND tbd.del_flag = 0
     </select>

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AccessMgeController.java

@@ -79,9 +79,6 @@ public class AccessMgeController extends BaseController {
                 String[] date = dto.getDate().split(" - ");
                 dto.setStartDate(date[0]);
                 dto.setEndDate(date[1]);
-            }else{
-                dto.setStartDate(DateTimeHelper.getNowDate());
-                dto.setEndDate(DateTimeHelper.getNowDate());
             }
             List<AccessMgeVo> list = service.getVehicleStatisticsList(dto);
             return getDataTableLayui(list);
@@ -100,9 +97,6 @@ public class AccessMgeController extends BaseController {
                 String[] date = dto.getDate().split(" - ");
                 dto.setStartDate(date[0]);
                 dto.setEndDate(date[1]);
-            }else{
-                dto.setStartDate(DateTimeHelper.getNowDate());
-                dto.setEndDate(DateTimeHelper.getNowDate());
             }
             List<AccessMgeVo> proLists = service.getVehicleStatisticsList(dto);
             for (int i = 0; i < proLists.size(); i++) {
@@ -160,9 +154,6 @@ public class AccessMgeController extends BaseController {
                 String[] date = dto.getDate().split(" - ");
                 dto.setStartDate(date[0]);
                 dto.setEndDate(date[1]);
-            }else{
-                dto.setStartDate(DateTimeHelper.getNowDate());
-                dto.setEndDate(DateTimeHelper.getNowDate());
             }
             List<AccessMgeVo> list = service.getPerStatisticsList(dto);
             return getDataTableLayui(list);
@@ -181,9 +172,6 @@ public class AccessMgeController extends BaseController {
                 String[] date = dto.getDate().split(" - ");
                 dto.setStartDate(date[0]);
                 dto.setEndDate(date[1]);
-            }else{
-                dto.setStartDate(DateTimeHelper.getNowDate());
-                dto.setEndDate(DateTimeHelper.getNowDate());
             }
             List<AccessMgeVo> proLists = service.getPerStatisticsList(dto);
             for (int i = 0; i < proLists.size(); i++) {

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java

@@ -65,6 +65,7 @@ public class PersonnelControlImpl implements PersonnelControlService {
      */
     @Override
     public List<PersonnelControlVo> getPersonnelMovementList(PersonnelControlDto dto) {
+        dto.setTypeCode(Constant.SPORT_WARN);
         return mapper.getPersonnelMovementList(dto);
     }
 

securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml

@@ -25,8 +25,10 @@
         INNER JOIN tb_device_detail tdd ON tdd.id = thdv.attribute_id AND tdd.del_flag = 0 AND tdd.mode_name = #{modeName}
         INNER JOIN tb_bd_device tbd ON tbd.device_id = tdd.device_id AND tbd.del_flag = 0 AND tbd.devic_type = #{typeCode}
         INNER JOIN tb_project tp ON thdv.bid_code = tp.bid_code AND tp.del_flag = 0
-        WHERE thdv.create_time BETWEEN CONCAT(#{startDate},' 00:00:00') AND CONCAT(#{endDate},' 23:59:59')
+        WHERE thdv.bid_code = #{bidCode}
-        AND thdv.bid_code = #{bidCode}
+        <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
+            AND thdv.create_time BETWEEN CONCAT(#{startDate},' 00:00:00') AND CONCAT(#{endDate},' 23:59:59')
+        </if>
         <if test="carNum!=null and carNum!=''">
             AND INSTR(thdv.val,#{carNum}) > 0
         </if>
@@ -61,8 +63,10 @@
         INNER JOIN tb_device_detail tdd ON tdd.id = thdv.attribute_id AND tdd.del_flag = 0 AND tdd.mode_name = #{modeName}
         INNER JOIN tb_bd_device tbd ON tbd.device_id = tdd.device_id AND tbd.del_flag = 0 AND tbd.devic_type = #{typeCode}
         INNER JOIN tb_project tp ON thdv.bid_code = tp.bid_code AND tp.del_flag = 0
-        WHERE thdv.create_time BETWEEN CONCAT(#{startDate},' 00:00:00') AND CONCAT(#{endDate},' 23:59:59')
+        WHERE thdv.bid_code = #{bidCode}
-        AND thdv.bid_code = #{bidCode}
+        <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
+            AND thdv.create_time BETWEEN CONCAT(#{startDate},' 00:00:00') AND CONCAT(#{endDate},' 23:59:59')
+        </if>
         <if test="userName!=null and userName!=''">
             AND INSTR(thdv.val,#{carNum}) > 0
         </if>

securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml

@@ -66,15 +66,10 @@
     </select>
     <!--人员管控-人员运动趋预警-->
     <select id="getPersonnelMovementList" resultType="com.securitycontrol.entity.screen.vo.PersonnelControlVo">
-        SELECT
+        SELECT tw.warn_time AS warningTime,
-            tw.warn_time AS warningTime,
             tw.warn_content AS warningContent
-        FROM
+        FROM tb_warn tw
-            tb_warn tw
+        WHERE tw.warn_type = #{typeCode} AND tw.bid_code = #{bidCode} AND DATE(tw.warn_time) = CURDATE()
-        WHERE
-            tw.warn_type = 9995
-            AND tw.bid_code = #{bidCode}
-            AND DATE(tw.warn_time) = CURDATE();
     </select>
     <select id="getNewFenceList" resultType="com.securitycontrol.entity.screen.vo.PersonnelControlVo">
         SELECT