From b300d6edc8ee95ef897b96875d783925de5777ab Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 26 四月 2023 16:46:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 68 +++++++++++++++++++++-------------
src/main/java/com/yssh/controller/WarningAnalyseController.java | 4 --
2 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index d724acb..a225299 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -33,8 +33,6 @@
public static final long CACHE_HOLD_TIME_24H = 24 * 60 * 60 * 1000L;
- //鎶ヨ鍒嗘瀽
-
/**
* 1.鏌ヨ褰撳墠鏃堕棿鐨勬墍鏈夌偣浣峷alue鍊硷紙浠�47.dat鏌ヨ鍗冲彲锛�
* 2.绛涢�夊ぇ浜巠ssh_bjyj涓殑jcbj瀛楁鐨勫�� 杩斿洖id+缁忕含搴�+value
@@ -45,8 +43,6 @@
public Result alarmAnalyse() {
return Result.OK(warningService.getRunTimeAlarmAnalyse());
}
-
- //棰勮鍒嗘瀽
/**
* 1.鏌ヨ褰撳墠鏃堕棿鐨勬墍鏈夌偣浣峷alue鍊硷紙浠�47.dat鏌ヨ鍗冲彲锛�
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 79b1a49..ce640f9 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -75,12 +75,11 @@
public List<WarningVo> getRunTimeAlarmAnalyse() {
List<WarningVo> result = new ArrayList<>();
Date nowDate = DateUtils.getNowDate();
- String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, nowDate);
- DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
- if (StringUtils.isNull(dictRecord)) {
- nowDate = DateUtils.getAPeriodOfTime(nowDate, -1, Calendar.HOUR_OF_DAY);
- }
-
+ //String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, nowDate);
+ //DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
+ //if (StringUtils.isNull(dictRecord)) {
+ // nowDate = DateUtils.getAPeriodOfTime(nowDate, -1, Calendar.HOUR_OF_DAY);
+ //}
//List<WarningDetail> list = alarmAnalyseOperation(nowDate);
List<WarningDetail> list = new ArrayList<>();
@@ -92,7 +91,6 @@
list.addAll(rs);
}
}
-
list.forEach(s -> {
result.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue()));
});
@@ -111,13 +109,13 @@
public List<WarningVo> getRunTimeWarningAnalyse() {
List<WarningVo> result = new ArrayList<>();
Date nowDate = DateUtils.getNowDate();
- String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, nowDate);
- DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
- if (StringUtils.isNull(dictRecord)) {
- nowDate = DateUtils.getAPeriodOfTime(nowDate, -1, Calendar.HOUR_OF_DAY);
- }
-
+ //String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, nowDate);
+ //DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
+ //if (StringUtils.isNull(dictRecord)) {
+ // nowDate = DateUtils.getAPeriodOfTime(nowDate, -1, Calendar.HOUR_OF_DAY);
+ //}
//List<WarningDetail> list = warningAnalyseOperation(nowDate);
+
List<WarningDetail> list = new ArrayList<>();
Calendar calendar = getCalendar(nowDate);
for (int i = 0; i < 3; i++) {
@@ -127,7 +125,6 @@
list.addAll(rs);
}
}
-
list.forEach(s -> {
result.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue()));
});
@@ -135,36 +132,55 @@
}
public List<WarningDetail> alarmAnalyseOperation(Date date) {
- List<WarningDetail> result = new ArrayList<WarningDetail>();
+ List<WarningDetail> result = new ArrayList<>();
String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, date);
List<String> ids = CalculateUtils.assembleId(commonService.getCheckPoints3d());
+ if (ids.size() == 0) {
+ return result;
+ }
DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
- if (StringUtils.isNull(dictRecord)) {
+ if (null == dictRecord) {
return result;
}
String tableName = dictRecord.getTableName();
+ if (suYuanMapper.isTableExists(tableName) == 0) {
+ return result;
+ }
+
List<SuYuan2d> list = suYuanMapper.getAlarmsAnalyse(tableName, ids);
- list.forEach(s -> {
- String locationName = commonService.select3dCheckPointById(s.getId()).getName();
- result.add(new WarningDetail(0L, tableName, s.getId(), locationName, date, 0, s.getValue()));
- });
+ if (null != list && list.size() > 0) {
+ for (SuYuan2d s : list) {
+ String locationName = commonService.select3dCheckPointById(s.getId()).getName();
+ result.add(new WarningDetail(0L, tableName, s.getId(), locationName, date, 0, s.getValue()));
+ }
+ }
+
return result;
}
public List<WarningDetail> warningAnalyseOperation(Date date) {
- List<WarningDetail> result = new ArrayList<WarningDetail>();
+ List<WarningDetail> result = new ArrayList<>();
String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, date);
List<String> ids = CalculateUtils.assembleId(commonService.getCheckPoints3d());
+ if (ids.size() == 0) {
+ return result;
+ }
DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
- if (StringUtils.isNull(dictRecord)) {
+ if (null == dictRecord) {
return result;
}
String tableName = dictRecord.getTableName();
+ if (suYuanMapper.isTableExists(tableName) == 0) {
+ return result;
+ }
+
List<SuYuan2d> list = suYuanMapper.getWarningAnalyse(tableName, ids);
- list.forEach(s -> {
- String locationName = commonService.select3dCheckPointById(s.getId()).getName();
- result.add(new WarningDetail(0L, tableName, s.getId(), locationName, date, 1, s.getValue()));
- });
+ if (null != list && list.size() > 0) {
+ for (SuYuan2d s : list) {
+ String locationName = commonService.select3dCheckPointById(s.getId()).getName();
+ result.add(new WarningDetail(0L, tableName, s.getId(), locationName, date, 1, s.getValue()));
+ }
+ }
return result;
}
--
Gitblit v1.9.3