[add] 路口事件列表

signal-optimize-service/src/main/java/net/wanji/opt/controller/signalopt/CrossIndexController.java

@@ -13,6 +13,7 @@ import net.wanji.opt.entity.GreenwaveHist;
 import net.wanji.opt.po.trend.HoloEventInfoPO;
 import net.wanji.opt.service.CrossIndexService;
 import net.wanji.opt.vo.AIOptResultVO;
+import net.wanji.opt.vo.CrossEventListPO;
 import net.wanji.opt.vo.CrossOptResult;
 import net.wanji.opt.vo.CrossStatusCountVO;
 import org.springframework.web.bind.annotation.*;
@@ -159,10 +160,10 @@ public class CrossIndexController {
             @ApiResponse(code = 200, message = "成功", response = GreenwaveHist.class,
                     responseHeaders = {@ResponseHeader(name = "Content-Type", description = "application/json")})
     })
-    public JsonViewObject findGreenWaveCrossTurnIndex() {
+    public JsonViewObject selectCrossEventList() {
         JsonViewObject jsonView = JsonViewObject.newInstance();
         try {
-            List<HoloEventInfoPO> list = crossIndexService.selectCrossEventList();
+            List<CrossEventListPO> list = crossIndexService.selectCrossEventList();
             jsonView.success(list);
         } catch (Exception e) {
             jsonView.fail(I18nResourceBundle.getConstants("GET_FAILED_MSG"));

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/HoloEventMapper.java

@@ -7,6 +7,7 @@ import net.wanji.opt.entity.EventAlarmInfo;
 import net.wanji.opt.po.base.EventStatisticPo;
 import net.wanji.opt.po.trend.EventInfoSimplePo;
 import net.wanji.opt.po.trend.HoloEventInfoPO;
+import net.wanji.opt.vo.CrossEventListPO;
 import org.springframework.stereotype.Repository;
 
 import java.util.Date;
@@ -26,7 +27,7 @@ public interface HoloEventMapper extends BaseMapper<HoloEventInfoPO> {
     List<HoloEventInfoPO> selectAIList(Date startTime);
 
     List<HoloEventInfoPO> selectAIGreenList(Date startTime);
-    List<HoloEventInfoPO> selectCrossEventList();
+    List<CrossEventListPO> selectCrossEventList();
 
     EventStatisticPo findCrossEventCount(Map<String,Object> params);
 

signal-optimize-service/src/main/java/net/wanji/opt/service/CrossIndexService.java

@@ -7,6 +7,7 @@ import net.wanji.databus.po.CrossDirStatusDataPO;
 import net.wanji.databus.po.TBaseCrossInfo;
 import net.wanji.opt.po.trend.HoloEventInfoPO;
 import net.wanji.opt.vo.AIOptResultVO;
+import net.wanji.opt.vo.CrossEventListPO;
 import net.wanji.opt.vo.CrossOptResult;
 import net.wanji.opt.vo.CrossStatusCountVO;
 
@@ -30,7 +31,7 @@ public interface CrossIndexService {
 
     List<CrossStatusCountVO> crossStatusCount(String crossId) throws Exception;
     HoloEventInfoPO crossEventDirTurn(String crossId) throws Exception;
-    List<HoloEventInfoPO> selectCrossEventList() throws Exception;
+    List<CrossEventListPO> selectCrossEventList() throws Exception;
 
     /**
      * @Description 查询据当前时间某小时的数据

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/CrossIndexServiceImpl.java

@@ -21,6 +21,7 @@ import net.wanji.opt.po.trend.HoloEventInfoPO;
 import net.wanji.opt.service.CrossIndexService;
 import net.wanji.opt.synthesis.pojo.StrategyCrossResultEntity;
 import net.wanji.opt.vo.AIOptResultVO;
+import net.wanji.opt.vo.CrossEventListPO;
 import net.wanji.opt.vo.CrossOptResult;
 import net.wanji.opt.vo.CrossStatusCountVO;
 import org.apache.curator.drivers.EventTrace;
@@ -250,8 +251,8 @@ public class CrossIndexServiceImpl implements CrossIndexService {
     }
 
     @Override
-    public List<HoloEventInfoPO> selectCrossEventList() throws Exception {
-        List<HoloEventInfoPO> holoEventInfoPOS = holoEventMapper.selectCrossEventList();
+    public List<CrossEventListPO> selectCrossEventList() throws Exception {
+        List<CrossEventListPO> holoEventInfoPOS = holoEventMapper.selectCrossEventList();
         return holoEventInfoPOS;
     }
 }

signal-optimize-service/src/main/resources/mapper/HoloEventMapper.xml

@@ -114,7 +114,7 @@
         LEFT JOIN t_cross_data_realtime t3
         ON t1.id = t3.cross_id
         where t1.is_signal = 1
-        order by t2.duration desc
+        order by t2.duration desc, trafficIndex desc
     </select>
     <!-- 查询路口未结束的报警状态 -->
     <select id="findNotFinishAlarmInfo" parameterType="String" resultMap="eventAlarm">