From 656aa4f953eb52502a6414965e46642c31b6e8ee Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 四月 2025 15:33:09 +0800
Subject: [PATCH] 设备会在多种功能码上报数据中携带报警与状态数据，这样数据库保存设备报警与状态数据可能很多，为此修改逻辑，当前实现为一设备一个小时内只保存一条报警与状态数据。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
index e33506e..066894a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
@@ -84,16 +84,22 @@
List<Integer> yearGrp = new ArrayList<Integer>();
int nowYear = Integer.parseInt(DateTime.yyyy()) ;
if(qo.year == null) {
- for(int i = startYear4YearStatistics; i <= nowYear; i++) {
+ int startYear = nowYear - 4 ;//鏌�5骞寸殑
+ if(startYear < startYear4YearStatistics){
+ startYear = startYear4YearStatistics ;
+ }
+ for(int i = startYear; i <= nowYear; i++) {
yearGrp.add(i) ;
}
}else{
+ /*
if(qo.year > nowYear){
qo.year = nowYear;
}
if(qo.year < startYear4YearStatistics){
qo.year = startYear4YearStatistics;
}
+ */
yearGrp.add(qo.year) ;
}
return BaseResponseUtils.buildSuccess(this.sv.selectStClientAmountYear(qo, yearGrp));
--
Gitblit v1.8.0