code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-17 16:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

设备摘要bug修复

Browse Source
This commit is contained in:
kerwincui
2022-06-16 16:18:09 +08:00
parent 13663aad63
commit 5ebdb8d05e
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java
View File

@@ -34,9 +34,6 @@ public class EmqxService {
@Autowired
private IDeviceService deviceService;
// @Autowired
// private IDeviceLogService deviceLogService;
@Autowired
private ILogService logService;
@@ -133,11 +130,6 @@ public class EmqxService {
Device device = JSON.parseObject(message, Device.class);
device.setProductId(productId);
device.setSerialNumber(deviceNum);
// 未采用设备定位则清空定位，定位方式(1=ip自动定位，2=设备定位，3=自定义)
if(device.getLocationWay()!=2){
device.setLatitude(null);
device.setLongitude(null);
}
deviceService.reportDevice(device);
} catch (Exception e) {
logger.error("接收设备信息，解析数据时异常 message={}", e.getMessage());

5
springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
View File

@@ -825,6 +825,11 @@ public class DeviceServiceImpl implements IDeviceService {
@Override
public int reportDevice(Device device) {
Device deviceEntity=deviceMapper.selectDeviceBySerialNumber(device.getSerialNumber());
// 未采用设备定位则清空定位，定位方式(1=ip自动定位，2=设备定位，3=自定义)
if(deviceEntity.getLocationWay()!=2){
device.setLatitude(null);
device.setLongitude(null);
}
int result=0;
if(deviceEntity!=null){
// 更新设备信息

4
springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
View File

@@ -316,6 +316,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="imgUrl != null">img_url,</if>
<if test="summary != null">summary,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
@@ -344,6 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="imgUrl != null">#{imgUrl},</if>
<if test="summary != null">#{summary},</if>
</trim>
</insert>
@@ -376,6 +378,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="imgUrl != null">img_url = #{imgUrl},</if>
<if test="summary != null">summary = #{summary},</if>
</trim>
where device_id = #{deviceId}
</update>
@@ -428,6 +431,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="imgUrl != null">img_url = #{imgUrl},</if>
<if test="summary != null">summary = #{summary},</if>
</trim>
where serial_number = #{serialNumber}
</update>