update

徐烜
1 parent 1b27857c
Showing 9 changed files with 83 additions and 53 deletions
src/main/java/com/bsth/service/BaseService.java
src/main/java/com/bsth/service/impl/BaseServiceImpl.java
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleResult_output.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/application.properties
src/main/resources/rules/shiftloop.drl
src/test/java/com/bsth/service/schedule/rules/DroolsRulesTest.java
@@ -4,6 +4,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.Map;
 /**
@@ -70,4 +71,11 @@ public interface BaseService&lt;T, ID extends Serializable&gt; {
      * @return {status:状态编码,msg:错误描述}，状态编码 @see com.bsth.common.ResponseCode
      */
     Map<String, Object> validateEquale(Map<String, Object> params);
+
+    /**
+     * 批量保存。
+     * @param entities 实体列表
+     * @return 保存后的entities
+     */
+    <S extends T> Collection<S> bulkSave(Collection<S> entities);
 }
@@ -7,18 +7,23 @@ import com.bsth.service.BaseService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import javax.persistence.EntityManager;
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 public class BaseServiceImpl<T, ID extends Serializable> implements BaseService<T, ID>{
 	@Autowired
 	private BaseRepository<T, ID> baseRepository;
+    @Autowired
+    private EntityManager entityManager;
+    @Value("${hibernate.jdbc.batch_size}")
+    private int batchSize;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -50,9 +55,25 @@ public class BaseServiceImpl&lt;T, ID extends Serializable&gt; implements BaseService&lt;
 		}
 		return map;
 	}
-	
-	@Override
+    @Override
+    public <S extends T> Collection<S> bulkSave(Collection<S> entities) {
+        final List<S> savedEntities = new ArrayList<>(entities.size());
+        int i = 0;
+        for (S t : entities) {
+            entityManager.persist(t);
+            savedEntities.add(t);
+            i++;
+            if (i % batchSize == 0) {
+                entityManager.flush();
+                entityManager.clear();
+            }
+        }
+
+        return savedEntities;
+    }
+
+    @Override
 	public Iterable<T> findAll() {
 		return baseRepository.findAll();
 	}
@@ -101,7 +101,7 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
             // 人员配置对应的人员
             EmployeeConfigInfo employeeConfigInfo = employeeConfigMaps.get(scheduleResult_output.getEmployeeConfigId());
             // 排班明细（这个要迭代的）
