From cca49565739060eb7097302e5d49d8619c742f4c Mon Sep 17 00:00:00 2001
From: wangyan <405898180@qq.com>
Date: Sat, 15 Nov 2025 17:27:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(config):=20=E6=9B=B4=E6=96=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E9=85=8D=E7=BD=AE=E5=8F=8A=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=9C=B0=E5=9D=80-=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84=E9=94=AE?=
 =?UTF-8?q?=E5=80=BC=E5=AF=B9=E5=88=86=E9=9A=94=E7=AC=A6=E4=B8=BA=E7=AD=89?=
 =?UTF-8?q?=E5=8F=B7=20-=E4=BF=AE=E6=AD=A3MySQL=E5=92=8CPostgreSQL?=
 =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E7=B1=BB=E5=90=8D=E9=85=8D=E7=BD=AE=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F-=20=E6=9B=B4=E6=96=B0XXL-JOB=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AB=AF=E5=9C=B0=E5=9D=80=E8=87=B3=E6=96=B0=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=20-=20=E8=B0=83=E6=95=B4Druid=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E6=B1=A0=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=20-=20=E6=96=B0=E5=A2=9E=E9=99=A4=E5=B0=98=E5=99=A8=E9=94=81?=
 =?UTF-8?q?=E6=B0=94=E5=8D=B8=E7=81=B0=E6=95=85=E9=9A=9C=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduled/dataDocking/TagDescription.java |  6 ++
 src/main/resources/application-dev.properties | 62 +++++++++----------
 .../resources/application-local.properties    | 44 +++++++------
 .../resources/application-master.properties   |  4 +-
 4 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/src/main/java/com/zcloud/scheduled/dataDocking/TagDescription.java b/src/main/java/com/zcloud/scheduled/dataDocking/TagDescription.java
index 20e7af3..8aab615 100644
--- a/src/main/java/com/zcloud/scheduled/dataDocking/TagDescription.java
+++ b/src/main/java/com/zcloud/scheduled/dataDocking/TagDescription.java
@@ -27,6 +27,12 @@ public enum TagDescription {
     TAG338("2#除尘器出风口压力"),
     TAG347("3#除尘器进风口压力"),
     TAG348("3#除尘器出风口压力"),
+    TAG355("1#除尘器锁气卸灰故障信号南"),
+    TAG356("1#除尘器锁气卸灰故障信号北"),
+    TAG357("2#除尘器锁气卸灰故障信号南"),
+    TAG358("2#除尘器锁气卸灰故障信号北"),
+    TAG359("3#除尘器锁气卸灰故障信号南"),
+    TAG360("3#除尘器锁气卸灰故障信号北"),
     TAG339("1#除尘器灰斗温度1#东南温度"),
     TAG340("1#除尘器灰斗温度1#东北温度"),
     TAG341("1#除尘器灰斗温度1#西南温度"),
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 4411473..07c07ec 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,9 +1,9 @@
-datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
+datasource.no1.driver-class-name=com.mysql.cj.jdbc.Driver
 datasource.no1.url=jdbc:mysql://192.168.20.230:33080/integrated_yjb?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no1.username=root
 datasource.no1.password=Mysql@zcloud33080
 #
-datasource.no2.driver-class-name:org.postgresql.Driver
+datasource.no2.driver-class-name=org.postgresql.Driver
 datasource.no2.url=jdbc:postgresql://39.100.115.58:15431/postgres?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
 datasource.no2.username=postgres
 datasource.no2.password=DjIGYM8k0h
@@ -13,45 +13,45 @@ spring.redis.password=5.5pYdZqHxpR#9%W.
 spring.redis.database=4
 spring.redis.port=16379
 
-#druid连接池
-spring.datasource.type:com.alibaba.druid.pool.DruidDataSource
-#最大活跃数
-spring.datasource.maxActive:20
-#初始化数量
-spring.datasource.initialSize:1
-#最大连接等待超时时间
-spring.datasource.maxWait:60000
-#打开PSCache，并且指定每个连接PSCache的大小
-spring.datasource.poolPreparedStatements:true
-spring.datasource.maxPoolPreparedStatementPerConnectionSize:20
-#通过connectionProperties属性来打开mergeSql功能；慢SQL记录
-#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-spring.datasource.minIdle:1
-spring.datasource.timeBetweenEvictionRunsMillis:60000
-spring.datasource.minEvictableIdleTimeMillis:300000
-spring.datasource.validationQuery:select 1 from dual
-spring.datasource.testWhileIdle:true
-spring.datasource.testOnBorrow:false
-spring.datasource.testOnReturn:false
-#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
-filters:stat, wall, log4j
-#缓存配置文件位置
+#druid连接池
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+#最大活动数
+spring.datasource.maxActive=20
+#初始化数量
+spring.datasource.initialSize=1
+#最大连接等待超时时间
+spring.datasource.maxWait=60000
+#打开PSCache，并且指定每个连接PSCache的大小
+spring.datasource.poolPreparedStatements=true
+spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
+#通过connectionProperties属性来打开mergeSql功能；慢SQL记录
+#connectionProperties= druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring.datasource.minIdle=1
+spring.datasource.timeBetweenEvictionRunsMillis=60000
+spring.datasource.minEvictableIdleTimeMillis=300000
+spring.datasource.validationQuery=select 1 from dual
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=false
+spring.datasource.testOnReturn=false
+#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
+filters=stat, wall, log4j
+#缓存配置文件位置
 spring.cache.ehcache.cofnig=ehcache.xml
-#配置这句话,控制台输出sql语句
+#配置这句话,控制台输出sql语句
 logging.level.com.zcloud.mapper=debug
-#上传文件大小限制
+#上传文件大小限制
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
-#activiti模型检测
+#activiti模型检测
 spring.activiti.check-process-definitions=false
-#字符
+#字符
 server.servlet.encoding.charset=UTF-8
 server.servlet.encoding.force=true
 server.servlet.encoding.enabled=true
 spring.main.banner-mode=off
 
-xxl.job.admin.addresses=http://192.168.20.230:28080/xxl-job-admin
+xxl.job.admin.addresses=http://172.16.70.226:8084/xxl-job-admin
 xxl.job.accessToken=yjb.prod
 xxl.job.port=1211
 xxl.job.executor.appname=yjb-job-normal-task
-xxl.job.executor.logretentiondays=30
+xxl.job.executor.logretentiondays=30
\ No newline at end of file
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
index c7e49a1..e8a4fc8 100644
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -1,13 +1,13 @@
-datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
+datasource.no1.driver-class-name=com.mysql.cj.jdbc.Driver
 datasource.no1.url=jdbc:mysql://172.16.70.228:33080/sx_yjb?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no1.username=root
 datasource.no1.password=Mysql@zcloud33080
 #
-datasource.no2.driver-class-name:org.postgresql.Driver
+datasource.no2.driver-class-name=org.postgresql.Driver
 datasource.no2.url=jdbc:postgresql://172.16.70.228:15431/postgres?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
 datasource.no2.username=postgres
 datasource.no2.password=Mysql@zcloud15431
-#MES系统数据库配置
+#MES系统数据库配置
 datasource.mes.driver-class-name=oracle.jdbc.driver.OracleDriver
 datasource.mes.url=jdbc:oracle:thin:@172.16.90.252:1521/jymes
 datasource.mes.username=drzf
@@ -23,27 +23,27 @@ spring.redis.database=10
 spring.redis.port=16379
 
 #druid连接池
-spring.datasource.type:com.alibaba.druid.pool.DruidDataSource
-#最大活跃数
-spring.datasource.maxActive:20
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+#最大活动数
+spring.datasource.maxActive=20
 #初始化数量
-spring.datasource.initialSize:1
+spring.datasource.initialSize=1
 #最大连接等待超时时间
-spring.datasource.maxWait:60000
+spring.datasource.maxWait=60000
 #打开PSCache，并且指定每个连接PSCache的大小
-spring.datasource.poolPreparedStatements:true
-spring.datasource.maxPoolPreparedStatementPerConnectionSize:20
+spring.datasource.poolPreparedStatements=true
+spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
 #通过connectionProperties属性来打开mergeSql功能；慢SQL记录
-#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-spring.datasource.minIdle:1
-spring.datasource.timeBetweenEvictionRunsMillis:60000
-spring.datasource.minEvictableIdleTimeMillis:300000
-spring.datasource.validationQuery:select 1 from dual
-spring.datasource.testWhileIdle:true
-spring.datasource.testOnBorrow:false
-spring.datasource.testOnReturn:false
+#connectionProperties= druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring.datasource.minIdle=1
+spring.datasource.timeBetweenEvictionRunsMillis=60000
+spring.datasource.minEvictableIdleTimeMillis=300000
+spring.datasource.validationQuery=select 1 from dual
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=false
+spring.datasource.testOnReturn=false
 #配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
-filters:stat, wall, log4j
+filters=stat, wall, log4j
 #缓存配置文件位置
 spring.cache.ehcache.cofnig=ehcache.xml
 #配置这句话,控制台输出sql语句
@@ -59,10 +59,8 @@ server.servlet.encoding.force=true
 server.servlet.encoding.enabled=true
 spring.main.banner-mode=off
 
-xxl.job.admin.addresses=http://192.168.20.230:28080/xxl-job-admin
+xxl.job.admin.addresses=http://172.16.70.226:8084/xxl-job-admin
 xxl.job.accessToken=yjb.prod
 xxl.job.port=1211
 xxl.job.executor.appname=yjb-job-normal-task
-xxl.job.executor.logretentiondays=30
-
-
+xxl.job.executor.logretentiondays=30
\ No newline at end of file
diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties
index 8859848..788107d 100644
--- a/src/main/resources/application-master.properties
+++ b/src/main/resources/application-master.properties
@@ -50,8 +50,8 @@ server.servlet.encoding.enabled=true
 spring.main.banner-mode=off
 
 
-xxl.job.admin.addresses=http://10.199.64.30:9001/xxl-job-admin/
+xxl.job.admin.addresses=http://172.16.70.226:8084/xxl-job-admin
 xxl.job.accessToken=yjb.prod
-xxl.job.port=10000
+xxl.job.port=1211
 xxl.job.executor.appname=yjb-job-normal-task
 xxl.job.executor.logretentiondays=30