Merge remote-tracking branch 'origin/master'

wj-datacenter-service/src/main/java/net/wanji/datacenter/cache/CrossRidInfoCache.java

@@ -28,7 +28,7 @@ public class CrossRidInfoCache implements CommandLineRunner {
 
     public static RidInfoEntity getStartRidInfoEntity(String startCrossId, Integer inDir) {
         for (RidInfoEntity ridInfoEntity : ridInfoEntityList) {
-            if (StringUtils.equalsIgnoreCase(startCrossId, ridInfoEntity.getStartCrossId()) && Objects.equals(inDir, Integer.parseInt(ridInfoEntity.getId()))) {
+            if (StringUtils.equalsIgnoreCase(startCrossId, ridInfoEntity.getStartCrossId()) && Objects.equals(inDir, ridInfoEntity.getInDir())) {
                 return ridInfoEntity;
             }
         }

wj-datacenter-service/src/main/java/net/wanji/datacenter/service/impl/LanePeriodicDataProcessServiceImpl.java

@@ -663,9 +663,10 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
                         greenwaveHistPOS.add(greenwaveHistPO);
                         greenwaveRealtimeMapper.deleteOne(greenWaveId);
                     }
+                }if (!CollectionUtils.isEmpty(greenwaveHistPOS)) {
+                    greenwaveHistMapper.insertBatch(greenwaveHistPOS);
+                    greenwaveRealtimeMapper.insertBatch(greenwaveRealtimePOS);
                 }
-                greenwaveHistMapper.insertBatch(greenwaveHistPOS);
-                greenwaveRealtimeMapper.insertBatch(greenwaveRealtimePOS);
             }
         } catch (Exception e) {
             log.error("插入绿波实时历史表失败：", e);