SQL查询

@@ -471,3 +471,20 @@ COMMENT ON COLUMN qg_db_connect_ssl.ca_cert IS 'CA证书';
 COMMENT ON COLUMN qg_db_connect_ssl.verify_ca_cert IS '验证CA证书';
 COMMENT ON COLUMN qg_db_connect_ssl.client_key IS '客户端秘钥';
 COMMENT ON COLUMN qg_db_connect_ssl.client_cert IS '客户端证书';
+
+CREATE TABLE "qg_db_data_set" (
+    "id"             varchar(36) PRIMARY KEY,
+    "component_code" varchar(36) NOT NULL,
+    "connect_id"     varchar(36) NOT NULL,
+    "sql"            text        NOT NULL,
+    "tenant_id"      varchar(36),
+    "create_time"    timestamp(6),
+    "creator"        varchar(36) NULL,
+    "updater"        varchar(36) NULL,
+    "update_time"    timestamp(6)
+);
+COMMENT ON TABLE qg_db_data_set IS '数据集配置';
+COMMENT ON COLUMN qg_db_data_set.tenant_id IS '租户ID';
+COMMENT ON COLUMN qg_db_data_set.component_code IS '大屏组件code';
+COMMENT ON COLUMN qg_db_data_set.connect_id IS '数据库链接信息id';
+COMMENT ON COLUMN qg_db_data_set.sql IS 'sql内容';
\ No newline at end of file

