admin/iot_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Gjm
2026-05-13 10:32:33 +08:00
parent d9aefeaf9c 9854bd188b
commit e116c95d57
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lidee-iot-data/src/main/java/iot/lidee/iot/data/job/SyncDeviceMaintenanceRepairJob.java
View File

@@ -27,6 +27,6 @@ public class SyncDeviceMaintenanceRepairJob {
deviceMaintenanceRepairService.syncDeviceMaintenanceRepairInfo(); deviceMaintenanceRepairService.syncDeviceMaintenanceRepairInfo();
log.info("*********** 开始同步维修保修数据 ************"); log.info("*********** 同步维修保修数据结束 ************");
} }
} }

6
lidee-service/lidee-iot-service/src/main/resources/mapper/iot/ByManagementJlMapper.xml
View File

@@ -36,8 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
by_management_jl w by_management_jl w
LEFT JOIN sys_device s ON s.id = w.equipment_info LEFT JOIN sys_device s ON s.id = w.equipment_info
WHERE WHERE
s.dev_type = #{devtype} w.is_deleted = 0
AND w.is_deleted = 0; <if test="devtype != null">
AND s.dev_type = #{devtype}
</if>
</select> </select>
</mapper> </mapper>

10
lidee-service/lidee-iot-service/src/main/resources/mapper/iot/DevGzbxWxgdMapper.xml
View File

@@ -51,7 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN LEFT JOIN
sys_device s ON s.id = w.dev_name sys_device s ON s.id = w.dev_name
WHERE WHERE
w.dev_type = #{devtype} AND w.is_deleted = 0 w.is_deleted = 0
<if test="devtype != null">
AND w.dev_type = #{devtype}
</if>
</select> </select>
<select id="deviceList" resultType="iot.lidee.iot.domain.Device"> <select id="deviceList" resultType="iot.lidee.iot.domain.Device">
@@ -62,7 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN LEFT JOIN
iot_device_group g ON g.device_id = w.device_id iot_device_group g ON g.device_id = w.device_id
WHERE WHERE
w.del_flag = 0 AND g.group_id = #{devtype} w.del_flag = 0
<if test="devtype != null">
AND g.group_id = #{devtype}
</if>
</select> </select>