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

 package org.thingsboard.server.controller.yunteng;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +13,7 @@ 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.id.DeviceProfileId;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
@@ -20,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel;
 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;
@@ -122,11 +125,11 @@ public class ThingsModelController extends BaseController {
     if (null == dto) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    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));
+    List<TkThingsModel> thingsModels = thingsModelService.changeTSLStatus(deviceProfileId, tenantId, StatusEnum.ENABLE.getIndex());
+    DeviceProfile tbProfile = deviceProfileService.findDeviceProfileById(getTenantId(), DeviceProfileId.fromString(dto.getTbProfileId()));
+    tbProfile.getProfileData()
+            .setThingsModel(thingsModels);
+    updateTbDeviceProfile(tbProfile);
     return ResponseEntity.ok(true);
   }
 

@@ -18,7 +18,7 @@ package org.thingsboard.server.common.data.device.profile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel;
 
 import javax.validation.Valid;
 import java.io.Serializable;
@@ -41,7 +41,7 @@ public class DeviceProfileData implements Serializable {
 
     //Thingskit function
     @Valid
-    @ApiModelProperty(position = 1, value = "JSON object of has published things model configuration")
-    private List<ThingsModelDTO> thingsModel;
+    @ApiModelProperty(position = 5, value = "JSON object of has published things model configuration")
+    private List<TkThingsModel> thingsModel;
 
 }

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class TkThingsModel implements Serializable {
+
+  private FunctionTypeEnum functionType;
+
+
+  private String functionName;
+
+
+  private String identifier;
+
+
+  private CallTypeEnum callType;
+
+  private String accessMode;
+
+
+  private DeviceEventTypeEnum eventType;
+
+
+  private JsonNode functionJson;
+
+
+  private Integer status;
+
+
+  private String deviceProfileId;
+
+  private String remark;
+}

@@ -196,14 +196,14 @@ public class ThingsModelServiceImpl
 
   @Override
   @Transactional
-  public List<ThingsModelDTO> changeTSLStatus(String deviceProfileId, String tenantId, Integer status) {
+  public List<TkThingsModel> 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 entityList.stream().map(en -> en.getDTO(TkThingsModel.class)).collect(Collectors.toList());
     }
     return null;
   }

@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.service;
 import com.fasterxml.jackson.databind.JsonNode;
 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.dto.TkThingsModel;
 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;
@@ -27,5 +28,5 @@ public interface ThingsModelService {
 
   JsonNode getTingsModelTSL(FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId);
 
-  List<ThingsModelDTO> changeTSLStatus(String deviceProfileId, String tenantId, Integer status);
+  List<TkThingsModel> changeTSLStatus(String deviceProfileId, String tenantId, Integer status);
 }

@@ -23,9 +23,8 @@ import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
-import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkEventKvEntry;
-import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
+import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.session.SessionMsgType;
@@ -35,7 +34,8 @@ import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import static org.thingsboard.server.dao.model.ModelConstants.*;
+import static org.thingsboard.server.dao.model.ModelConstants.DEVICE_DEVICE_PROFILE_ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.EVENT_IDENTIFIER_COLUMN;
 
 @Slf4j
 @RuleNode(
@@ -70,7 +70,7 @@ public class TkMsgEventNode implements TbNode {
         DeviceProfileId profileId = new DeviceProfileId(UUID.fromString(deviceProfileId));
         DeviceProfile profile = cache.get(tenantId,profileId);
         String eventIdentifier = msg.getMetaData().getValue(EVENT_IDENTIFIER_COLUMN);
-        List<ThingsModelDTO> eventList =profile.getProfileData().getThingsModel().stream()
+        List<TkThingsModel> eventList =profile.getProfileData().getThingsModel().stream()
                 .filter(f -> f.getIdentifier().equals(eventIdentifier) && FunctionTypeEnum.events.equals(f.getFunctionType()))
                 .collect(Collectors.toList());
         List<TkEventKvEntry> entryList = new ArrayList<>();
@@ -83,7 +83,6 @@ public class TkMsgEventNode implements TbNode {
         ////TODO: 验证事件类型、事件标识符和数据建是否与产品物模型中的事件匹配
         long ts = System.currentTimeMillis();
         String src = msg.getData();
-        DeviceEventTypeEnum eventType = DeviceEventTypeEnum.valueOf(msg.getMetaData().getValue(EVENT_TYPE_COLUMN));
         ctx.getTelemetryService().saveAndNotify(
                 tenantId,profileId,
                 msg.getOriginator(),