[update] 逻辑优化

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

@@ -28,6 +28,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.validation.constraints.NotNull;
 import java.text.SimpleDateFormat;
@@ -352,7 +353,7 @@ public class PlanSendServiceImpl implements PlanSendService {
     }
 
     @Override
-//    @Transactional
+    @Transactional
     public JsonViewObject syncScheme(CrossIdDTO crossIdDTO) throws Exception {
         String crossId = crossIdDTO.getCrossId();
         CrossIdVO crossIdVO = new CrossIdVO();
@@ -382,7 +383,9 @@ public class PlanSendServiceImpl implements PlanSendService {
             // 保存旧方案ID
             List<Integer> oldSchemeIds = baseCrossSchemeList.stream().map(BaseCrossSchemePO::getId).collect(Collectors.toList());
             // 保存新方案ID
-            baseCrossSchemeMapper.insertBatch(baseCrossSchemeList);
+            if (!CollectionUtils.isEmpty(baseCrossSchemeList)) {
+                baseCrossSchemeMapper.insertBatch(baseCrossSchemeList);
+            }
 
             List<Integer> newSchemeIds = baseCrossSchemeList.stream().map(BaseCrossSchemePO::getId).collect(Collectors.toList());
             // 生成新旧方案ID映射
@@ -418,7 +421,9 @@ public class PlanSendServiceImpl implements PlanSendService {
             TreeSet<BaseCrossLightsPO> crossLightsSet = distinctLightsNo(baseCrossLightsPOS);
             // 修改灯组数据内容
             changeLightsType(crossLightsSet);
-            baseCrossLightsMapper.insertBatch(crossLightsSet);
+            if (!CollectionUtils.isEmpty(crossLightsSet)) {
+                baseCrossLightsMapper.insertBatch(crossLightsSet);
+            }
 
             baseCrossPhaseLightsMapper.deleteByCrossId(crossId);
             baseCrossLaneLightsMapper.deleteByCrossId(crossId);

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/StaticInfoServiceImpl.java

@@ -100,7 +100,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
         } else {
             // todo 其他厂商
             // 默认万集标准服务
-//            wanjiCommonStaticInfoService.schemePhaseLights(crossId, crossCode);
+            wanjiCommonStaticInfoService.schemePhaseLights(crossId, crossCode);
         }
     }