From ace9397eabf2bbf409eac07cdd59a661254706ac Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 19 五月 2023 09:23:14 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
index 9ed7439..8392bad 100644
--- a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
@@ -1,12 +1,7 @@
package com.yssh.service.impl;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
@@ -243,7 +238,7 @@
return null;
}
- List<DictRecord> recordList = dictRecordMapper.selectDictRecordList(new DictRecord());
+ /*List<DictRecord> recordList = dictRecordMapper.selectDictRecordList(new DictRecord());
List<String> tableNames = new ArrayList<String>();
for (DictRecord dr : recordList) {
@@ -252,7 +247,17 @@
}
}
- return suYuanMapper.getMonitorData(tableNames, checkPoint.getX() + "_" + checkPoint.getY() + "_" + checkPoint.getZ());
+ return suYuanMapper.getMonitorData(tableNames, checkPoint.getX() + "_" + checkPoint.getY() + "_" + checkPoint.getZ());*/
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
+ String end = dateFormat.format(calendar.getTime());
+
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.add(Calendar.DATE, -7);
+ String start = dateFormat.format(calendar.getTime());
+
+ return suYuanMapper.getNewMonitorData(checkPoint.getName(), start, end);
}
@Override
--
Gitblit v1.9.3