Commit 8fac009d4bca81f785218cc323fd0ad8292fa828
1 parent
8ced4a0a
【功能优化】IoT:基于 review 修改 ota 的表结构设计
Showing
2 changed files
with
12 additions
and
3 deletions
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDO.java
| 1 | package cn.iocoder.yudao.module.iot.dal.dataobject.device; | 1 | package cn.iocoder.yudao.module.iot.dal.dataobject.device; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | ||
| 4 | import cn.iocoder.yudao.framework.mybatis.core.type.LongSetTypeHandler; | 3 | import cn.iocoder.yudao.framework.mybatis.core.type.LongSetTypeHandler; |
| 5 | import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; | 4 | import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; |
| 5 | +import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaFirmwareDO; | ||
| 6 | import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO; | 6 | import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO; |
| 7 | import cn.iocoder.yudao.module.iot.enums.device.IotDeviceStateEnum; | 7 | import cn.iocoder.yudao.module.iot.enums.device.IotDeviceStateEnum; |
| 8 | import com.baomidou.mybatisplus.annotation.KeySequence; | 8 | import com.baomidou.mybatisplus.annotation.KeySequence; |
| @@ -116,9 +116,11 @@ public class IotDeviceDO extends TenantBaseDO { | @@ -116,9 +116,11 @@ public class IotDeviceDO extends TenantBaseDO { | ||
| 116 | */ | 116 | */ |
| 117 | private String ip; | 117 | private String ip; |
| 118 | /** | 118 | /** |
| 119 | - * 设备的固件版本 | 119 | + * 固件编号 |
| 120 | + * | ||
| 121 | + * 关联 {@link IotOtaFirmwareDO#getId()} | ||
| 120 | */ | 122 | */ |
| 121 | - private String firmwareVersion; | 123 | + private String firmwareId; |
| 122 | 124 | ||
| 123 | /** | 125 | /** |
| 124 | * 设备密钥,用于设备认证,需安全存储 | 126 | * 设备密钥,用于设备认证,需安全存储 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/ota/IotOtaUpgradeRecordDO.java
| 1 | package cn.iocoder.yudao.module.iot.dal.dataobject.ota; | 1 | package cn.iocoder.yudao.module.iot.dal.dataobject.ota; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 4 | +import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; | ||
| 4 | import com.baomidou.mybatisplus.annotation.KeySequence; | 5 | import com.baomidou.mybatisplus.annotation.KeySequence; |
| 5 | import com.baomidou.mybatisplus.annotation.TableId; | 6 | import com.baomidou.mybatisplus.annotation.TableId; |
| 6 | import com.baomidou.mybatisplus.annotation.TableName; | 7 | import com.baomidou.mybatisplus.annotation.TableName; |
| @@ -57,6 +58,12 @@ public class IotOtaUpgradeRecordDO extends BaseDO { | @@ -57,6 +58,12 @@ public class IotOtaUpgradeRecordDO extends BaseDO { | ||
| 57 | * 关联 {@link cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO#getId()} | 58 | * 关联 {@link cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO#getId()} |
| 58 | */ | 59 | */ |
| 59 | private String deviceId; | 60 | private String deviceId; |
| 61 | + /** | ||
| 62 | + * 来源的固件编号 | ||
| 63 | + * | ||
| 64 | + * 关联 {@link IotDeviceDO#getFirmwareId()} | ||
| 65 | + */ | ||
| 66 | + private Long fromFirmwareId; | ||
| 60 | 67 | ||
| 61 | /** | 68 | /** |
| 62 | * 升级状态 | 69 | * 升级状态 |