Commit dc3384a5 authored by duanruiming's avatar duanruiming

[add] AI路口失衡事件优化中状态优化

parent 4df3927b
...@@ -682,8 +682,9 @@ public class StrategyControlServiceImpl implements StrategyControlService { ...@@ -682,8 +682,9 @@ public class StrategyControlServiceImpl implements StrategyControlService {
Integer duration = Objects.nonNull(entity.getDuration()) ? entity.getDuration() : 0; Integer duration = Objects.nonNull(entity.getDuration()) ? entity.getDuration() : 0;
// 计算结束时间 // 计算结束时间
if (Objects.nonNull(issueTime)) { if (Objects.nonNull(issueTime)) {
if (Objects.equals(2, currentAlgo) && current.getTime() - issueTime.getTime() - duration * 1000 > 0) { if (Objects.equals(2, currentAlgo) && current.getTime() - issueTime.getTime() <= duration * 1000) {
currentAlgo = null; ext.setOptStatus("优化中");
ext.setOptMethod("均衡调控");
} else if (current.getTime() - issueTime.getTime() > 10 * 1000) { } else if (current.getTime() - issueTime.getTime() > 10 * 1000) {
currentAlgo = null; currentAlgo = null;
} }
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<select id="selectAICrossList" resultType="net.wanji.opt.synthesis.pojo.StrategyCrossResultEntity"> <select id="selectAICrossList" resultType="net.wanji.opt.synthesis.pojo.StrategyCrossResultEntity">
select t1.id as crossId, t1.name as crossName, t2.issue_time, t2.current_algo, t2.response_code, t1.location as responseContent from select t1.id as crossId, t1.name as crossName, t2.issue_time, t2.current_algo, t2.response_code, t1.location as responseContent, t2.duration from
(select id, name, location from t_base_cross_info where is_signal = 1) t1 (select id, name, location from t_base_cross_info where is_signal = 1) t1
left join (select t1.cross_id, t1.issue_time, t1.current_algo, t1.response_code from t_strategy_cross_result t1 left join (select t1.cross_id, t1.issue_time, t1.current_algo, t1.response_code, t1.duration from t_strategy_cross_result t1
inner join (select cross_id, max(issue_time) issue_time from t_strategy_cross_result where issue_time > CURDATE() group by cross_id) t3 inner join (select cross_id, max(issue_time) issue_time from t_strategy_cross_result where issue_time > CURDATE() group by cross_id) t3
on t1.cross_id = t3.cross_id and t1.issue_time = t3.issue_time where t1.issue_time > CURDATE()) t2 on t1.cross_id = t3.cross_id and t1.issue_time = t3.issue_time where t1.issue_time > CURDATE()) t2
on t1.id = t2.cross_id on t1.id = t2.cross_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment