perf: 在编辑模式下设置设备、产品的固件、软件升级

@@ -538,6 +538,12 @@ public class TkDeviceController extends BaseController {
     tbDevice.setName(deviceDTO.getName());
     tbDevice.setName(deviceDTO.getName());
     tbDevice.setCreatedTime(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
     tbDevice.setCreatedTime(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
     tbDevice.setTenantId(tenantId);
     tbDevice.setTenantId(tenantId);
+    tbDevice.setFirmwareId(
+        StringUtils.isEmpty(deviceDTO.getFirmwareId()) ? null :
+                new OtaPackageId(UUID.fromString(deviceDTO.getFirmwareId())));
+    tbDevice.setSoftwareId(
+        StringUtils.isEmpty(deviceDTO.getSoftwareId()) ? null :
+                new OtaPackageId(UUID.fromString(deviceDTO.getSoftwareId())));
     return tbDevice;
     return tbDevice;
   }
   }
 
 

@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
@@ -257,6 +258,12 @@ public class TkDeviceProfileController extends BaseController {
 
 
     tbDeviceProfile.setProfileData(
     tbDeviceProfile.setProfileData(
             buildDeviceProfileData(transportType, deviceProfileDTO.getProfileData()));
             buildDeviceProfileData(transportType, deviceProfileDTO.getProfileData()));
+    tbDeviceProfile.setFirmwareId(
+            StringUtils.isEmpty(deviceProfileDTO.getFirmwareId()) ? null :
+                    new OtaPackageId(UUID.fromString(deviceProfileDTO.getFirmwareId())));
+    tbDeviceProfile.setSoftwareId(
+            StringUtils.isEmpty(deviceProfileDTO.getSoftwareId()) ? null :
+                    new OtaPackageId(UUID.fromString(deviceProfileDTO.getSoftwareId())));
     return tbDeviceProfile;
     return tbDeviceProfile;
   }
   }
 }
 }

@@ -128,4 +128,10 @@ public class DeviceDTO extends TenantDTO {
 
 
   @ApiModelProperty(value = "是否收藏:0否1是")
   @ApiModelProperty(value = "是否收藏:0否1是")
   private Integer isCollect;
   private Integer isCollect;
+
+  @ApiModelProperty(value = "OTA升级固件ID")
+  private String firmwareId;
+
+  @ApiModelProperty(value = "OTA升级软件ID")
+  private String softwareId;
 }
 }

@@ -88,6 +88,12 @@ public class DeviceProfileDTO extends BaseDTO {
   @ApiModelProperty(value = "品类名称")
   @ApiModelProperty(value = "品类名称")
   private String categoryName;
   private String categoryName;
 
 
+  @ApiModelProperty(value = "OTA升级固件ID")
+  private String firmwareId;
+
+  @ApiModelProperty(value = "OTA升级软件ID")
+  private String softwareId;
+
   public DeviceProfileDTO() {}
   public DeviceProfileDTO() {}
 
 
   public DeviceProfileDTO(
   public DeviceProfileDTO(

@@ -44,6 +44,8 @@
         <result property="gatewayAlias" column="gateway_alias"/>
         <result property="gatewayAlias" column="gateway_alias"/>
         <result property="isCollect" column="isCollect"/>
         <result property="isCollect" column="isCollect"/>
         <result property="transportType" column="transport_type"/>
         <result property="transportType" column="transport_type"/>
+        <result property="firmwareId" column="firmware_id"/>
+        <result property="softwareId" column="software_id"/>
         <association property="deviceProfile"
         <association property="deviceProfile"
                      javaType="org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO">
                      javaType="org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO">
             <result property="name" column="profile_name"/>
             <result property="name" column="profile_name"/>
@@ -94,7 +96,8 @@
     </sql>
     </sql>
     <select id="getDevicePage" resultMap="deviceMap">
     <select id="getDevicePage" resultMap="deviceMap">
         SELECT
         SELECT
-        <include refid="pageColumns"/>,d.customer_id::TEXT AS customer_id,cus.title AS customer_name,cus.additional_info AS customer_additional_info
+        <include refid="pageColumns"/>,d.customer_id::TEXT AS customer_id,cus.title AS customer_name,cus.additional_info AS customer_additional_info,
+        d.firmware_id,d.software_id
         FROM tk_device ifd
         FROM tk_device ifd
         LEFT JOIN device_profile ifdp ON ifd.profile_id = ifdp.id::TEXT
         LEFT JOIN device_profile ifdp ON ifd.profile_id = ifdp.id::TEXT
         LEFT JOIN tk_organization io ON io.id = ifd.organization_id
         LEFT JOIN tk_organization io ON io.id = ifd.organization_id

@@ -23,6 +23,8 @@
         <result property="type" column="type"/>
         <result property="type" column="type"/>
         <result property="categoryId" column="category_id"/>
         <result property="categoryId" column="category_id"/>
         <result property="categoryName" column="categoryName"/>
         <result property="categoryName" column="categoryName"/>
+        <result property="firmwareId" column="firmware_id"/>
+        <result property="softwareId" column="software_id"/>
     </resultMap>
     </resultMap>
 
 
 
 
@@ -60,7 +62,7 @@
 
 
     <select id="selectDetail" resultMap="detail">
     <select id="selectDetail" resultMap="detail">
         SELECT
         SELECT
-        <include refid="basicColumns"/>
+        <include refid="basicColumns"/>,base.firmware_id,base.software_id
         FROM device_profile base
         FROM device_profile base
         LEFT JOIN tk_device_profile iot ON iot.tb_profile_id = base.id::TEXT
         LEFT JOIN tk_device_profile iot ON iot.tb_profile_id = base.id::TEXT
         <where>
         <where>