feat:新增license过期时间和激活时间

db/上线后sql/update.sql

-ALTER TABLE `plat_device_other`
+ALTER TABLE `plat_device_other`
@@ -29,4 +29,8 @@ ALTER TABLE `dev_iot_yanglao_platform`.`plat_device_other`
 
 
 ALTER TABLE `plat_device`
 ALTER TABLE `plat_device`
     ADD COLUMN `device_license` varchar(64) COMMENT '许可证' AFTER `end_date`,
     ADD COLUMN `device_license` varchar(64) COMMENT '许可证' AFTER `end_date`,
-ADD COLUMN `license_info` varchar(255) COMMENT '许可证信息' AFTER `license`;
+ADD COLUMN `license_info` varchar(255) COMMENT '许可证信息' AFTER `license`;
\ No newline at end of file
+
+ALTER TABLE `plat_device`
+    ADD COLUMN `expire_time` int8 COMMENT '过期时间' AFTER `license_info`,
+ADD COLUMN `activation_time` int8 COMMENT '激活时间' AFTER `expire_time`;
\ No newline at end of file

server-service/src/main/java/com/makeit/entity/platform/device/PlatDevice.java

@@ -77,6 +77,10 @@ public class PlatDevice extends BaseBusEntity {
     private String deviceLicense;
     private String deviceLicense;
     @ApiModelProperty(value = "许可证信息")
     @ApiModelProperty(value = "许可证信息")
     private String licenseInfo;
     private String licenseInfo;
+    @ApiModelProperty(value = "过期时间")
+    private Long expireTime;
+    @ApiModelProperty(value = "激活时间")
+    private Long activationTime;
 
 
     @ApiModelProperty(value = "设备类型 0-呼吸心率雷达 1-空间人体雷达 2-跌倒检测雷达")
     @ApiModelProperty(value = "设备类型 0-呼吸心率雷达 1-空间人体雷达 2-跌倒检测雷达")
     private String category;
     private String category;

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -749,6 +749,8 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
             PlatDeviceActiveVO platDeviceActiveVO = JSON.parseObject(data.toString(), PlatDeviceActiveVO.class);
             PlatDeviceActiveVO platDeviceActiveVO = JSON.parseObject(data.toString(), PlatDeviceActiveVO.class);
             platDevice.setDeviceLicense(platDeviceActiveVO.getLicense());
             platDevice.setDeviceLicense(platDeviceActiveVO.getLicense());
             platDevice.setLicenseInfo(JSON.toJSONString(platDeviceActiveVO.getSkuView()));
             platDevice.setLicenseInfo(JSON.toJSONString(platDeviceActiveVO.getSkuView()));
+            platDevice.setExpireTime(platDeviceActiveVO.getExpireTime());
+            platDevice.setActivationTime(platDeviceActiveVO.getActivationTime());
             updateById(platDevice);
             updateById(platDevice);
 
 
             // 调用设备写入接口
             // 调用设备写入接口

server-service/src/main/java/com/makeit/vo/platform/device/PlatDeviceActiveVO.java

@@ -17,6 +17,8 @@ public class PlatDeviceActiveVO {
 
 
     private String license;
     private String license;
     private SkuView skuView;
     private SkuView skuView;
+    private Long expireTime;
+    private Long activationTime;
 
 
 
 
     @Data
     @Data