潘钊 / bsth_control · Commits

Commit c13b906b2388c35d4e7b5c0e5b167eeebc4576ca

Authored by 徐烜
1 parent 304d1a84
build: skipped

Update

Inline Side-by-side
Showing 3 changed files with 28 additions and 2 deletions
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
  View file @c13b906
... ... @@ -19,6 +19,11 @@ public class SchedulePlanRuleResult {
19 19 @GeneratedValue
20 20 private Long id;
21 21  
  22 + /** 线路id */
  23 + private String xlId;
  24 + /** 线路名字 */
  25 + private String xlName;
  26 +
22 27 /** 排班规则id */
23 28 private String ruleId;
24 29 /** 车辆配置id */
... ... @@ -55,7 +60,8 @@ public class SchedulePlanRuleResult {
55 60 public SchedulePlanRuleResult(SchedulePlan schedulePlan) {
56 61 this.sysuserId = schedulePlan.getCreateBy().getId().toString();
57 62 this.sysuserName = schedulePlan.getCreateBy().getName();
58   - this.createDate = schedulePlan.getCreateDate();
  63 +// this.createDate = schedulePlan.getCreateDate();
  64 + this.createDate = new Date();
59 65 }
60 66  
61 67 public Long getId() {
... ... @@ -169,4 +175,20 @@ public class SchedulePlanRuleResult {
169 175 public void setCreateDate(Date createDate) {
170 176 this.createDate = createDate;
171 177 }
  178 +
  179 + public String getXlId() {
  180 + return xlId;
  181 + }
  182 +
  183 + public void setXlId(String xlId) {
  184 + this.xlId = xlId;
  185 + }
  186 +
  187 + public String getXlName() {
  188 + return xlName;
  189 + }
  190 +
  191 + public void setXlName(String xlName) {
  192 + this.xlName = xlName;
  193 + }
172 194 }
... ...
src/main/resources/application-dev.properties
  View file @c13b906
... ... @@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
8 8 spring.jpa.database= MYSQL
9 9 spring.jpa.show-sql= true
10 10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
11   -spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  11 +spring.datasource.url= jdbc:mysql://127.0.0.1:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
12 12 spring.datasource.username= root
13 13 spring.datasource.password=
14 14 #DATASOURCE
... ...
src/main/resources/rules/shiftloop_fb_2.drl
  View file @c13b906
... ... @@ -209,6 +209,8 @@ rule "Calcu_loop2_1_" // 路牌在时刻表中存在，就翻
209 209  
210 210 // 保存排班规则循环结果 --> SchedulePlanRuleResult
211 211 SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
  212 + schedulePlanRuleResult.setXlId(String.valueOf($srf.getXl().getId()));
  213 + schedulePlanRuleResult.setXlName($srf.getXl().getName());
212 214 schedulePlanRuleResult.setRuleId($ruleId);
213 215 schedulePlanRuleResult.setCcId($cid);
214 216 schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
... ... @@ -263,6 +265,8 @@ rule "Calcu_loop2_2_" // 路牌在时刻表中不存在，就不翻
263 265  
264 266 // 保存排班规则循环结果 --> SchedulePlanRuleResult
265 267 SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
  268 + schedulePlanRuleResult.setXlId(String.valueOf($srf.getXl().getId()));
  269 + schedulePlanRuleResult.setXlName($srf.getXl().getName());
266 270 schedulePlanRuleResult.setRuleId($ruleId);
267 271 schedulePlanRuleResult.setCcId($cid);
268 272 schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
... ...