From 446ea614144a92568b90d3faaf2311087d99057c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Mon, 19 Aug 2024 10:10:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E9=97=B4=E5=BA=93=E9=97=A8=E6=9E=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B8=85=E9=99=A4=EF=BC=8C=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=BB=88=E6=AD=A2=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GantryTimingController.java | 37 +++++++++++++++++++ .../service/IOdsTollEnpassDataService.java | 8 +++- .../service/IOdsTollEtctuDataService.java | 3 ++ .../service/IOdsTollExpassDataService.java | 11 ++++++ .../service/impl/DcEventServiceImpl.java | 8 ++-- .../service/impl/DcWarningServiceImpl.java | 7 +++- .../impl/OdsTollEnpassDataServiceImpl.java | 19 ++++++++++ .../service/impl/OdsTollEtctuDataImpl.java | 20 ++++++++++ .../impl/OdsTollExpassDataServiceImpl.java | 24 ++++++++++++ 9 files changed, 131 insertions(+), 6 deletions(-) create mode 100644 zc-business/src/main/java/com/zc/business/controller/GantryTimingController.java diff --git a/zc-business/src/main/java/com/zc/business/controller/GantryTimingController.java b/zc-business/src/main/java/com/zc/business/controller/GantryTimingController.java new file mode 100644 index 00000000..1c95ce6d --- /dev/null +++ b/zc-business/src/main/java/com/zc/business/controller/GantryTimingController.java @@ -0,0 +1,37 @@ +package com.zc.business.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.zc.business.domain.OdsTollEtctuData; +import com.zc.business.service.IDcWarningService; +import com.zc.business.service.IOdsTollEnpassDataService; +import com.zc.business.service.IOdsTollEtctuDataService; +import com.zc.business.service.IOdsTollExpassDataService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import java.util.Date; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.List; + +/** + *门架数据定时任务 + */ +@Component +public class GantryTimingController { + public void gantryTiming(){ + //收费站入口 + IOdsTollEnpassDataService iOdsTollEnpassDataService = SpringUtils.getBean(IOdsTollEnpassDataService.class); + //收费站出口 + IOdsTollExpassDataService iOdsTollExpassDataService = SpringUtils.getBean(IOdsTollExpassDataService.class); + //门架 + IOdsTollEtctuDataService iOdsTollEtctuDataService = SpringUtils.getBean(IOdsTollEtctuDataService.class); + + boolean remove = iOdsTollEtctuDataService.removeGantry(); + boolean remove2 = iOdsTollExpassDataService.removeGantry(); + boolean remove3 = iOdsTollEnpassDataService.removeGantry(); + System.out.println("清除数据:"+remove+": "+remove2+": "+remove3); + } +} diff --git a/zc-business/src/main/java/com/zc/business/service/IOdsTollEnpassDataService.java b/zc-business/src/main/java/com/zc/business/service/IOdsTollEnpassDataService.java index 0251afed..d2913e61 100644 --- a/zc-business/src/main/java/com/zc/business/service/IOdsTollEnpassDataService.java +++ b/zc-business/src/main/java/com/zc/business/service/IOdsTollEnpassDataService.java @@ -48,6 +48,12 @@ public interface IOdsTollEnpassDataService extends IService { * 收费站入口流水数据统计 */ int odsTollEnpassDataCountNumber(); - + /** + * + /** + * 清除两周前的数据 + * @return + */ + boolean removeGantry(); } diff --git a/zc-business/src/main/java/com/zc/business/service/IOdsTollEtctuDataService.java b/zc-business/src/main/java/com/zc/business/service/IOdsTollEtctuDataService.java index 4ad8117d..033eff97 100644 --- a/zc-business/src/main/java/com/zc/business/service/IOdsTollEtctuDataService.java +++ b/zc-business/src/main/java/com/zc/business/service/IOdsTollEtctuDataService.java @@ -1,5 +1,6 @@ package com.zc.business.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.zc.business.domain.DcGantryStatisticsData; import com.zc.business.domain.OdsTollEtctuData; @@ -42,4 +43,6 @@ public interface IOdsTollEtctuDataService extends IService { * 门架流水数据接口统计 */ int odsTollEtctuDataCountNumber(); + + boolean removeGantry(); } diff --git a/zc-business/src/main/java/com/zc/business/service/IOdsTollExpassDataService.java b/zc-business/src/main/java/com/zc/business/service/IOdsTollExpassDataService.java index fe766393..b297562e 100644 --- a/zc-business/src/main/java/com/zc/business/service/IOdsTollExpassDataService.java +++ b/zc-business/src/main/java/com/zc/business/service/IOdsTollExpassDataService.java @@ -1,10 +1,14 @@ package com.zc.business.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.zc.business.domain.DcTollStationStatisticsData; +import com.zc.business.domain.OdsTollEtctuData; import com.zc.business.domain.OdsTollExpassData; import com.zc.business.domain.OdsTollExpassData; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.List; /** @@ -34,6 +38,13 @@ public interface IOdsTollExpassDataService extends IService { */ List currentMonthData(); + /** + * + /** + * 清除两周前的数据 + * @return + */ + boolean removeGantry(); /** * 计算收费站在指定时间段内的统计数据。 * diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java index b6a56db2..fbc27d8f 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java @@ -1335,10 +1335,10 @@ public class DcEventServiceImpl extends ServiceImpl impl return UniversalEnum.ONE.getNumber(); } -/* //事件状态已被修改 返回成功 - if (dcEvent1.getEventState() == 1) { - return 1; - }*/ + //事件状态已终止 + if (dcEvent1.getEventState() == UniversalEnum.THREE.getNumber()) { + return dcEventMapper.updateDcEventState(id, state); + } int i = dcEventMapper.updateDcEventState(id, state); diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java index a47f7213..3d8b547e 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java @@ -307,7 +307,12 @@ public class DcWarningServiceImpl implements IDcWarningService { contentMap.put("content", content); } contentMap.put("event", dcWarning); - WebSocketService.broadcast(WebSocketEvent.WARNING, contentMap); //推送事件消息 0不是感知事件 + if (dcWarning.getWarningSource()==UniversalEnum.FIVE.getNumber()){ + WebSocketService.broadcast(WebSocketEvent.EVENT, contentMap); //推送事件消息 0是交通事件 + }else { + WebSocketService.broadcast(WebSocketEvent.WARNING, contentMap); //推送事件消息 0不是感知事件 + + } dcEventService.getCountNum(); } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/OdsTollEnpassDataServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/OdsTollEnpassDataServiceImpl.java index ea86acd7..63e1b432 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/OdsTollEnpassDataServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/OdsTollEnpassDataServiceImpl.java @@ -8,6 +8,7 @@ import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; import com.zc.business.domain.DcTollStationStatisticsData; import com.zc.business.domain.OdsTollEnpassData; +import com.zc.business.domain.OdsTollEtctuData; import com.zc.business.enums.TrafficDataPeriodTypeEnum; import com.zc.business.enums.UniversalEnum; import com.zc.business.enums.VehicleTypeEnum; @@ -15,6 +16,8 @@ import com.zc.business.mapper.OdsTollEnpassDataMapper; import com.zc.business.service.IOdsTollEnpassDataService; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -106,6 +109,22 @@ public class OdsTollEnpassDataServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.lt(OdsTollEnpassData::getEntime, dateTwoWeeksAgo); + System.out.println("*******************************"+list(queryWrapper).size()); + return remove(queryWrapper); + } /** * 计算交通统计数据 diff --git a/zc-business/src/main/java/com/zc/business/service/impl/OdsTollEtctuDataImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/OdsTollEtctuDataImpl.java index d4eb6698..6ed9db61 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/OdsTollEtctuDataImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/OdsTollEtctuDataImpl.java @@ -15,6 +15,8 @@ import com.zc.business.mapper.OdsTollEtctuDataMapper; import com.zc.business.service.IOdsTollEtctuDataService; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -102,6 +104,24 @@ public class OdsTollEtctuDataImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.lt(OdsTollEtctuData::getTranstime, dateTwoWeeksAgo); + System.out.println("*******************************"+list(queryWrapper).size()); + return remove(queryWrapper); + } + + /** * 计算交通统计数据 * diff --git a/zc-business/src/main/java/com/zc/business/service/impl/OdsTollExpassDataServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/OdsTollExpassDataServiceImpl.java index e12e9a43..9ba5eb0c 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/OdsTollExpassDataServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/OdsTollExpassDataServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; import com.zc.business.domain.DcTollStationStatisticsData; +import com.zc.business.domain.OdsTollEtctuData; import com.zc.business.domain.OdsTollExpassData; import com.zc.business.enums.TrafficDataPeriodTypeEnum; import com.zc.business.enums.UniversalEnum; @@ -15,6 +16,8 @@ import com.zc.business.mapper.OdsTollExpassDataMapper; import com.zc.business.service.IOdsTollExpassDataService; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -66,6 +69,27 @@ public class OdsTollExpassDataServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.lt(OdsTollExpassData::getExtime, dateTwoWeeksAgo); + System.out.println("*******************************"+list(queryWrapper).size()); + return remove(queryWrapper); + } + + + + /** * 计算收费站在指定时间段内的统计数据。 *