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 | 6 ++++--
lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml | 9 +++++++--
2 files changed, 11 insertions(+), 4 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 da5fdd5..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
@@ -210,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")) {
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
index cba014e..d783d04 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
@@ -52,7 +52,12 @@
instanceName: MyScheduler
instanceId: AUTO
jobStore:
- selectWithLockSQL: SELECT* FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?
+ class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
+ driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+ tablePrefix: qrtz_
+ isClustered: true
+ misfireThreshold: 12000
+ clusterCheckinInterval: 15000
threadPool:
class: org.quartz.simpl.SimpleThreadPool
threadCount: 10
@@ -126,7 +131,7 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/lx_iot_mdc?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/lxzn?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: root
driver-class-name: com.mysql.cj.jdbc.Driver
--
Gitblit v1.9.3