From 62366fc03880af95d87a0d43fa281e4b071256bc Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期四, 28 八月 2025 15:41:57 +0800
Subject: [PATCH] quartz配置修改，设备单表设备编号处理
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java
index 1e81b96..b6bfba0 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java
@@ -82,8 +82,12 @@
AtomicReference<String> end = new AtomicReference<>("");
AtomicReference<Date> endDate = new AtomicReference<>(null); // 閲囬泦鏃堕棿
serverDeployList.forEach(s -> {
- if (s.getId().equals(in.getServerDeployId()) && s.getCollectTime() != null) {
- start.set(sdf.format(s.getCollectTime()));
+ if (s.getId().equals(in.getServerDeployId())) {
+ if (s.getCollectTime() != null) {
+ start.set(sdf.format(s.getCollectTime()));
+ } else {
+ start.set(sdf.format(new Date()));
+ }
// 鑾峰彇褰撳墠鏃堕棿
LocalDateTime now = LocalDateTime.now();
// 鍑忓幓涓�鍒嗛挓
@@ -98,7 +102,7 @@
end.set(formattedTime);
}
});
- if (start.get().equals("")){
+ if (start.get().equals("")) {
return;
}
LocalDateTime startTime = LocalDateTime.parse(start.get(), inputFormatter);
@@ -158,7 +162,13 @@
// 澶勭悊璁惧鐘舵��
int lastIndex = table.lastIndexOf('.');
String code = table.substring(lastIndex + 1);
- EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(code);
+ EquipmentLog equipmentLog = null;
+ if (databaseType.equals("SqlServer")) {
+ equipmentLog = equipmentLogService.selectEquipmentOporationSqlServer(code);
+ } else if (databaseType.equals("MySql")) {
+ equipmentLog = equipmentLogService.selectEquipmentOporationMySql(code);
+
+ }
// 璁惧鐘舵��
Integer equipmentState = null;
for (Map.Entry<String, List<Influxdb>> entry : timeListMap.entrySet()) {
@@ -200,8 +210,10 @@
// 杞崲涓� LocalDateTime
LocalDateTime dateTime = LocalDateTime.parse(influxdbList.get(0).getAcquisitionTime(), formatter);
values[influxdbList.size() + 1] = dateTime;
- values[influxdbList.size()] = tableName.replace("-", "_");
- // 鎻掑叆鏁版嵁
+ int index = tableName.indexOf("_");
+ if (index != -1) {
+ values[influxdbList.size()] = tableName.substring(0, index);
+ }
if (databaseType.equals("SqlServer")) {
equipmentService.insertSqlServerData(tableName, columns, values);
} else if (databaseType.equals("MySql")) {
--
Gitblit v1.9.3