From 33ff7d45973f850d89a1f827b9f1a6564ea140bb Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 22 Aug 2023 17:24:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=99=84=E4=BB=B6=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/api/basefiles/BaseFiles.java | 2 ++ .../base/api/basefiles/BaseFilesDto.java | 2 ++ .../base/api/basefiles/BaseFilesFeign.java | 29 +++++++++++++++++++ .../api/basefiles/BaseFilesFeignFallback.java | 15 ++++++++++ .../anrui/base/api/basefiles/BaseFilesVo.java | 4 +-- .../base/biz/basefiles/BaseFilesMapper.xml | 6 +++- .../base/biz/basefiles/BaseFilesRest.java | 22 ++++++++++++++ .../base/biz/basefiles/BaseFilesService.java | 28 ++++++++++++++++-- 8 files changed, 103 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java index 8af566ddc3..99106b9bc0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java @@ -57,6 +57,8 @@ public class BaseFiles extends BaseEntity { private String fileNo; @ApiModelProperty("文件名称") private String fileName; + @ApiModelProperty("文件格式key") + private String fileTypeKey; @ApiModelProperty("文件格式") private String fileType; @ApiModelProperty("示例") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java index d0382a9e05..f8479507d4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java @@ -65,6 +65,8 @@ public class BaseFilesDto implements Dto { private String fileNo; @ApiModelProperty("文件名称") private String fileName; + @ApiModelProperty("文件格式key") + private String fileTypeKey; @ApiModelProperty("文件格式") private String fileType; @ApiModelProperty("份数") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java index 68c0ff0a15..d2fb45ceee 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java @@ -103,5 +103,34 @@ public interface BaseFilesFeign { @GetMapping("/createFileNo") ResultBean createFileNo(@RequestParam("busTypeKey") String busTypeKey); + /** + * 隐藏 + * + * @param + * @return + */ + @ApiOperation("隐藏") + @PostMapping("/hide") + ResultBean hide(@RequestParam("sid") String sid); + + /** + * 隐藏 + * + * @param + * @return + */ + @ApiOperation("隐藏") + @PostMapping("/hideOrShow") + ResultBean hideOrShow(@RequestParam("sid") String sid, @RequestParam("state") String state); + + /** + * 显示 + * + * @param + * @return + */ + @ApiOperation("显示") + @PostMapping("/show") + ResultBean show(@RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java index 5b888ae2c1..2a0f760ce9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java @@ -75,5 +75,20 @@ public class BaseFilesFeignFallback implements BaseFilesFeign { return null; } + @Override + public ResultBean hide(String sid) { + return null; + } + + @Override + public ResultBean hideOrShow(String sid, String state) { + return null; + } + + @Override + public ResultBean show(String sid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java index 4cc2592527..42fcb5cc6b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java @@ -70,6 +70,6 @@ public class BaseFilesVo implements Vo { private List files = new ArrayList<>(); @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("查看附件按钮显示") - private Boolean showSampleBtn; + @ApiModelProperty("显示状态") + private String state; } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml index 13e446a146..f661481448 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml @@ -13,6 +13,7 @@ fileName, fileType, `count`, + `state`, isUpload, sample, remarks @@ -22,6 +23,9 @@ \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java index 267210a2fb..9e546be424 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java @@ -89,4 +89,26 @@ public class BaseFilesRest implements BaseFilesFeign { return baseFilesService.createFileNo(busTypeKey); } + @Override + public ResultBean hide(String sid) { + return baseFilesService.hide(sid); + } + + @Override + public ResultBean hideOrShow(String sid, String state) { + ResultBean rb = ResultBean.fireFail(); + if (state.equals("0")) { + this.hide(sid); + } else if (state.equals("1")) { + this.show(sid); + } + return rb.success(); + } + + @Override + public ResultBean show(String sid) { + return baseFilesService.show(sid); + } + + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java index 92f9956c21..55cd4f4307 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java @@ -157,9 +157,7 @@ public class BaseFilesService extends MybatisBaseService filePaths = new ArrayList<>(); String array[] = filePath.split(","); @@ -254,4 +252,30 @@ public class BaseFilesService extends MybatisBaseService