boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (farm): 设备中心

Browse Source 
- 水肥机设备
This commit is contained in:
达富斌
2025-10-10 18:58:27 +08:00
parent 4af34297e2
commit 1aed0f42ab
11 changed files with 176 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
yudao-server/src/main/resources/application.yaml
View File

@@ -344,10 +344,10 @@ spring:
keep-alive: 60s # 空闲线程存活时间
# 万懋wms系统
wms:
hosts: ${wms.hosts}
url_1: ${wms.url_1}
hosts: ${wanmao.wms.hosts}
url_1: ${wanmao.wms.url_1}
# 万懋设备管理
# 吉水设备管理
device-manager:
# 四情 (文档来源: 物连网农业四情采集api协议.pdf 版本:v2.0.3 日期:2022.08.16)
four-situations:
@@ -375,7 +375,11 @@ device-manager:
hosts: https://ryy.mythiot.com
username: jishui
password: jishui@888
url-1: /prod-api/login # 获取公钥 POST
clientId: 8db4e3f233bba68d069d2f628ee8a621 # 固定值
grantType: password # 固定值
url-1: /prod-api/auth/getToken # 获取公钥 POST
url-2: /prod-api/agriculture/deviceMain/list # 获取设备列表 GET
url-3: /prod-api/agriculture/deviceMain/getDeviceAllPropertyAndDataSimple/{0} # 获取设备实时状态 GET {0}: deviceId
url-3: /prod-api/agriculture/deviceMain/getDeviceAllPropertyAndData/{0} # 获取设备实时状态 GET {0}: deviceId
url-4: /prod-api/agriculture/deviceMain/updateDeviceStatus # 更改设备属性 POST

10
yudao-server/src/main/resources/db.properties
View File

@@ -12,15 +12,15 @@ redis.database=5
redis.password=luxifa970219
wm.wx.mp.app-id=wx508d9a9ab84f67d0
wm.wx.mp.secret=88b5a8deca40c8f86d064717d82d8485
wm.wx.mp.secret=92c571b9973f9078c11da47a16c4094c
wm.wx.miniapp.app-id=wx508d9a9ab84f67d0
wm.wx.miniapp.secret=88b5a8deca40c8f86d064717d82d8485
wm.wx.miniapp.secret=92c571b9973f9078c11da47a16c4094c
# ????
wms.hosts=https://wms.simple.gltec.cn/prod-ai
wanmao.wms.hosts=https://wms.simple.gltec.cn/prod-api
# ????
#wms.hosts=47.111.15.9:8074/prod-api
wms.url_1=getTenantByMobile
#wanmao.wms.hosts=47.111.15.9:8074/prod-api
wanmao.wms.url_1=getTenantByMobile