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

app增加字典

Browse Source
This commit is contained in:
chenyouting
2025-08-15 10:14:35 +08:00
parent f65a8cdc8c
commit 33f3cb5989
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml
View File

@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.device_pic, d.device_pic,
dt.type_name, dt.type_name,
dt.communication_mode, dt.communication_mode,
dt.model_dictionary detailPageUrl,
d.bluetooth_name, d.bluetooth_name,
c.binding_time, c.binding_time,
ad.*,u.user_name otherPhonenumber ad.*,u.user_name otherPhonenumber
@ -34,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dt.type_name, dt.type_name,
dt.communication_mode, dt.communication_mode,
d.bluetooth_name, d.bluetooth_name,
dt.model_dictionary detailPageUrl,
c.binding_time, c.binding_time,
ad.*,u.user_name otherPhonenumber ad.*,u.user_name otherPhonenumber
from from

5
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java
View File

@ -81,4 +81,9 @@ public class AppDeviceVo implements Serializable {
* 告警状态(0解除告警，1告警) * 告警状态(0解除告警，1告警)
*/ */
private String alarmStatus; private String alarmStatus;
/**
* 设备详情页面
*/
private String detailPageUrl;
} }

2
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
View File

@ -148,6 +148,7 @@
dt.type_name, dt.type_name,
dt.communication_mode, dt.communication_mode,
d.bluetooth_name, d.bluetooth_name,
dt.model_dictionary detailPageUrl,
c.binding_time c.binding_time
from device d from device d
inner join device_type dt on d.device_type = dt.id inner join device_type dt on d.device_type = dt.id
@ -177,6 +178,7 @@
d.device_pic, d.device_pic,
dt.type_name, dt.type_name,
dt.communication_mode, dt.communication_mode,
dt.model_dictionary detailPageUrl,
d.bluetooth_name d.bluetooth_name
from device d from device d
inner join device_type dt on d.device_type = dt.id inner join device_type dt on d.device_type = dt.id