Skip to content

T
traffic-signal-platform
Commit 3ddf29dc authored by zhoushiguang's avatar zhoushiguang
Browse files
Options

事件报警

parent 1db82380
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 35 deletions
signal-optimize-service/src/main/java/net/wanji/opt/controller/EventController.java
View file @ 3ddf29dc
......@@ -95,19 +95,20 @@ public class EventController {
@GetMapping("/getAlarmInfo")
@ApiOperation(hidden = false, value = "事件报警", notes = "", produces = "application/json")
@ApiImplicitParams({
@ApiImplicitParam(name = "greenId", value = "绿波编号，指定干线编号时查询干线相关事件", required = false, dataType = "String"),
@ApiImplicitParam(name = "crossId", value = "路口编号，指定路口编号时查询路口相关事件", required = false, dataType = "String"),
@ApiImplicitParam(name = "type", value = "为1查询最近实时30条，为空时查询当天历史", required = false, dataType = "String")
@ApiImplicitParam(name = "timeScope", value = "时间范围：为1查询最近实时30条，为空时查询当天历史", required = false, dataType = "String"),
@ApiImplicitParam(name = "eventType", value = "事件类型，701：空放 702：失衡 703：溢出 705：干线缓行 706：干线拥堵 707：路口拥堵", required = false, dataType = "String"),
@ApiImplicitParam(name = "name", value = "按名称模糊查询", required = false, dataType = "String"),
}
)
@ApiResponses({
@ApiResponse(code = 200, message = "成功", response = EventAlarmInfo.class,
responseHeaders = {@ResponseHeader(name = "Content-Type", description = "application/json")})
})
public JsonViewObject list(@RequestParam(defaultValue = "") Integer greenId, @RequestParam(defaultValue = "") String crossId , @RequestParam(defaultValue = "") String type) {
public JsonViewObject list(@RequestParam(defaultValue = "") String timeScope, @RequestParam(defaultValue = "") String eventType , @RequestParam(defaultValue = "") String name) {
try {
JsonViewObject jsonViewObject = JsonViewObject.newInstance();
List<EventAlarmInfo> eventAlarmInfo = eventService.findEventAlarmInfo(greenId,crossId,type);
List<EventAlarmInfo> eventAlarmInfo = eventService.findEventAlarmInfo(timeScope,eventType,name);
return jsonViewObject.success(eventAlarmInfo);
} catch (Exception e) {
log.error("", e);
......
signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/HoloEventMapper.java
View file @ 3ddf29dc
......@@ -31,6 +31,6 @@ public interface HoloEventMapper extends BaseMapper<HoloEventInfoPO> {
List<EventInfoSimplePo> findEventDistribute(Map<String,Object> params);
List<EventAlarmInfo> findEventAlarmInfo(@Param(value = "greenId") Integer greenId , @Param(value = "crossId") String crossId, @Param(value = "type") String type );
List<EventAlarmInfo> findEventAlarmInfo(String timeScope,String eventType,String name);
}
signal-optimize-service/src/main/java/net/wanji/opt/service/EventService.java
View file @ 3ddf29dc
......@@ -79,5 +79,5 @@ public interface EventService {
* @return
* @throws DubboProviderException
*/
List<EventAlarmInfo> findEventAlarmInfo(Integer greenId, String crossId, String type) throws DubboProviderException;
List<EventAlarmInfo> findEventAlarmInfo(String timeScope,String eventType,String name) throws DubboProviderException;
}
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/EventServiceImpl.java
View file @ 3ddf29dc
......@@ -225,9 +225,9 @@ public class EventServiceImpl implements EventService {
}
});
});
List<EventInfoSimplePo> sortList = tmpList.stream().sorted(Comparator.comparing(o->o.getStartTime())).collect(Collectors.toList());
List<EventInfoSimplePo> sortList = tmpList.stream().sorted(Comparator.comparing(o -> o.getStartTime())).collect(Collectors.toList());
sortList.forEach(po -> {
String axis = DateUtil.formatDate(po.getStartTime(), "M/d") + "," + DateUtil.formatDate(po.getStartTime(), "HH:mm:ss") +","+ po.getEventType();
String axis = DateUtil.formatDate(po.getStartTime(), "M/d") + "," + DateUtil.formatDate(po.getStartTime(), "HH:mm:ss") + "," + po.getEventType();
dataserList.add(axis);
});
Map<String, Object> map = new HashMap<>();
......@@ -251,9 +251,9 @@ public class EventServiceImpl implements EventService {
}
@Override
public List<EventAlarmInfo> findEventAlarmInfo(Integer greenId, String crossId, String type) throws DubboProviderException {
public List<EventAlarmInfo> findEventAlarmInfo(String timeScope, String eventType, String name) throws DubboProviderException {
//获取数据库数据
List<EventAlarmInfo> eventAlarmInfo = holoEventMapper.findEventAlarmInfo(greenId,crossId,type);
List<EventAlarmInfo> eventAlarmInfo = holoEventMapper.findEventAlarmInfo(timeScope, eventType, name);
return eventAlarmInfo;
}
......
signal-optimize-service/src/main/resources/mapper/HoloEventMapper.xml
View file @ 3ddf29dc
......@@ -106,38 +106,32 @@
( <!-- 查询未结束事件b.alarm_status in (0,1,2) -->
select b.green_id ,b.cross_id , b.cross_name , DATE_FORMAT(b.issue_time,'%H:%i') as issue_time ,b.current_algo ,b.wkt ,
case b.alarm_status when 0 then '未处理' when 1 then '分析中' when 2 then '优化中' end as type, b.opt_status,
case when b.issue_time > DATE_SUB(NOW(), INTERVAL 1 MINUTE) then '1' else '0' end as new_recoder, 1 as type2
case when b.issue_time > DATE_SUB(NOW(), INTERVAL 1 MINUTE) then '1' else '0' end as new_recoder, 1 as type2,b.event_type
from
(
<!-- 查询路口事件 -->
select a.green_id,a.cross_id,c.name as cross_name , a.start_time as issue_time, b.label as current_algo, SUBSTRING(c.location FROM 7 FOR 20) as wkt,a.alarm_status,a.opt_status
select a.type as event_type,a.green_id,a.cross_id,c.name as cross_name , a.start_time as issue_time, b.label as current_algo, SUBSTRING(c.location FROM 7 FOR 20) as wkt,a.alarm_status,a.opt_status
from t_event_info a
left join (select a.event_type, a.label from t_config_event_category a where a.category = 4) b on a.type = b.event_type
left join t_base_cross_info c on a.cross_id = c.id
where a.type in (701,702,703,707) and DATE(a.start_time) = CURDATE()
union
<!-- 查询干线事件 -->
select a.green_id,a.cross_id,c.name as cross_name , a.start_time as issue_time, b.label as current_algo, c.wkt,a.alarm_status,a.opt_status
select a.type as event_type,a.green_id,a.cross_id,c.name as cross_name , a.start_time as issue_time, b.label as current_algo, c.wkt,a.alarm_status,a.opt_status
from t_event_info a
left join (select a.event_type, a.label from t_config_event_category a where a.category = 4) b on a.type = b.event_type
left join t_greenwave_info c on a.green_id = c.id
where a.type in (705,706) and DATE(a.start_time) = CURDATE()
) b where b.alarm_status in (0,1,2)
<if test= "greenId != null and greenId != '' ">
and b.green_id = #{greenId}
</if>
<if test= "crossId != null and crossId != '' ">
and b.cross_id = #{crossId}
</if>
order by b.issue_time desc
)
union
( <!-- 查询事件结束b.alarm_status in (3,4) -->
select b.green_id ,b.cross_id , b.cross_name , b.issue_time ,b.current_algo ,b.wkt ,
'已结束' as type, b.opt_status,'0' as new_recoder, 2 as type2
'已结束' as type, b.opt_status,'0' as new_recoder, 2 as type2,b.event_type
from
( <!-- 查询路口空放、失衡、溢出、拥堵事件 -->
select a.green_id,a.cross_id,c.name as cross_name , DATE_FORMAT(a.start_time,'%H:%i') as issue_time, b.label as current_algo, SUBSTRING(c.location FROM 7 FOR 20) as wkt,
select a.type as event_type,a.green_id,a.cross_id,c.name as cross_name , DATE_FORMAT(a.start_time,'%H:%i') as issue_time, b.label as current_algo, SUBSTRING(c.location FROM 7 FOR 20) as wkt,
a.alarm_status ,a.opt_status
from t_event_info a
left join (select a.event_type, a.label from t_config_event_category a where a.category = 4) b on a.type = b.event_type
......@@ -145,28 +139,27 @@
where a.type in (701,702,703,707) and DATE(a.start_time) = CURDATE()
union
<!-- 查询干线事件缓行、拥堵事件 -->
select a.green_id,a.cross_id,c.name as cross_name , DATE_FORMAT(a.start_time,'%H:%i') as issue_time, b.label as current_algo, c.wkt,a.alarm_status ,a.opt_status
select a.type as event_type,a.green_id,a.cross_id,c.name as cross_name , DATE_FORMAT(a.start_time,'%H:%i') as issue_time, b.label as current_algo, c.wkt,a.alarm_status ,a.opt_status
from t_event_info a
left join (select a.event_type, a.label from t_config_event_category a where a.category = 4 ) b on a.type = b.event_type
left join t_greenwave_info c on a.green_id = c.id
where a.type in (705,706) and DATE(a.start_time) = CURDATE()
) b
where b.alarm_status in (3,4)
<if test= "greenId != null and greenId != '' ">
and b.green_id = #{greenId}
</if>
<if test= "crossId != null and crossId != '' ">
and b.cross_id = #{crossId}
</if>
order by b.issue_time desc
<if test="type != null and type != '' ">
LIMIT 30
</if>
)
ORDER BY type2,issue_time desc
) d
where 1=1
<if test= "name != null and name != '' ">
and instr(d.cross_name,#{name})>0
</if>
<if test= "eventType != null and eventType != '' ">
and d.event_type = #{eventType}
</if>
<if test="timeScope != null and timeScope != '' ">
LIMIT 30
</if>
</select>
......
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