Browse Source

修改 新增交通管制事件(收费站)后,显示的桩号有误

develop
王兴琳 6 months ago
parent
commit
f13b7732ff
  1. 4
      zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java
  2. 3
      zc-business/src/main/java/com/zc/business/statistics/handler/TrafficGantryMetricsStatistics.java

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

@ -447,7 +447,7 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
//交通管制 //交通管制
if (eventType == UniversalEnum.THREE.getNumber() && dcEvent.getDcEventTrafficControl().getFacilityIds()[i] != null) { if (eventType == UniversalEnum.THREE.getNumber() && dcEvent.getDcEventTrafficControl().getFacilityIds()[i] != null) {
String facilityId = String.valueOf(dcEvent.getDcEventTrafficControl().getFacilityIds()[i]); String facilityId = String.valueOf(dcEvent.getDcEventTrafficControl().getFacilityIds()[i]);
// dcEvent.setStakeMark(extracted(facilityId)); dcEvent.setStakeMark(extracted(facilityId));
} }
dcEvent.setOccurrenceTime(DateUtils.getNowDate());//默认发生时间 dcEvent.setOccurrenceTime(DateUtils.getNowDate());//默认发生时间
dcEventMapper.insertDcEvent(dcEvent); dcEventMapper.insertDcEvent(dcEvent);
@ -522,7 +522,7 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
//交通管制 //交通管制
if (eventType == UniversalEnum.THREE.getNumber() && dcEvent.getDcEventTrafficControl().getFacilityIds()[i] != null) { if (eventType == UniversalEnum.THREE.getNumber() && dcEvent.getDcEventTrafficControl().getFacilityIds()[i] != null) {
String facilityId = String.valueOf(dcEvent.getDcEventTrafficControl().getFacilityIds()[i]); String facilityId = String.valueOf(dcEvent.getDcEventTrafficControl().getFacilityIds()[i]);
// dcEvent.setStakeMark(extracted(facilityId)); dcEvent.setStakeMark(extracted(facilityId));
} }
dcEvent.setOccurrenceTime(DateUtils.getNowDate());//默认发生时间 dcEvent.setOccurrenceTime(DateUtils.getNowDate());//默认发生时间

3
zc-business/src/main/java/com/zc/business/statistics/handler/TrafficGantryMetricsStatistics.java

@ -45,7 +45,7 @@ public class TrafficGantryMetricsStatistics {
/** /**
* 定义每小时第20分钟执行的任务用于清除过期缓存数据并将缓存中的数据整合后保存至数据库 * 定义每小时第30分钟执行的任务用于清除过期缓存数据并将缓存中的数据整合后保存至数据库
*/ */
@Scheduled(cron = "0 30 * * * ?") // 每小时的30分整点执行该任务 @Scheduled(cron = "0 30 * * * ?") // 每小时的30分整点执行该任务
public void performHourlyCleanupAndPersist() { public void performHourlyCleanupAndPersist() {
@ -96,7 +96,6 @@ public class TrafficGantryMetricsStatistics {
// 添加日门架指标数据到缓存中 // 添加日门架指标数据到缓存中
lastHourData.forEach(DailyGantryMetricsStatisticsCache::addCacheData); lastHourData.forEach(DailyGantryMetricsStatisticsCache::addCacheData);
// 添加三日门架指标数据到缓存中 // 添加三日门架指标数据到缓存中
// threeDays.forEach(DailyGantryMetricsStatisticsCache::addCacheData);
// 清除已过期的缓存数据 // 清除已过期的缓存数据
DailyGantryMetricsStatisticsCache.clearExpiredData(); DailyGantryMetricsStatisticsCache.clearExpiredData();

Loading…
Cancel
Save