[update] 优化持久层

signal-optimize-service/src/main/java/net/wanji/opt/cache/CrossInfoCache.java

@@ -2,7 +2,7 @@ package net.wanji.opt.cache;
 
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.databus.dao.mapper.BaseCrossInfoMapper;
-import net.wanji.databus.po.CrossInfoPO;
+import net.wanji.databus.po.BaseCrossInfoPO;
 import net.wanji.databus.vo.CrossInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
@@ -24,14 +24,14 @@ public class CrossInfoCache implements CommandLineRunner {
     @Autowired
     private BaseCrossInfoMapper baseCrossInfoMapper;
 
-    private static final List<CrossInfoPO> crossInfoList = new ArrayList<>();
+    private static final List<BaseCrossInfoPO> crossInfoList = new ArrayList<>();
 
     /**
      * 获取所有路口信息
      *
      * @return
      */
-    public List<CrossInfoPO> getCrossInfoCache() {
+    public List<BaseCrossInfoPO> getCrossInfoCache() {
         return crossInfoList;
     }
 
@@ -41,7 +41,7 @@ public class CrossInfoCache implements CommandLineRunner {
      * @return
      */
     public List<String> getIsSignalCrossIdList() {
-        List<String> isSignalCrossIdList = crossInfoList.stream().filter(crossInfoPO -> crossInfoPO.getIsSignal() == 1).map(CrossInfoPO::getId).collect(Collectors.toList());
+        List<String> isSignalCrossIdList = crossInfoList.stream().filter(crossInfoPO -> crossInfoPO.getIsSignal() == 1).map(BaseCrossInfoPO::getId).collect(Collectors.toList());
         return isSignalCrossIdList;
     }
 
@@ -51,9 +51,9 @@ public class CrossInfoCache implements CommandLineRunner {
     }
 
     public void init () {
-        List<CrossInfoPO> crossInfoPOS = baseCrossInfoMapper.selectAll(new CrossInfoVO());
-        if (!CollectionUtils.isEmpty(crossInfoPOS)) {
-            crossInfoList.addAll(crossInfoPOS);
+        List<BaseCrossInfoPO> baseCrossInfoPOS = baseCrossInfoMapper.selectAll(new CrossInfoVO());
+        if (!CollectionUtils.isEmpty(baseCrossInfoPOS)) {
+            crossInfoList.addAll(baseCrossInfoPOS);
         }
     }
 }

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/TrendServiceImpl.java

@@ -13,7 +13,7 @@ import net.wanji.databus.dao.entity.RidInfoEntity;
 import net.wanji.databus.dao.mapper.*;
 import net.wanji.databus.po.CrossDataRealtimePO;
 import net.wanji.databus.po.CrossDirDataHistPO;
-import net.wanji.databus.po.CrossInfoPO;
+import net.wanji.databus.po.BaseCrossInfoPO;
 import net.wanji.databus.po.CrossTurnDataRealtimePO;
 import net.wanji.databus.po.TBaseCrossInfo;
 import net.wanji.databus.vo.AbnormalCrossListVO;
@@ -398,12 +398,12 @@ public class TrendServiceImpl implements TrendService {
         List<GreenwaveListVO.CrossListElement> crossList = new ArrayList<>();
         List<String> crossIdList = greenwaveInfoMapper.selectCrossIdsById(greenwaveId);
         if (CollectionUtil.isNotEmpty(crossIdList)) {
-            List<CrossInfoPO> crossInfoPOList = baseCrossInfoMapper.selectByCrossIds(crossIdList);
-            for (CrossInfoPO crossInfoPO : crossInfoPOList) {
+            List<BaseCrossInfoPO> baseCrossInfoPOList = baseCrossInfoMapper.selectByCrossIds(crossIdList);
+            for (BaseCrossInfoPO baseCrossInfoPO : baseCrossInfoPOList) {
                 GreenwaveListVO.CrossListElement crossListElement = new GreenwaveListVO.CrossListElement();
-                crossListElement.setCrossId(crossInfoPO.getId());
-                crossListElement.setName(crossInfoPO.getName());
-                List<Double> location = buildLocation(crossInfoPO);
+                crossListElement.setCrossId(baseCrossInfoPO.getId());
+                crossListElement.setName(baseCrossInfoPO.getName());
+                List<Double> location = buildLocation(baseCrossInfoPO);
                 crossListElement.setLocation(location);
 
                 crossList.add(crossListElement);
@@ -412,8 +412,8 @@ public class TrendServiceImpl implements TrendService {
         return crossList;
     }
 
-    private List<Double> buildLocation(CrossInfoPO crossInfoPO) {
-        String location = crossInfoPO.getLocation();
+    private List<Double> buildLocation(BaseCrossInfoPO baseCrossInfoPO) {
+        String location = baseCrossInfoPO.getLocation();
         double[] lonLat = CrossUtil.getLonLat(location);
         List<Double> res = new ArrayList<>();
         res.add(lonLat[0]);