[update] 重命名，实体类冲突

signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java

@@ -423,7 +423,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         LambdaQueryWrapper<TBaseCrossInfo> crossInfoQuery = new LambdaQueryWrapper<>();
         List<TBaseCrossInfo> tBaseCrossInfos = tBaseCrossInfoMapper.selectList(crossInfoQuery);
 
-        List<CrossInfoOutVo> crossInfoOutVoList = getCrossInfoOutVoList(new CrossInfoVO());
+        List<CrossInfoOutVo> crossInfoOutVoList = getCrossInfoOutVoList(new CrossInfoPageVO());
 
         getJurisdictionAreaTreeVO(resultList, tBaseAreaInfos, tBaseAreaCrosses, tBaseCrossInfos, crossInfoOutVoList);
 
@@ -574,7 +574,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         LambdaQueryWrapper<TDeviceStatusLog> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.ne(TDeviceStatusLog::getFaultType, 0);
         List<TDeviceStatusLog> tDeviceStatusLogs = tDeviceStatusLogMapper.selectList(queryWrapper);
-        List<CrossInfoOutVo> crossInfoOutVoList = getCrossInfoOutVoList(new CrossInfoVO());
+        List<CrossInfoOutVo> crossInfoOutVoList = getCrossInfoOutVoList(new CrossInfoPageVO());
 
         List<SignalFaultInfoVO> signalFaultInfoVOS = new ArrayList<>(tDeviceStatusLogs.size());
         tDeviceStatusLogs.forEach(tDeviceStatusLog -> {
@@ -700,7 +700,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         List<SignalManufacturerCountInfoVO> resultList = new ArrayList<>();
 
         List<ManufacturerInfoOutVO> manufacturerInfoOutVOList = getManufacturerInfoOutVOList(new ManufacturerVO());
-        List<CrossInfoOutVo> crossInfoOutVoList = getCrossInfoOutVoList(new CrossInfoVO());
+        List<CrossInfoOutVo> crossInfoOutVoList = getCrossInfoOutVoList(new CrossInfoPageVO());
 
         // key:crossId value:nickName
         Map<String, List<String>> nickNameCrossIdMap = getCrossIdNickNameMap(manufacturerInfoOutVOList, crossInfoOutVoList);
@@ -759,12 +759,12 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
     /**
      * 通过utcFeignClients获取信号机详细信息
      *
-     * @param crossInfoVO
+     * @param crossInfoPageVO
      * @return List<CrossInfoOutVo>
      * @throws Exception
      */
-    private List<CrossInfoOutVo> getCrossInfoOutVoList(CrossInfoVO crossInfoVO) throws Exception {
-        JsonViewObject jsonViewObject = utcFeignClients.listCrossInfo(crossInfoVO);
+    private List<CrossInfoOutVo> getCrossInfoOutVoList(CrossInfoPageVO crossInfoPageVO) throws Exception {
+        JsonViewObject jsonViewObject = utcFeignClients.listCrossInfo(crossInfoPageVO);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             throw new Exception("远程调用UTC服务路口信息失败！");
         }