From 74e3485e6bae63e73f5d3be8b36c671e30aa389d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 20 十一月 2024 10:31:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/WarningAnalyseService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index e1ee99c..0a0aece 100644
--- a/src/main/java/com/yssh/service/WarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/WarningAnalyseService.java
@@ -71,10 +71,11 @@
List<Qxsh> list = CacheUtils.getListByKey(key);
if (null == list) {
list = qxshMapper.selectAlarmByBeginAndEnd(start, end);
+ copeHasSuYuan(list);
CacheUtils.putListByKey(key, list);
}
- return copeHasSuYuan(list);
+ return list;
}
/**
@@ -86,10 +87,11 @@
List<Qxsh> list = CacheUtils.getListByKey(key);
if (null == list) {
list = qxshMapper.selectWarnByBeginAndEnd(start, end);
+ copeHasSuYuan(list);
CacheUtils.putListByKey(key, list);
}
- return copeHasSuYuan(list);
+ return list;
}
/**
@@ -262,12 +264,20 @@
WarningDetail wd = new WarningDetail(0L, tab, suYuanId, qxsh.getName(), null, 0, qxsh.getValue());
DistanceSuYuan suYuan = suYuanMapper.getSuYuanById(tab, suYuanId);
+ if (null == suYuan) {
+ String[] strs = suYuanId.split("_");
+ suYuan = new DistanceSuYuan(null, null, 0.0, suYuanId, Integer.parseInt(strs[0]), Integer.parseInt(strs[1]), 0, 0, null, 0.0, 0.0, 0.0, 0.0);
+ }
//List<String> ids3d = CalculateUtils.aloneCrosswiseExtend(point, 50);
//DistanceSuYuan suMax = suYuanMapper.getSuYuan500Max(tab, ids3d);
//String filter = CalculateUtils.getFilterByExtend(point, 50);
String filter = getFilterByPoint(point, 50);
DistanceSuYuan suMax = suYuanMapper.getSuYuan500MaxByFilter(tab, filter);
+ if (null == suMax) {
+ String[] strs = suYuanId.split("_");
+ suMax = new DistanceSuYuan(null, null, 0.0, suYuanId, Integer.parseInt(strs[0]), Integer.parseInt(strs[1]), 0, 0, null, 0.0, 0.0, 0.0, 0.0);
+ }
suMax.setAddr(getAddr(suMax.getId()));
Report report = Report.calcReport(wd, suYuan, suMax);
--
Gitblit v1.9.3