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

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents e6d71322 b7789aeb
Showing 6 changed files with 47 additions and 18 deletions
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/entity/search/SearchOperator.java
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/resources/rules/kBase3_validate_timetable.drl
src/main/resources/static/pages/trafficManage/timeTempletUploadRecord.html
@@ -30,21 +30,15 @@ public class PredicatesBuilder {
 	static{
 		nf = NumberFormat.getInstance();
 	}
-	
+
 	public static Predicate eq(CriteriaBuilder cb,Path<?> expression, Object object){
-        Class<?> leftType = expression.getJavaType();
-        Class<?> rightType = object.getClass();
+		Class<?> leftType = expression.getJavaType();
+		Class<?> rightType = object.getClass();
 		if(Date.class.isAssignableFrom(leftType) &&
 				String.class.isAssignableFrom(rightType)){
 			DateTime dateTime = new DateTime(object);
-			Date startTime = dateTime.toDate();//设置起始时间
-			Calendar c = Calendar.getInstance();
-			c.setTime(startTime);
-			c.add(Calendar.DAY_OF_MONTH, 1);
-			// 设置结束时间，起始时间为结束时间加1天
-			Date endTime = c.getTime();
-			return cb.between((Path<Date>) expression,startTime,endTime);
+			return cb.equal(expression, dateTime.toDate());
 		}
 		else {
 			return cb.equal(expression, object);
@@ -208,4 +202,21 @@ public class PredicatesBuilder {
 		}
 		return cb.equal(expression, time);
 	}
+
+	public static Predicate dateEq(CriteriaBuilder cb,Path<?> expression, Object object){
+		Predicate predicate = null;
+		try {
+			DateTime dateTime = new DateTime(object);
+			Date startTime = dateTime.toDate();//设置起始时间
+			Calendar c = Calendar.getInstance();
+			c.setTime(startTime);
+			c.add(Calendar.DAY_OF_MONTH, 1);
+			// 设置结束时间，起始时间为结束时间加1天
+			Date endTime = c.getTime();
+			predicate = cb.between((Path<Date>) expression,startTime,endTime);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return predicate;
+	}
 }
@@ -27,6 +27,7 @@ public enum SearchOperator {
 	isf,				//假 isFalse，boolean
 	ist,				//真 isTrue，boolean
 	date,				//时间
+	dateEq,				//时间等于
 	in,					//数组
 	ins                 //传参 List<String>
 }
@@ -358,7 +358,6 @@ public class CalcToolServiceImpl implements CalcToolService {
 		    	t_.setDtbc(0);
 		    	t_.setDtbczgf(0);
 		    	t_.setDtbcwgf(0);
-		    	list.add(t_);
 		    	list2.add(t_);
 	    	}
     	}
@@ -483,8 +483,13 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sf.append("</DLDS>");
 					str = sf.toString().replace("'","");// 去掉'号
 					results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
-					// 记录日志
-					result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str,logLineMap);
+					try {
+						// 记录日志
+						result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str,logLineMap);
+					}catch (Exception e){
+						logger.error("logRecord:",e);
+						continue;
+					}
 				}
 			}
 			// 每per条线路上传后剩下的数据再上传
@@ -492,8 +497,12 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				sf.append("</DLDS>");
 				str = sf.toString().replace("'","");// 去掉'号
 				results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
