Merge branch '20220512' into 'master'

feat: 组态结点信息

See merge request huang/thingsboard3.3.2!97

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+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.ConfigurationDatasourceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationEventDTO;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.YtConfigurationDatasourceService;
+import org.thingsboard.server.dao.yunteng.service.YtConfigurationEventService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/api/yt/configuration/node")
+@RequiredArgsConstructor
+@Api(tags = "组态结点管理")
+public class YtConfigurationNodeController extends BaseController {
+
+    private final YtConfigurationDatasourceService datasourceService;
+    private final YtConfigurationEventService eventService;
+
+    @PostMapping("datascource")
+    @ApiOperation("编辑数据源")
+    public ResponseEntity<ConfigurationDatasourceDTO> saveDatascource(
+            @Validated({AddGroup.class}) @RequestBody ConfigurationDatasourceDTO datasourceDTO)
+            throws ThingsboardException {
+        datasourceDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(
+                datasourceService.saveConfigurationDatasource(datasourceDTO));
+    }
+
+    @PostMapping("event")
+    @ApiOperation("编辑数据交互")
+    public ResponseEntity<ConfigurationEventDTO> saveEvent(
+            @Validated({AddGroup.class}) @RequestBody ConfigurationEventDTO eventDTO)
+            throws ThingsboardException {
+        eventDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(
+                eventService.saveConfigurationEvent(eventDTO));
+    }
+
+
+    @DeleteMapping("datascource")
+    @ApiOperation("删除数据源")
+    public ResponseEntity<Boolean> deleteDatascource(
+            @Validated({DeleteGroup.class}) @RequestBody ConfigurationDatasourceDTO deleteDTO)
+            throws ThingsboardException {
+        deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(datasourceService.deleteConfigurationDatasource(deleteDTO));
+    }
+
+    @DeleteMapping("event")
+    @ApiOperation("删除数据交互")
+    public ResponseEntity<Boolean> deleteEvent(
+            @Validated({DeleteGroup.class}) @RequestBody ConfigurationEventDTO deleteDTO)
+            throws ThingsboardException {
+        deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(eventService.deleteConfigurationEvent(deleteDTO));
+    }
+
+
+    @GetMapping("/{levelType}/{levelId}")
+    @ApiOperation("组件信息")
+    public ResponseEntity<Map<String, List>> nodeInform(
+            @ApiParam(value = "组态资源类型，例如：CONFIGURE、CONTENT、NODE", required = true, defaultValue = "NODE") @PathVariable("levelType") String levelType,
+            @ApiParam(value = "组态资源ID", required = true) @PathVariable("levelId") String levelId) throws ThingsboardException {
+        String tenantId = getCurrentUser().getCurrentTenantId();
+
+        List<ConfigurationDatasourceDTO> sources = datasourceService.listConfigurationDatasource(tenantId, levelType, levelId);
+        List<ConfigurationEventDTO> events = eventService.listConfigurationEvent(tenantId, levelType, levelId);
+        Map<String, List> result = new HashMap<>();
+        if (sources != null && sources.size() > 0) {
+            result.put("dataSources", sources);
+        }
+        if (events != null && events.size() > 0) {
+            result.put("event", events);
+        }
+        return ResponseEntity.ok(result);
+    }
+
+}

@@ -90,4 +90,10 @@ public interface FastIotConstants {
     String area = "thingsArea";
     int DRAFT = 0;
   }
+
+  interface ConfigureLevel {
+    String CONFIGURE = "CONFIGURE";
+    String CONTENT = "CONTENT";
+    String NODE = "NODE";
+  }
 }

@@ -75,6 +75,10 @@ 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_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 javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 组态结点数据源
+ * @author Administrator
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ConfigurationDatasourceDTO 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 = "组态ID", required = true)
+  @NotEmpty(
+          message = "组件ID不能未空或空字符串",
+          groups = {UpdateGroup.class, AddGroup.class})
+  private String nodeId;
+
+  @ApiModelProperty(value = "tbDeviceId", required = true)
+  @NotEmpty(
+          message = "tbDeviceId不能未空或空字符串",
+          groups = {UpdateGroup.class, AddGroup.class})
+  private String deviceId;
+
+  @ApiModelProperty(value = "组件关注的指标")
+  private JsonNode attr;
+
+  @ApiModelProperty(value = "组态描述")
+  private String remark;
+}

