Merge branch '20220512' into 'master'

fix: 组态节点保存数据交互问题修复

See merge request huang/thingsboard3.3.2!99

@@ -135,8 +135,12 @@ public class YtUserController extends AbstractUserAccount {
 
 
   @PutMapping("/center")
   @PutMapping("/center")
   @ApiOperation(value = "修改个人中心")
   @ApiOperation(value = "修改个人中心")
-  public UserDTO updatePersonalCenter(@Validated(UpdateGroup.class) @RequestBody UserDTO userDTO) {
-    return userService.updatePersonalCenter(userDTO);
+  public UserInfoDTO updatePersonalCenter(@Validated(UpdateGroup.class) @RequestBody UserDTO userDTO) throws ThingsboardException {
+    userService.updatePersonalCenter(userDTO);
+    return userService.me(
+            getCurrentUser().getCurrentUserId(),
+            getCurrentUser().getCurrentTenantId(),
+            getCurrentUser().getRoles());
   }
   }
 
 
   @PostMapping
   @PostMapping

@@ -32,9 +32,6 @@ public class ConfigurationActDTO extends TenantDTO {
   private String contentId;
   private String contentId;
 
 
   @ApiModelProperty(value = "动画类型", required = true)
   @ApiModelProperty(value = "动画类型", required = true)
-  @NotEmpty(
-          message = "tbDeviceId不能未空或空字符串",
-          groups = {UpdateGroup.class, AddGroup.class})
   private ActTypeEnum type;
   private ActTypeEnum type;
   @ApiModelProperty(value = "orgId", required = true)
   @ApiModelProperty(value = "orgId", required = true)
   @NotEmpty(
   @NotEmpty(
@@ -52,7 +49,7 @@ public class ConfigurationActDTO extends TenantDTO {
   @ApiModelProperty(value = "组件关注的指标")
   @ApiModelProperty(value = "组件关注的指标")
   private String attr;
   private String attr;
   @ApiModelProperty(value = "触发条件")
   @ApiModelProperty(value = "触发条件")
-  private JsonNode content;
+  private JsonNode condition;
 
 
   @ApiModelProperty(value = "组态描述")
   @ApiModelProperty(value = "组态描述")
   private String remark;
   private String remark;

@@ -30,9 +30,6 @@ public class ConfigurationEventDTO extends TenantDTO {
   private String contentId;
   private String contentId;
 
 
   @ApiModelProperty(value = "事件类型", required = true)
   @ApiModelProperty(value = "事件类型", required = true)
-  @NotEmpty(
-          message = "tbDeviceId不能未空或空字符串",
-          groups = {UpdateGroup.class, AddGroup.class})
   private EventTypeEnum type;
   private EventTypeEnum type;
 
 
   @ApiModelProperty(value = "事件内容")
   @ApiModelProperty(value = "事件内容")

@@ -14,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.ActTypeEnum;
  * @author Administrator
  * @author Administrator
  */
  */
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_CONFIGURATION_ACT)
+@TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_ACT, autoResultMap = true)
 @Data
 @Data
 public class ConfigurationAct extends TenantBaseEntity {
 public class ConfigurationAct extends TenantBaseEntity {
     private static final long serialVersionUID = -4125982858197381343L;
     private static final long serialVersionUID = -4125982858197381343L;
@@ -28,5 +28,5 @@ public class ConfigurationAct extends TenantBaseEntity {
     private String slaveDeviceId;
     private String slaveDeviceId;
     private String attr;
     private String attr;
     @TableField(typeHandler = JacksonTypeHandler.class)
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private JsonNode content;
+    private JsonNode condition;
 }
 }

@@ -15,7 +15,7 @@ import java.util.List;
  * @author Administrator
  * @author Administrator
  */
  */
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_CONFIGURATION_DATASOURCE)
+@TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_DATASOURCE, autoResultMap = true)
 @Data
 @Data
 public class ConfigurationDatasource extends TenantBaseEntity {
 public class ConfigurationDatasource extends TenantBaseEntity {
     private static final long serialVersionUID = 2830393872646826226L;
     private static final long serialVersionUID = 2830393872646826226L;

@@ -14,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.EventTypeEnum;
  * @author Administrator
  * @author Administrator
  */
  */
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_CONFIGURATION_EVENT)
+@TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_EVENT, autoResultMap = true)
 @Data
 @Data
 public class ConfigurationEvent extends TenantBaseEntity {
 public class ConfigurationEvent extends TenantBaseEntity {
     private static final long serialVersionUID = 4613503997176066996L;
     private static final long serialVersionUID = 4613503997176066996L;