Commit 63c6ae0b by admin

修复入库错误

parent 1f779ff3
......@@ -4,9 +4,6 @@ import java.util.Date;
import java.util.List;
import com.zhiwei.manage.bean.Data;
import com.zhiwei.manage.bean.EasyNews;
import com.zhiwei.manage.bean.News;
import com.zhiwei.manage.bean.Template;
public interface DataDao {
......
......@@ -176,6 +176,9 @@ public class MainThread extends Thread {
start.add(Calendar.DATE, -1);
}
Calendar end = Calendar.getInstance();
Calendar inTime=Calendar.getInstance();
inTime.setTime(end.getTime());
inTime.add(Calendar.HOUR_OF_DAY, -1);
try {
start.set(Calendar.HOUR_OF_DAY, 0);
start.setTime(sdf.parse(sdf.format(start.getTime())));
......@@ -194,9 +197,7 @@ public class MainThread extends Thread {
data.setTime(start.getTime());
dataService.insert(data);
log.info(sdf.format(start.getTime()) + "|" + chan.getPt() + "|入库");
start.setTime(end.getTime());
start.add(Calendar.HOUR, -1);
count = es.getCountByPt(start.getTime(), end.getTime(), chan.getPt(), chan.getValue(), ser);//小时的数据量
count = es.getCountByPt(inTime.getTime(), end.getTime(), chan.getPt(), chan.getValue(), ser);//小时的数据量
if (counts.get(chan.getPt()) != null)
if (count < counts.get(chan.getPt())) {
Messages m = new Messages();
......
......@@ -4,8 +4,6 @@ import java.util.Date;
import java.util.List;
import com.zhiwei.manage.bean.Data;
import com.zhiwei.manage.bean.EasyNews;
import com.zhiwei.manage.bean.Template;
public interface DataService {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment