refactor: 物模型发布时，同时刷新设备配置

@@ -41,31 +41,13 @@ import org.thingsboard.server.common.data.edge.EdgeEventType;
 import org.thingsboard.server.common.data.edge.EdgeInfo;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.common.data.id.AssetId;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.DashboardId;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.EdgeId;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.EntityIdFactory;
-import org.thingsboard.server.common.data.id.EntityViewId;
-import org.thingsboard.server.common.data.id.OtaPackageId;
-import org.thingsboard.server.common.data.id.RpcId;
-import org.thingsboard.server.common.data.id.RuleChainId;
-import org.thingsboard.server.common.data.id.RuleNodeId;
-import org.thingsboard.server.common.data.id.TbResourceId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.id.TenantProfileId;
-import org.thingsboard.server.common.data.id.UserId;
-import org.thingsboard.server.common.data.id.WidgetTypeId;
-import org.thingsboard.server.common.data.id.WidgetsBundleId;
+import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.common.data.page.PageDataIterableByTenantIdEntityId;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.rpc.Rpc;
@@ -74,6 +56,9 @@ import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.audit.AuditLogService;
@@ -121,12 +106,7 @@ import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 import static org.thingsboard.server.controller.ControllerConstants.DEFAULT_PAGE_SIZE;
 import static org.thingsboard.server.controller.ControllerConstants.INCORRECT_TENANT_ID;
@@ -929,4 +909,45 @@ public abstract class BaseController {
         return deviceProfileData;
 
     }
+
+
+    /**
+     * 更新thingsboard的设备配置信息
+     *
+     * @param deviceProfile 设备配置
+     * @throws ThingsboardException
+     */
+    protected DeviceProfile updateTbDeviceProfile(DeviceProfile deviceProfile)
+            throws ThingsboardException {
+        boolean isFirmwareChanged = false;
+        boolean isSoftwareChanged = false;
+
+        DeviceProfile oldDeviceProfile =
+                deviceProfileService.findDeviceProfileById(getTenantId(), deviceProfile.getId());
+        if (!Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId())) {
+            isFirmwareChanged = true;
+        }
+        if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
+            isSoftwareChanged = true;
+        }
+        if (FastIotConstants.ASSERT_DEFAULT_NAME.equals(oldDeviceProfile.getName())
+                && !Objects.equals(deviceProfile.getName(), oldDeviceProfile.getName())) {
+            throw new TkDataValidationException(ErrorMessage.ASSERT_DEFAULT_NAME_NO_CHANGED.getMessage());
+        }
+
+        DeviceProfile savedDeviceProfile =
+                checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
+
+        tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
+        tbClusterService.broadcastEntityStateChangeEvent(
+                deviceProfile.getTenantId(), savedDeviceProfile.getId(), ComponentLifecycleEvent.UPDATED);
+
+        logEntityAction(savedDeviceProfile.getId(), savedDeviceProfile, null, ActionType.UPDATED, null);
+
+        otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
+
+        sendEntityNotificationMsg(
+                getTenantId(), savedDeviceProfile.getId(), EdgeEventActionType.UPDATED);
+        return savedDeviceProfile;
+    }
 }

@@ -9,6 +9,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
@@ -21,6 +23,7 @@ import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
+import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
@@ -119,9 +122,12 @@ public class ThingsModelController extends BaseController {
     if (null == dto) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    return ResponseEntity.ok(
-        thingsModelService.changeTSLStatus(
-            deviceProfileId, tenantId, StatusEnum.ENABLE.getIndex()));
+    List<ThingsModelDTO> thingsModels = thingsModelService.changeTSLStatus(deviceProfileId, tenantId, StatusEnum.ENABLE.getIndex());
+    DeviceProfileData profileData = dto.getProfileData();
+    profileData.setThingsModel(thingsModels);
+    dto.setProfileData(profileData);
+    updateTbDeviceProfile(JacksonUtil.convertValue(dto, DeviceProfile.class));
+    return ResponseEntity.ok(true);
   }
 
   @GetMapping("/get_services/{deviceProfileId}")

@@ -114,45 +114,6 @@ public class TkDeviceScriptController extends BaseController {
     return ResponseEntity.ok(true);
   }
 
-  /**
-   * 更新thingsboard的设备配置信息
-   *
-   * @param deviceProfile 设备配置
-   * @throws ThingsboardException
-   */
-  private DeviceProfile updateTbDeviceProfile(DeviceProfile deviceProfile)
-      throws ThingsboardException {
-    boolean isFirmwareChanged = false;
-    boolean isSoftwareChanged = false;
-
-    DeviceProfile oldDeviceProfile =
-        deviceProfileService.findDeviceProfileById(getTenantId(), deviceProfile.getId());
-    if (!Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId())) {
-      isFirmwareChanged = true;
-    }
-    if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
-      isSoftwareChanged = true;
-    }
-    if (FastIotConstants.ASSERT_DEFAULT_NAME.equals(oldDeviceProfile.getName())
-        && !Objects.equals(deviceProfile.getName(), oldDeviceProfile.getName())) {
-      throw new TkDataValidationException(ErrorMessage.ASSERT_DEFAULT_NAME_NO_CHANGED.getMessage());
-    }
-
-    DeviceProfile savedDeviceProfile =
-        checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
-
-    tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
-    tbClusterService.broadcastEntityStateChangeEvent(
-        deviceProfile.getTenantId(), savedDeviceProfile.getId(), ComponentLifecycleEvent.UPDATED);
-
-    logEntityAction(savedDeviceProfile.getId(), savedDeviceProfile, null, ActionType.UPDATED, null);
-
-    otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
-
-    sendEntityNotificationMsg(
-        getTenantId(), savedDeviceProfile.getId(), EdgeEventActionType.UPDATED);
-    return savedDeviceProfile;
-  }
 
   @GetMapping("{id}")
   @ApiOperation("详情")

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -195,8 +196,16 @@ public class ThingsModelServiceImpl
 
   @Override
   @Transactional
-  public boolean changeTSLStatus(String deviceProfileId, String tenantId, Integer status) {
-    return baseMapper.changeTSLStatus(deviceProfileId, tenantId, status);
+  public List<ThingsModelDTO> changeTSLStatus(String deviceProfileId, String tenantId, Integer status) {
+    boolean result = baseMapper.changeTSLStatus(deviceProfileId, tenantId, status);
+    if(result){
+      List<TkThingsModelEntity> entityList = baseMapper.selectList(new LambdaQueryWrapper<TkThingsModelEntity>().eq(TkThingsModelEntity::getDeviceProfileId,deviceProfileId));
+      if (entityList.isEmpty()) {
+        return null;
+      }
+      return entityList.stream().map(en -> en.getDTO(ThingsModelDTO.class)).collect(Collectors.toList());
+    }
+    return null;
   }
 
   private boolean checkIdentifier(

@@ -5,6 +5,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkThingsModelEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -26,5 +27,5 @@ public interface ThingsModelService {
 
   JsonNode getTingsModelTSL(FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId);
 
-  boolean changeTSLStatus(String deviceProfileId, String tenantId, Integer status);
+  List<ThingsModelDTO> changeTSLStatus(String deviceProfileId, String tenantId, Integer status);
 }