+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.EventTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 组态节点事件
+ * @author Administrator
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ConfigurationEventDTO 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 EventTypeEnum type;
+
+  @ApiModelProperty(value = "事件内容")
+  private JsonNode content;
+
+  @ApiModelProperty(value = "组态描述")
+  private String remark;
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/** 组态数据互动类型 */
+public enum EventTypeEnum {
+  DOWN,
+  UP,
+  SINGLE,
+  DOUBLE
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/**
+ * @author Administrator
+ */
+@EqualsAndHashCode(callSuper = true)
+@TableName(ModelConstants.Table.IOTFS_CONFIGURATION_DATASOURCE)
+@Data
+public class ConfigurationDatasource extends TenantBaseEntity {
+    private static final long serialVersionUID = 2830393872646826226L;
+    private String configurationId;
+    private String contentId;
+    private String nodeId;
+    private String deviceId;
+    private JsonNode attr;
+    private String remark;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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.common.data.yunteng.enums.EventTypeEnum;
+
+/**
+ * @author Administrator
+ */
+@EqualsAndHashCode(callSuper = true)
+@TableName(ModelConstants.Table.IOTFS_CONFIGURATION_EVENT)
+@Data
+public class ConfigurationEvent extends TenantBaseEntity {
+    private static final long serialVersionUID = 4613503997176066996L;
+    private String configurationId;
+    private String contentId;
+    private JsonNode content;
+    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.ConfigurationDatasourceDTO;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationDatasource;
+import org.thingsboard.server.dao.yunteng.mapper.ConfigurationDatasourceMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.YtConfigurationDatasourceService;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class YtConfigurationDatasourceServiceImpl
+        extends AbstractBaseService<ConfigurationDatasourceMapper, ConfigurationDatasource>
+        implements YtConfigurationDatasourceService {
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ConfigurationDatasourceDTO saveConfigurationDatasource(ConfigurationDatasourceDTO sourceDTO) {
+        LambdaQueryWrapper<ConfigurationDatasource> filter = new QueryWrapper<ConfigurationDatasource>().lambda()
+                .eq(ConfigurationDatasource::getNodeId, sourceDTO.getNodeId());
+        ConfigurationDatasource old = baseMapper.selectOne(filter);
+        ConfigurationDatasource newData = sourceDTO.getEntity(ConfigurationDatasource.class);
+        if (old == null) {
+            baseMapper.insert(newData);
+        } else if(!sourceDTO.getTenantId().equals(old.getTenantId())){
+            throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());
+        } else {
+            baseMapper.update(newData, filter);
+        }
+        return sourceDTO;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteConfigurationDatasource(ConfigurationDatasourceDTO sourceDTO) {
+        LambdaQueryWrapper<ConfigurationDatasource> filter = new QueryWrapper<ConfigurationDatasource>().lambda()
+                .eq(ConfigurationDatasource::getTenantId,sourceDTO.getTenantId())
+                .eq(StringUtils.isNotBlank(sourceDTO.getConfigurationId()), ConfigurationDatasource::getConfigurationId, sourceDTO.getConfigurationId())
+                .eq(StringUtils.isNotBlank(sourceDTO.getContentId()), ConfigurationDatasource::getContentId, sourceDTO.getContentId())
+                .eq(StringUtils.isNotBlank(sourceDTO.getNodeId()), ConfigurationDatasource::getNodeId, sourceDTO.getNodeId());
+        int result = baseMapper.delete(filter);
+        return result > 0;
+    }
+
+    @Override
+    public List<ConfigurationDatasourceDTO> listConfigurationDatasource(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<ConfigurationDatasource> filter = new QueryWrapper<ConfigurationDatasource>().lambda()
+                .eq(ConfigurationDatasource::getTenantId,tenantId)
+                .eq(FastIotConstants.ConfigureLevel.CONTENT.equals(levelType), ConfigurationDatasource::getContentId, levelId)
+                .eq(FastIotConstants.ConfigureLevel.NODE.equals(levelType), ConfigurationDatasource::getNodeId, levelId);
+        List<ConfigurationDatasource> result = baseMapper.selectList(filter);
+        if (result == null || result.isEmpty()) {
+            return null;
+        }
+        return result.stream()
+                .map(i -> i.getDTO(ConfigurationDatasourceDTO.class))
+                .collect(Collectors.toList());
+    }
+
+}

+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.ConfigurationEventDTO;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationDatasource;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationEvent;
+import org.thingsboard.server.dao.yunteng.mapper.ConfigurationEventMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.YtConfigurationEventService;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class YtConfigurationEventServiceImpl
+        extends AbstractBaseService<ConfigurationEventMapper, ConfigurationEvent>
+        implements YtConfigurationEventService {
+
+
+    @Override
+    @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);
+        ConfigurationEvent newData = eventDTO.getEntity(ConfigurationEvent.class);
+        if (old == null) {
+            baseMapper.insert(newData);
+        } else if(!eventDTO.getTenantId().equals(old.getTenantId())){
+            throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());
+        } else {
+            baseMapper.update(newData, filter);
+        }
+        return eventDTO;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteConfigurationEvent(ConfigurationEventDTO eventDTO) {
+        LambdaQueryWrapper<ConfigurationEvent> filter = new QueryWrapper<ConfigurationEvent>().lambda()
+                .eq(ConfigurationEvent::getTenantId,eventDTO.getTenantId())
+                .eq(StringUtils.isNotBlank(eventDTO.getConfigurationId()), ConfigurationEvent::getConfigurationId, eventDTO.getConfigurationId())
+                .eq(StringUtils.isNotBlank(eventDTO.getContentId()), ConfigurationEvent::getContentId, eventDTO.getContentId())
+                .eq(StringUtils.isNotBlank(eventDTO.getId()), ConfigurationEvent::getId, eventDTO.getId());
+        int result = baseMapper.delete(filter);
+        return result > 0;
+    }
+
+    @Override
+    public List<ConfigurationEventDTO> listConfigurationEvent(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<ConfigurationEvent> filter = new QueryWrapper<ConfigurationEvent>().lambda()
+                .eq(ConfigurationEvent::getTenantId,tenantId)
+                .eq(FastIotConstants.ConfigureLevel.CONTENT.equals(levelType), ConfigurationEvent::getContentId, levelId)
+                .eq(FastIotConstants.ConfigureLevel.NODE.equals(levelType), ConfigurationEvent::getId, levelId);
+        List<ConfigurationEvent> result = baseMapper.selectList(filter);
+        if (result == null || result.isEmpty()) {
+            return null;
+        }
+        return result.stream()
+                .map(i -> i.getDTO(ConfigurationEventDTO.class))
+                .collect(Collectors.toList());
+    }
+
+
+}

+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.ConfigurationContent;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationDatasource;
+
+/**
+ * @author Administrator
+ */
+@Mapper
+public interface ConfigurationDatasourceMapper extends BaseMapper<ConfigurationDatasource> {
+}

+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.ConfigurationEvent;
+
+/**
+ * @author Administrator
+ */
+@Mapper
+public interface ConfigurationEventMapper extends BaseMapper<ConfigurationEvent> {
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationDatasourceDTO;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+public interface YtConfigurationDatasourceService {
+
+    /**
+     * 保存节点数据源，只会有1个
+     *
+     * @param sourceDTO
+     * @return
+     */
+    ConfigurationDatasourceDTO saveConfigurationDatasource(ConfigurationDatasourceDTO sourceDTO);
+
+    /**
+     * 删除数据源信息
+     *
+     * @param sourceDTO 组态ID、内容ID、结点ID任选其一
+     * @return
+     */
+    boolean deleteConfigurationDatasource(ConfigurationDatasourceDTO sourceDTO);
+
+    /**
+     * 查看数据交互信息
+     * @param levelType  组件类型
+     * @param levelId    内容ID、结点ID任选其一
+     * @return
+     */
+    List<ConfigurationDatasourceDTO> listConfigurationDatasource(String tenantId,String levelType,String levelId);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationEventDTO;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+public interface YtConfigurationEventService {
+
+    /**
+     * 保存节点数据交互信息，每种事件类型只会有1个
+     *
+     * @param eventDTO
+     * @return
+     */
+    ConfigurationEventDTO saveConfigurationEvent(ConfigurationEventDTO eventDTO);
+
+    /**
+     * 删除数据交互信息
+     *
+     * @param eventDTO 组态ID、内容ID、结点ID任选其一
+     * @return
+     */
+    boolean deleteConfigurationEvent(ConfigurationEventDTO eventDTO);
+
+    /**
+     * 查看数据交互信息
+     * @param levelType  组件类型
+     * @param levelId    内容ID、结点ID任选其一
+     * @return
+     */
+    List<ConfigurationEventDTO> listConfigurationEvent(String tenantId,String levelType,String levelId);
+}