feat: 新功能开发：大屏公共接口

@@ -31,7 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequestMapping("/api/yt/data_view")
 @RequestMapping("/api/yt/data_view")
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 @Api(tags = "大屏设计器")
 @Api(tags = "大屏设计器")
-@PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+@PreAuthorize("@check.checkPermissions({},{})")
 public class TkDataViewController extends BaseController {
 public class TkDataViewController extends BaseController {
 
 
     private final TkDataViewService tkDataViewService;
     private final TkDataViewService tkDataViewService;
@@ -114,4 +114,20 @@ public class TkDataViewController extends BaseController {
                 tkDataViewService.getDataViewInfos(
                 tkDataViewService.getDataViewInfos(
                         id, getCurrentUser().getCurrentTenantId()));
                         id, getCurrentUser().getCurrentTenantId()));
     }
     }
+
+    @GetMapping("/publish/{id}")
+    @ApiOperation("发布")
+    @PreAuthorize("@check.checkPermissions({},{})")
+    public ResponseEntity<Boolean> publishDataView(@PathVariable("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(
+                tkDataViewService.publishDataView(id, getCurrentUser().getCurrentTenantId()));
+    }
+
+    @GetMapping("/cancel_publish/{id}")
+    @ApiOperation("取消发布")
+    @PreAuthorize("@check.checkPermissions({},{})")
+    public ResponseEntity<Boolean> cancelPublishDataView(@PathVariable("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(
+                tkDataViewService.cancelPublishDataView(id, getCurrentUser().getCurrentTenantId()));
+    }
 }
 }

