feat: 组态节点相关功能

1、新增组态动画效果
2、完善组态数据源字段

@@ -10,9 +10,11 @@ import org.springframework.web.bind.annotation.*;
 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;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationActDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationDatasourceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationEventDTO;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.YtConfigurationActService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationDatasourceService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationEventService;
 
@@ -31,6 +33,7 @@ public class YtConfigurationNodeController extends BaseController {
 
     private final YtConfigurationDatasourceService datasourceService;
     private final YtConfigurationEventService eventService;
+    private final YtConfigurationActService actService;
 
     @PostMapping("datascource")
     @ApiOperation("编辑数据源")
@@ -52,11 +55,20 @@ public class YtConfigurationNodeController extends BaseController {
                 eventService.saveConfigurationEvent(eventDTO));
     }
 
+    @PostMapping("act")
+    @ApiOperation("编辑动画效果")
+    public ResponseEntity<ConfigurationActDTO> saveAct(
+            @Validated({AddGroup.class}) @RequestBody ConfigurationActDTO actDTO)
+            throws ThingsboardException {
+        actDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(
+                actService.saveConfigurationAct(actDTO));
+    }
+
 
     @DeleteMapping("datascource")
     @ApiOperation("删除数据源")
-    public ResponseEntity<Boolean> deleteDatascource(
-            @Validated({DeleteGroup.class}) @RequestBody ConfigurationDatasourceDTO deleteDTO)
+    public ResponseEntity<Boolean> deleteDatascource(@RequestBody ConfigurationDatasourceDTO deleteDTO)
             throws ThingsboardException {
         deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
         return ResponseEntity.ok(datasourceService.deleteConfigurationDatasource(deleteDTO));
@@ -64,12 +76,18 @@ public class YtConfigurationNodeController extends BaseController {
 
     @DeleteMapping("event")
     @ApiOperation("删除数据交互")
-    public ResponseEntity<Boolean> deleteEvent(
-            @Validated({DeleteGroup.class}) @RequestBody ConfigurationEventDTO deleteDTO)
+    public ResponseEntity<Boolean> deleteEvent( @RequestBody ConfigurationEventDTO deleteDTO)
             throws ThingsboardException {
         deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
         return ResponseEntity.ok(eventService.deleteConfigurationEvent(deleteDTO));
     }
+    @DeleteMapping("act")
+    @ApiOperation("删除动画效果")
+    public ResponseEntity<Boolean> deleteAct( @RequestBody ConfigurationActDTO deleteDTO)
+            throws ThingsboardException {
+        deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(actService.deleteConfigurationAct(deleteDTO));
+    }
 
 
     @GetMapping("/{levelType}/{levelId}")
@@ -81,6 +99,7 @@ public class YtConfigurationNodeController extends BaseController {
 
         List<ConfigurationDatasourceDTO> sources = datasourceService.listConfigurationDatasource(tenantId, levelType, levelId);
         List<ConfigurationEventDTO> events = eventService.listConfigurationEvent(tenantId, levelType, levelId);
+        List<ConfigurationActDTO> acts = actService.listConfigurationAct(tenantId, levelType, levelId);
         Map<String, List> result = new HashMap<>();
         if (sources != null && sources.size() > 0) {
             result.put("dataSources", sources);
@@ -88,6 +107,9 @@ public class YtConfigurationNodeController extends BaseController {
         if (events != null && events.size() > 0) {
             result.put("event", events);
         }
+        if (acts != null && acts.size() > 0) {
+            result.put("act", acts);
+        }
         return ResponseEntity.ok(result);
     }
 

@@ -75,10 +75,12 @@ public final class ModelConstants {
     public static final String IOTFS_CONFIGURATION_CENTER_NAME = "iotfs_configuration_center";
     /** 组态内容 */
     public static final String IOTFS_CONFIGURATION_CONTENT_NAME = "iotfs_configuration_content";
-    /** 组态内容 */
+    /** 组态节点数据源 */
     public static final String IOTFS_CONFIGURATION_DATASOURCE = "iotfs_configuration_datasource";
-    /** 组态内容 */
+    /** 组态节点数据交互 */
     public static final String IOTFS_CONFIGURATION_EVENT = "iotfs_configuration_event";
+    /** 组态节点动画效果 */
+    public static final String IOTFS_CONFIGURATION_ACT = "iotfs_configuration_act";
     /** 视频流 */
     public static final String IOTFS_VIDEO_STREAM_TABLE_NAME = "iotfs_device_camera";
     /** 意见反馈 */

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+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.ActTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.EventTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 组态节点动画效果
+ * @author Administrator
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ConfigurationActDTO extends TenantDTO {
+  @ApiModelProperty(value = "组态ID", required = true)
+  @NotEmpty(
+          message = "组态ID不能为空或空字符串",
+          groups = {UpdateGroup.class, AddGroup.class})
+  private String configurationId;
+
+  @ApiModelProperty(value = "页面ID", required = true)
+  @NotEmpty(
+          message = "页面ID不能为空或空字符串",
+          groups = {UpdateGroup.class, AddGroup.class})
+  private String contentId;
+
+  @ApiModelProperty(value = "动画类型", required = true)
+  @NotEmpty(
+          message = "tbDeviceId不能未空或空字符串",
+          groups = {UpdateGroup.class, AddGroup.class})
+  private ActTypeEnum type;
+  @ApiModelProperty(value = "orgId", required = true)
+  @NotEmpty(
+          message = "设备所属组织ID",
+          groups = {UpdateGroup.class, AddGroup.class})
+  private String orgId;
+
+  @ApiModelProperty(value = "tbDeviceId", required = true)
+  @NotEmpty(
+          message = "tbDeviceId不能未空或空字符串",
+          groups = {UpdateGroup.class, AddGroup.class})
+  private String deviceId;
+  private String slaveDeviceId;
+
+  @ApiModelProperty(value = "组件关注的指标")
+  private String attr;
+  @ApiModelProperty(value = "触发条件")
+  private JsonNode content;
+
+  @ApiModelProperty(value = "组态描述")
+  private String remark;
+}

@@ -9,6 +9,7 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 组态结点数据源
@@ -35,14 +36,21 @@ public class ConfigurationDatasourceDTO extends TenantDTO {
           groups = {UpdateGroup.class, AddGroup.class})
   private String nodeId;
 
+  @ApiModelProperty(value = "orgId", required = true)
+  @NotEmpty(
+          message = "设备所属组织ID",
+          groups = {UpdateGroup.class, AddGroup.class})
+  private String orgId;
+
   @ApiModelProperty(value = "tbDeviceId", required = true)
   @NotEmpty(
           message = "tbDeviceId不能未空或空字符串",
           groups = {UpdateGroup.class, AddGroup.class})
   private String deviceId;
+  private String slaveDeviceId;
 
   @ApiModelProperty(value = "组件关注的指标")
-  private JsonNode attr;
+  private List<String> attr;
 
   @ApiModelProperty(value = "组态描述")
   private String remark;

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/** 组态数据互动类型 */
+public enum ActTypeEnum {
+  FLASH,
+  ROTATE,
+  DISPLAY
+}

+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 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
+ */
+@EqualsAndHashCode(callSuper = true)
+@TableName(ModelConstants.Table.IOTFS_CONFIGURATION_ACT)
+@Data
+public class ConfigurationAct extends TenantBaseEntity {
+    private static final long serialVersionUID = -4125982858197381343L;
+    private String configurationId;
+    private String contentId;
+    @TableField(typeHandler = EnumTypeHandler.class)
+    private ActTypeEnum type;
+    private String remark;
+    private String orgId;
+    private String deviceId;
+    private String slaveDeviceId;
+    private String attr;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode content;
+}

 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 org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
+
+import java.util.List;
 
 /**
  * @author Administrator
@@ -17,7 +22,10 @@ public class ConfigurationDatasource extends TenantBaseEntity {
     private String configurationId;
     private String contentId;
     private String nodeId;
+    private String orgId;
     private String deviceId;
-    private JsonNode attr;
+    private String slaveDeviceId;
+    @TableField(typeHandler = ListStringTypeHandler.class)
+    private List<String> attr;
     private String remark;
 }

 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 org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.EventTypeEnum;
 
@@ -17,7 +20,9 @@ public class ConfigurationEvent extends TenantBaseEntity {
     private static final long serialVersionUID = 4613503997176066996L;
     private String configurationId;
     private String contentId;
+    @TableField(typeHandler = JacksonTypeHandler.class)
     private JsonNode content;
+    @TableField(typeHandler = EnumTypeHandler.class)
     private EventTypeEnum type;
     private String remark;
 }

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationActDTO;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationAct;
+import org.thingsboard.server.dao.yunteng.mapper.ConfigurationActMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.YtConfigurationActService;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class YtConfigurationActServiceImpl
+        extends AbstractBaseService<ConfigurationActMapper, ConfigurationAct>
+        implements YtConfigurationActService {
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ConfigurationActDTO saveConfigurationAct(ConfigurationActDTO actDTO) {
+        LambdaQueryWrapper<ConfigurationAct> filter = new QueryWrapper<ConfigurationAct>().lambda()
+                .eq(ConfigurationAct::getType, actDTO.getType())
+                .eq(ConfigurationAct::getId, actDTO.getId());
+        ConfigurationAct old = baseMapper.selectOne(filter);
+        ConfigurationAct newData = actDTO.getEntity(ConfigurationAct.class);
+        if (old == null) {
+            baseMapper.insert(newData);
+        } else if(!actDTO.getTenantId().equals(old.getTenantId())){
+            throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());
+        } else {
+            baseMapper.update(newData, filter);
+        }
+        return actDTO;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteConfigurationAct(ConfigurationActDTO eventDTO) {
+        LambdaQueryWrapper<ConfigurationAct> filter = new QueryWrapper<ConfigurationAct>().lambda()
+                .eq(ConfigurationAct::getTenantId,eventDTO.getTenantId())
+                .eq(StringUtils.isNotBlank(eventDTO.getConfigurationId()), ConfigurationAct::getConfigurationId, eventDTO.getConfigurationId())
+                .eq(StringUtils.isNotBlank(eventDTO.getContentId()), ConfigurationAct::getContentId, eventDTO.getContentId())
+                .eq(StringUtils.isNotBlank(eventDTO.getId()), ConfigurationAct::getId, eventDTO.getId());
+        int result = baseMapper.delete(filter);
+        return result > 0;
+    }
+
+    @Override
+    public List<ConfigurationActDTO> listConfigurationAct(String tenantId,String levelType,String levelId) {
+        if(!FastIotConstants.ConfigureLevel.CONTENT.equals(levelType)
+                && !FastIotConstants.ConfigureLevel.NODE.equals(levelType)){
+            throw new YtDataValidationException("please provide correct levelType!");
+        }
+        LambdaQueryWrapper<ConfigurationAct> filter = new QueryWrapper<ConfigurationAct>().lambda()
+                .eq(ConfigurationAct::getTenantId,tenantId)
+                .eq(FastIotConstants.ConfigureLevel.CONTENT.equals(levelType), ConfigurationAct::getContentId, levelId)
+                .eq(FastIotConstants.ConfigureLevel.NODE.equals(levelType), ConfigurationAct::getId, levelId);
+        List<ConfigurationAct> result = baseMapper.selectList(filter);
+        if (result == null || result.isEmpty()) {
+            return null;
+        }
+        return result.stream()
+                .map(i -> i.getDTO(ConfigurationActDTO.class))
+                .collect(Collectors.toList());
+    }
+
+
+}

@@ -35,7 +35,6 @@ public class YtConfigurationEventServiceImpl
     @Transactional(rollbackFor = Exception.class)
     public ConfigurationEventDTO saveConfigurationEvent(ConfigurationEventDTO eventDTO) {
         LambdaQueryWrapper<ConfigurationEvent> filter = new QueryWrapper<ConfigurationEvent>().lambda()
-                .eq(ConfigurationEvent::getTenantId,eventDTO.getTenantId())
                 .eq(ConfigurationEvent::getType, eventDTO.getType())
                 .eq(ConfigurationEvent::getId, eventDTO.getId());
         ConfigurationEvent old = baseMapper.selectOne(filter);

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationAct;
+
+/**
+ * @author Administrator
+ */
+@Mapper
+public interface ConfigurationActMapper extends BaseMapper<ConfigurationAct> {
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationActDTO;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+public interface YtConfigurationActService {
+
+    /**
+     * 保存节点动画效果信息，每种事件类型只会有1个
+     *
+     * @param eventDTO
+     * @return
+     */
+    ConfigurationActDTO saveConfigurationAct(ConfigurationActDTO eventDTO);
+
+    /**
+     * 删除动画效果信息
+     *
+     * @param eventDTO 组态ID、内容ID、结点ID任选其一
+     * @return
+     */
+    boolean deleteConfigurationAct(ConfigurationActDTO eventDTO);
+
+    /**
+     * 查看动画效果信息
+     * @param tenantId  租户ID
+     * @param levelType  组件类型
+     * @param levelId    内容ID、结点ID任选其一
+     * @return
+     */
+    List<ConfigurationActDTO> listConfigurationAct(String tenantId,String levelType,String levelId);
+}