时间入库修改

src/main/java/com/zhiwei/manage/dao/DataDaoImpl.java

 package com.zhiwei.manage.dao;
 
 import java.lang.reflect.Field;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -81,12 +82,19 @@ public class DataDaoImpl implements DataDao {
 	@Override
 	public void insert(Data data) {
 		Data d = null;
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		Date today=null;
+		try {
+			today=sdf.parse(sdf.format(data.getTime()));
+		} catch (ParseException e1) {
+			e1.printStackTrace();
+		}
 		if (data.getTempName() != null) {
-			d = mongo.findOne(Query.query(Criteria.where("time").is(data.getTime())
+			d = mongo.findOne(Query.query(Criteria.where("time").is(today)
 					.andOperator(Criteria.where("tempName").is(data.getTempName()))), Data.class);
 		} else {
 			d = mongo.findOne(Query.query(
-					Criteria.where("time").is(data.getTime()).andOperator(Criteria.where("pt").is(data.getPt()))),
+					Criteria.where("time").is(today).andOperator(Criteria.where("pt").is(data.getPt()))),
 					Data.class);
 		}
 		if (d == null) {
@@ -100,6 +108,8 @@ public class DataDaoImpl implements DataDao {
 				try {
 					if (fields[j].getName().equals("dataId")) {
 						continue;
+					}else if(fields[j].getName().equals("time")) {
+						update.set(fields[j].getName(), today);
 					}
 					if (fields[j].get(d) != null)
 						update.set(fields[j].getName(), fields[j].get(d));

src/main/java/com/zhiwei/manage/handle/MainThread.java

@@ -168,7 +168,7 @@ public class MainThread extends Thread {
 					start.setTime(sdf.parse(today));
 				}
 				end.setTime(sdf2.parse(sdf2.format(end.getTime())));
-//				end.add(Calendar.HOUR_OF_DAY, -1);
+				end.add(Calendar.HOUR_OF_DAY, -1);
 			} catch (ParseException e2) {
 				e2.printStackTrace();
 			}
@@ -182,7 +182,7 @@ public class MainThread extends Thread {
 						Data data = new Data();
 						data.setCount(count);
 						data.setPt(chan.getPt());
-						data.setTime(sdf.parse(sdf.format(d)));
+						data.setTime(start.getTime());
 						dataService.insert(data);
 						log.info(sdf.format(start.getTime()) + "|" + chan.getPt() + "|入库");
 					} catch (Exception e) {
@@ -200,7 +200,7 @@ public class MainThread extends Thread {
 						try {
 							Data data = new Data();
 							data.setCount(cwCount);
-							data.setTime(sdf.parse(sdf.format(d)));
+							data.setTime(start.getTime());
 							data.setTempName(tmp.getTempName());
 							dataService.insert(data);
 							log.info(TimeUtil.yearToDay(start.getTime()) + "|" + tmp.getTempName() + "|入库");
@@ -210,7 +210,7 @@ public class MainThread extends Thread {
 						if (cwCount < tmp.getNewsNumber()) {
 							Message m = new Message();
 							m.setHandle(false);
-							m.setCreateDate(sdf.parse(sdf.format(d)));
+							m.setCreateDate(start.getTime());
 							m.setTemplateLv(tmp.getTemplateLv());
 							m.setTempName(tmp.getTempName());
 							m.setErrorType("count");