中间库门架数据清除，事件终止状态

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

zc-business/src/main/java/com/zc/business/service/IOdsTollEnpassDataService.java

@@ -48,6 +48,12 @@ public interface IOdsTollEnpassDataService extends IService<OdsTollEnpassData> {
      * 收费站入口流水数据统计
      */
     int odsTollEnpassDataCountNumber();
-
+    /**
+     *
+     /**
+     * 清除两周前的数据
+     * @return
+     */
+    boolean removeGantry();
 }
 

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<OdsTollEtctuData> {
      * 门架流水数据接口统计
      */
     int odsTollEtctuDataCountNumber();
+
+    boolean removeGantry();
 }

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<OdsTollExpassData> {
      */
     List<OdsTollExpassData> currentMonthData();
 
+    /**
+     *
+     /**
+     * 清除两周前的数据
+     * @return
+     */
+    boolean removeGantry();
     /**
      * 计算收费站在指定时间段内的统计数据。
      *

zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java

@@ -1335,10 +1335,10 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> 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);

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

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<OdsTollEnpassDataM
         return count(queryWrapper);
     }
 
+    /**
+     * 清除一月前的数据
+     * @return
+     */
+    @Override
+    public boolean removeGantry() {
+        // 计算一个月时间点
+        LocalDateTime oneMonthAgo  = LocalDateTime.now().minusMonths(1);
+        // 转换为 Date 类型
+        Date dateTwoWeeksAgo = Date.from(oneMonthAgo .atZone(ZoneId.systemDefault()).toInstant());
+        // 构建查询条件
+        LambdaQueryWrapper<OdsTollEnpassData> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.lt(OdsTollEnpassData::getEntime, dateTwoWeeksAgo);
+        System.out.println("*******************************"+list(queryWrapper).size());
+        return remove(queryWrapper);
+    }
 
     /**
      * 计算交通统计数据

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<OdsTollEtctuDataMapper, Od
         return count(queryWrapper);
     }
 
+    /**
+     * 清除一月前的数据
+     * @return
+     */
+    @Override
+    public boolean removeGantry() {
+        // 计算一个月时间点
+        LocalDateTime oneMonthAgo  = LocalDateTime.now().minusMonths(1);
+        // 转换为 Date 类型
+        Date dateTwoWeeksAgo = Date.from(oneMonthAgo .atZone(ZoneId.systemDefault()).toInstant());
+        // 构建查询条件
+        LambdaQueryWrapper<OdsTollEtctuData> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.lt(OdsTollEtctuData::getTranstime, dateTwoWeeksAgo);
+        System.out.println("*******************************"+list(queryWrapper).size());
+        return remove(queryWrapper);
+    }
+
+
     /**
      * 计算交通统计数据
      *

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<OdsTollExpassDataM
         return list(queryWrapper);
     }
 
+
+    /**
+     * 清除一月前的数据
+     * @return
+     */
+    @Override
+    public boolean removeGantry() {
+        // 计算一个月时间点
+        LocalDateTime oneMonthAgo  = LocalDateTime.now().minusMonths(1);
+        // 转换为 Date 类型
+        Date dateTwoWeeksAgo = Date.from(oneMonthAgo .atZone(ZoneId.systemDefault()).toInstant());
+        // 构建查询条件
+        LambdaQueryWrapper<OdsTollExpassData> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.lt(OdsTollExpassData::getExtime, dateTwoWeeksAgo);
+        System.out.println("*******************************"+list(queryWrapper).size());
+        return remove(queryWrapper);
+    }
+
+
+
+
     /**
      * 计算收费站在指定时间段内的统计数据。
      *