Commit 03abf7c1 authored by duanruiming's avatar duanruiming

[update] 演示环境提交

parent 4087d0ae
......@@ -219,9 +219,10 @@ public class EvaluateServiceImpl implements EvaluateService {
@NotNull
private Map<Integer, List<CrossDirDataHistAvgBO>> getHistData(String crossId, Integer minutes) {
// 获取当前时间之前 minutes 分钟的10位时间戳
long currentSeconds = DateUtil.currentSeconds();
//long currentSeconds = DateUtil.currentSeconds();
long currentSeconds = 1700262000l;
long preSeconds = currentSeconds - minutes * 60 - 10 * 60; // 再向前10分钟数据才能形成对比
long endSeconds = DateUtil.currentSeconds() - 10 * 60;
long endSeconds = currentSeconds - 10 * 60;
List<CrossDirDataHistAvgBO> crossDirDataHistAvgBOList = crossDirDataHistMapper.selectByCrossIdInOutTimestamp(
crossId, CrossInOutEnum.IN.getCode(), preSeconds, endSeconds);
Map<Integer, List<CrossDirDataHistAvgBO>> dirObjMapHist = crossDirDataHistAvgBOList.stream()
......@@ -248,7 +249,8 @@ public class EvaluateServiceImpl implements EvaluateService {
// 路口流量
// 获取当前时间前 minutes 分钟的10位时间戳
long currentSeconds = DateUtil.currentSeconds();
//long currentSeconds = DateUtil.currentSeconds();
long currentSeconds = 1700262000l;
long preSeconds = currentSeconds - (minutes + 5) * 60L;
List<CrossDataHistPO> crossDataHistPOS = crossDataHistMapper.selectByCrossIdAndTimestamp(crossId, preSeconds);
if (CollectionUtil.isNotEmpty(crossDataHistPOS)) {
......
......@@ -125,7 +125,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
}
@Override
public List<MainlineEvaluateBottomCurveVO> bottomCurve(BottomCurveBO bo) {
public List<MainlineEvaluateBottomCurveVO> bottomCurve(BottomCurveBO bo) throws Exception {
String crossId = bo.getCrossId();
Integer scope = bo.getScope();
List<String> scopeList = bo.getScopeList();
......@@ -2253,6 +2253,8 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
Date nameDate = chineseDayFormat.parse(name);
Calendar calendar1 = Calendar.getInstance();
calendar1.set(2023,11,18,7,00,00);
calendar1.setTime(histGreenwaveGmtModified);
int month1 = calendar1.get(Calendar.MONTH) + 1; // Calendar.MONTH is 0-based
int day1 = calendar1.get(Calendar.DAY_OF_MONTH);
......
......@@ -440,7 +440,8 @@ public class TrendServiceImpl implements TrendService {
@Override
public List<GreenwaveRunMonitorVO> greenwaveRunMonitor(GreenwaveIdBO greenwaveIdBO) {
List<GreenwaveRunMonitorVO> res = new ArrayList<>();
Date nowTime = new Date();
//Date nowTime = new Date();
Date nowTime = new Date(1705453200000L);
List<GreenwaveHistPOExt> extList = greenwaveHistMapper.selectRunMonitor(nowTime);
for (GreenwaveHistPOExt greenwaveHistPOExt : extList) {
GreenwaveRunMonitorVO greenWaveRunMonitorVO = new GreenwaveRunMonitorVO();
......@@ -1150,6 +1151,7 @@ public class TrendServiceImpl implements TrendService {
// 获取当前日期和时间的 Calendar 对象
Calendar calendar = Calendar.getInstance();
calendar.set(2023,11,18,7,00,00);
// 设置时、分、秒和毫秒为 0,以获取当天的 00:00:00
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
......@@ -1370,6 +1372,7 @@ public class TrendServiceImpl implements TrendService {
List<MainlineSchemeAnalysisVO.GreenwaveData> greenwaveData) {
Calendar now = Calendar.getInstance();
now.set(2023,11,18,10,00,00);
String currentTime = new SimpleDateFormat("HH:mm").format(now.getTime());
for (MainlineSchemeAnalysisVO.GreenwaveData data : greenwaveData) {
......
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