+package org.thingsboard.server.controller.yunteng;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+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.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDataViewInterfaceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkDataViewInterfaceService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+/**
+ * @author tianfuLei
+ */
+@RestController
+@RequestMapping("/api/yt/data_view_interface")
+@RequiredArgsConstructor
+@Api(tags = "大屏公共接口")
+public class TkDataViewInterfaceController extends BaseController {
+
+    private final TkDataViewInterfaceService tkDataViewInterfaceService;
+
+    @GetMapping(params = {PAGE_SIZE, PAGE})
+    @ApiOperation("分页")
+    public TkPageData<TkDataViewInterfaceDTO> page(
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "state", required = false) String state,
+            @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+            @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+            throws ThingsboardException {
+
+        HashMap<String, Object> queryMap = new HashMap<>();
+        queryMap.put(PAGE_SIZE, pageSize);
+        queryMap.put(PAGE, page);
+        queryMap.put(ORDER_FILED, orderBy);
+        queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
+        if (StringUtils.isNotBlank(name)) {
+            queryMap.put("name", name);
+        }
+        if (StringUtils.isNotBlank(state)) {
+            queryMap.put("state", state);
+        }
+        if (null != orderType) {
+            queryMap.put(ORDER_TYPE, orderType.name());
+        }
+        return tkDataViewInterfaceService.page(queryMap);
+    }
+
+    @PostMapping
+    @ApiOperation("新增")
+    @PreAuthorize("@check.checkPermissions({},{})")
+    public ResponseEntity<TkDataViewInterfaceDTO> save(
+            @Validated({AddGroup.class}) @RequestBody TkDataViewInterfaceDTO tkDataViewInterfaceDTO)
+            throws ThingsboardException {
+        tkDataViewInterfaceDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+
+        return ResponseEntity.ok(
+                tkDataViewInterfaceService.saveDataViewInterface(tkDataViewInterfaceDTO));
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @PreAuthorize("@check.checkPermissions({},{})")
+    public ResponseEntity<TkDataViewInterfaceDTO> update(
+            @Validated({UpdateGroup.class}) @RequestBody TkDataViewInterfaceDTO TkDataViewInterfaceDTO)
+            throws ThingsboardException {
+        TkDataViewInterfaceDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(
+                tkDataViewInterfaceService.updateDataViewInterface(TkDataViewInterfaceDTO));
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @PreAuthorize("@check.checkPermissions({},{})")
+    public ResponseEntity<Boolean> delete(
+            @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
+            throws ThingsboardException {
+        deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(tkDataViewInterfaceService.deleteDataViewInterface(deleteDTO));
+    }
+
+
+    @GetMapping("/publish/{id}")
+    @ApiOperation("发布")
+    @PreAuthorize("@check.checkPermissions({},{})")
+    public ResponseEntity<Boolean> publishInterface(@PathVariable("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(
+                tkDataViewInterfaceService.publishInterface(id, getCurrentUser().getCurrentTenantId()));
+    }
+
+    @GetMapping("/cancel_publish/{id}")
+    @ApiOperation("取消发布")
+    @PreAuthorize("@check.checkPermissions({},{})")
+    public ResponseEntity<Boolean> cancelPublishInterface(@PathVariable("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(
+                tkDataViewInterfaceService.cancelPublishInterface(id, getCurrentUser().getCurrentTenantId()));
+    }
+
+
+    @ApiOperation("根据接口ID，获得接口详情")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/get_interface_details", params = {"ids"}, method = RequestMethod.GET)
+    @ResponseBody
+    public List<TkDataViewInterfaceDTO> getInterfaceDetails(
+            @ApiParam(value = "A list of interface ids, separated by comma ','")
+            @RequestParam("ids") String[] ids) throws ThingsboardException {
+
+        List<String> idsList = new ArrayList<>();
+        for (String strId : ids) {
+            idsList.add(strId);
+        }
+        return tkDataViewInterfaceService.getInterfaceDetails(idsList);
+    }
+
+    @GetMapping("/filter_by_interface_type/{type}")
+    @ApiOperation("根据接口类型过滤数据")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    public List<TkDataViewInterfaceDTO> filterByInterfaceType(@PathVariable("type") String type) throws ThingsboardException {
+        return tkDataViewInterfaceService.filterByInterfaceType(type,getCurrentUser().getCurrentTenantId());
+    }
+
+
+    @GetMapping("/find_all_interface")
+    @ApiOperation("查询所有接口")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    public List<TkDataViewInterfaceDTO> findAll() throws ThingsboardException {
+        return tkDataViewInterfaceService.findAll(getCurrentUser().getCurrentTenantId());
+    }
+
+}

@@ -82,6 +82,8 @@ public final class ModelConstants {
     public static final String TK_DATA_VIEW_NAME = "tk_data_view";
     public static final String TK_DATA_VIEW_NAME = "tk_data_view";
     /** 大屏设计页面内容 */
     /** 大屏设计页面内容 */
     public static final String TK_DATA_VIEW_CONTENT_NAME = "tk_data_view_content";
     public static final String TK_DATA_VIEW_CONTENT_NAME = "tk_data_view_content";
+    /** 大屏公共接口 */
+    public static final String TK_DATA_VIEW_INTERFACE_NAME = "tk_data_view_interface";
     /** 组态中心 */
     /** 组态中心 */
     public static final String TK_CONFIGURATION_CENTER_NAME = "tk_configuration_center";
     public static final String TK_CONFIGURATION_CENTER_NAME = "tk_configuration_center";
     /** 组态内容 */
     /** 组态内容 */

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 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.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
 
 
@@ -33,4 +34,10 @@ public class TkDataViewDTO extends TenantDTO {
     private String thumbnail;
     private String thumbnail;
 
 
     private OrganizationDTO organizationDTO;
     private OrganizationDTO organizationDTO;
+
+    @ApiModelProperty(value = "视图类型")
+    private ViewType viewType;
+
+    @ApiModelProperty(value = "访问凭证")
+    private String accessCredentials;
 }
 }

+package org.thingsboard.server.common.data.yunteng.dto;
+
+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;
+/**
+ * @author tianfuLei
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkDataViewInterfaceDTO extends TenantDTO {
+
+    @ApiModelProperty(value = "接口名称", required = true)
+    @NotEmpty(
+            message = "名称不能为空或空字符串",
+            groups = {UpdateGroup.class, AddGroup.class})
+    private String interfaceName;
+
+    @ApiModelProperty(value = "请求方式:0普通请求 1SQL请求 2websocket请求")
+    private Integer requestContentType;
+
+    @ApiModelProperty(value = "源地址")
+    private String requestOriginUrl;
+
+    @ApiModelProperty(value = "请求类型:GET、PUT、POST", required = true)
+    private String requestHttpType;
+
+    @ApiModelProperty(value = "接口地址")
+    private String requestUrl;
+
+    @ApiModelProperty(value = "参数配置")
+    private String requestParams;
+
+    @ApiModelProperty(value = "状态:0待发布 1已发布")
+    private Integer state;
+
+    @ApiModelProperty(value = "接口描述")
+    private String remark;
+
+}

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 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.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 
 
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(ModelConstants.Table.TK_DATA_VIEW_NAME)
 @TableName(ModelConstants.Table.TK_DATA_VIEW_NAME)
@@ -16,6 +18,12 @@ public class TkDataViewEntity extends TenantBaseEntity {
   private String remark;
   private String remark;
   private String organizationId;
   private String organizationId;
   private Integer state;
   private Integer state;
+
   @TableField(updateStrategy = FieldStrategy.IGNORED)
   @TableField(updateStrategy = FieldStrategy.IGNORED)
   private String thumbnail;
   private String thumbnail;
+
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private ViewType viewType;
+
+  private String accessCredentials;
 }
 }

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/**
+ * @author tianfuLei
+ */
+@EqualsAndHashCode(callSuper = true)
+@TableName(ModelConstants.Table.TK_DATA_VIEW_INTERFACE_NAME)
+@Data
+public class TkDataViewInterfaceEntity extends TenantBaseEntity {
+  private static final long serialVersionUID = -7825135358032541445L;
+
+  private String interfaceName;
+  private Integer requestContentType;
+  private String requestOriginUrl;
+  private String requestHttpType;
+  private String requestUrl;
+  private String requestParams;
+  private Integer state;
+  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 com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.*;
+import org.thingsboard.server.dao.yunteng.entities.TkDataViewInterfaceEntity;
+import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
+import org.thingsboard.server.dao.yunteng.mapper.TkDataViewInterfaceMapper;
+import org.thingsboard.server.dao.yunteng.mapper.TkDataViewMapper;
+import org.thingsboard.server.dao.yunteng.service.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author tianfuLei
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class TkDataViewInterfaceServiceImpl
+        extends AbstractBaseService<TkDataViewInterfaceMapper, TkDataViewInterfaceEntity>
+        implements TkDataViewInterfaceService {
+
+    @Override
+    public TkPageData<TkDataViewInterfaceDTO> page(
+            Map<String, Object> queryMap) {
+        IPage<TkDataViewInterfaceEntity> iPage = null;
+        if(queryMap.get("state") != null){
+            iPage = baseMapper.selectPage(
+                    getPage(queryMap, "create_time", false),
+                    new QueryWrapper<TkDataViewInterfaceEntity>()
+                            .lambda()
+                            .like(
+                                    queryMap.get("name") != null,
+                                    TkDataViewInterfaceEntity::getInterfaceName,
+                                    String.valueOf(queryMap.get("name")))
+                            .in(
+                                    queryMap.get("tenantId") != null,
+                                    TkDataViewInterfaceEntity::getTenantId, EntityId.NULL_UUID.toString(),
+                                    String.valueOf(queryMap.get("tenantId")))
+                            .eq(
+                                    queryMap.get("state") != null,
+                                    TkDataViewInterfaceEntity::getState,
+                                    Integer.parseInt((String)queryMap.get("state"))));
+        }else{
+            iPage = baseMapper.selectPage(
+                    getPage(queryMap, "create_time", false),
+                    new QueryWrapper<TkDataViewInterfaceEntity>()
+                            .lambda()
+                            .like(
+                                    queryMap.get("name") != null,
+                                    TkDataViewInterfaceEntity::getInterfaceName,
+                                    String.valueOf(queryMap.get("name")))
+                            .in(
+                                    queryMap.get("tenantId") != null,
+                                    TkDataViewInterfaceEntity::getTenantId, EntityId.NULL_UUID.toString(),
+                                    String.valueOf(queryMap.get("tenantId")))
+                            .eq(
+                                    queryMap.get("state") != null,
+                                    TkDataViewInterfaceEntity::getState,
+                                    String.valueOf(queryMap.get("state"))));
+        }
+
+        return getPageData(iPage, TkDataViewInterfaceDTO.class);
+    }
+
+    @Override
+    @Transactional
+    public TkDataViewInterfaceDTO saveDataViewInterface(TkDataViewInterfaceDTO tkDataViewInterfaceDTO) {
+        TkDataViewInterfaceEntity interfaceEntity =
+                tkDataViewInterfaceDTO.getEntity(TkDataViewInterfaceEntity.class);
+        interfaceEntity.setState(0);
+
+        baseMapper.insert(interfaceEntity);
+        return tkDataViewInterfaceDTO;
+    }
+
+    @Override
+    @Transactional
+    public TkDataViewInterfaceDTO updateDataViewInterface(TkDataViewInterfaceDTO tkDataViewInterfaceDTO) {
+        TkDataViewInterfaceEntity interfaceEntity = baseMapper.selectById(tkDataViewInterfaceDTO.getId());
+        if (!interfaceEntity.getTenantId().equals(tkDataViewInterfaceDTO.getTenantId())) {
+            throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+        }
+        baseMapper.updateById(tkDataViewInterfaceDTO.getEntity(TkDataViewInterfaceEntity.class));
+        return tkDataViewInterfaceDTO;
+    }
+
+    @Override
+    @Transactional
+    public boolean deleteDataViewInterface(DeleteDTO deleteDTO) {
+        List<TkDataViewInterfaceEntity> interfaceEntityList =
+                baseMapper.selectList(
+                        new LambdaQueryWrapper<TkDataViewInterfaceEntity>()
+                                .in(TkDataViewInterfaceEntity::getId, deleteDTO.getIds()));
+        for (TkDataViewInterfaceEntity center : interfaceEntityList) {
+            if (!center.getTenantId().equals(deleteDTO.getTenantId())) {
+                throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+            }
+        }
+        return baseMapper.deleteBatchIds(deleteDTO.getIds()) > FastIotConstants.MagicNumber.ZERO;
+    }
+
+
+    @Override
+    public boolean publishInterface(String id, String tenantId) {
+        TkDataViewInterfaceEntity dataViewInterfaceEntity = baseMapper.selectById(id);
+        if (!dataViewInterfaceEntity.getTenantId().equals(tenantId)) {
+            throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+        }
+        //Modify interface state is publish
+        dataViewInterfaceEntity.setState(1);
+        int resultInt = baseMapper.updateById(dataViewInterfaceEntity);
+        return resultInt > 0 ? true : false;
+    }
+
+    @Override
+    public boolean cancelPublishInterface(String id, String tenantId) {
+        TkDataViewInterfaceEntity dataViewInterfaceEntity = baseMapper.selectById(id);
+        if (!dataViewInterfaceEntity.getTenantId().equals(tenantId)) {
+            throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+        }
+        //Modify interface state is cancelPublish
+        dataViewInterfaceEntity.setState(0);
+        int resultInt = baseMapper.updateById(dataViewInterfaceEntity);
+        return resultInt > 0 ? true : false;
+    }
+
+    @Override
+    public List<TkDataViewInterfaceDTO> getInterfaceDetails(List<String> ids) {
+        List<TkDataViewInterfaceDTO> lists = baseMapper.getInterfaceDetails(ids);
+        return lists;
+    }
+
+    @Override
+    public List<TkDataViewInterfaceDTO> filterByInterfaceType(String type,String tenantId) {
+        List<String> tenantIds = new ArrayList<>();
+        tenantIds.add(tenantId);
+        tenantIds.add(EntityId.NULL_UUID.toString());
+        List<TkDataViewInterfaceDTO> lists = baseMapper.filterByInterfaceType(type,tenantIds);
+        return lists;
+    }
+
+    @Override
+    public List<TkDataViewInterfaceDTO> findAll(String tenantId){
+        List<String> tenantIds = new ArrayList<>();
+        tenantIds.add(tenantId);
+        tenantIds.add(EntityId.NULL_UUID.toString());
+        List<TkDataViewInterfaceDTO>  lists =baseMapper.findAll(tenantIds);
+        return lists;
+    }
+
+}

@@ -13,6 +13,7 @@ import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDataViewEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDataViewEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkDataViewInterfaceEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkDataViewMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkDataViewMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -24,7 +25,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
-
+/**
+ * @author tianfuLei
+ */
 @Slf4j
 @Slf4j
 @Service
 @Service
 @RequiredArgsConstructor
 @RequiredArgsConstructor
@@ -68,12 +71,13 @@ public class TkDataViewServiceImpl
     @Override
     @Override
     @Transactional
     @Transactional
     public TkDataViewDTO saveDataView(TkDataViewDTO TkDataViewDTO) {
     public TkDataViewDTO saveDataView(TkDataViewDTO TkDataViewDTO) {
-        TkDataViewEntity DataView =
+        TkDataViewEntity dataView =
                 TkDataViewDTO.getEntity(TkDataViewEntity.class);
                 TkDataViewDTO.getEntity(TkDataViewEntity.class);
-        baseMapper.insert(DataView);
+        dataView.setState(0);
+        baseMapper.insert(dataView);
         TkDataViewContentDTO contentDTO = new TkDataViewContentDTO();
         TkDataViewContentDTO contentDTO = new TkDataViewContentDTO();
-        contentDTO.setTenantId(DataView.getTenantId());
-        contentDTO.setViewId(DataView.getId());
+        contentDTO.setTenantId(dataView.getTenantId());
+        contentDTO.setViewId(dataView.getId());
         contentDTO.setContent(
         contentDTO.setContent(
                 "<mxGraphModel><root><mxCell id=\"0\"/><mxCell id=\"1\" parent=\"0\"/></root></mxGraphModel>");
                 "<mxGraphModel><root><mxCell id=\"0\"/><mxCell id=\"1\" parent=\"0\"/></root></mxGraphModel>");
         ytDataViewContentService.saveDataViewContent(contentDTO);
         ytDataViewContentService.saveDataViewContent(contentDTO);
@@ -114,4 +118,29 @@ public class TkDataViewServiceImpl
                 ? list.get(FastIotConstants.MagicNumber.ZERO)
                 ? list.get(FastIotConstants.MagicNumber.ZERO)
                 : null;
                 : null;
     }
     }
+
+
+    @Override
+    public boolean publishDataView(String id, String tenantId) {
+        TkDataViewEntity dataView = baseMapper.selectById(id);
+        if (!dataView.getTenantId().equals(tenantId)) {
+            throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+        }
+        //Modify dataView state is publish
+        dataView.setState(1);
+        int resultInt = baseMapper.updateById(dataView);
+        return resultInt > 0 ? true : false;
+    }
+
+    @Override
+    public boolean cancelPublishDataView(String id, String tenantId) {
+        TkDataViewEntity dataView = baseMapper.selectById(id);
+        if (!dataView.getTenantId().equals(tenantId)) {
+            throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+        }
+        //Modify dataView state is cancelPublish
+        dataView.setState(0);
+        int resultInt = baseMapper.updateById(dataView);
+        return resultInt > 0 ? true : false;
+    }
 }
 }

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.TkDataViewInterfaceDTO;
+import org.thingsboard.server.dao.yunteng.entities.TkDataViewInterfaceEntity;
+
+import java.util.List;
+
+/**
+ * @author tianfuLei
+ */
+@Mapper
+public interface TkDataViewInterfaceMapper extends BaseMapper<TkDataViewInterfaceEntity> {
+
+    /**
+     * 根据ID获得详情
+     * @param ids
+     * @return
+     */
+    List<TkDataViewInterfaceDTO> getInterfaceDetails(@Param("ids") List<String> ids);
+
+    /**
+     * 根据接口类型过滤
+     * @param type
+     * @param tenantIds
+     * @return
+     */
+    List<TkDataViewInterfaceDTO> filterByInterfaceType(@Param("type") String type,@Param("tenantIds") List<String> tenantIds);
+
+    /**
+     * 查询所有数据
+     * @param tenantIds
+     * @return
+     */
+    List<TkDataViewInterfaceDTO> findAll(@Param("tenantIds") List<String> tenantIds);
+
+}

@@ -11,6 +11,9 @@ import org.thingsboard.server.dao.yunteng.entities.TkDataViewEntity;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
+/**
+ * @author tianfuLei
+ */
 @Mapper
 @Mapper
 public interface TkDataViewMapper extends BaseMapper<TkDataViewEntity> {
 public interface TkDataViewMapper extends BaseMapper<TkDataViewEntity> {
     IPage<TkDataViewDTO> getDataViewPage(
     IPage<TkDataViewDTO> getDataViewPage(

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDataViewDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDataViewInterfaceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author tianfuLei
+ */
+public interface TkDataViewInterfaceService {
+
+    TkPageData<TkDataViewInterfaceDTO> page(Map<String, Object> queryMap);
+
+    TkDataViewInterfaceDTO saveDataViewInterface(TkDataViewInterfaceDTO tkDataViewInterfaceDTO);
+
+    TkDataViewInterfaceDTO updateDataViewInterface(TkDataViewInterfaceDTO tkDataViewInterfaceDTO);
+
+    boolean deleteDataViewInterface(DeleteDTO deleteDTO);
+
+    boolean publishInterface(String id, String tenantId);
+
+    boolean cancelPublishInterface(String id, String tenantId);
+
+    List<TkDataViewInterfaceDTO> getInterfaceDetails(List<String> ids);
+
+    List<TkDataViewInterfaceDTO> filterByInterfaceType(String type,String tenantId);
+
+    List<TkDataViewInterfaceDTO> findAll(String tenantId);
+
+}

@@ -6,7 +6,9 @@ import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentI
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 
 
 import java.util.Map;
 import java.util.Map;
-
+/**
+ * @author tianfuLei
+ */
 public interface TkDataViewService {
 public interface TkDataViewService {
     TkPageData<TkDataViewDTO> page(Map<String, Object> queryMap, boolean tenantAdmin);
     TkPageData<TkDataViewDTO> page(Map<String, Object> queryMap, boolean tenantAdmin);
 
 
@@ -17,4 +19,8 @@ public interface TkDataViewService {
     boolean deleteDataView(DeleteDTO deleteDTO);
     boolean deleteDataView(DeleteDTO deleteDTO);
 
 
     TkDataViewContentInfoDTO getDataViewInfos(String id, String tenantId);
     TkDataViewContentInfoDTO getDataViewInfos(String id, String tenantId);
+
+    boolean publishDataView(String id, String tenantId);
+
+    boolean cancelPublishDataView(String id, String tenantId);
 }
 }

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TkDataViewInterfaceMapper">
+
+    <resultMap id="dataViewInterfaceMap" type="org.thingsboard.server.common.data.yunteng.dto.TkDataViewInterfaceDTO">
+        <result property="id" column="id"/>
+        <result property="interfaceName" column="interface_name"/>
+        <result property="requestContentType" column="request_content_type"/>
+        <result property="requestOriginUrl" column="request_origin_url"/>
+
+        <result property="requestHttpType" column="request_http_type"/>
+        <result property="requestUrl" column="request_url"/>
+        <result property="requestParams" column="request_params"/>
+        <result property="state" column="state"/>
+
+        <result property="remark" column="remark"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="creator" column="creator"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="updater" column="updater"/>
+    </resultMap>
+
+    <sql id="columns">
+        id,interface_name, request_content_type, request_origin_url, request_http_type, request_url, request_params, state, creator, create_time, updater, update_time, tenant_id, remark
+    </sql>
+
+    <select id="getInterfaceDetails" resultMap="dataViewInterfaceMap">
+        SELECT
+        <include refid="columns"/>
+        FROM tk_data_view_interface
+        <where>
+            <if test="ids !=null">
+                id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="filterByInterfaceType" resultMap="dataViewInterfaceMap">
+        SELECT
+        <include refid="columns"/>
+        FROM tk_data_view_interface
+        <where>
+            <if test="type !=null and type !=''">
+                AND request_http_type = #{type}
+            </if>
+
+            <if test="tenantIds !=null">
+                AND tenant_id IN
+                <foreach collection="tenantIds" item="tenantId" open="(" separator="," close=")">
+                    #{tenantId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="findAll" resultMap="dataViewInterfaceMap">
+        SELECT
+        <include refid="columns"/>
+        FROM tk_data_view_interface
+        <where>
+            <if test="tenantIds !=null">
+                AND tenant_id IN
+                <foreach collection="tenantIds" item="tenantId" open="(" separator="," close=")">
+                    #{tenantId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+</mapper>