refactor: 组态数据交互逻辑优化

1、数据源和事件交互的组织解绑

@@ -36,7 +36,7 @@ public class YtConfigurationNodeController extends BaseController {
     private final YtConfigurationActService actService;
     private final YtConfigurationActService actService;
 
 
     @PostMapping
     @PostMapping
-    @ApiOperation("编辑节点信息")
+    @ApiOperation("保存节点数据源并刷新节点的交互和动效信息")
     public ResponseEntity<ConfigurationNodeStateDTO> saveNode(
     public ResponseEntity<ConfigurationNodeStateDTO> saveNode(
             @Validated({AddGroup.class}) @RequestBody ConfigurationNodeStateDTO nodeDTO)
             @Validated({AddGroup.class}) @RequestBody ConfigurationNodeStateDTO nodeDTO)
             throws ThingsboardException {
             throws ThingsboardException {

@@ -23,11 +23,7 @@ public class ConfigurationActDTO extends ConfigurationDTO {
 
 
   @ApiModelProperty(value = "动画类型", required = true)
   @ApiModelProperty(value = "动画类型", required = true)
   private ActTypeEnum type;
   private ActTypeEnum type;
-  @ApiModelProperty(value = "orgId", required = true)
-  @NotEmpty(
-          message = "设备所属组织ID",
-          groups = {UpdateGroup.class, AddGroup.class})
-  private String orgId;
+
 
 
   @ApiModelProperty(value = "tbDeviceId", required = true)
   @ApiModelProperty(value = "tbDeviceId", required = true)
   @NotEmpty(
   @NotEmpty(

@@ -31,5 +31,9 @@ public class ConfigurationDTO extends TenantDTO {
           groups = {UpdateGroup.class, AddGroup.class})
           groups = {UpdateGroup.class, AddGroup.class})
   private String contentId;
   private String contentId;
 
 
-
+  @ApiModelProperty(value = "orgId", required = true)
+  @NotEmpty(
+          message = "设备所属组织ID",
+          groups = {UpdateGroup.class, AddGroup.class})
+  private String orgId;
 }
 }

@@ -24,11 +24,7 @@ public class ConfigurationDatasourceDTO extends ConfigurationDTO {
           message = "组件ID不能未空或空字符串",
           message = "组件ID不能未空或空字符串",
           groups = {UpdateGroup.class, AddGroup.class})
           groups = {UpdateGroup.class, AddGroup.class})
   private String nodeId;
   private String nodeId;
-  @ApiModelProperty(value = "orgId", required = true)
-  @NotEmpty(
-          message = "设备所属组织ID",
-          groups = {UpdateGroup.class, AddGroup.class})
-  private String orgId;
+
 
 
   @ApiModelProperty(value = "tbDeviceId", required = true)
   @ApiModelProperty(value = "tbDeviceId", required = true)
   @NotEmpty(
   @NotEmpty(

@@ -16,19 +16,14 @@ import org.thingsboard.server.common.data.yunteng.enums.ActTypeEnum;
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_ACT, autoResultMap = true)
 @TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_ACT, autoResultMap = true)
 @Data
 @Data
-public class ConfigurationAct extends TenantBaseEntity {
+public class ConfigurationAct extends ConfigurationBaseEntity {
     private static final long serialVersionUID = -4125982858197381343L;
     private static final long serialVersionUID = -4125982858197381343L;
-    private String configurationId;
-    private String contentId;
     @TableField(typeHandler = EnumTypeHandler.class)
     @TableField(typeHandler = EnumTypeHandler.class)
     private ActTypeEnum type;
     private ActTypeEnum type;
-    private String remark;
-    private String orgId;
     private String deviceId;
     private String deviceId;
     private String slaveDeviceId;
     private String slaveDeviceId;
     private String attr;
     private String attr;
     @TableField(typeHandler = JacksonTypeHandler.class)
     @TableField(typeHandler = JacksonTypeHandler.class)
     private JsonNode condition;
     private JsonNode condition;
-    private boolean enabled;
 
 
 }
 }

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.ibatis.type.EnumTypeHandler;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.ActTypeEnum;
+
+/**
+ * @author Administrator
+ */
+@Getter
+@Setter
+public class ConfigurationBaseEntity extends TenantBaseEntity {
+    private String configurationId;
+    private String contentId;
+    private String remark;
+    private String orgId;
+    private boolean enabled;
+
+}

@@ -17,16 +17,11 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_DATASOURCE, autoResultMap = true)
 @TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_DATASOURCE, autoResultMap = true)
 @Data
 @Data
-public class ConfigurationDatasource extends TenantBaseEntity {
+public class ConfigurationDatasource extends ConfigurationBaseEntity {
     private static final long serialVersionUID = 2830393872646826226L;
     private static final long serialVersionUID = 2830393872646826226L;
-    private String configurationId;
-    private String contentId;
     private String nodeId;
     private String nodeId;
-    private String orgId;
     private String deviceId;
     private String deviceId;
     private String slaveDeviceId;
     private String slaveDeviceId;
     private String attr;
     private String attr;
-    private String remark;
-    private boolean enabled;
 
 
 }
 }

@@ -16,14 +16,10 @@ import org.thingsboard.server.common.data.yunteng.enums.EventTypeEnum;
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_EVENT, autoResultMap = true)
 @TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_EVENT, autoResultMap = true)
 @Data
 @Data
-public class ConfigurationEvent extends TenantBaseEntity {
+public class ConfigurationEvent extends ConfigurationBaseEntity {
     private static final long serialVersionUID = 4613503997176066996L;
     private static final long serialVersionUID = 4613503997176066996L;
-    private String configurationId;
-    private String contentId;
     @TableField(typeHandler = JacksonTypeHandler.class)
     @TableField(typeHandler = JacksonTypeHandler.class)
     private JsonNode content;
     private JsonNode content;
     @TableField(typeHandler = EnumTypeHandler.class)
     @TableField(typeHandler = EnumTypeHandler.class)
     private EventTypeEnum type;
     private EventTypeEnum type;
-    private String remark;
-    private boolean enabled;
 }
 }