Merge branch 'dev' of github.com:dataease/dataease into dev

This commit is contained in:
taojinlong 2022-02-23 17:21:20 +08:00
commit b1100a01e4
3 changed files with 14 additions and 0 deletions

View File

@ -2,6 +2,8 @@ package io.dataease.controller.panel.api;
import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.auth.annotation.DePermission;
import io.dataease.commons.constants.DePermissionType;
import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.controller.request.chart.ChartExtRequest;
import io.dataease.controller.request.panel.link.*; import io.dataease.controller.request.panel.link.*;
import io.dataease.dto.panel.link.GenerateDto; import io.dataease.dto.panel.link.GenerateDto;
@ -18,26 +20,32 @@ import java.util.Map;
public interface LinkApi { public interface LinkApi {
@DePermission(type = DePermissionType.PANEL, value = "resourceId")
@ApiOperation("重置密码") @ApiOperation("重置密码")
@PostMapping("/resetPwd") @PostMapping("/resetPwd")
void replacePwd(PasswordRequest request); void replacePwd(PasswordRequest request);
@DePermission(type = DePermissionType.PANEL, value = "resourceId")
@ApiOperation("启用密码") @ApiOperation("启用密码")
@PostMapping("/enablePwd") @PostMapping("/enablePwd")
void enablePwd(EnablePwdRequest request); void enablePwd(EnablePwdRequest request);
@DePermission(type = DePermissionType.PANEL, value = "resourceId")
@ApiOperation("过期时间") @ApiOperation("过期时间")
@PostMapping("/resetOverTime") @PostMapping("/resetOverTime")
void resetOverTime(OverTimeRequest request); void resetOverTime(OverTimeRequest request);
@DePermission(type = DePermissionType.PANEL, value = "resourceId")
@ApiOperation("启用/禁用链接分享") @ApiOperation("启用/禁用链接分享")
@PostMapping("/switchLink") @PostMapping("/switchLink")
void switchLink(LinkRequest request); void switchLink(LinkRequest request);
@DePermission(type = DePermissionType.PANEL)
@ApiOperation("当前链接信息") @ApiOperation("当前链接信息")
@PostMapping("/currentGenerate/{resourceId}") @PostMapping("/currentGenerate/{resourceId}")
GenerateDto currentGenerate(String resourceId); GenerateDto currentGenerate(String resourceId);
@ApiOperation("验证访问") @ApiOperation("验证访问")
@PostMapping("/validate") @PostMapping("/validate")
ValidateDto validate(LinkValidateRequest request) throws Exception; ValidateDto validate(LinkValidateRequest request) throws Exception;

View File

@ -1,7 +1,9 @@
package io.dataease.controller.panel.api; package io.dataease.controller.panel.api;
import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.auth.annotation.DePermission;
import io.dataease.base.domain.PanelShare; import io.dataease.base.domain.PanelShare;
import io.dataease.commons.constants.DePermissionType;
import io.dataease.controller.request.panel.PanelShareFineDto; import io.dataease.controller.request.panel.PanelShareFineDto;
import io.dataease.controller.request.panel.PanelShareRemoveRequest; import io.dataease.controller.request.panel.PanelShareRemoveRequest;
import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.controller.sys.base.BaseGridRequest;
@ -47,6 +49,7 @@ public interface ShareApi {
List<PanelShareOutDTO> queryTargets(@PathVariable("panelId") String panelId); List<PanelShareOutDTO> queryTargets(@PathVariable("panelId") String panelId);
@DePermission(type = DePermissionType.PANEL, value = "resourceId")
@ApiOperation("创建分享") @ApiOperation("创建分享")
@PostMapping("/fineSave") @PostMapping("/fineSave")
void fineSave(PanelShareFineDto panelShareFineDto); void fineSave(PanelShareFineDto panelShareFineDto);

View File

@ -1,6 +1,8 @@
package io.dataease.controller.panel.api; package io.dataease.controller.panel.api;
import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.auth.annotation.DePermission;
import io.dataease.commons.constants.DePermissionType;
import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.dto.panel.PanelStoreDto; import io.dataease.dto.panel.PanelStoreDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -21,6 +23,7 @@ import java.util.List;
@RequestMapping("/api/store") @RequestMapping("/api/store")
public interface StoreApi { public interface StoreApi {
@DePermission(type = DePermissionType.PANEL)
@ApiOperation("创建收藏") @ApiOperation("创建收藏")
@PostMapping("/{id}") @PostMapping("/{id}")
void store(@PathVariable("id") String id); void store(@PathVariable("id") String id);