Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 7880c549 c2a61e14
Showing 8 changed files with 183 additions and 26 deletions
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/GidFbFcnoFunction.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/readme.txt
src/main/resources/rules/functions.drl
src/main/resources/rules/plan.drl
src/main/resources/static/pages/forms/statement/scheduleDaily.html
@@ -48,6 +48,7 @@ import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.DlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.util.Arith;
+import com.bsth.util.BatchSaveUtils;
 @Service
 public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbService{
@@ -245,8 +246,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
 		//从排班表中计算出行驶的总里程
 		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
-		List<Ylb> addList=new ArrayList<Ylb>();
-		List<Ylb> updateList=new ArrayList<Ylb>();
+		List<Dlb> addList=new ArrayList<Dlb>();
+		List<Dlb> updateList=new ArrayList<Dlb>();
 		for(int x=0;x<listpb.size();x++){
 			String type="add";
 			boolean sfdc=false;
@@ -332,12 +333,11 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 					t.setRq(sdf.parse(rq));
 					t.setCreatetime(new Date());
-					/*if(type.equals("add")){
+					if(type.equals("add")){
 						addList.add(t);
 					}else{
 						updateList.add(t);
-					}*/
-					repository.save(t);
+					}
 					newMap.put("status", ResponseCode.SUCCESS);
 				} catch (ParseException e) {
 					// TODO Auto-generated catch block
@@ -346,20 +346,30 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				}
 			}
 		}
-	/*	try {
+		try {
 			if(addList.size()>0){
-				new BatchSaveUtils<Ylb>().saveList(addList, Ylb.class);
+				try{
+				new BatchSaveUtils<Dlb>().saveList(addList, Dlb.class);
+				} catch (Exception e) {
+					// TODO: handle exception
+					if(e.getMessage().indexOf("PK_DLB_UK")>0){
+						newMap.put("fage", "存在相同数据,数据已经过滤");
+						logger.info("获取:存在相同数据,数据已经过滤");
+					}
+				}
 			}
 			if(updateList.size()>0){
-				
+				for (int i = 0; i < updateList.size(); i++) {
+					repository.save(updateList.get(i));
+				}
 			}
 			newMap.put("status", ResponseCode.SUCCESS);
 		}
 		catch (Exception e) {
 			// TODO: handle exception
 			newMap.put("status", ResponseCode.ERROR);
-		}*/
+		}
 		return newMap;
 	}
@@ -875,7 +875,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
         map.put("ksgl",ksgl);
         map.put("realMileage", Arith.add(yygl ,ksgl));
-        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("jhbc", culateMieageService.culateJhbc(scheduleRealInfos,""));
         map.put("cjbc", culateMieageService.culateLbbc(lists));
         map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
         int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
@@ -2674,8 +2674,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         for (int i = 0; i < newList.size(); i++) {
             ScheduleRealInfo t1 = newList.get(i);
+            String reamrks1=t1.getRemarks()==null?"":t1.getRemarks();
+            if(reamrks1.length()>5){
+            	t1.setRemarks(reamrks1.substring(0, 5));
+            	t1.setRemark(reamrks1);
+            }
             for (int j = 0; j < list.size(); j++) {
                 ScheduleRealInfo t2 = list.get(j);
+                String reamrks2=t2.getRemarks()==null?"":t2.getRemarks();
+                if(reamrks2.length()>5){
+                	t2.setRemarks(reamrks2.substring(0, 5));
+                	t2.setRemark(reamrks2);
+                }
                 if (t1.getId() == t2.getId()) {
                     t1 = t2;
                 }
@@ -3989,7 +3999,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              }
              tempMap.put("fcsjk" + x, fcsjk);
              tempMap.put("fcsjm" + x, fcsjm);
-             tempMap.put("remarks" + x, schedule.getRemarks() != null ? schedule.getRemarks() : "");
+             tempMap.put("remarks" + x, schedule.getRemark() != null ? schedule.getRemark() : "");
              size++;
         }
@@ -4084,7 +4094,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
         map.put("ksgl",ksgl);
         map.put("realMileage", Arith.add(yygl ,ksgl));
-        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("jhbc", culateMieageService.culateJhbc(scheduleRealInfos,""));
         map.put("cjbc", culateMieageService.culateLbbc(lists));
         map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
         int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
