From 6c754049b8dc302049e9e95e08843984c9614816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Wed, 3 Jul 2024 17:20:23 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B7=AF=E5=86=B5=E4=BF=A1=E6=81=AF=20?=
=?UTF-8?q?=E6=AF=8F=E5=B0=8F=E6=97=B6=E5=85=A5=E4=B8=80=E6=AC=A1=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...DcTimingOfTrafficConditionsController.java | 20 +++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
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);
+ }
+ }
+
// 将获取到的交通指标数据封装为成功的结果并返回
- }
+
}
From e56f9ef8d2d8603056193f33db763e3c3d1369a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Wed, 3 Jul 2024 17:57:35 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=B9=E5=90=91?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
zc-business/src/main/java/com/zc/business/domain/DcEvent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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..48ccfe1d 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;
From 04b179d85455ce5e181b21e0d2f10f76b2c37014 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Wed, 3 Jul 2024 18:15:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=9D=9E=E6=9C=BA=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/business/DcPerceivedEventsWarningMapper.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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
From 6e15d74db05a010575fe56cab73502df85c8f737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Wed, 3 Jul 2024 18:59:05 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BD=A6=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/zc/business/domain/ComprehensiveIndexQuery.java | 1 +
zc-business/src/main/java/com/zc/business/domain/DcEvent.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
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 48ccfe1d..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
@@ -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("高速名")