-            Collection<TTInfoDetail> ttInfoDetails = gbdTTinfoMaps.get(scheduleResult_output.getGuideboardId());
+            Collection<TTInfoDetail> ttInfoDetails = gbdTTinfoMaps.get(Long.parseLong(scheduleResult_output.getGuideboardId()));
             for (TTInfoDetail ttInfoDetail : ttInfoDetails) {
                 SchedulePlanInfo schedulePlanInfo = new SchedulePlanInfo(
                         xl,
@@ -9,13 +9,13 @@ public class ScheduleResult_output {
     /** 具体日期 */
     private DateTime sd;
     /** 用的是哪一组rule */
-    private Long ruleId;
+    private String ruleId;
     /** 路牌id */
-    private Long guideboardId;
+    private String guideboardId;
     /** 人员配置id */
-    private Long employeeConfigId;
+    private String employeeConfigId;
     /** 车辆配置id */
-    private Long carConfigId;
+    private String carConfigId;
     public DateTime getSd() {
         return sd;
@@ -25,36 +25,35 @@ public class ScheduleResult_output {
         this.sd = sd;
     }
-    public Long getGuideboardId() {
+    public String getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(String ruleId) {
+        this.ruleId = ruleId;
+    }
+
+    public String getGuideboardId() {
         return guideboardId;
     }
-    public void setGuideboardId(Long guideboardId) {
+    public void setGuideboardId(String guideboardId) {
         this.guideboardId = guideboardId;
     }
-    public Long getEmployeeConfigId() {
+    public String getEmployeeConfigId() {
         return employeeConfigId;
     }
-    public void setEmployeeConfigId(Long employeeConfigId) {
+    public void setEmployeeConfigId(String employeeConfigId) {
         this.employeeConfigId = employeeConfigId;
     }
-    public Long getCarConfigId() {
+    public String getCarConfigId() {
         return carConfigId;
     }
-    public void setCarConfigId(Long carConfigId) {
+    public void setCarConfigId(String carConfigId) {
         this.carConfigId = carConfigId;
     }
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-
 }
@@ -25,7 +25,7 @@ public class ScheduleResults_output {
      */
     public String showGuideboardDesc1() {
         StringBuilder stringBuilder = new StringBuilder();
-        Map<Long, List<ScheduleResult_output>> groupRuleIdGuideBoardMap = new HashMap<>();
+        Map<String, List<ScheduleResult_output>> groupRuleIdGuideBoardMap = new HashMap<>();
         for (ScheduleResult_output s : results) {
             if (groupRuleIdGuideBoardMap.get(s.getRuleId()) == null) {
                 groupRuleIdGuideBoardMap.put(s.getRuleId(), new ArrayList<ScheduleResult_output>());
@@ -33,7 +33,7 @@ public class ScheduleResults_output {
             groupRuleIdGuideBoardMap.get(s.getRuleId()).add(s);
         }
-        for (Long ruleId : groupRuleIdGuideBoardMap.keySet()) {
+        for (String ruleId : groupRuleIdGuideBoardMap.keySet()) {
             Collections.sort(groupRuleIdGuideBoardMap.get(ruleId), new Comparator<ScheduleResult_output>() {
                 @Override
                 public int compare(ScheduleResult_output o1, ScheduleResult_output o2) {
@@ -41,8 +41,8 @@ public class ScheduleResults_output {
                 }
             });
-            List<Long> gbids = new ArrayList<>();
-            List<Long> ecids = new ArrayList<>();
+            List<String> gbids = new ArrayList<>();
+            List<String> ecids = new ArrayList<>();
             for (ScheduleResult_output so : groupRuleIdGuideBoardMap.get(ruleId)) {
                 gbids.add(so.getGuideboardId());
                 ecids.add(so.getEmployeeConfigId());
@@ -12,7 +12,7 @@ import java.util.List;
  */
 public class ScheduleRule_input {
     /** 规则Id */
-    private Long ruleId;
+    private String ruleId;
     /** 规则启用日期 */
     private DateTime qyrq;
@@ -27,14 +27,14 @@ public class ScheduleRule_input {
     private int startEIndex;
     /** 车辆配置id */
-    private Long carConfigId;
+    private String carConfigId;
     // TODO：车辆翻班暂时不考虑进去
     public ScheduleRule_input() {}
     public ScheduleRule_input(ScheduleRule1Flat scheduleRule1Flat) {
-        this.ruleId = scheduleRule1Flat.getId();
+        this.ruleId = String.valueOf(scheduleRule1Flat.getId());
         this.qyrq = new DateTime(scheduleRule1Flat.getQyrq());
         List<String> lpIds = Splitter.on(",").splitToList(scheduleRule1Flat.getLpIds());
 //        for (String lpId : lpIds) {
@@ -50,14 +50,14 @@ public class ScheduleRule_input {
         employeeConfigIds.addAll(ryCids);
         // 人员初始索引减1
         this.startEIndex = scheduleRule1Flat.getRyStart() - 1;
-        this.carConfigId = scheduleRule1Flat.getCarConfigInfo().getId();
+        this.carConfigId = String.valueOf(scheduleRule1Flat.getCarConfigInfo().getId());
     }
-    public Long getRuleId() {
+    public String getRuleId() {
         return ruleId;
     }
-    public void setRuleId(Long ruleId) {
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
@@ -101,11 +101,11 @@ public class ScheduleRule_input {
         this.startEIndex = startEIndex;
     }
-    public Long getCarConfigId() {
+    public String getCarConfigId() {
         return carConfigId;
     }
-    public void setCarConfigId(Long carConfigId) {
+    public void setCarConfigId(String carConfigId) {
         this.carConfigId = carConfigId;
     }
 }
@@ -11,3 +11,5 @@ multipart.maxFileSize = -1
 # Total request size for a multipart/form-data
 multipart.maxRequestSize = -1
+# batch insert
+hibernate.jdbc.batch_size = 50
 \ No newline at end of file
@@ -15,7 +15,7 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 //------------------------- 第一阶段、计算规则准备数据（天数） ----------------------------//
 declare Calcu_days_result
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     qyrq_days : Integer // 开始日期离启用日期的天数
     sdays : Integer // 总共需要排班的天数
     calcu_start_date : DateTime // 开始计算日期
@@ -104,18 +104,18 @@ end
 //----------------------- 路牌范围循环计算 ------------------------//
 declare Calcu_guideboard_index_result
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     calcu_index : Integer // 计算之后的起始索引
 end
 declare Calcu_guideboard_index_param_1
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     oindex : Integer // 原始起始索引
     range_size : Integer // 范围大小
     temp : Integer // 原始起始索引距离最后一个索引的大小
     days_temp : Integer // 开始日期离启用日期的天数 － temp
 end
 declare Calcu_guideboard_index_param_2
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     s_value : Integer // 商
     y_value : Integer // 余
 end
@@ -217,18 +217,18 @@ end
 //----------------------- 人员范围循环计算 ------------------------//
 declare Calcu_employee_index_result
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     calcu_index : Integer // 计算之后的起始索引
 end
 declare Calcu_employee_index_param_1
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     oindex : Integer // 原始起始索引
     range_size : Integer // 范围大小
     temp : Integer // 原始起始索引距离最后一个索引的大小
     days_temp : Integer // 开始日期离启用日期的天数 － temp
 end
 declare Calcu_employee_index_param_2
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     s_value : Integer // 商
     y_value : Integer // 余
 end
@@ -332,7 +332,7 @@ end
 //----------------------- 路牌范围循环计算 ------------------------//
 declare Calcu_guideboard_range_loop_result
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     firstLoopSize : Integer // 初始的范围循环个数
     middelLoopCount : Integer // 中间的范围循环次数
     rangeSize : Integer // 范围大小
@@ -340,7 +340,7 @@ declare Calcu_guideboard_range_loop_result
 end
 declare Calcu_guideboard_range_loop_param
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     temp : Integer // 起始索引距离最后一个索引的大小
     sdays : Integer // 总共需要排班的天数
 end
@@ -409,7 +409,7 @@ end
 //----------------------- 人员范围循环计算 ------------------------//
 declare Calcu_employee_range_loop_result
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     firstLoopSize : Integer // 初始的范围循环个数
     middelLoopCount : Integer // 中间的范围循环次数
     rangeSize : Integer // 范围大小
@@ -417,7 +417,7 @@ declare Calcu_employee_range_loop_result
 end
 declare Calcu_employee_range_loop_param
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     temp : Integer // 起始索引距离最后一个索引的大小
     sdays : Integer // 总共需要排班的天数
 end
@@ -489,7 +489,7 @@ end
 //----------------------- 路牌范围循环计算 ------------------------//
 declare Calcu_loop_guideboard_result
-    ruleId : Long // 规则id
+    ruleId : String // 规则id
     go_list : List // 路牌循环的列表
 end
@@ -553,7 +553,7 @@ end
 //----------------------- 人员范围循环计算 ------------------------//
 declare Calcu_loop_employee_result
-    ruleId : Long // 规则id
+    ruleId : String // 规则id
     eo_list : List // 人员循环的列表
 end
@@ -69,14 +69,14 @@ public class DroolsRulesTest {
         scheduleCalcuParam_input.setTtinfoId(1L);
         ScheduleRule_input scheduleRule_input1 = new ScheduleRule_input();
-        scheduleRule_input1.setRuleId(1L);
+        scheduleRule_input1.setRuleId("1");
         scheduleRule_input1.setQyrq(new DateTime(2016, 7, 22, 0, 0));
         scheduleRule_input1.getGuideboardIds().addAll(Arrays.asList(
-                9L, 9L , 8L ,8L ,7L ,7L ,6L ,6L, 5L, 5L, 4L, 4L, 3L, 3L, 2L, 2L, 1L, 1L));
+                "9", "9" , "8" ,"8" ,"7" ,"7" ,"6" ,"6", "5", "5", "4", "4", "3", "3", "2", "2", "1", "1"));
         scheduleRule_input1.setStartGbdIndex(3);
-        scheduleRule_input1.getEmployeeConfigIds().addAll(Arrays.asList(1L, 2L));
+        scheduleRule_input1.getEmployeeConfigIds().addAll(Arrays.asList("1", "2"));
         scheduleRule_input1.setStartEIndex(1);
-        scheduleRule_input1.setCarConfigId(1L);
+        scheduleRule_input1.setCarConfigId("1");
 //        ScheduleRule_input scheduleRule_input2 = new ScheduleRule_input();
 //        scheduleRule_input2.setRuleId(2L);