From 25d6cd1de3127a0409d21056d1ccb02a13c8addd Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Sat, 20 Apr 2024 12:17:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/Constant.java | 2 ++ .../background/controller/HumanManageController.java | 3 --- .../background/service/impl/VehicleServiceImpl.java | 3 --- .../src/main/resources/mapper/HumanManageMapper.xml | 5 ++++- .../src/main/resources/mapper/VehicleMapper.xml | 5 ++++- .../screen/controller/AccessMgeController.java | 12 ------------ .../screen/service/impl/PersonnelControlImpl.java | 1 + .../src/main/resources/mapper/AccessMgeMapper.xml | 12 ++++++++---- .../main/resources/mapper/PersonnelControlMapper.xml | 11 +++-------- 9 files changed, 22 insertions(+), 32 deletions(-) diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java index 6219b99..07cb0eb 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java +++ b/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,池州", diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java index 0431b26..2f0d282 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java +++ b/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 list = new ArrayList<>(); diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java index e8dd849..92a09da 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java +++ b/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); diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml index c460539..7f8605e 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml +++ b/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} + + AND thdv.create_time BETWEEN CONCAT(#{startTime},' 00:00:00') AND CONCAT(#{endTime},' 23:59:59') + WHERE tbd.devic_type = #{typeCode} AND tdd.mode_name = #{modeName} AND tbd.del_flag = 0 diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AccessMgeController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AccessMgeController.java index feebd54..6661c53 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AccessMgeController.java +++ b/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 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 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 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 proLists = service.getPerStatisticsList(dto); for (int i = 0; i < proLists.size(); i++) { diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java index bd844ac..bebfb42 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java +++ b/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 getPersonnelMovementList(PersonnelControlDto dto) { + dto.setTypeCode(Constant.SPORT_WARN); return mapper.getPersonnelMovementList(dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml index 0412d9c..afe3b56 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml +++ b/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') - AND thdv.bid_code = #{bidCode} + WHERE thdv.bid_code = #{bidCode} + + AND thdv.create_time BETWEEN CONCAT(#{startDate},' 00:00:00') AND CONCAT(#{endDate},' 23:59:59') + AND INSTR(thdv.val,#{carNum}) > 0 @@ -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') - AND thdv.bid_code = #{bidCode} + WHERE thdv.bid_code = #{bidCode} + + AND thdv.create_time BETWEEN CONCAT(#{startDate},' 00:00:00') AND CONCAT(#{endDate},' 23:59:59') + AND INSTR(thdv.val,#{carNum}) > 0 diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml index e0317a1..a55e56f 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml @@ -66,15 +66,10 @@