[update] 方案管理-方案下发优化

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/ControlCommandStrategyServiceImpl.java

@@ -118,27 +118,6 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
     @Override
     @Transactional(rollbackFor = Exception.class)
     public JsonViewObject planSendStrategy(PlanSendVO planSendVO) throws Exception {
-        PlanSendVO.Plan plan = new PlanSendVO.Plan();
-        plan.setPlanNo("1");
-        plan.setPlanDescribe("date1111");
-
-        List<PlanSendVO.Plan.Section> sectionList = new ArrayList<>();
-        PlanSendVO.Plan.Section section = new PlanSendVO.Plan.Section();
-        section.setPatternNo("1");
-        section.setSectionNo("1");
-        section.setControlMode("4"); // runMode
-        section.setBeginTime("7:00");
-        section.setEndTime("18:00");
-        sectionList.add(section);
-        plan.setSectionList(sectionList);
-
-        List<PlanSendVO.Plan> plans = new ArrayList<>();
-        plans.add(plan);
-
-        planSendVO.setPlanList(plans);
-        planSendVO.setCrossCode("14Q1409IRF0");
-
-
         JsonViewObject jsonViewObject;
         String manufacturerIdCode = getManufacturerCodeByCrossId(planSendVO.getCrossCode());
         if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerIdCode)) {

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

@@ -110,6 +110,7 @@ public class HkPlanSectionServiceImpl implements HkPlanSectionService {
                         // 获取方案ID
                         Integer schemeNo = sectionPO.getPatternNo();
                         CrossSchemePO crossSchemePO = crossSchemeMapper.selectByCrossIdAndSchemeNo(crossId, schemeNo);
+                        if (Objects.nonNull(crossSchemePO)) {
                             Integer schemePOId = crossSchemePO.getId();
                             crossSectionPO.setScemeId(schemePOId);
                             // 写入数据库
@@ -120,4 +121,5 @@ public class HkPlanSectionServiceImpl implements HkPlanSectionService {
                 }
             }
         }
+    }
 }