liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

Merge branch 'liwenlong-jingquan'

Browse Source 
# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java
#	fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java
#	fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
#	fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
This commit is contained in:
daiyongfei
2025-09-18 12:03:43 +08:00
parent 630c6a8a35 4d9038567f
commit 7d4bc1f8ad
10 changed files with 540 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttXinghanJson.java
View File

@ -39,8 +39,8 @@ public class MqttXinghanJson {
/**
* 第七键值对, 静止报警状态，0-未静止报警，1-正在静止报警。
*/
@JsonProperty("staShakeBit")
public Integer sta_ShakeBit;
@JsonProperty("sta_ShakeBit")
public Integer staShakeBit;
/**
* 第八键值对, 4G信号强度，0-32，数值越大，信号越强。
*/