Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jinan
traffic-signal-platform
Commits
98f8907c
Commit
98f8907c
authored
Apr 16, 2025
by
黄伟铭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改干线事件接口,新增持续时间字段
parent
9ed713e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
CrossRealTimeAlarmEntity.java
...et/wanji/opt/synthesis/pojo/CrossRealTimeAlarmEntity.java
+1
-0
TrunkLineMapper.xml
...ize-service/src/main/resources/mapper/TrunkLineMapper.xml
+4
-3
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/CrossRealTimeAlarmEntity.java
View file @
98f8907c
...
...
@@ -8,4 +8,5 @@ public class CrossRealTimeAlarmEntity {
private
String
startTime
;
private
String
dir
;
private
String
eventSerialNumber
;
private
String
duration
;
}
signal-optimize-service/src/main/resources/mapper/TrunkLineMapper.xml
View file @
98f8907c
...
...
@@ -11,6 +11,7 @@
<result
property=
"type"
column=
"type"
></result>
<result
property=
"startTime"
column=
"startTime"
></result>
<result
property=
"dir"
column=
"dir"
></result>
<result
property=
"duration"
column=
"duration"
></result>
</resultMap>
<select
id=
"getTrunkLineProblemDescribe"
parameterType=
"String"
resultMap=
"tlProblemDescribe"
>
...
...
@@ -38,7 +39,7 @@
</select>
<select
id=
"getTrunkLineRealTimeAlarm"
parameterType=
"map"
resultMap=
"tlRealTimeAlarmsResultMap"
>
select a.type , a.start_time as startTime , SUBSTR(a.dir, 2, length(a.dir)-2) as dir
select a.type , a.start_time as startTime , SUBSTR(a.dir, 2, length(a.dir)-2) as dir
, a.duration
from t_event_info a
where a.start_time = (select MAX(start_time) from t_event_info where green_id = #{greenID}
and start_time
<![CDATA[ <= ]]>
DATE_FORMAT(#{time}, '%Y-%m-%d %H:%i:%s') and start_time >= DATE_FORMAT(DATE_SUB(#{time},INTERVAL 5 MINUTE), '%Y-%m-%d %H:%i:%s')
...
...
@@ -48,7 +49,7 @@
</select>
<select
id=
"getTrunkLineRealTimeAlarmPlan"
parameterType=
"map"
resultMap=
"tlRealTimeAlarmsResultMap"
>
select DISTINCT '' as type,a.control_time as startTime ,'' as dir from t_strategy_green_opt_hist a
select DISTINCT '' as type,a.control_time as startTime ,'' as dir
, '' as duration
from t_strategy_green_opt_hist a
where a.control_time = (select MAX(control_time) from t_strategy_green_opt_hist where green_id = #{greenID}
and control_time >= DATE_FORMAT(DATE_sub(#{time},INTERVAL control_duration SECOND),'%Y-%m-%d %H:%i:%s') and control_time
<![CDATA[ <= ]]>
DATE_FORMAT(#{time}, '%Y-%m-%d %H:%i:%s')
and response_code = 200 )
...
...
@@ -56,7 +57,7 @@
</select>
<select
id=
"getTrunkLineRealTimeAlarmPlan1"
parameterType=
"map"
resultMap=
"tlRealTimeAlarmsResultMap"
>
select DISTINCT '' as type,a.control_time as startTime ,'' as dir from t_strategy_green_opt_hist a
select DISTINCT '' as type,a.control_time as startTime ,'' as dir
, '' as duration
from t_strategy_green_opt_hist a
where a.control_time = (select MIN(control_time) from t_strategy_green_opt_hist where green_id = #{greenID}
and control_time
<![CDATA[ <= ]]>
DATE_FORMAT(DATE_ADD(#{time},INTERVAL 5 MINUTE),'%Y-%m-%d %H:%i:%s') and control_time >= DATE_FORMAT(#{time}, '%Y-%m-%d %H:%i:%s')
and response_code = 200 )
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment