From fbc2429987b5d9a645349fabeb2960948d07fef4 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 24 十一月 2025 12:48:59 +0800
Subject: [PATCH] 伸长率、电阻数采对接新Iot平台数据
---
ruoyi-admin-ztns/src/main/resources/application-ztns.yml | 76 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin-ztns/src/main/resources/application-ztns.yml b/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
index 3d83cd6..ddf388d 100644
--- a/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
+++ b/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
@@ -10,7 +10,7 @@
master:
url: jdbc:mysql://127.0.0.1:3306/center-lims-ztns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: uvjN5qkwwJ@C)
+ password: ~u8jSK784jMKJur7
# 浠庡簱鏁版嵁婧�
slave:
@@ -50,8 +50,8 @@
allow:
url-pattern: /druid/*
# 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
- login-username: ruoyi
- login-password: 123456
+ login-username: ztns_admin
+ login-password: ^60RkNBrAH7!6n)
filter:
stat:
enabled: true
@@ -72,7 +72,7 @@
# 鏁版嵁搴撶储寮�
database: 1
# # 瀵嗙爜
- password: 9Z*$_StZ_5!S2ZY
+ password: iHDR^6&Z8Oj_2Mx
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -131,7 +131,7 @@
# oa娴佺▼
oa:
oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
- prodIp: http://192.168.21.53:7012/lims
+ prodIp: http://192.168.21.53:7002/lims
unqualifiedProcessId: 715114
# 浼佷笟寰俊鎺ㄩ��
@@ -161,25 +161,71 @@
custorder-port: http://192.168.20.50:8008/PurchService.ashx?
erp-services: http://192.168.20.50:8081
+mes:
+ ztns:
+ ip: http://10.1.51.128
+ user: lims
+ password: q1CItm6Zl7P4SQkfczu/oQ==
+
# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@
mqtt:
- - url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
- username: 2455220 # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
- password: 108300 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+# - url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
+# username: 2455220 # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+# password: 108300 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+# timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
+# keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
+# qos: 1 # 蹇冭烦鍖呯骇鍒�
+# completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
+# clientId: ztns01 # clientId
+# subscribe: /ztt/v3/2455220/publish # 璁㈤槄涓婚
+# client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
+# - url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
+# username: 2455221 # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+# password: 108295 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+# timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
+# keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
+# qos: 1 # 蹇冭烦鍖呯骇鍒�
+# completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
+# clientId: ztns02 # clientId
+# subscribe: /ztt/v3/2455221/publish # 璁㈤槄涓婚
+# client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
+ - url: tcp://mqtt.ztt.cn:1883 # 鏈嶅姟鍣╥p
+ username: admin # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+ password: public # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
qos: 1 # 蹇冭烦鍖呯骇鍒�
completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
- clientId: ztns01 # clientId
- subscribe: /ztt/v3/2455220/publish # 璁㈤槄涓婚
+ clientId: ztns_gc_scl_108303 # clientId,杩囩▼璇曢獙瀹や几闀跨巼璁惧
+ subscribe: /aiot/5447dad0-c6b9-11f0-8b13-c14e8310d70b # 璁㈤槄涓婚
client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
- - url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
- username: 2455221 # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
- password: 108295 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+ - url: tcp://mqtt.ztt.cn:1883 # 鏈嶅姟鍣╥p
+ username: admin # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+ password: public # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
qos: 1 # 蹇冭烦鍖呯骇鍒�
completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
- clientId: ztns02 # clientId
- subscribe: /ztt/v3/2455221/publish # 璁㈤槄涓婚
+ clientId: ztns_gc_dz_108301 # clientId
+ subscribe: /aiot/51eaff10-c6b9-11f0-8b13-c14e8310d70b # 璁㈤槄涓婚
client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
+ - url: tcp://mqtt.ztt.cn:1883 # 鏈嶅姟鍣╥p
+ username: admin # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+ password: public # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+ timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
+ keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
+ qos: 1 # 蹇冭烦鍖呯骇鍒�
+ completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
+ clientId: ztns_cp_scl_108295 # clientId,杩囩▼璇曢獙瀹や几闀跨巼璁惧
+ subscribe: /aiot/a4b27900-c6b7-11f0-8b13-c14e8310d70b # 璁㈤槄涓婚
+ client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
+ - url: tcp://mqtt.ztt.cn:1883 # 鏈嶅姟鍣╥p
+ username: admin # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+ password: public # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+ timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
+ keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
+ qos: 1 # 蹇冭烦鍖呯骇鍒�
+ completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
+ clientId: ztns_cp_dz_108300 # clientId
+ subscribe: /aiot/4e40cdb0-c6b7-11f0-8b13-c14e8310d70b # 璁㈤槄涓婚
+ client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
\ No newline at end of file
--
Gitblit v1.9.3