[update] 信号机灯态->历史灯态返回结果更新

signal-utc-service/src/main/java/net/wanji/utc/controller/SignalStatusController.java

@@ -127,7 +127,7 @@ public class SignalStatusController {
             @ApiResponse(code = 200, message = "OK", response = LightsStatusVO.class)
     })
     public JsonViewObject lightStatusHist(String crossId, Integer startBatchTime, Integer endBatchTime) throws Exception {
-        List<LightsStatusVO> lightsStatusVOList = signalStatusService.lightStatusHist(crossId, startBatchTime, endBatchTime);
+        List<LightsStatusVO2> lightsStatusVOList = signalStatusService.lightStatusHist(crossId, startBatchTime, endBatchTime);
         return JsonViewObject.newInstance().success(lightsStatusVOList);
     }
 }

signal-utc-service/src/main/java/net/wanji/utc/service/runninginfo/SignalStatusService.java

@@ -2,6 +2,7 @@ package net.wanji.utc.service.runninginfo;
 
 import net.wanji.databus.po.SignalStatusLogPO;
 import net.wanji.databus.vo.LightsStatusVO;
+import net.wanji.databus.vo.LightsStatusVO2;
 
 import java.util.List;
 
@@ -23,6 +24,6 @@ public interface SignalStatusService {
     List<LightsStatusVO> lightStatus() throws Exception;
     List<LightsStatusVO> lightStatus4StaticScheme() throws Exception;
     List<LightsStatusVO> lightStatus(String crossId) throws Exception;
-    List<LightsStatusVO> lightStatusHist(String crossId, Integer batchTime, Integer endBatchTime) throws Exception;
+    List<LightsStatusVO2> lightStatusHist(String crossId, Integer batchTime, Integer endBatchTime) throws Exception;
 
 }

signal-utc-service/src/main/java/net/wanji/utc/service/runninginfo/impl/SignalStatusServiceImpl.java

@@ -16,6 +16,7 @@ import net.wanji.databus.po.ManufacturerInfoPO;
 import net.wanji.databus.po.SignalStatusLogPO;
 import net.wanji.databus.vo.BaseCrossInfo;
 import net.wanji.databus.vo.LightsStatusVO;
+import net.wanji.databus.vo.LightsStatusVO2;
 import net.wanji.utc.common.constant.Constants;
 import net.wanji.utc.common.constant.RedisKeyConst;
 import net.wanji.utc.common.typeenum.BasicEnum;
@@ -204,17 +205,16 @@ public class SignalStatusServiceImpl implements SignalStatusService {
     }
 
     @Override
-    public List<LightsStatusVO> lightStatusHist(String crossId, Integer startBatchTime, Integer endBatchTime) throws Exception {
-        ArrayList<LightsStatusVO> result = new ArrayList<>();
+    public List<LightsStatusVO2> lightStatusHist(String crossId, Integer startBatchTime, Integer endBatchTime) throws Exception {
+        List<LightsStatusVO2> result = new ArrayList<>();
         List<CrossLightsStatusHistPO> crossLightsStatusHistPOS = crossLightsStatusHistMapper.selectRangeList(crossId, startBatchTime, endBatchTime);
         if (!CollectionUtils.isEmpty(crossLightsStatusHistPOS)) {
             for (CrossLightsStatusHistPO crossLightsStatusHistPO : crossLightsStatusHistPOS) {
                 String lightsStatusJson = crossLightsStatusHistPO.getLightsStatusJson();
                 ObjectMapper instance = JacksonUtils.getInstance();
-                List<LightsStatusVO> lightsStatusVOS = instance.readValue(lightsStatusJson, new TypeReference<List<LightsStatusVO>>() {
-                });
+                List<LightsStatusVO2> lightsStatusVOS = instance.readValue(lightsStatusJson, new TypeReference<List<LightsStatusVO2>>() {});
                 if (!CollectionUtils.isEmpty(lightsStatusVOS)) {
-                    LightsStatusVO lightsStatusVO = lightsStatusVOS.get(0);
+                    LightsStatusVO2 lightsStatusVO = lightsStatusVOS.get(0);
                     result.add(lightsStatusVO);
                 }
             }