@@ -10,10 +10,12 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.dto.TkDbConnectDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDbDataSetDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DbConnectTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDbConnectService;
+import org.thingsboard.server.dao.yunteng.service.TkDbDataSetService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
@@ -31,6 +33,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Slf4j
 public class TkDbConnectController extends BaseController {
     private final TkDbConnectService tkDbConnectService;
+    private final TkDbDataSetService tkDbDataSetService;
 
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页查询")
@@ -80,4 +83,23 @@ public class TkDbConnectController extends BaseController {
     public ResponseEntity<Object> dataView(@RequestBody TkDbConnectDTO tkDbConnectDTO) throws ThingsboardException {
         return ResponseEntity.ok(tkDbConnectService.connectResult(tkDbConnectDTO));
     }
+
+    @PostMapping("/saveDataSet")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<TkDbDataSetDTO> dataView(@RequestBody TkDbDataSetDTO tkDbDataSetDTO) throws ThingsboardException {
+        tkDbDataSetDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(tkDbDataSetService.save(tkDbDataSetDTO));
+    }
+
+    @GetMapping("/getDataSet")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<TkDbDataSetDTO> getDataSet(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(tkDbDataSetService.get(id));
+    }
+
+    @PostMapping("/getDataView")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<Object> getDataView(@RequestBody TkDbDataSetDTO tkDbDataSetDTO) throws ThingsboardException {
+        return ResponseEntity.ok(tkDbDataSetService.getDataView(tkDbDataSetDTO));
+    }
 }

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.enums.DbConnectTypeEnum;
 
+import java.util.Map;
+
 /**
  * 数据库链接信息
  */
@@ -62,4 +64,7 @@ public class TkDbConnectDTO extends TenantDTO {
 
     @ApiModelProperty("预览sql")
     private String sql;
+
+    @ApiModelProperty("SQL传参")
+    private Map<String, Object> paramMap;
 }

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Map;
+
+/**
+ * SSL通道配置信息
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkDbDataSetDTO extends TenantDTO {
+
+    @ApiModelProperty("大屏组件code")
+    private String componentCode;
+
+    @ApiModelProperty("数据库链接信息id")
+    private String connectId;
+
+    @ApiModelProperty("sql内容")
+    private String sql;
+
+    @ApiModelProperty("数据库链接信息")
+    private TkDbConnectDTO tkDbConnectDTO;
+
+    @ApiModelProperty("SQL传参")
+    private Map<String, Object> paramMap;
+}

@@ -704,6 +704,7 @@ public class ModelConstants {
     public static final String TKDBCONNECT_TABLE_NAME = "qg_db_connect"; // 数据库链接信息
     public static final String TKDBCONNECTSSH_TABLE_NAME = "qg_db_connect_ssh"; // SSH通道配置信息
     public static final String TKDBCONNECTSSL_TABLE_NAME = "qg_db_connect_ssl"; // SSL通道配置信息
+    public static final String TKDBDATESET_TABLE_NAME = "qg_db_data_set"; // 数据集配置
 
     protected static final String[] NONE_AGGREGATION_COLUMNS = new String[]{LONG_VALUE_COLUMN, DOUBLE_VALUE_COLUMN, BOOLEAN_VALUE_COLUMN, STRING_VALUE_COLUMN, JSON_VALUE_COLUMN, KEY_COLUMN, TS_COLUMN};
 

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+/**
+ * 数据集配置
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.TKDBDATESET_TABLE_NAME, autoResultMap = true)
+public class TkDbDataSetEntity extends TenantBaseEntity {
+
+    private String componentCode;
+
+    private String connectId;
+
+    private String sql;
+}

@@ -5,7 +5,9 @@ import com.jcraft.jsch.Session;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.dto.TkDbConnectDTO;
@@ -21,6 +23,7 @@ import java.security.KeyStore;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 /**
@@ -181,7 +184,7 @@ public class BaseDbConnectServiceImpl implements BaseDbConnectService {
         List<Object> resultList = new ArrayList<>();
         try {
             HikariConfig config = new HikariConfig();
-            config.setJdbcUrl(tkDbConnectDTO.getUrl());
+            config.setJdbcUrl(replaceParam(tkDbConnectDTO.getUrl(), tkDbConnectDTO.getParamMap()));
             config.setUsername(tkDbConnectDTO.getUserName());
             config.setPassword(tkDbConnectDTO.getPassword());
             if (DbConnectTypeEnum.MySql.equals(tkDbConnectDTO.getType())) {
@@ -254,6 +257,24 @@ public class BaseDbConnectServiceImpl implements BaseDbConnectService {
         return resultList;
     }
 
+    private String replaceParam(String url, Map<String, Object> paramMap) {
+        if (MapUtils.isEmpty(paramMap)) {
+            return url;
+        }
+
+        for (Map.Entry<String, Object> objectEntry : paramMap.entrySet()) {
+            String key = objectEntry.getKey();
+            Object value = objectEntry.getValue();
+            if (StringUtils.isBlank(key) || ObjectUtils.isEmpty(value)) {
+                continue;
+            }
+
+            url = url.replaceAll("${" + key + "}", String.valueOf(value));
+        }
+
+        return url;
+    }
+
     private Object getTypedValue(ResultSet rs, int index, int sqlType) throws SQLException {
         Object value;
 

+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.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.dto.TkDbConnectDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDbDataSetDTO;
+import org.thingsboard.server.dao.yunteng.entities.TkDbDataSetEntity;
+import org.thingsboard.server.dao.yunteng.factory.DbConnectServiceFactory;
+import org.thingsboard.server.dao.yunteng.mapper.TkDbDataSetMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkDbConnectService;
+import org.thingsboard.server.dao.yunteng.service.TkDbDataSetService;
+
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class TkDbDataSetServiceImpl extends AbstractBaseService<TkDbDataSetMapper, TkDbDataSetEntity>
+        implements TkDbDataSetService {
+
+    private final TkDbConnectService tkDbConnectService;
+    private final DbConnectServiceFactory connectServiceFactory;
+
+    @Override
+    public TkDbDataSetDTO save(TkDbDataSetDTO dto) {
+        checkDto(dto);
+        TkDbDataSetEntity entity = new TkDbDataSetEntity();
+        if (StringUtils.isBlank(dto.getId())) {
+            dto.copyToEntity(entity);
+            baseMapper.insert(entity);
+        } else {
+            LambdaQueryWrapper<TkDbDataSetEntity> filter = new QueryWrapper<TkDbDataSetEntity>().lambda()
+                    .eq(TkDbDataSetEntity::getId, dto.getId());
+            entity = dto.getEntity(TkDbDataSetEntity.class);
+            baseMapper.update(entity, filter);
+        }
+
+        return dto;
+    }
+
+    @Override
+    public TkDbDataSetDTO get(String id) {
+        if (StringUtils.isBlank(id)) {
+            return new TkDbDataSetDTO();
+        }
+
+        TkDbDataSetEntity entity = baseMapper.selectById(id);
+        TkDbDataSetDTO tkDbDataSetDTO = new TkDbDataSetDTO();
+        entity.copyToDTO(tkDbDataSetDTO);
+        if (StringUtils.isNotBlank(tkDbDataSetDTO.getConnectId())) {
+            tkDbDataSetDTO.setTkDbConnectDTO(tkDbConnectService.get(tkDbDataSetDTO.getConnectId()));
+        }
+
+        return tkDbDataSetDTO;
+    }
+
+    @Override
+    public Object getDataView(TkDbDataSetDTO dto) {
+        Map<String, Object> paramMap = dto.getParamMap();
+        dto = get(dto.getId());
+        TkDbConnectDTO dbConnectDTO = dto.getTkDbConnectDTO();
+        dbConnectDTO.setParamMap(paramMap);
+        return connectServiceFactory.getService("baseConnect").connect(dbConnectDTO);
+    }
+
+    private void checkDto(TkDbDataSetDTO dto) {
+        if (StringUtils.isBlank(dto.getTenantId())) {
+            throw new TkDataValidationException("租户id为空！");
+        }
+    }
+}

+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.TkDbDataSetEntity;
+
+/**
+ * 数据集配置
+ */
+@Mapper
+public interface TkDbDataSetMapper extends BaseMapper<TkDbDataSetEntity> {
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.TkDbDataSetDTO;
+import org.thingsboard.server.dao.yunteng.entities.TkDbDataSetEntity;
+
+public interface TkDbDataSetService extends BaseService<TkDbDataSetEntity> {
+
+    TkDbDataSetDTO save(TkDbDataSetDTO dto);
+
+    TkDbDataSetDTO get(String id);
+
+    Object getDataView(TkDbDataSetDTO dto);
+}