diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTimingOfTrafficConditionsController.java b/zc-business/src/main/java/com/zc/business/controller/DcTimingOfTrafficConditionsController.java
index 29c88a5a..d2b000c6 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcTimingOfTrafficConditionsController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcTimingOfTrafficConditionsController.java
@@ -11,6 +11,8 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
/**
*路况信息 每小时入一次库
@@ -24,13 +26,27 @@ public class DcTimingOfTrafficConditionsController {
// 调用服务层方法,获取当前交通指标数据
@Scheduled(cron = "0 0 * * * *")
+ //@Scheduled(cron = "0 0/1 * * * ?")
public void getTheCurrentCongestedSection() throws HttpException, IOException {
// 调用服务层方法,获取当前交通指标数据
JSONArray jsonArray = dcTrafficStatisticsService.getTheCurrentCongestedSection();
//插入 数据库
DcRoadConditionInformation dcRoadConditionInformation =new DcRoadConditionInformation();
dcRoadConditionInformation.setOtherConfig(jsonArray.toJSONString());
- dcRoadConditionInformationService.insertDcRoadConditionInformation(dcRoadConditionInformation);
+ DcRoadConditionInformation dcRoadConditionInformation1 = dcRoadConditionInformationService.selectlistTime().get(0);
+ Date createTime = dcRoadConditionInformation1.getCreateTime();
+ Calendar createTimeCalendar = Calendar.getInstance();
+ createTimeCalendar.setTime(createTime);
+// 获取 createTime 的小时
+ int createHour = createTimeCalendar.get(Calendar.HOUR_OF_DAY);
+// 获取当前时间的小时
+ Calendar currentCalendar = Calendar.getInstance();
+ int currentHour = currentCalendar.get(Calendar.HOUR_OF_DAY);
+ if (createHour != currentHour) {
+ dcRoadConditionInformationService.insertDcRoadConditionInformation(dcRoadConditionInformation);
+ }
+ }
+
// 将获取到的交通指标数据封装为成功的结果并返回
- }
+
}
diff --git a/zc-business/src/main/java/com/zc/business/domain/ComprehensiveIndexQuery.java b/zc-business/src/main/java/com/zc/business/domain/ComprehensiveIndexQuery.java
index b3aaffca..7e7620a2 100644
--- a/zc-business/src/main/java/com/zc/business/domain/ComprehensiveIndexQuery.java
+++ b/zc-business/src/main/java/com/zc/business/domain/ComprehensiveIndexQuery.java
@@ -21,6 +21,7 @@ public class ComprehensiveIndexQuery {
private String facilityCode;
private String facilityName;
+ @Excel(name = "方向", readConverterExp = "1=菏泽方向,3=济南方向")
private String direction;
@Excel(name = "饱和度")
private Float saturationRate;
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
index eef30096..f2a65c46 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
@@ -58,7 +58,7 @@ public class DcEvent {
* 2-中
* 3-下
*/
- @Excel(name = "方向")
+ @Excel(name = "方向", readConverterExp = "1=菏泽方向,3=济南方向")
//@Excel(name = "方向")
@ApiModelProperty("方向")
private String direction;
@@ -219,7 +219,7 @@ public class DcEvent {
@ApiModelProperty("是否是感知事件 0 表示 false,1 表示 true")
private Integer isPerceived;
- @Excel(name = "影响车道")
+ @Excel(name = "影响车道",readConverterExp ="0=应急车道,1=行1,2=行2,3=行3,4=行4")
@ApiModelProperty("影响车道 车道占用:0-应急1-行1,2-行2,3-行3,4-行4")
private String lang;
@ApiModelProperty("高速名")
diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
index b76ec34d..ea71dd2b 100644
--- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
@@ -479,7 +479,7 @@
left join
(select HOUR(warning_time) hours,count(*) num,dc_warning.stake_mark,facility_name from dc_warning
left join dc_facility on dc_warning.stake_mark=dc_facility.stake_mark and dc_facility.facility_type=1
- where date_format(warning_time,'%Y-%m-%d') = date_format('2024-06-25','%Y-%m-%d') and warning_source=6
+ where date_format(warning_time,'%Y-%m-%d') = date_format(#{warningTime},'%Y-%m-%d') and warning_source=6
and dc_facility.id=#{facilityId}
GROUP BY hours) t2
on t1.n = t2.hours
@@ -488,7 +488,7 @@
SELECT distinct DATE(warning.warning_time) AS day, COUNT(*) AS number
FROM dc_warning as warning
left join dc_facility on warning.stake_mark=dc_facility.stake_mark and dc_facility.facility_type=1
- WHERE DATE_FORMAT(warning.warning_time,'%Y-%m') =DATE_FORMAT('2024-06-01','%Y-%m') and warning_source=6
+ WHERE DATE_FORMAT(warning.warning_time,'%Y-%m') =DATE_FORMAT(#{warningTime},'%Y-%m') and warning_source=6
and dc_facility.id=#{facilityId}
GROUP BY day
ORDER BY day;
@@ -502,7 +502,7 @@
) t1 left join
(select month(warning_time) hours,count(*) num from dc_warning t1
left join dc_facility on t1.stake_mark=dc_facility.stake_mark and dc_facility.facility_type=1
- where DATE_FORMAT(t1.warning_time,'%Y')=DATE_FORMAT('2024-01-01','%Y') and warning_source=6
+ where DATE_FORMAT(t1.warning_time,'%Y')=DATE_FORMAT(#{warningTime},'%Y') and warning_source=6
and dc_facility.id=#{facilityId}
GROUP BY hours) t2
on t1.n = t2.hours