[update] 优化持久层

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

@@ -3,7 +3,7 @@ package net.wanji.web.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dao.mapper.BaseCrossInfoMapper;
-import net.wanji.databus.po.CrossInfoPO;
+import net.wanji.databus.po.BaseCrossInfoPO;
 import net.wanji.databus.po.TBaseCrossInfo;
 import net.wanji.databus.vo.CrossInfoVO;
 import net.wanji.web.common.enums.CrossTypeEnum;
@@ -48,9 +48,9 @@ public class CrossInfoService {
      * @param crossInfoVO 查询路口管理输入参数
      */
     public JsonViewObject selectAll(CrossInfoVO crossInfoVO) {
-        PageResultPO<CrossInfoPO> page = new PageResultPO<>();
+        PageResultPO<BaseCrossInfoPO> page = new PageResultPO<>();
         Integer count = baseCrossInfoMapper.countSelectAll(crossInfoVO);
-        List<CrossInfoPO> list = baseCrossInfoMapper.selectAll(crossInfoVO);
+        List<BaseCrossInfoPO> list = baseCrossInfoMapper.selectAll(crossInfoVO);
         page.setPageNum(crossInfoVO.getPageNum());
         page.setPageSize(crossInfoVO.getPageSize());
         page.setTotal(count);

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

 package net.wanji.web.service;
 
-import net.wanji.databus.po.CrossInfoPO;
+import net.wanji.databus.po.BaseCrossInfoPO;
 import net.wanji.databus.vo.CrossDeviceStatusInfoOutVO;
 import net.wanji.web.vo.situationDetection.*;
 
@@ -34,7 +34,7 @@ public interface SituationDetectionService {
 
     List<CrossDeviceStatusInfoOutVO> crossDeviceStatusInfo();
 
-    CrossInfoPO selectCrossInfoById(String signalId);
+    BaseCrossInfoPO selectCrossInfoById(String signalId);
 
     List<JurisdictionAreaTreeVO> jurisdictionTree(Integer areaId, Integer type) throws Exception;
 

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

@@ -12,7 +12,7 @@ import net.wanji.common.utils.tool.BeanListUtils;
 import net.wanji.common.utils.tool.BeanMapUtils;
 import net.wanji.common.utils.tool.CrossUtil;
 import net.wanji.databus.dao.mapper.BaseCrossInfoMapper;
-import net.wanji.databus.po.CrossInfoPO;
+import net.wanji.databus.po.BaseCrossInfoPO;
 import net.wanji.databus.po.TBaseCrossInfo;
 import net.wanji.databus.vo.*;
 import net.wanji.feign.service.UtcFeignClients;
@@ -403,7 +403,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
     }
 
     @Override
-    public CrossInfoPO selectCrossInfoById(String signalId) {
+    public BaseCrossInfoPO selectCrossInfoById(String signalId) {
         return tBaseBaseCrossInfoMapper.selectById(signalId);
     }
 

signal-control-service/src/main/java/net/wanji/web/task/CommonEventWarnTask.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.rest.JsonViewObject;
-import net.wanji.databus.po.CrossInfoPO;
+import net.wanji.databus.po.BaseCrossInfoPO;
 import net.wanji.feign.service.UtcFeignClients;
 import net.wanji.web.common.constant.Constant;
 import net.wanji.web.common.util.StringUtils;
@@ -105,7 +105,7 @@ public class  CommonEventWarnTask {
                 String crossName = "";
                 TDeviceStatusInfo tDeviceStatusInfo1 = new TDeviceStatusInfo();
                 if (StringUtils.isNotEmpty(crossId)) {
-                    CrossInfoPO tBaseCrossInfo = situationDetectionService.selectCrossInfoById(crossId);
+                    BaseCrossInfoPO tBaseCrossInfo = situationDetectionService.selectCrossInfoById(crossId);
                     if (Objects.nonNull(tBaseCrossInfo)) {
                         coordinate = tBaseCrossInfo.getLocation();
                     }

signal-control-service/src/main/java/net/wanji/web/task/SignalStatusTask.java

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.common.utils.tool.BeanMapUtils;
 import net.wanji.databus.dao.mapper.BaseCrossInfoMapper;
-import net.wanji.databus.po.CrossInfoPO;
+import net.wanji.databus.po.BaseCrossInfoPO;
 import net.wanji.databus.vo.SignalStatusVO;
 import net.wanji.feign.service.UtcFeignClients;
 import net.wanji.web.entity.TCrossControlHist;
@@ -52,14 +52,14 @@ public class SignalStatusTask {
             List<SignalStatusVO> content = BeanMapUtils.mapsToObjects(source, SignalStatusVO.class);
             List<String> crossIdList = content.stream().map(SignalStatusVO::getCrossId).collect(Collectors.toList());
             // 信号机状态信息
-            List<CrossInfoPO> crossInfoPOList = new ArrayList<>();
+            List<BaseCrossInfoPO> baseCrossInfoPOList = new ArrayList<>();
             if (!CollectionUtils.isEmpty(crossIdList)) {
-                crossInfoPOList = baseCrossInfoMapper.selectByCrossIds(crossIdList);
+                baseCrossInfoPOList = baseCrossInfoMapper.selectByCrossIds(crossIdList);
             }
-            List<CrossInfoPO> finalCrossInfoPOList = crossInfoPOList;
+            List<BaseCrossInfoPO> finalBaseCrossInfoPOList = baseCrossInfoPOList;
             content.forEach(signalStatusVO -> {
                 String crossId = signalStatusVO.getCrossId();
-                String name = getSignalName(finalCrossInfoPOList, crossId);
+                String name = getSignalName(finalBaseCrossInfoPOList, crossId);
                 Integer currentSignalStatus = signalStatusVO.getStatus() == null ? 0 : signalStatusVO.getStatus();
                 Integer currentFaultType = signalStatusVO.getFaultType() == null ? 0 : signalStatusVO.getFaultType();
                 // 信号机在线，但是故障，数据库状态为2
@@ -76,11 +76,11 @@ public class SignalStatusTask {
         }
     }
 
-    private static String getSignalName(List<CrossInfoPO> finalCrossInfoPOList, String crossId) {
+    private static String getSignalName(List<BaseCrossInfoPO> finalBaseCrossInfoPOList, String crossId) {
         String name = null;
-        for (CrossInfoPO crossInfoPO : finalCrossInfoPOList) {
-            if (StringUtils.equals(crossId, crossInfoPO.getId())) {
-                name = crossInfoPO.getName();
+        for (BaseCrossInfoPO baseCrossInfoPO : finalBaseCrossInfoPOList) {
+            if (StringUtils.equals(crossId, baseCrossInfoPO.getId())) {
+                name = baseCrossInfoPO.getName();
                 break;
             }
         }