增加运管处上传日志的保存功能（时刻表上传、线路上传、路单上传）

周勤
1 parent 0c0dbec2
Showing 4 changed files with 37 additions and 16 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/impl/TrafficManageServiceImpl.java
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>
 }
@@ -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;
 		// 记录日志
@@ -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"