Merge branch 'master' of http://222.66.0.204:8090/panzhaov5/bsth_control

潘钊
2 parents 604b28c2 e480b016
Showing 5 changed files with 39 additions and 22 deletions
src/main/resources/datatools/config-dev.properties
src/main/resources/rules/shiftloop.drl
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableManage.js
src/test/java/com/bsth/service/schedule/rules/DroolsRulesTest.java
@@ -12,11 +12,11 @@ datatools.kettle_properties=/datatools/kettle.properties
 ##------------------ ktr通用变量 ------------------
 #数据库ip地址
-datatools.kvars_dbip=192.168.168.201
+datatools.kvars_dbip=192.168.168.171
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-datatools.kvars_dbpwd=123456
+datatools.kvars_dbpwd=root2jsp
 # 以下是封装数据导入导出逻辑的ktr转换文件，类路径，以后考虑放到数据库中
 # 测试temp的ktr转换文件
@@ -40,12 +40,12 @@ rule &quot;calcu_days_1&quot;
         Period p1 = new Period($qyrq, $fromDate, PeriodType.days());
         cdr.setQyrq_days(p1.getDays());
         Period p2 = new Period($fromDate, $toDate, PeriodType.days());
-        cdr.setSdays(p2.getDays());
+        cdr.setSdays(p2.getDays() + 1);
         cdr.setCalcu_start_date($fromDate);
         cdr.setCalcu_end_date($toDate);
-        System.out.println("qyrq_days=" + p1.getDays());
-        System.out.println("sdays=" + p2.getDays());
+        System.out.println("开始日期离启用日期的天数 qyrq_days=" + p1.getDays());
+        System.out.println("总共需要排班的天数 sdays=" + (p2.getDays() + 1));
         insert(cdr); // 插入fact数据，进入下一个阶段
 end
@@ -66,8 +66,8 @@ rule &quot;calcu_days_2&quot;
         cdr.setCalcu_start_date($qyrq);
         cdr.setCalcu_end_date($toDate);
-        System.out.println("qyrq_days=0");
-        System.out.println("sdays=" + p2.getDays());
+        System.out.println("开始日期离启用日期的天数 qyrq_days=0");
+        System.out.println("总共需要排班的天数 sdays=" + (p2.getDays() + 1));
         insert(cdr); // 插入fact数据，进入下一个阶段
 end
@@ -87,7 +87,8 @@ end
 //        int temp = rangsize - 1 - oindex;
 //        int days_temp = days - temp;
 //        if (days_temp <= 0) {
-//            return oindex + days_temp;
+//            //return oindex + days_temp;
+//            return oindex + days;
 //        } else {
 //            int s_value = (int) (days_temp / rangsize); // 商
 //            int y_value = days_temp % rangsize; // 余
@@ -155,12 +156,13 @@ rule &quot;calcu_guideboard_index_2_1_result&quot;
     when
         $calcu_days_result : Calcu_days_result($ruleId: ruleId, qyrq_days > 0)
         $param1 : Calcu_guideboard_index_param_1(ruleId == $ruleId,
-            $oindex : oindex,
+            $oindex : oindex, $range_size : range_size,
             $days_temp : days_temp, days_temp <= 0)
     then
         Calcu_guideboard_index_result cgir = new Calcu_guideboard_index_result();
         cgir.setRuleId($ruleId);
-        cgir.setCalcu_index($oindex + $days_temp);
+//        cgir.setCalcu_index($oindex + $days_temp);
+        cgir.setCalcu_index($range_size - 1 + $days_temp);
         System.out.println("guideboard ruleId=" + $ruleId + ", calcu_index=" + cgir.getCalcu_index());
@@ -266,12 +268,13 @@ rule &quot;calcu_employee_index_2_1_result&quot;
     when
         $calcu_days_result : Calcu_days_result($ruleId: ruleId, qyrq_days > 0)
         $param1 : Calcu_employee_index_param_1(ruleId == $ruleId,
-            $oindex : oindex,
+            $oindex : oindex, $range_size : range_size,
             $days_temp : days_temp, days_temp <= 0)
     then
         Calcu_employee_index_result cgir = new Calcu_employee_index_result();
         cgir.setRuleId($ruleId);