-				// 记录日志
-				result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str,logLineMap);
+				try {
+					// 记录日志
+					result = logRecord(results, logXlbmMap, logXlbmSuccessMap, logXlbmFailureMap, logSuccess, logFailure, str, logLineMap);
+				}catch (Exception e){
+					logger.error("logRecord:",e);
+				}
 			}
 		} catch (Exception e) {
 			logger.error("setLD:",e);
@@ -529,7 +538,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * @param str
 	 */
 	private String logRecord(Results results,HashMap logXlbmMap,HashMap logXlbmSuccessMap,HashMap logXlbmFailureMap,StringBuffer logSuccess,
-						   StringBuffer logFailure,String str,Map<String ,Line> logLineMap){
+						   StringBuffer logFailure,String str,Map<String ,Line> logLineMap) throws Exception{
 		String result = "failure";
 		String state;
 		// 记录日志
@@ -100,6 +100,7 @@ declare TTInfo_wrap
     weekdays: List // 周一到周日是否启用 List<Boolean>
     specialDays: List // 特殊节假日 List<DateTime>
     updateDate: DateTime // 最新修改时间
+    lineVersion : Integer // 线路版本
 end
 rule "TTInfo_wrap_result"
@@ -118,6 +119,7 @@ rule &quot;TTInfo_wrap_result&quot;
         ttInfo_wrap.setUpdateDate(new DateTime($ttinfo.getUpdateDate()));
         ttInfo_wrap.setWeekdays(new ArrayList());
         ttInfo_wrap.setSpecialDays(new ArrayList());
+        ttInfo_wrap.setLineVersion($ttinfo.getLineVersion());
         String[] days = $ttinfo.getRule_days().split(",");
         for (int i = 0; i < 7; i++) {
@@ -151,6 +153,7 @@ end
 declare TTInfoDetails_wrap
     ttInfoId: Long // 时刻表id
+    lineVersion: Integer // 线路版本
     bcInfoList: List // 班次信息列表 List<TTInfoDetail>
 end
@@ -165,6 +168,7 @@ rule &quot;Calcu_iter_days_special_day&quot; // 特殊日期匹配
         TTInfo_wrap(
             $tid: id,
             $tname: name,
+            $lineVersion: lineVersion,
             specialDays contains $calcu_date
         )
     then
@@ -189,6 +193,7 @@ rule &quot;Calcu_iter_days_special_day&quot; // 特殊日期匹配
             TTInfoDetails_wrap ttInfoDetails_wrap = new TTInfoDetails_wrap();
             ttInfoDetails_wrap.setTtInfoId($tid);
+            ttInfoDetails_wrap.setLineVersion($lineVersion);
             ttInfoDetails_wrap.setBcInfoList(tTInfoDetailRepository.findByTtinfoId($tid));
             insert(ttInfoDetails_wrap);
         }
@@ -208,6 +213,7 @@ rule &quot;Calcu_iter_days_normal_day&quot; // 平日匹配
         TTInfo_wrap(
             $tid: id,
             $tname: name,
+            $lineVersion: lineVersion,
             specialDays not contains $calcu_date,
             weekdays[$calcu_weekday - 1] == Boolean.TRUE
         )
@@ -234,6 +240,7 @@ rule &quot;Calcu_iter_days_normal_day&quot; // 平日匹配
             TTInfoDetails_wrap ttInfoDetails_wrap = new TTInfoDetails_wrap();
             ttInfoDetails_wrap.setTtInfoId($tid);
+            ttInfoDetails_wrap.setLineVersion($lineVersion);
             ttInfoDetails_wrap.setBcInfoList(tTInfoDetailRepository.findByTtinfoId($tid));
             insert(ttInfoDetails_wrap);
         }
@@ -253,6 +260,7 @@ rule &quot;Calcu_iter_days_other_day&quot; // 都没有的情况下，匹配
         TTInfo_wrap(
             $tid: id,
             $tname: name,
+            $lineVersion: lineVersion,
             specialDays not contains $calcu_date,
             weekdays[$calcu_weekday - 1] == false
         )
@@ -278,6 +286,7 @@ rule &quot;Calcu_iter_days_other_day&quot; // 都没有的情况下，匹配
             TTInfoDetails_wrap ttInfoDetails_wrap = new TTInfoDetails_wrap();
             ttInfoDetails_wrap.setTtInfoId($tid);
+            ttInfoDetails_wrap.setLineVersion($lineVersion);
             Map<String, Object> param = new HashMap<String, Object>();
             ttInfoDetails_wrap.setBcInfoList(tTInfoDetailRepository.findByTtinfoId($tid));
             insert(ttInfoDetails_wrap);
@@ -308,7 +317,7 @@ rule &quot;statinfo_result&quot; // 统计计算结果
         $statInfo.setYybc($yybc);
         $statInfo.setErrorbc($errorbc);
-        int lineVersion = ((TTInfoDetail) $ttInfoDetails_wrap.getBcInfoList().get(0)).getLineVersion();
+        int lineVersion = $ttInfoDetails_wrap.getLineVersion();
         $statInfo.setLineVersion(lineVersion);
         rs.getInfos().add($statInfo);
@@ -13,7 +13,7 @@
 			<li><select name="line.company_eq" class="form-control" id="companySelect"></select></li>
 			<li><select name="line.brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select></li>
 			<li>日期:</li>
-			<li><input type="text" class="inputCommon dateTime" name="createDate_eq" id="dateInput" placeholder="日期">
+			<li><input type="text" class="inputCommon dateTime" name="createDate_dateEq" id="dateInput" placeholder="日期">
 			</li>
 			<li>线路名称:</li>
 			<li><input type="text" class="form-control form-filter input-sm"