From 3b20c91323abd42512a45a8796871a81454f53b8 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期五, 29 八月 2025 09:54:58 +0800
Subject: [PATCH] 设备单表设备编号处理
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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..810ca82 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,12 +82,15 @@
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();
// 鍑忓幓涓�鍒嗛挓
-// LocalDateTime oneMinuteAgo = now.minusMinutes(1);
LocalDateTime oneMinuteAgo = now.minusSeconds(2);
// 鏍煎紡鍖栦负瀛楃涓诧紙鍙�夛級
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -98,29 +101,16 @@
end.set(formattedTime);
}
});
- if (start.get().equals("")){
+ if (start.get().equals("")) {
return;
}
LocalDateTime startTime = LocalDateTime.parse(start.get(), inputFormatter);
LocalDateTime endTime = LocalDateTime.parse(end.get(), inputFormatter);
// 瀹氫箟鏃ユ湡鏃堕棿鏍煎紡鍣紙ISO_LOCAL_DATE_TIME 瀵瑰簲 "yyyy-MM-ddTHH:mm:ss"锛�
DateTimeFormatter formatter1 = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
-
- // 瑙ｆ瀽瀛楃涓蹭负 LocalDateTime 瀵硅薄
- LocalDateTime startDateTime = LocalDateTime.parse(startTime.toString(), formatter1);// 瑙ｆ瀽瀛楃涓蹭负 LocalDateTime 瀵硅薄
- LocalDateTime endDateTime = LocalDateTime.parse(endTime.toString(), formatter1);
-
- // 鍔犱笂 8 灏忔椂
- LocalDateTime startNewDateTime = startDateTime.minusHours(8);
- LocalDateTime endNewDateTime = endDateTime.minusHours(8);
-// String query = "from(bucket: \"IOT\") \n" +
-// "|> range(start: "+startNewDateTime+"Z, stop: "+endNewDateTime+"Z) \n" +
-// "|> fill(usePrevious: true) \n" +
-// "|> filter(fn: (r) => r[\"_field\"] == \"TimeStamp\" or r[\"_field\"] == \"Value\")";
String query = "from(bucket: \"" + influxBucket + "\") " +
"|> range(start: -5s) " +
"|> filter(fn: (r) => r[\"_field\"] == \"TimeStamp\" or r[\"_field\"] == \"Value\")";
-
// 鎵ц鏌ヨ
try {
List<FluxTable> tables = queryApi.query(query, influxOrg);
@@ -154,11 +144,16 @@
)),
Collectors.toList()
));
-
// 澶勭悊璁惧鐘舵��
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 +195,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(index + 1);
+ }
if (databaseType.equals("SqlServer")) {
equipmentService.insertSqlServerData(tableName, columns, values);
} else if (databaseType.equals("MySql")) {
--
Gitblit v1.9.3