From 73ff23c1359f5688760ea0279c526136414127ac Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 16 六月 2023 19:01:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 28381b2..3e5eaa6 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -384,16 +384,17 @@
//String time = ymdh.format(wd.getCreateTime());
//list.add(new WarningVo(wd.getLocationName(), wd.getSuYuanId(), 0.0, 0.0, wd.getValue(), time));
- int rows = suYuanMapper.isTableExists(wd.getTableName());
+ DistanceSuYuan suYuan = suYuanMapper.getSuYuanById(wd.getTableName(), wd.getSuYuanId());
- DistanceSuYuan suYuan = null;
+ int rows = suYuanMapper.isTableExists(wd.getTableName());
+ DistanceSuYuan suMax = null;
if (rows > 0) {
MonitorPointPosition point = commonService.select3dCheckPointByName(wd.getLocationName());
List<String> ids3d = CalculateUtils.aloneCrosswiseExtend(point, 50);
- suYuan = suYuanMapper.getSuYuan500Max(wd.getTableName(), ids3d);
+ suMax = suYuanMapper.getSuYuan500Max(wd.getTableName(), ids3d);
}
- Report report = Report.calcReport(wd, suYuan);
+ Report report = Report.calcReport(wd, suYuan, suMax);
list.add(report);
}
--
Gitblit v1.9.3