From 59b61e7cd8c8c648da383971b5ad5b2691c11245 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 30 四月 2025 11:29:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcDataServiceImpl.java | 10 +++++++++-
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/config/ScheduleJobListConfig.java | 6 ++++++
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcDataEntity.java | 3 ++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcDataEntity.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcDataEntity.java
index c93ec39..01d3497 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcDataEntity.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcDataEntity.java
@@ -7,6 +7,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.util.Date;
@Data
@TableName("t_arc_data")
@@ -43,6 +44,6 @@
/**
* 创建时间
*/
- private String createTime;
+ private Date createTime;
}
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcDataServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcDataServiceImpl.java
index d1dca00..9f71963 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcDataServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcDataServiceImpl.java
@@ -125,6 +125,8 @@
arcDataEntity.setArcTime(arcTime);
arcDataEntity.setArcId(item.getId());
arcDataEntity.setArcValue(value);
+ arcDataEntity.setCode(item.getCode());
+ arcDataEntity.setCreateTime(new Date());
insert(arcDataEntity);
log.debug("归档完成，point："+item.getPoint());
});
@@ -155,6 +157,8 @@
arcDataEntity.setArcTime(arcTime);
arcDataEntity.setArcId(item.getId());
arcDataEntity.setArcValue(value);
+ arcDataEntity.setCode(item.getCode());
+ arcDataEntity.setCreateTime(new Date());
insert(arcDataEntity);
log.debug("归档完成，point："+item.getPoint());
});
@@ -185,6 +189,8 @@
arcDataEntity.setArcTime(arcTime);
arcDataEntity.setArcId(item.getId());
arcDataEntity.setArcValue(value);
+ arcDataEntity.setCode(item.getCode());
+ arcDataEntity.setCreateTime(new Date());
insert(arcDataEntity);
log.debug("归档完成，point："+item.getPoint());
});
@@ -218,7 +224,9 @@
BigDecimal prev = BigDecimal.valueOf(valueList.get(0).getV());
for (int i = 1; i < valueList.size(); i++) {
BigDecimal curr = BigDecimal.valueOf(valueList.get(i).getV());
- value = value.add(curr.subtract(prev));
+ if(curr.compareTo(prev) > 0) {
+ value = value.add(curr.subtract(prev));
+ }
prev = curr;
}
break;
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/config/ScheduleJobListConfig.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/config/ScheduleJobListConfig.java
index 9dcefe4..0f071aa 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/config/ScheduleJobListConfig.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/config/ScheduleJobListConfig.java
@@ -25,5 +25,11 @@
scheduleJobList.add("pointCollectTaskNetKIO10");
scheduleJobList.add("pointCollectTaskNetKIO60");
scheduleJobList.add("indCollectTaskNetDay");
+ scheduleJobList.add("pointArchivingTaskNet1h");
+ scheduleJobList.add("pointArchivingTaskNet15min");
+ scheduleJobList.add("pointArchivingTaskNetDay");
+ scheduleJobList.add("pointArchivingTaskNetMonth");
+ scheduleJobList.add("pointArchivingTaskNetShift");
+ scheduleJobList.add("pointArchivingTaskNetYear");
}
}
--
Gitblit v1.9.3