-        cgir.setCalcu_index($oindex + $days_temp);
+//        cgir.setCalcu_index($oindex + $days_temp);
+        cgir.setCalcu_index($range_size - 1 + $days_temp);
         System.out.println("employee ruleId=" + $ruleId + ", calcu_index=" + cgir.getCalcu_index());
@@ -6,8 +6,8 @@
                 <th style="width: 5%;">序号</th>
                 <th style="width: 15%;">线路</th>
                 <th style="width: 15%;">修改时间</th>
-                <th style="width: 12%;">启用日期</th>
-                <th>车辆</th>
+                <th style="width: 10%;">启用日期</th>
+                <th style="width: 10%;">车辆</th>
                 <th>翻版模式</th>
                 <th>起始路牌</th>
                 <th>路牌范围</th>
@@ -189,7 +189,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableManageListCtrl&#39;, [&#39;TimeTableM
         // 时刻表名称
         var ttinfoname = self.pageInfo.infos[$index]["name"];
         // 停车场名称（TODO：暂时写死）
-        var tccname = "江南旅游服务有限公司浦西停车保养场";
+        var tccname = "东川路地铁站停车场";
         // large方式弹出模态对话框
         var modalInstance = $uibModal.open({
@@ -64,21 +64,35 @@ public class DroolsRulesTest {
         // 2、创建fact对象
         ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input();
-        scheduleCalcuParam_input.setFromDate(new DateTime(2016, 1, 1, 0, 0));
-        scheduleCalcuParam_input.setToDate(new DateTime(2016, 1, 17, 0, 0));
+        scheduleCalcuParam_input.setFromDate(new DateTime(2016, 7, 1, 0, 0));
+        scheduleCalcuParam_input.setToDate(new DateTime(2016, 7, 31, 0, 0));
         scheduleCalcuParam_input.setTtinfoId(1L);
         ScheduleRule_input scheduleRule_input1 = new ScheduleRule_input();
         scheduleRule_input1.setRuleId(1L);
-        scheduleRule_input1.setQyrq(new DateTime(2015, 12, 21, 0, 0));
-        scheduleRule_input1.getGuideboardIds().addAll(Arrays.asList(1L, 2L, 3L, 4L));
-        scheduleRule_input1.setStartGbdIndex(2);
-        scheduleRule_input1.getEmployeeConfigIds().addAll(Arrays.asList(1L, 2L));
-        scheduleRule_input1.setStartEIndex(0);
+        scheduleRule_input1.setQyrq(new DateTime(2016, 6, 12, 0, 0));
+        scheduleRule_input1.getGuideboardIds().addAll(Arrays.asList(
+                1L, 1L, 2L, 2L, 3L, 3L, 4L, 4L, 5L, 5L, 6L, 6L, 7L, 7L, 8L, 8L, 9L, 9L, 10L, 10L,
+                11L, 11L, 12L, 12L, 13L, 13L));
+        scheduleRule_input1.setStartGbdIndex(3);
+        scheduleRule_input1.getEmployeeConfigIds().addAll(Arrays.asList(7L, 8L));
+        scheduleRule_input1.setStartEIndex(1);
         scheduleRule_input1.setCarConfigId(1L);
+        ScheduleRule_input scheduleRule_input2 = new ScheduleRule_input();
+        scheduleRule_input2.setRuleId(2L);
+        scheduleRule_input2.setQyrq(new DateTime(2016, 6, 12, 0, 0));
+        scheduleRule_input2.getGuideboardIds().addAll(Arrays.asList(
+                1L, 1L, 2L, 2L, 3L, 3L, 4L, 4L, 5L, 5L, 6L, 6L, 7L, 7L, 8L, 8L, 9L, 9L, 10L, 10L,
+                11L, 11L, 12L, 12L, 13L, 13L));
+        scheduleRule_input2.setStartGbdIndex(7);
+        scheduleRule_input2.getEmployeeConfigIds().addAll(Arrays.asList(11L, 12L));
+        scheduleRule_input2.setStartEIndex(1);
+        scheduleRule_input2.setCarConfigId(2L);
+
         session.insert(scheduleCalcuParam_input);
         session.insert(scheduleRule_input1);
+        session.insert(scheduleRule_input2);
         // 3、执行rule