Update

徐烜
1 parent fdc4287f
Showing 11 changed files with 290 additions and 3 deletions
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
src/main/java/com/bsth/repository/schedule/SchedulePlanRuleResultRepository.java
src/main/java/com/bsth/service/schedule/SchedulePlanRuleResultService.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanRuleResultServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleCalcuParam_input.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleResults_output.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleRule_input.java
src/main/resources/logback.xml
src/main/resources/rules/shiftloop_fb_2.drl
src/main/resources/test.txt
+package com.bsth.entity.schedule.temp;
+
+import com.bsth.entity.schedule.SchedulePlan;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * 排班的中间结果数据，记录每次排班后规则的变化。
+ */
+@Entity
+@Table(name = "bsth_c_s_sp_rule_rst")
+public class SchedulePlanRuleResult {
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 排班规则id */
+    private String ruleId;
+    /** 车辆配置id */
+    private String ccId;
+    /** 车辆自编号 */
+    private String ccZbh;
+
+    /** 路牌id列表字符串 */
+    private String gids;
+    /** 路牌名字列表字符串 */
+    private String gnames;
+    /** 翻到哪个路牌索引 */
+    private String gidindex;
+    /** 人员配置id列表字符串 */
+    private String ecids;
+    /** 人员配置搭班编码列表字符串 */
+    private String ecdbbms;
+    /** 翻到哪个人员配置索引 */
+    private String ecindex;
+
+    /** 排班日期 */
+    private Date scheduleDate;
+
+    /** 操作人员id */
+    private String sysuserId;
+    /** 操作人员姓名 */
+    private String sysuserName;
+    /** 操作时间 */
+    private Date createDate;
+
+    public SchedulePlanRuleResult() {
+
+    }
+    public SchedulePlanRuleResult(SchedulePlan schedulePlan) {
+        this.sysuserId = schedulePlan.getCreateBy().getId().toString();
+        this.sysuserName = schedulePlan.getCreateBy().getName();
+        this.createDate = schedulePlan.getCreateDate();
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(String ruleId) {
+        this.ruleId = ruleId;
+    }
+
+    public String getCcId() {
+        return ccId;
+    }
+
+    public void setCcId(String ccId) {
+        this.ccId = ccId;
+    }
+
+    public String getCcZbh() {
+        return ccZbh;
+    }
+
+    public void setCcZbh(String ccZbh) {
+        this.ccZbh = ccZbh;
+    }
+
+    public String getGids() {
+        return gids;
+    }
+
+    public void setGids(String gids) {
+        this.gids = gids;
+    }
+
+    public String getGnames() {
+        return gnames;
+    }
+
+    public void setGnames(String gnames) {
+        this.gnames = gnames;
+    }
+
+    public String getGidindex() {
+        return gidindex;
+    }
+
+    public void setGidindex(String gidindex) {
+        this.gidindex = gidindex;
+    }
+
+    public String getEcids() {
+        return ecids;
+    }
+
+    public void setEcids(String ecids) {
+        this.ecids = ecids;
+    }
+
+    public String getEcdbbms() {
+        return ecdbbms;
+    }
+
+    public void setEcdbbms(String ecdbbms) {
+        this.ecdbbms = ecdbbms;
+    }
+
+    public String getEcindex() {
+        return ecindex;
+    }
+
+    public void setEcindex(String ecindex) {
+        this.ecindex = ecindex;
+    }
+
+    public Date getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(Date scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    public String getSysuserId() {
+        return sysuserId;
+    }
+
+    public void setSysuserId(String sysuserId) {
+        this.sysuserId = sysuserId;
+    }
+
+    public String getSysuserName() {
+        return sysuserName;
+    }
+
+    public void setSysuserName(String sysuserName) {
+        this.sysuserName = sysuserName;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}
+package com.bsth.repository.schedule;
+
+import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by xu on 17/3/29.
+ */
+@Repository
+public interface SchedulePlanRuleResultRepository extends BaseRepository<SchedulePlanRuleResult, Long> {
+}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+
+/**
+ * Created by xu on 17/3/29.
+ */
+public interface SchedulePlanRuleResultService extends BService<SchedulePlanRuleResult, Long> {
+}
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+import com.bsth.service.schedule.SchedulePlanRuleResultService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by xu on 17/3/29.
+ */
+@Service
+public class SchedulePlanRuleResultServiceImpl extends BServiceImpl<SchedulePlanRuleResult, Long> implements SchedulePlanRuleResultService {
+}
@@ -6,6 +6,7 @@ import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.repository.BusinessRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.schedule.*;
+import com.bsth.service.schedule.SchedulePlanRuleResultService;
 import com.bsth.service.schedule.SchedulePlanService;
 import com.bsth.service.schedule.rules.plan.PlanCalcuParam_input;
 import com.bsth.service.schedule.rules.plan.PlanResult;
@@ -51,6 +52,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     private EmployeeConfigInfoRepository employeeConfigInfoRepository;
     @Autowired
     private BusinessRepository businessRepository;
+    @Autowired
+    private SchedulePlanRuleResultService schedulePlanRuleResultService;
     /** 日志记录器 */
     private Logger logger = LoggerFactory.getLogger(SchedulePlanServiceImpl.class);
@@ -229,6 +232,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         schedulePlan.getSchedulePlanInfoList().addAll(planResult.getSchedulePlanInfos());
         super.save(schedulePlan);
+        schedulePlanRuleResultService.bulkSave(scheduleResults_output.getSchedulePlanRuleResults());
+
         return new SchedulePlan();
     }
@@ -12,11 +12,16 @@ public class ScheduleCalcuParam_input {
     /** 结束计算日期 */
     private DateTime toDate;
+    /** 排班计划实体 */
+    private SchedulePlan schedulePlan;
+
     public ScheduleCalcuParam_input() {}
     public ScheduleCalcuParam_input(SchedulePlan schedulePlan) {
         this.fromDate = new DateTime((schedulePlan.getScheduleFromTime()));
         this.toDate = new DateTime((schedulePlan.getScheduleToTime()));
+
+        this.schedulePlan = schedulePlan;
     }
     public DateTime getFromDate() {
@@ -35,4 +40,11 @@ public class ScheduleCalcuParam_input {
         this.toDate = toDate;
     }
+    public SchedulePlan getSchedulePlan() {
+        return schedulePlan;
+    }
+
+    public void setSchedulePlan(SchedulePlan schedulePlan) {
+        this.schedulePlan = schedulePlan;
+    }
 }
 package com.bsth.service.schedule.rules.shiftloop;
+import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
 import org.apache.commons.lang3.StringUtils;
 import java.util.*;
@@ -11,6 +12,17 @@ public class ScheduleResults_output {
     /** 输出列表 */
     private List<ScheduleResult_output> results = new ArrayList<>();
+    /** 排班规则结果保存数据 */
+    private List<SchedulePlanRuleResult> schedulePlanRuleResults = new ArrayList<>();
+
+    public List<SchedulePlanRuleResult> getSchedulePlanRuleResults() {
+        return schedulePlanRuleResults;
+    }
+
+    public void setSchedulePlanRuleResults(List<SchedulePlanRuleResult> schedulePlanRuleResults) {
+        this.schedulePlanRuleResults = schedulePlanRuleResults;
+    }
+
     public List<ScheduleResult_output> getResults() {
         return results;
     }
@@ -36,6 +36,9 @@ public class ScheduleRule_input {
     /** 车辆翻版（周一到周日是否启用） */
     private List<Boolean> weekdays = new ArrayList<>();
+    /** 关联的原始规则 */
+    private ScheduleRule1Flat self;
+
     public ScheduleRule_input() {}
     public ScheduleRule_input(ScheduleRule1Flat scheduleRule1Flat) {
@@ -74,6 +77,8 @@ public class ScheduleRule_input {
                 weekdays.add(false);
             }
         }
+
+        this.self = scheduleRule1Flat;
     }
     public String getRuleId() {
@@ -147,4 +152,12 @@ public class ScheduleRule_input {
     public void setXlId(String xlId) {
         this.xlId = xlId;
     }
+
+    public ScheduleRule1Flat getSelf() {
+        return self;
+    }
+
+    public void setSelf(ScheduleRule1Flat self) {
+        this.self = self;
+    }
 }
@@ -155,6 +155,10 @@
 		<appender-ref ref="DATATOOLS" />
 	</logger>
+    <!--<logger name="org.hibernate.SQL" level="TRACE">-->
+        <!--<appender-ref ref="STDOUT" />-->
+    <!--</logger>-->
+
 	<!-- 日志输出级别 -->
 	<root level="info">
 		<appender-ref ref="STDOUT" />
@@ -10,6 +10,8 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+
 import org.slf4j.Logger;
 global Logger log;
@@ -167,6 +169,7 @@ end
 rule "Calcu_loop2_1_" // 路牌在时刻表中存在，就翻
     salience 800
     when
+        ScheduleCalcuParam_input($sp: schedulePlan)
         $cdrp: Calcu_days_result_pre(
             calcu_start_date_1.isEqual(calcu_end_date_1),
             calcu_start_date_2.isBefore(calcu_end_date_2) || calcu_start_date_2.isEqual(calcu_end_date_2),
@@ -182,7 +185,8 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
             $gids: guideboardIds,
             $eids: employeeConfigIds,
             $lprangesize : guideboardIds.size(),
-            $ryrangesize: employeeConfigIds.size()
+            $ryrangesize: employeeConfigIds.size(),
+            $srf: self
         )
         $liro: LpInfoResult_output(
             dateTime.isEqual($csd2),
@@ -203,6 +207,22 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
         $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+        // 保存排班规则循环结果 --> SchedulePlanRuleResult
+        SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
+        schedulePlanRuleResult.setRuleId($ruleId);
+        schedulePlanRuleResult.setCcId($cid);
+        schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
+        schedulePlanRuleResult.setGids($srf.getLpIds());
+        schedulePlanRuleResult.setGnames($srf.getLpNames());
+        schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
+        schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
+        schedulePlanRuleResult.setEcdbbms($srf.getRyDbbms());
+        schedulePlanRuleResult.setEcindex(String.valueOf($ryindex));
+        schedulePlanRuleResult.setScheduleDate($csd2.toDate());
+
+        scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
+
+
         log.info("Calcu_loop2_1_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
             $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
@@ -212,6 +232,7 @@ end
 rule "Calcu_loop2_2_" // 路牌在时刻表中不存在，就不翻
     salience 800
     when
+        ScheduleCalcuParam_input($sp: schedulePlan)
         $cdrp: Calcu_days_result_pre(
             calcu_start_date_1.isEqual(calcu_end_date_1),
             calcu_start_date_2.isBefore(calcu_end_date_2) || calcu_start_date_2.isEqual(calcu_end_date_2),
@@ -225,8 +246,8 @@ rule &quot;Calcu_loop2_2_&quot; // 路牌在时刻表中不存在，就不翻
             ruleId == $ruleId,
             $cid: carConfigId,
             $gids: guideboardIds,
-            $eids: employeeConfigIds
-
+            $eids: employeeConfigIds,
+            $srf: self
         )
     then
         ScheduleResult_output ro = new ScheduleResult_output();
@@ -240,6 +261,21 @@ rule &quot;Calcu_loop2_2_&quot; // 路牌在时刻表中不存在，就不翻
         $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+        // 保存排班规则循环结果 --> SchedulePlanRuleResult
+        SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
+        schedulePlanRuleResult.setRuleId($ruleId);
+        schedulePlanRuleResult.setCcId($cid);
+        schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
+        schedulePlanRuleResult.setGids($srf.getLpIds());
+        schedulePlanRuleResult.setGnames($srf.getLpNames());
+        schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
+        schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
+        schedulePlanRuleResult.setEcdbbms($srf.getRyDbbms());
+        schedulePlanRuleResult.setEcindex(String.valueOf($ryindex));
+        schedulePlanRuleResult.setScheduleDate($csd2.toDate());
+
+        scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
+
         log.info("Calcu_loop2_2_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
             $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);