[add] 优化查区间灯态

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

@@ -153,7 +153,7 @@ public class SignalStatusServiceImpl implements SignalStatusService {
                         }
                         Date date = new Date();
                         Long time = date.getTime();
-                        int offsetTime = (int) ((time - signalMachineStamp) / 1000) - 6; //37.12.182.29服务器比北京时间快6秒
+                        int offsetTime = (int) ((time - signalMachineStamp) / 1000); //37.12.182.29服务器比北京时间快6秒
                         int cycleCountDown = content.getCycleCountDown() - Math.max(offsetTime, 0);
                         int hiControlMode = content.getControlMode();
                         int period = content.getPeriod();

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

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

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

@@ -24,6 +24,6 @@ public interface SignalStatusService {
 
     List<LightsStatusVO> lightStatus(String crossId) throws Exception;
 
-    List<LightsStatusVO> lightStatusHist(String crossId, Integer batchTime) throws Exception;
+    List<LightsStatusVO> lightStatusHist(String crossId, Integer batchTime, Integer endBatchTime) throws Exception;
 
 }

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

@@ -174,18 +174,20 @@ public class SignalStatusServiceImpl implements SignalStatusService {
     }
 
     @Override
-    public List<LightsStatusVO> lightStatusHist(String crossId, Integer batchTime) throws Exception {
-        CrossLightsStatusHistPO entity = new CrossLightsStatusHistPO();
-        entity.setCrossId(crossId);
-        entity.setBatchTime(batchTime);
-        List<CrossLightsStatusHistPO> crossLightsStatusHistPOS = crossLightsStatusHistMapper.selectList(entity);
+    public List<LightsStatusVO> lightStatusHist(String crossId, Integer startBatchTime, Integer endBatchTime) throws Exception {
+        ArrayList<LightsStatusVO> 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();
-                return  instance.readValue(lightsStatusJson, new TypeReference<List<LightsStatusVO>>() {});
+                List<LightsStatusVO> lightsStatusVOS = instance.readValue(lightsStatusJson, new TypeReference<List<LightsStatusVO>>() {});
+                if (!CollectionUtils.isEmpty(lightsStatusVOS)) {
+                    LightsStatusVO lightsStatusVO = lightsStatusVOS.get(0);
+                    result.add(lightsStatusVO);
                 }
             }
-        return null;
+        }
+        return result;
     }
 }