Update

徐烜
1 parent 851fdf7c
Showing 7 changed files with 50 additions and 14 deletions
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/validate/ValidRepeatBcFunction.java
src/main/resources/rules/shiftloop_fb_2.drl
src/main/resources/rules/validplan.drl
src/test/resources/testdata/test6.txt
@@ -27,20 +27,22 @@ public class SchedulePlanRuleResult {
  
     /** 排班规则id */
     private String ruleId;
-    /** 启用日期 */
+    /** 启用日期（用于md5计算） */
     private Date qyrq;
     /** 车辆配置id */
     private String ccId;
     /** 车辆自编号 */
     private String ccZbh;
  
-    /** 路牌id列表字符串 */
+    /** 路牌id列表字符串（用于md5计算） */
     @Column(length = 1000)
     private String gids;
     /** 路牌名字列表字符串 */
     private String gnames;
     /** 翻到哪个路牌索引 */
     private String gidindex;
+    /** 原始的起始路牌索引（用于md5计算） */
+    private String origingidindex;
     /** 人员配置id列表字符串 */
     @Column(length = 1000)
     private String ecids;
@@ -81,8 +83,8 @@ public class SchedulePlanRuleResult {
                 "(xl_id,xl_name,rule_id,cc_id,cc_zbh," +
                 "gids,gnames,gidindex,ecids,ecdbbms,ecindex," +
                 "ttinfo_id,ttinfo_name,schedule_date," +
-                "sysuser_id,sysuser_name,create_date, qyrq) " +
-                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+                "sysuser_id,sysuser_name,create_date, qyrq, origingidindex) " +
+                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
  
         return sql;
     }
@@ -106,7 +108,7 @@ public class SchedulePlanRuleResult {
         ps.setString(16, this.getSysuserName());
         ps.setTimestamp(17, new java.sql.Timestamp(this.getCreateDate().getTime()));
         ps.setDate(18, new java.sql.Date(this.getQyrq().getTime()));
-
+        ps.setString(19, this.getOrigingidindex());
  
     }
  
@@ -261,4 +263,12 @@ public class SchedulePlanRuleResult {
     public void setQyrq(Date qyrq) {
         this.qyrq = qyrq;
     }
+
+    public String getOrigingidindex() {
+        return origingidindex;
+    }
+
+    public void setOrigingidindex(String origingidindex) {
+        this.origingidindex = origingidindex;
+    }
 }
@@ -358,6 +358,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 执行完毕销毁，有日志的也要关闭
         session.dispose();
  
+//        logger.info("错误总数={}", result.getInfos().size());
 //        for (ValidateResults_output.ValidInfo validInfo: result.getInfos()) {
 //            logger.info(validInfo.getDesc());
 //        }
@@ -119,6 +119,7 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
                 obj.setScheduleDate(rs.getDate("schedule_date"));
                 obj.setGidindex(rs.getString("gidindex"));
                 obj.setEcindex(rs.getString("ecindex"));
+                obj.setOrigingidindex(rs.getString("origingidindex"));
  
                 // 其他字段没用
                 return obj;
@@ -47,12 +47,14 @@ public class ValidRepeatBcFunction implements AccumulateFunction {
  
     @Override
     public Serializable createContext() {
+        System.out.println("create");
         return new RepeatBcInfo();
     }
  
     @Override
     public void init(Serializable serializable) throws Exception {
         // TODO：
+        System.out.println("init");
     }
  
     @Override
@@ -82,12 +84,20 @@ public class ValidRepeatBcFunction implements AccumulateFunction {
  
     @Override
     public boolean supportsReverse() {
-        return false;
+        return true;
     }
  
     @Override
-    public void reverse(Serializable serializable, Object o) throws Exception {
+    public void reverse(Serializable context, Object o) throws Exception {
+        RepeatBcInfo repeatBcInfo = (RepeatBcInfo) context;
+        SchedulePlanInfo schedulePlanInfo = (SchedulePlanInfo) o;
  
+        String key = schedulePlanInfo.getLp() + "_" + schedulePlanInfo.getFcsj();
+        repeatBcInfo.lpBcFcsjCount.remove(key);
+
+        if (!repeatBcInfo.validInfoList.isEmpty()) { // 全部清空
+            repeatBcInfo.validInfoList.clear();
+        }
     }
  
     @Override
@@ -88,7 +88,9 @@ rule &quot;calcu_days_1_&quot;
         String ruleMd5 = Md5Util.getMd5(
             String.valueOf($qyrq.getMillis()) +
             "_" +
-            $sri.getSelf().getLpIds()
+            $sri.getSelf().getLpIds() +
+            "_" +
+            $sri.getSelf().getLpStart().toString()
         );
         cdrp.setRuleMd5(ruleMd5);
         // 人员范围个数
@@ -136,7 +138,9 @@ rule &quot;calcu_days_2_&quot;
         String ruleMd5 = Md5Util.getMd5(
             String.valueOf($qyrq.getMillis()) +
             "_" +
-            $sri.getSelf().getLpIds()
+            $sri.getSelf().getLpIds() +
+            "_" +
+            $sri.getSelf().getLpStart().toString()
         );
         cdrp.setRuleMd5(ruleMd5);
         // 人员范围个数
@@ -187,7 +191,9 @@ rule &quot;Calcu_SchedulePlanRuleResult_wrap&quot;
         String md5 = Md5Util.getMd5(
             String.valueOf($sprr.getQyrq().getTime()) +
             "_" +
-            $sprr.getGids()
+            $sprr.getGids() +
+            "_" +
+            $sprr.getOrigingidindex()
         );
  
 //        System.out.println("修改后的md5：" + md5 + "车辆：" + $sprr.getCcZbh());
@@ -350,7 +356,7 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         schedulePlanRuleResult.setRuleId($ruleId);
         schedulePlanRuleResult.setCcId($cid);
         schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
-        schedulePlanRuleResult.setGids($srf.getLpIds());
+        schedulePlanRuleResult.setGids($srf.getLpIds()); // 参与md5计算
         schedulePlanRuleResult.setGnames($srf.getLpNames());
         schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
         schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
@@ -359,7 +365,8 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         schedulePlanRuleResult.setScheduleDate($csd2.toDate());
         schedulePlanRuleResult.setTtinfoId($ttinfoId);
         schedulePlanRuleResult.setTtinfoName($ttinfoName);
-        schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate());
+        schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate()); // 参与md5计算
+        schedulePlanRuleResult.setOrigingidindex(String.valueOf($sri.getSelf().getLpStart())); // 参与md5计算
  
         scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
  
@@ -46,11 +46,11 @@ rule &quot;Valid_repeat_bc&quot; // 验证是否存在重复班次
     when
         $lp: Loop_param($sd: start_date, $ed: end_date)
         eval($sd.isBefore($ed) || $sd.isEqual($ed))
-        $spiList: ArrayList() from collect (SchedulePlanInfo(scheduleDate.getTime() == $sd.millis))
+        $spiList: ArrayList() from collect (SchedulePlanInfo(scheduleDate.getTime() == $sd.getMillis()))
         $infos: ArrayList() from accumulate ($spi: SchedulePlanInfo() from $spiList, vrb($spi))
     then
         // TODO：
-//        log.info("日期={}，班次重复错误数={}", $sd, $infos.size());
+        log.info("日期={}，班次重复错误数={}", $sd, $infos.size());
  
         validResult.getInfos().addAll($infos);
  
@@ -7,6 +7,13 @@ update bsth_c_s_sp_rule_rst a
 set a.qyrq = (select qyrq from bsth_c_s_sr1_flat where id = a.rule_id)
 where a.qyrq is null;
  
+select * from bsth_c_s_sp_rule_rst
+where origingidindex is null;
+
+update bsth_c_s_sp_rule_rst a
+set a.origingidindex = (select lp_start from bsth_c_s_sr1_flat where id = a.rule_id)
+where a.origingidindex is null;
+
 970
 789
 604