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

Merge remote-tracking branch 'origin/dyf-device' into 6170

Browse Source 
# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java
This commit is contained in:
daiyongfei
2025-09-02 08:51:41 +08:00
parent dfb5d8ac65 eca113d388
commit 0787e4b205
16 changed files with 310 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
<!-- 查询设备告警列表 -->
<select id="selectVoPage" resultType="com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo">
select *, d.device_mac as deviceMac, d.device_imei as deviceImei,
d.type_name as deviceTypeName
d.type_name as deviceTypeName, d.device_pic as devicePic
from device_alarm da
left join device d on da.device_id = d.id
left join device_type dt on dt.id = da.device_type

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

@ -41,7 +41,7 @@
SELECT *
FROM (
SELECT
da.id AS id, d.device_name, d.bluetooth_name,
da.id AS id, d.id AS deviceId, d.device_name, d.bluetooth_name, d.group_id,
d.pub_topic, d.sub_topic, d.device_pic,
d.device_mac, d.device_sn, d.update_by,
d.device_imei, d.update_time, dg.id AS device_type,
@ -71,6 +71,9 @@
<if test="criteria.deviceStatus != null">
and da.active = #{criteria.deviceStatus}
</if>
<if test="criteria.groupId != null">
and d.group_id = #{criteria.groupId}
</if>
<if test="criteria.params.beginTime != null and criteria.params.endTime != null">
and da.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}
</if>