From f865ecb9807d0046f14a42e532702cb808a18899 Mon Sep 17 00:00:00 2001 From: songwenxuan <1924103812@qq.com> Date: Sat, 3 Feb 2024 18:29:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=91=98=E9=97=B8?= =?UTF-8?q?=E6=9C=BA=E6=9F=A5=E8=AF=A2=E4=B8=8D=E8=AE=BF=E9=97=AE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/map/MapController.java | 8 +++++++- .../gatemachine/GateMachineInfoMapper.java | 2 ++ .../gatemachine/GateMachineInfoService.java | 2 ++ .../impl/GateMachineInfoServiceImpl.java | 5 +++++ .../gatemachine/GateCarMachineInfoMapper.xml | 2 ++ .../gatemachine/GateMachineInfoMapper.xml | 16 ++++++++++++++++ .../datasource/gatemachine/GateVideoMapper.xml | 4 ++-- 7 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index e9e83379..f7949fa3 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -294,7 +294,13 @@ public class MapController extends BaseController { String[] gateIdsByGateAreaId = mapService.getGateIdsByGateAreaId(pd); Map doorComeAndOutInfo = new HashMap<>(); if (pd.getString("TYPE").equals("PERSON_MACHINE")){ - doorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(gateIdsByGateAreaId, pd.getString("pageNo"), pd.getString("pageSize"),fstartDate,fendDate); + List infoByArea = gateMachineInfoService.findInfoByArea(pd); + Map data = new HashMap<>(); + data.put("list", infoByArea); + doorComeAndOutInfo.put("data", data); + doorComeAndOutInfo.put("code", 0); + doorComeAndOutInfo.put("msg", "success"); +// doorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(gateIdsByGateAreaId, pd.getString("pageNo"), pd.getString("pageSize"),fstartDate,fendDate); }else { List infoByArea = gateCarMachineInfoService.findInfoByArea(pd); Map data = new HashMap<>(); diff --git a/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineInfoMapper.java b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineInfoMapper.java index 218cc569..ef9ae28b 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineInfoMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineInfoMapper.java @@ -19,4 +19,6 @@ public interface GateMachineInfoMapper { List findByIds(PageData pd); PageData perpleCount(PageData pd); + + List findInfoByArea(PageData pd); } diff --git a/src/main/java/com/zcloud/service/gatemachine/GateMachineInfoService.java b/src/main/java/com/zcloud/service/gatemachine/GateMachineInfoService.java index 2aeece72..995bea84 100644 --- a/src/main/java/com/zcloud/service/gatemachine/GateMachineInfoService.java +++ b/src/main/java/com/zcloud/service/gatemachine/GateMachineInfoService.java @@ -17,4 +17,6 @@ public interface GateMachineInfoService { public List findByIds(PageData pd); PageData peopleCount(PageData pd); + + List findInfoByArea(PageData pd); } diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineInfoServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineInfoServiceImpl.java index 472a0482..52a3c85d 100644 --- a/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineInfoServiceImpl.java @@ -37,4 +37,9 @@ public class GateMachineInfoServiceImpl implements GateMachineInfoService { public PageData peopleCount(PageData pd) { return gateMachineInfoMapper.perpleCount(pd); } + + @Override + public List findInfoByArea(PageData pd) { + return gateMachineInfoMapper.findInfoByArea(pd); + } } diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml index f9a13081..804272d6 100644 --- a/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml @@ -81,6 +81,8 @@ mk_gate_car_machine_info f WHERE f.ENTRANCESYSCODE = #{GATE_AREA_ID} + AND + f.`CROSSTIME` >= CONCAT_WS("", date_format(now(),'%Y-%m'), '-01 00:00:00') GROUP BY f.CAR_MACHINE_INFO_ID ORDER BY diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateMachineInfoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateMachineInfoMapper.xml index 947db57c..624db1bd 100644 --- a/src/main/resources/mybatis/datasource/gatemachine/GateMachineInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/gatemachine/GateMachineInfoMapper.xml @@ -74,4 +74,20 @@ and f.eventTime >= #{eventTime} + + diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml index f5569946..48ba5eab 100644 --- a/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml +++ b/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml @@ -160,7 +160,7 @@ pv.INDEXCODE from f - left join `qa-gwj-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID + left join `qa-cmt-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID where f.ISDELETE = '0' and f.GATE_AREA_ID=#{pd.GATE_AREA_ID} @@ -199,7 +199,7 @@ pv.INDEXCODE from f - left join `qa-gwj-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID + left join `qa-cmt-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID where f.ISDELETE = '0' and f.CORPINFO_ID=#{CORPINFO_ID}