From f7b5a4ff8dd93f444c00d103b0609ae81e0dd70c Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 10 Apr 2024 22:17:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=20API=EF=BC=8C?= =?UTF-8?q?=E5=90=88=E5=B9=B6=20StorageResp=20=E5=8F=8A=20StorageDetailRes?= =?UTF-8?q?p?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/model/query/StorageQuery.java | 10 +- .../admin/system/model/req/StorageReq.java | 26 ++-- .../system/model/resp/StorageDetailResp.java | 135 ------------------ .../admin/system/model/resp/StorageResp.java | 27 ++-- .../admin/system/service/StorageService.java | 5 +- .../service/impl/StorageServiceImpl.java | 3 +- .../webapi/system/StorageController.java | 10 +- 7 files changed, 36 insertions(+), 180 deletions(-) delete mode 100644 continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageDetailResp.java diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java index 432d9659..a86f609a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java @@ -38,15 +38,15 @@ public class StorageQuery implements Serializable { private static final long serialVersionUID = 1L; /** - * 名称 + * 关键词 */ - @Schema(description = "名称") - @Query(type = QueryType.LIKE) - private String name; + @Schema(description = "关键词", example = "本地存储") + @Query(columns = {"name", "description"}, type = QueryType.LIKE) + private String description; /** * 状态 */ - @Schema(description = "状态") + @Schema(description = "状态（1：启用；2：禁用）", example = "1") private Integer status; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/StorageReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/StorageReq.java index 1fb5088f..f6073e13 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/StorageReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/StorageReq.java @@ -16,21 +16,19 @@ package top.charles7c.continew.admin.system.model.req; -import java.io.Serial; - -import jakarta.validation.constraints.*; - -import lombok.Data; - import io.swagger.v3.oas.annotations.media.Schema; - +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import lombok.Data; import org.hibernate.validator.constraints.Length; - import top.charles7c.continew.admin.common.constant.RegexConstants; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.system.enums.StorageTypeEnum; import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; +import java.io.Serial; + /** * 创建或修改存储库信息 * @@ -102,6 +100,12 @@ public class StorageReq extends BaseReq { @Length(max = 255, message = "自定义域名长度不能超过 {max} 个字符") private String domain; + /** + * 排序 + */ + @Schema(description = "排序", example = "1") + private Integer sort; + /** * 描述 */ @@ -116,12 +120,6 @@ public class StorageReq extends BaseReq { @NotNull(message = "是否为默认存储不能为空") private Boolean isDefault; - /** - * 排序 - */ - @Schema(description = "排序", example = "1") - private Integer sort; - /** * 状态 */ diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageDetailResp.java deleted file mode 100644 index 0d53487e..00000000 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageDetailResp.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package top.charles7c.continew.admin.system.model.resp; - -import java.io.Serial; - -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; - -import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; -import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.admin.system.enums.StorageTypeEnum; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; - -/** - * 存储库详情信息 - * - * @author Charles7c - * @since 2023/12/26 22:09 - */ -@Data -@ExcelIgnoreUnannotated -@Schema(description = "存储库详情信息") -public class StorageDetailResp extends BaseDetailResp { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @Schema(description = "名称", example = "存储库1") - @ExcelProperty(value = "名称") - private String name; - - /** - * 编码 - */ - @Schema(description = "编码", example = "local") - @ExcelProperty(value = "编码") - private String code; - - /** - * 类型 - */ - @Schema(description = "类型（1：兼容S3协议存储；2：本地存储）", type = "Integer", allowableValues = {"1", "2"}, example = "2") - @ExcelProperty(value = "类型", converter = ExcelBaseEnumConverter.class) - private StorageTypeEnum type; - - /** - * 访问密钥 - */ - @Schema(description = "访问密钥", example = "") - @ExcelProperty(value = "访问密钥") - private String accessKey; - - /** - * 私有密钥 - */ - @Schema(description = "私有密钥", example = "") - @ExcelProperty(value = "私有密钥") - private String secretKey; - - /** - * 终端节点 - */ - @Schema(description = "终端节点", example = "") - @ExcelProperty(value = "终端节点") - private String endpoint; - - /** - * 桶名称 - */ - @Schema(description = "桶名称", example = "C:/continew-admin/data/file/") - @ExcelProperty(value = "桶名称") - private String bucketName; - - /** - * 自定义域名 - */ - @Schema(description = "自定义域名", example = "http://localhost:8000/file") - @ExcelProperty(value = "自定义域名") - private String domain; - - /** - * 描述 - */ - @Schema(description = "描述", example = "存储库描述") - @ExcelProperty(value = "描述") - private String description; - - /** - * 是否为默认存储 - */ - @Schema(description = "是否为默认存储", example = "true") - @ExcelProperty(value = "是否为默认存储") - private Boolean isDefault; - - /** - * 排序 - */ - @Schema(description = "排序", example = "1") - @ExcelProperty(value = "排序") - private Integer sort; - - /** - * 状态 - */ - @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") - @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) - private DisEnableStatusEnum status; - - @Override - public Boolean getDisabled() { - return this.getIsDefault(); - } -} \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageResp.java index 529cab71..729bf63b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/StorageResp.java @@ -16,17 +16,14 @@ package top.charles7c.continew.admin.system.model.resp; -import java.io.Serial; - -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - import com.fasterxml.jackson.annotation.JsonIgnore; - +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.system.enums.StorageTypeEnum; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseResp; +import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; + +import java.io.Serial; /** * 存储库信息 @@ -36,7 +33,7 @@ import top.charles7c.continew.starter.extension.crud.model.resp.BaseResp; */ @Data @Schema(description = "存储库信息") -public class StorageResp extends BaseResp { +public class StorageResp extends BaseDetailResp { @Serial private static final long serialVersionUID = 1L; @@ -53,6 +50,12 @@ public class StorageResp extends BaseResp { @Schema(description = "编码", example = "local") private String code; + /** + * 状态 + */ + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + private DisEnableStatusEnum status; + /** * 类型 */ @@ -108,12 +111,6 @@ public class StorageResp extends BaseResp { @Schema(description = "排序", example = "1") private Integer sort; - /** - * 状态 - */ - @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") - private DisEnableStatusEnum status; - @Override public Boolean getDisabled() { return this.getIsDefault(); diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java index ce531882..c48a8a2b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java @@ -19,10 +19,9 @@ package top.charles7c.continew.admin.system.service; import top.charles7c.continew.admin.system.model.entity.StorageDO; import top.charles7c.continew.admin.system.model.query.StorageQuery; import top.charles7c.continew.admin.system.model.req.StorageReq; -import top.charles7c.continew.admin.system.model.resp.StorageDetailResp; import top.charles7c.continew.admin.system.model.resp.StorageResp; -import top.charles7c.continew.starter.extension.crud.service.BaseService; import top.charles7c.continew.starter.data.mybatis.plus.service.IService; +import top.charles7c.continew.starter.extension.crud.service.BaseService; /** * 存储库业务接口 @@ -30,7 +29,7 @@ import top.charles7c.continew.starter.data.mybatis.plus.service.IService; * @author Charles7c * @since 2023/12/26 22:09 */ -public interface StorageService extends BaseService, IService { +public interface StorageService extends BaseService, IService { /** * 查询默认存储库 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java index d75d2a2a..d315fd0f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java @@ -33,7 +33,6 @@ import top.charles7c.continew.admin.system.mapper.StorageMapper; import top.charles7c.continew.admin.system.model.entity.StorageDO; import top.charles7c.continew.admin.system.model.query.StorageQuery; import top.charles7c.continew.admin.system.model.req.StorageReq; -import top.charles7c.continew.admin.system.model.resp.StorageDetailResp; import top.charles7c.continew.admin.system.model.resp.StorageResp; import top.charles7c.continew.admin.system.service.FileService; import top.charles7c.continew.admin.system.service.StorageService; @@ -56,7 +55,7 @@ import java.util.concurrent.CopyOnWriteArrayList; */ @Service @RequiredArgsConstructor -public class StorageServiceImpl extends BaseServiceImpl implements StorageService { +public class StorageServiceImpl extends BaseServiceImpl implements StorageService { @Resource private FileService fileService; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/StorageController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/StorageController.java index 11c5e7c9..6b0ec1a9 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/StorageController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/StorageController.java @@ -17,16 +17,14 @@ package top.charles7c.continew.admin.webapi.system; import io.swagger.v3.oas.annotations.tags.Tag; - -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.RestController; import top.charles7c.continew.admin.system.model.query.StorageQuery; import top.charles7c.continew.admin.system.model.req.StorageReq; -import top.charles7c.continew.admin.system.model.resp.StorageDetailResp; import top.charles7c.continew.admin.system.model.resp.StorageResp; import top.charles7c.continew.admin.system.service.StorageService; import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.charles7c.continew.starter.extension.crud.controller.BaseController; +import top.charles7c.continew.starter.extension.crud.enums.Api; /** * 存储库管理 API @@ -36,5 +34,5 @@ import top.charles7c.continew.starter.extension.crud.controller.BaseController; */ @Tag(name = "存储库管理 API") @RestController -@CrudRequestMapping("/system/storage") -public class StorageController extends BaseController {} \ No newline at end of file +@CrudRequestMapping(value = "/system/storage", api = {Api.PAGE, Api.GET, Api.ADD, Api.UPDATE, Api.DELETE}) +public class StorageController extends BaseController {} \ No newline at end of file