@@ -864,12 +864,14 @@ public class ReportServiceImpl implements ReportService{
 				//查询时间里程
 				String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,2 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"' and "
-						+ " fcsj <='"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks') "
+						+ " fcsj <='"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks'"
+								+ " and bc_type !='region') "
 						+ " union "
 						+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,1 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
-						+ " fcsj > '"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks') "
-						+ " order by xl_dir, xh, fcsj";
+						+ " fcsj > '"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks' "
+								+ " and bc_type !='region') "
+						+ " order by xl_dir, xh, lp,fcsj";
 				Map<String, Object> map=new HashMap<String,Object>();
 				List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
 						new RowMapper<Map<String, Object>>(){
@@ -923,13 +925,17 @@ public class ReportServiceImpl implements ReportService{
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<Map<String, Object>> list2 = keyMap.get(key);
 			List<Integer> cjs = new ArrayList<Integer>();
+			List<Integer> fcsj_s = new ArrayList<Integer>();
+			List<Integer> fcsj_x = new ArrayList<Integer>();
 			int sxsj = 0, xxsj = 0, sxtssj = 0, xxtssj = 0;
 			int sxbc = 0, xxbc = 0, sxtsbc = 0, xxtsbc = 0;
 			int temp = 24*60+1, zcj = 0;
 			boolean ists = false;
+			String lpname="";
 			for(Map<String, Object> m : list2){
 				String[] split = m.get("fcsj").toString().split(":");
 				int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+				
 				int xlDir = Integer.valueOf(m.get("dir").toString());
 				int bcsj = Integer.valueOf(m.get("bcsj").toString());
 				if(temp >= fcsj){
@@ -937,28 +943,68 @@ public class ReportServiceImpl implements ReportService{
 					ists = false;
 				}
 				if(xlDir == 0){
+					fcsj_s.add(fcsj);
 					sxsj += bcsj;
 					sxbc ++;
-					if(ists){
-						sxtssj += fcsj - temp;
+					if(!ists){
+						if(lpname.equals("")){
+							lpname=m.get("lp").toString();
+						}else{
+							if(lpname.equals(m.get("lp").toString())){
+								sxtssj += (fcsj+bcsj) - temp;
+							}
+						}
 						sxtsbc++;
 					}
 				} else {
+					fcsj_x.add(fcsj);
 					xxsj += bcsj;
 					xxbc ++;
-					if(ists){
-						xxtssj += fcsj - temp;
+					
+					if(!ists){
+						
+						if(lpname.equals("")){
+							lpname=m.get("lp").toString();
+						}else{
+							if(lpname.equals(m.get("lp").toString())){
+								xxtssj += (fcsj+bcsj) - temp;
+							}
+						}
 						xxtsbc++;
 					}
 				}
-				if(temp < fcsj){
+				/*if(temp < fcsj){
 					cjs.add(fcsj - temp);
 					temp = fcsj;
-				}
+				}*/
 				if(m.get("ists").toString().trim().equals("1")){
 					ists = true;
+				}else{
+					ists=false;
 				}
 			}
+			Collections.sort(fcsj_s);
+			int fcsjs=0;
+			for (int i = 0; i < fcsj_s.size(); i++) {
+				if(i==0){
+					fcsjs =fcsj_s.get(i);
+				}else{
+					cjs.add(fcsj_s.get(i)-fcsjs);
+					fcsjs=fcsj_s.get(i);
+				}
+				
+			}
+			Collections.sort(fcsj_x);
+			int fcsjx=0;
+			for (int i = 0; i < fcsj_x.size(); i++) {
+				if(i==0){
+					fcsjx =fcsj_x.get(i);
+				}else{
+					cjs.add(fcsj_x.get(i)-fcsjx);
+					fcsjx =fcsj_x.get(i);
+				}
+				
+			}
 			Collections.sort(cjs);
 			for(int i : cjs){
 				zcj += i;
+package com.bsth.service.schedule.rules.shiftloop;
+
+import com.bsth.entity.schedule.TTInfoDetail;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+
+/**
+ * 时刻表路牌下的分班班次发车顺序号。
+ */
+public class GidFbFcnoFunction implements AccumulateFunction {
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    protected static class GidFbInfoData implements Externalizable {
+        public Integer fbfcno;
+        public TTInfoDetail ttInfoDetail;
+
+        public GidFbInfoData() {}
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            fbfcno = (Integer) in.readObject();
+            ttInfoDetail = (TTInfoDetail) in.readObject();
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(fbfcno);
+            out.writeObject(ttInfoDetail);
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new GidFbInfoData();
+    }
+
+    @Override
+    public void init(Serializable context) throws Exception {
+        GidFbInfoData gidFbInfoData = (GidFbInfoData) context;
+        gidFbInfoData.fbfcno = 999;
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object value) {
+        GidFbInfoData gidFbInfoData = (GidFbInfoData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        // 1块路牌有多个分班班次，取最早的时间作为起始分班班次发车顺序号
+        if (ttInfoDetail.getIsFB()) {
+            if (ttInfoDetail.getFcno() <= gidFbInfoData.fbfcno) {
+                gidFbInfoData.fbfcno = ttInfoDetail.getFcno();
+            }
+        }
+    }
+
+    @Override
+    public void reverse(Serializable serializable, Object o) throws Exception {
+
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return false;
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return Integer.class;
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        GidFbInfoData gidFbInfoData = (GidFbInfoData) context;
+
+        return gidFbInfoData.fbfcno;
+    }
+
+}
-翻班循环规则
 \ No newline at end of file
@@ -3,6 +3,7 @@ package com.bsth.service.schedule;
 import accumulate com.bsth.service.schedule.rules.ttinfo2.ErrorBcCountFunction ecount;
 import accumulate com.bsth.service.schedule.rules.shiftloop.GidsCountFunction gidscount;
 import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbTimeFunction gidfbtime;
+import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbFcnoFunction gidfbfcno;
 import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
 import accumulate com.bsth.service.schedule.rules.ttinfo.MinRuleQyrqFunction minruleqyrq;
 import accumulate com.bsth.service.schedule.rules.validate.ValidRepeatBcFunction vrb;
 \ No newline at end of file
@@ -224,6 +224,7 @@ declare TTInfo_gid_stat
     maxFcno: Integer // 最大发车顺序号
     fbTime: LocalTime // 分班时间
+    fbfcno: Integer // 分班发车顺序号
 end
 rule "calcu_TTInfo_gid_stat"
@@ -234,6 +235,7 @@ rule &quot;calcu_TTInfo_gid_stat&quot;
         $gids: List() from accumulate ($ttd: TTInfoDetail() from tTInfoDetailRepository.findByTtinfoId(Long.parseLong($ttInfoId)), gidscount($ttd))
         $gid: String() from $gids
         $fbtime_str: String() from accumulate ($ttd: TTInfoDetail(lp.id.toString() == $gid) from tTInfoDetailRepository.findByTtinfoId(Long.parseLong($ttInfoId)), gidfbtime($ttd))
+        $fbfcno: Integer() from accumulate ($ttd: TTInfoDetail(lp.id.toString() == $gid) from tTInfoDetailRepository.findByTtinfoId(Long.parseLong($ttInfoId)), gidfbfcno($ttd))
         $maxfcno: Double() from accumulate ($ttd: TTInfoDetail(lp.id.toString() == $gid) from tTInfoDetailRepository.findByTtinfoId(Long.parseLong($ttInfoId)), max($ttd.getFcno()))
     then
         TTInfo_gid_stat ttInfo_gid_stat = new TTInfo_gid_stat();
@@ -243,11 +245,12 @@ rule &quot;calcu_TTInfo_gid_stat&quot;
         ttInfo_gid_stat.setMaxFcno($maxfcno.intValue());
         ttInfo_gid_stat.setFbTime(fcsjTime($fbtime_str));
+        ttInfo_gid_stat.setFbfcno($fbfcno);
         insert(ttInfo_gid_stat);
-//        log.info("xlid={},ttid={},gid={},maxfcno={},fbtime={}",
-//            $xlId, $ttInfoId, $gid, ttInfo_gid_stat.getMaxFcno(), ttInfo_gid_stat.getFbTime());
+//        log.info("xlid={},ttid={},gid={},maxfcno={},fbtime={},fbfcno={}",
+//            $xlId, $ttInfoId, $gid, ttInfo_gid_stat.getMaxFcno(), ttInfo_gid_stat.getFbTime(), ttInfo_gid_stat.getFbfcno());
 end
@@ -304,7 +307,10 @@ rule &quot;calcu_TTInfoDetail_Wraps&quot;
             LocalTime fcsj = fcsjTime(ttInfoDetail.getFcsj());
             LocalTime fbsj = ttInfo_gid_stat.getFbTime();
-            ttInfoDetail_wrap.setIsFb(fbsj == null ? false : (fcsj.isEqual(fbsj) || fcsj.isAfter(fbsj)));
+            Integer fbfcno = ttInfo_gid_stat.getFbfcno();
+            // 不用时间判定，因为有的路牌，后面的班次都是凌晨的，时间反而比分班时间早，不合理，所以使用发车顺序号做第二次比较
+//            ttInfoDetail_wrap.setIsFb(fbsj == null ? false : (fcsj.isEqual(fbsj) || fcsj.isAfter(fbsj)));
+            ttInfoDetail_wrap.setIsFb(fbsj == null ? false : ttInfoDetail.getFcno() >= fbfcno);
             ttInfoDetail_wrap.setSelf(ttInfoDetail);
@@ -594,7 +594,7 @@
 				<td>{{obj.slow0}}
 				</td>
-				<td colspan="2"></td>
+				<td colspan="2" title="{{obj.remark}}">{{obj.remarks}}</td>
 		{{if (i+1)%3 == 0}}
 				<td>&nbsp;</td>
 			</tr>