1、修改排班计划规则验证逻辑，之前是验证自编号是否为空，现在改成规则中的车辆配置Id是否在该线路未作废的车辆配置中，具体查看相关drl

徐烜
1 parent f06e1baf
Showing 3 changed files with 35 additions and 16 deletions
src/main/java/com/bsth/service/schedule/impl/plan/kBase3/validate/rule/ErrorInfoFunction.java
src/main/java/com/bsth/service/schedule/impl/plan/kBase3/validate/rule/WrapInput.java
src/main/resources/rules/kBase3_validate_rule.drl
@@ -70,18 +70,26 @@ public class ErrorInfoFunction implements AccumulateFunction {
         ValidateRuleResult.ErrorInfo errorInfo = new ValidateRuleResult.ErrorInfo();
         errorInfo.setRuleId(wrapInput.getRuleId());
-        errorInfo.setClZbh(wrapInput.getClZbh());
+//        errorInfo.setClZbh(wrapInput.getClZbh());
         errorInfo.setQyrq(wrapInput.getQyrq());
-        // 1、车辆配置验证
-        if (StringUtils.isNotEmpty(wrapInput.getClZbh())) { // 自编号不能为空
-            if (wrapInput.getCcInfos().get(wrapInput.getClZbh()) == null) { // 车辆配置不在当前线路上
-                errorInfo.getErrorDescList().add("车辆配置不在当前线路，请重新编辑保存！");
-            }
+        // 1、车咯配置验证
+        if (wrapInput.getCcInfos().get(wrapInput.getCcId()) == null) {
+            errorInfo.setClZbh("未知的车咯配置 rule[id=" + wrapInput.getRuleId() + "]");
+            errorInfo.getErrorDescList().add("车辆配置不在当前线路，请重新编辑保存！");
         } else {
-            errorInfo.getErrorDescList().add("自编号不能为空，请重新编辑保存！");
+            errorInfo.setClZbh(wrapInput.getCcInfos().get(wrapInput.getCcId()).getCl().getInsideCode());
         }
+//        // 1、车辆配置验证
+//        if (StringUtils.isNotEmpty(wrapInput.getClZbh())) { // 自编号不能为空
+//            if (wrapInput.getCcInfos().get(wrapInput.getClZbh()) == null) { // 车辆配置不在当前线路上
+//                errorInfo.getErrorDescList().add("车辆配置不在当前线路，请重新编辑保存！");
+//            }
+//        } else {
+//            errorInfo.getErrorDescList().add("自编号不能为空，请重新编辑保存！");
+//        }
+
         // 2、路牌id，路牌名字，路牌起始索引验证
         if (StringUtils.isNotEmpty(wrapInput.getLpIds()) &&
                 StringUtils.isNotEmpty(wrapInput.getLpNames())) { // 冗余的路牌id和路牌名字都不能为空
@@ -16,6 +16,8 @@ public class WrapInput {
     private Integer xlId;
     /** 车辆自编号 */
     private String clZbh;
+    /** 车咯配置Id */
+    private Long ccId;
     /** 路牌id列表 */
     private String lpIds;
     /** 路牌名字列表 */
@@ -33,16 +35,17 @@ public class WrapInput {
     /** 启用日期 */
     private Date qyrq;
-    private Map<String, CarConfigInfo> ccInfos = new HashMap<>();
+    private Map<Long, CarConfigInfo> ccInfos = new HashMap<>();
     private Map<Long, GuideboardInfo> lpInfos = new HashMap<>();
     private Map<Long, EmployeeConfigInfo> ecInfos = new HashMap<>();
     public WrapInput(ScheduleRule1Flat r,
-                     Map<String, CarConfigInfo> cc,
+                     Map<Long, CarConfigInfo> cc,
                      Map<Long, GuideboardInfo> lp,
                      Map<Long, EmployeeConfigInfo> ec) {
         this.xlId = r.getXl().getId();
-        this.clZbh = r.getCarConfigInfo().getCl().getInsideCode();
+//        this.clZbh = r.getCarConfigInfo().getCl().getInsideCode();
+        this.ccId = r.getCarConfigInfo().getId();
         this.lpIds = r.getLpIds();
         this.lpNames = r.getLpNames();
         this.ecIds = r.getRyConfigIds();
@@ -136,6 +139,14 @@ public class WrapInput {
         this.ruleId = ruleId;
     }
+    public Long getCcId() {
+        return ccId;
+    }
+
+    public void setCcId(Long ccId) {
+        this.ccId = ccId;
+    }
+
     public Date getQyrq() {
         return qyrq;
     }
@@ -144,11 +155,11 @@ public class WrapInput {
         this.qyrq = qyrq;
     }
-    public Map<String, CarConfigInfo> getCcInfos() {
+    public Map<Long, CarConfigInfo> getCcInfos() {
         return ccInfos;
     }
-    public void setCcInfos(Map<String, CarConfigInfo> ccInfos) {
+    public void setCcInfos(Map<Long, CarConfigInfo> ccInfos) {
         this.ccInfos = ccInfos;
     }
@@ -38,10 +38,10 @@ global ValidateRuleResult result;
 //------------------ 第一阶段、车辆信息，路牌信息，人员信息载入 -----------------//
-// 1、车辆信息载入
+// 1、车辆配置信息载入
 declare CarConfig_Wraps
     xlId: Integer // 线路Id
-    ccMap: Map // 车辆配置Map Map<车辆自编号, CarConfigInfo>
+    ccMap: Map // 车辆配置Map Map<车咯配置Id, CarConfigInfo>
 end
 rule "calcu_CarConfig_Wraps"
@@ -58,13 +58,13 @@ rule &quot;calcu_CarConfig_Wraps&quot;
         for (int i = 0; i < ccInfos.size(); i++) {
             CarConfigInfo ccInfo = (CarConfigInfo) ccInfos.get(i);
             if (!ccInfo.getIsCancel()) {
-                carConfig_wraps.getCcMap().put(ccInfo.getCl().getInsideCode(), ccInfo);
+                carConfig_wraps.getCcMap().put(ccInfo.getId(), ccInfo);
             }
         }
         insert(carConfig_wraps);
-        LOG.info("第一阶段 --> 1、车辆信息载入 calcu_CarConfig_Wraps 有效配置车辆数={}", ccInfos.size());
+        LOG.info("第一阶段 --> 1、车辆配置信息载入 calcu_CarConfig_Wraps 有效配置车辆数={}", ccInfos.size());
 end
 // 2、路牌信息载入