[udpate] 优化远程路口信息返回结果处理

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import net.wanji.common.utils.tool.BeanListUtils;
+import net.wanji.common.utils.tool.BeanMapUtils;
+import net.wanji.common.utils.tool.CrossUtil;
 import net.wanji.feign.pojo.result.JsonViewObject;
 import net.wanji.feign.pojo.vo.CrossInfoOutVo;
 import net.wanji.feign.pojo.vo.CrossInfoVO;
@@ -14,7 +16,6 @@ import net.wanji.feign.pojo.vo.ManufacturerInfoOutVO;
 import net.wanji.feign.pojo.vo.ManufacturerVO;
 import net.wanji.feign.service.UtcFeignClients;
 import net.wanji.web.common.enums.*;
-import net.wanji.common.utils.tool.CrossUtil;
 import net.wanji.web.common.util.StringUtils;
 import net.wanji.web.dto.CrossIdNameDTO;
 import net.wanji.web.entity.*;
@@ -463,7 +464,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
             }
         }
 
-        List<JurisdictionAreaTreeVO> collect = resultList.stream().filter(jurisdictionAreaTreeVO -> jurisdictionAreaTreeVO.getChlidren() != null).collect(Collectors.toList());
+        List<JurisdictionAreaTreeVO> collect = resultList.stream().filter(vo -> StringUtils.equals("0", vo.getParentCode())).collect(Collectors.toList());
 
         return collect;
     }
@@ -679,9 +680,14 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             throw new Exception("远程调用UTC服务路口信息失败！");
         }
-        PageInfo<CrossInfoOutVo> content = (PageInfo<CrossInfoOutVo>) jsonViewObject.getContent();
-        List<CrossInfoOutVo> list = content.getList();
-        return list;
+        Map resultMap = (Map) jsonViewObject.getContent();
+        List<Map<String, Object>> list = (List<Map<String, Object>>) resultMap.get("list");
+        List<CrossInfoOutVo> resultList = new ArrayList<>(list.size());
+        for (Map<String, Object> map : list) {
+            CrossInfoOutVo crossInfoVOResult = BeanMapUtils.mapToBean(map, CrossInfoOutVo.class);
+            resultList.add(crossInfoVOResult);
+        }
+        return resultList;
     }
 
     /**