diff --git a/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java index d00b934..bfcc1c6 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java @@ -15,6 +15,7 @@ import com.ruoyi.bst.area.service.AreaService; import com.ruoyi.bst.area.utils.AreaUtil; import com.ruoyi.bst.areaSub.domain.AreaSubVO; import com.ruoyi.bst.areaSub.service.AreaSubService; +import com.ruoyi.bst.device.domain.Device; import com.ruoyi.bst.device.domain.DeviceVO; import com.ruoyi.bst.device.domain.enums.DeviceLockStatus; import com.ruoyi.bst.device.domain.enums.DeviceQuality; @@ -76,6 +77,7 @@ public class IotReceiveServiceImpl implements IotReceiveService { } // 数据点推送 if (ReceiveType.DATA_POINT.getType().equals(msg.getType())) { + // 设备数据 if (IotConstants.DS_SYS.equals(msg.getDsId())) { // 查询设备信息 DeviceVO device = deviceService.selectSimpleByMacForLocationLog(msg.getDevName()); @@ -117,6 +119,16 @@ public class IotReceiveServiceImpl implements IotReceiveService { // 处理定位日志 this.handleLocationLog(device); + } + // 软件版本 + else if (IotConstants.DS_VER.equals(msg.getDsId())) { + Device data = new Device(); + data.setVersion(msg.getValue().toString()); + data.setMac(msg.getDevName()); + int update = deviceIotService.updateIot(data); + if (update != 1) { + log.error("更新设备软件版本失败: {},版本:{}", msg.getDevName(), msg.getValue()); + } } } // 生命周期(暂时不做,需要测试) diff --git a/ruoyi-web/pom.xml b/ruoyi-web/pom.xml index afaea5c..fd9538a 100644 --- a/ruoyi-web/pom.xml +++ b/ruoyi-web/pom.xml @@ -18,11 +18,11 @@ - - org.springframework.boot - spring-boot-devtools - true - + + + + +