From 144251b21ec0d79927164a705f3c846aace53ca1 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 27 Dec 2024 20:48:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=20starter=20?= =?UTF-8?q?=E5=86=85=E7=9A=84=20BaseResp=E3=80=81BaseDetailResp=20?= =?UTF-8?q?=E5=88=B0=20admin=20=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/common/base/BaseDetailResp.java | 64 +++++++++++++++ .../continew/admin/common/base/BaseResp.java | 78 +++++++++++++++++++ .../top/continew/admin/auth/LoginHandler.java | 2 - .../admin/auth/model/resp/OnlineUserResp.java | 5 +- .../admin/system/mapper/ClientMapper.java | 5 +- .../mapper/UserPasswordHistoryMapper.java | 2 +- .../admin/system/model/entity/FileDO.java | 2 +- .../system/model/resp/ClientDetailResp.java | 2 +- .../admin/system/model/resp/ClientResp.java | 4 +- .../admin/system/model/resp/DeptResp.java | 2 +- .../admin/system/model/resp/DictItemResp.java | 2 +- .../admin/system/model/resp/DictResp.java | 2 +- .../admin/system/model/resp/FileResp.java | 2 +- .../admin/system/model/resp/MenuResp.java | 2 +- .../system/model/resp/NoticeDetailResp.java | 2 +- .../admin/system/model/resp/NoticeResp.java | 2 +- .../system/model/resp/RoleDetailResp.java | 2 +- .../admin/system/model/resp/RoleResp.java | 2 +- .../admin/system/model/resp/StorageResp.java | 2 +- .../model/resp/user/UserDetailResp.java | 2 +- .../system/model/resp/user/UserResp.java | 2 +- .../admin/system/service/ClientService.java | 3 +- .../admin/system/service/MenuService.java | 2 +- .../admin/system/service/MessageService.java | 4 +- .../system/service/MessageUserService.java | 4 +- .../admin/system/service/NoticeService.java | 2 +- .../system/service/UserSocialService.java | 5 +- .../service/impl/ClientServiceImpl.java | 3 +- .../service/impl/NoticeServiceImpl.java | 2 +- .../system/service/impl/UserServiceImpl.java | 2 +- .../service/impl/UserSocialServiceImpl.java | 18 ++--- .../admin/generator/enums/QueryTypeEnum.java | 1 - .../generator/model/req/GenConfigReq.java | 19 ++--- .../templates/backend/DetailResp.ftl | 2 +- .../main/resources/templates/backend/Resp.ftl | 2 +- .../resources/templates/frontend/AddModal.ftl | 2 +- .../resources/templates/frontend/index.ftl | 4 +- .../continew/admin/open/mapper/AppMapper.java | 4 +- .../admin/open/model/resp/AppDetailResp.java | 2 +- .../admin/open/model/resp/AppResp.java | 2 +- .../model/JobInstanceLogPageResult.java | 2 +- .../admin/schedule/service/JobLogService.java | 4 +- .../admin/schedule/service/JobService.java | 2 +- .../monitor/OnlineUserController.java | 10 +-- .../admin/controller/open/AppController.java | 2 +- .../controller/schedule/JobLogController.java | 4 +- .../controller/system/ClientController.java | 3 +- .../controller/system/DictController.java | 2 +- .../controller/system/DictItemController.java | 2 +- .../controller/system/FileController.java | 5 +- .../controller/system/RoleController.java | 4 +- .../controller/system/StorageController.java | 2 +- .../controller/system/UserController.java | 2 +- 53 files changed, 220 insertions(+), 95 deletions(-) create mode 100644 continew-common/src/main/java/top/continew/admin/common/base/BaseDetailResp.java create mode 100644 continew-common/src/main/java/top/continew/admin/common/base/BaseResp.java diff --git a/continew-common/src/main/java/top/continew/admin/common/base/BaseDetailResp.java b/continew-common/src/main/java/top/continew/admin/common/base/BaseDetailResp.java new file mode 100644 index 00000000..ad556898 --- /dev/null +++ b/continew-common/src/main/java/top/continew/admin/common/base/BaseDetailResp.java @@ -0,0 +1,64 @@ +/* + * 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.continew.admin.common.base; + +import cn.crane4j.annotation.Assemble; +import cn.crane4j.annotation.Mapping; +import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull; +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import top.continew.starter.extension.crud.constant.ContainerPool; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * 详情响应基类 + * + * @author Charles7c + * @since 2024/12/27 20:32 + */ +@Data +public class BaseDetailResp extends BaseResp { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 修改人 + */ + @JsonIgnore + @ConditionOnPropertyNotNull + @Assemble(container = ContainerPool.USER_NICKNAME, props = @Mapping(ref = "updateUserString")) + private Long updateUser; + + /** + * 修改人 + */ + @Schema(description = "修改人", example = "李四") + @ExcelProperty(value = "修改人", order = Integer.MAX_VALUE - 2) + private String updateUserString; + + /** + * 修改时间 + */ + @Schema(description = "修改时间", example = "2023-08-08 08:08:08", type = "string") + @ExcelProperty(value = "修改时间", order = Integer.MAX_VALUE - 1) + private LocalDateTime updateTime; +} diff --git a/continew-common/src/main/java/top/continew/admin/common/base/BaseResp.java b/continew-common/src/main/java/top/continew/admin/common/base/BaseResp.java new file mode 100644 index 00000000..1de84e2e --- /dev/null +++ b/continew-common/src/main/java/top/continew/admin/common/base/BaseResp.java @@ -0,0 +1,78 @@ +/* + * 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.continew.admin.common.base; + +import cn.crane4j.annotation.Assemble; +import cn.crane4j.annotation.Mapping; +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import top.continew.starter.extension.crud.constant.ContainerPool; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 响应参数基类 + * + * @author Charles7c + * @since 2024/12/27 20:32 + */ +@Data +public class BaseResp implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @Schema(description = "ID", example = "1") + @ExcelProperty(value = "ID", order = 1) + private Long id; + + /** + * 创建人 + */ + @JsonIgnore + @Assemble(container = ContainerPool.USER_NICKNAME, props = @Mapping(ref = "createUserString")) + private Long createUser; + + /** + * 创建人 + */ + @Schema(description = "创建人", example = "超级管理员") + @ExcelProperty(value = "创建人", order = Integer.MAX_VALUE - 4) + private String createUserString; + + /** + * 创建时间 + */ + @Schema(description = "创建时间", example = "2023-08-08 08:08:08", type = "string") + @ExcelProperty(value = "创建时间", order = Integer.MAX_VALUE - 3) + private LocalDateTime createTime; + + /** + * 是否禁用修改 + */ + @Schema(description = "是否禁用修改", example = "true") + @JsonInclude(JsonInclude.Include.NON_NULL) + private Boolean disabled; +} diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/LoginHandler.java b/continew-module-system/src/main/java/top/continew/admin/auth/LoginHandler.java index 10fdff73..f5a74936 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/LoginHandler.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/LoginHandler.java @@ -44,7 +44,6 @@ public interface LoginHandler { /** * 登录前置处理 * - * * @param req 登录请求参数 * @param client 客户端信息 * @param request 请求对象 @@ -54,7 +53,6 @@ public interface LoginHandler { /** * 登录后置处理 * - * * @param req 登录请求参数 * @param client 客户端信息 * @param request 请求对象 diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java index ee74a30f..00ed9ca8 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java @@ -16,7 +16,10 @@ package top.continew.admin.auth.model.resp; -import cn.crane4j.annotation.*; +import cn.crane4j.annotation.Assemble; +import cn.crane4j.annotation.AssembleMethod; +import cn.crane4j.annotation.ContainerMethod; +import cn.crane4j.annotation.MappingType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.admin.auth.service.OnlineUserService; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java index ded9fa1d..8f328cee 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java @@ -16,8 +16,8 @@ package top.continew.admin.system.mapper; -import top.continew.starter.data.mp.base.BaseMapper; import top.continew.admin.system.model.entity.ClientDO; +import top.continew.starter.data.mp.base.BaseMapper; /** * 客户端 Mapper @@ -25,4 +25,5 @@ import top.continew.admin.system.model.entity.ClientDO; * @author KAI * @since 2024/12/03 16:04 */ -public interface ClientMapper extends BaseMapper {} \ No newline at end of file +public interface ClientMapper extends BaseMapper { +} \ No newline at end of file diff --git a/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java index a7b85099..b9ac571b 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java @@ -17,8 +17,8 @@ package top.continew.admin.system.mapper; import org.apache.ibatis.annotations.Param; -import top.continew.starter.data.mp.base.BaseMapper; import top.continew.admin.system.model.entity.UserPasswordHistoryDO; +import top.continew.starter.data.mp.base.BaseMapper; /** * 用户历史密码 Mapper diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java index d5e9611f..94df2ab2 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java @@ -117,7 +117,7 @@ public class FileDO extends BaseDO { * 例如: * http://domain.cn/bucketName/2024/11/27/6746ec3b2907f0de80afdd70.png => 2024/11/27/ * http://bucketName.domain.cn/2024/11/27/6746ec3b2907f0de80afdd70.png => 2024/11/27/ - * + * * @param url 文件路径 * @param storageDO 存储桶信息 * @return diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientDetailResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientDetailResp.java index 611276ee..3ed5b32d 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientDetailResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientDetailResp.java @@ -18,8 +18,8 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; import java.util.List; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java index 969c82dd..a7b32d9b 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java @@ -18,8 +18,8 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.extension.crud.model.resp.BaseResp; import java.io.Serial; import java.util.List; @@ -33,7 +33,7 @@ import java.util.List; */ @Data @Schema(description = "客户端信息") -public class ClientResp extends BaseResp { +public class ClientResp extends BaseDetailResp { @Serial private static final long serialVersionUID = 1L; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java index 5218465f..94674e73 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java @@ -20,10 +20,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java index f5308edb..e7de4c6d 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java @@ -19,9 +19,9 @@ package top.continew.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java index 02db65c2..68db3bb8 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.admin.common.base.BaseDetailResp; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java index 21fc025d..dd885c5f 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java @@ -19,8 +19,8 @@ package top.continew.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.system.enums.FileTypeEnum; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java index c5b7b0e9..cb21ba16 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java @@ -18,10 +18,10 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.MenuTypeEnum; import top.continew.starter.extension.crud.annotation.TreeField; -import top.continew.starter.extension.crud.model.resp.BaseResp; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java index c01d35cb..570ee479 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java @@ -20,8 +20,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.system.enums.NoticeScopeEnum; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java index 27e022b1..f4ccbc78 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java @@ -18,9 +18,9 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseResp; import top.continew.admin.system.enums.NoticeScopeEnum; import top.continew.admin.system.enums.NoticeStatusEnum; -import top.continew.starter.extension.crud.model.resp.BaseResp; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java index 566fa571..69cbba21 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java @@ -23,10 +23,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.enums.DataScopeEnum; import top.continew.admin.system.service.RoleDeptService; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; import java.util.List; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java index b5b0f6f1..0c1c44e7 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java @@ -18,8 +18,8 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.enums.DataScopeEnum; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java index 2c93a14d..95ab30df 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java @@ -18,9 +18,9 @@ package top.continew.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.StorageTypeEnum; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import top.continew.starter.security.mask.annotation.JsonMask; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java index afe3b7fc..48b90888 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java @@ -26,13 +26,13 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.constant.ContainerConstants; import top.continew.admin.common.context.UserContextHolder; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.common.enums.GenderEnum; import top.continew.admin.system.model.resp.DeptResp; import top.continew.admin.system.service.DeptService; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import top.continew.starter.file.excel.converter.ExcelListConverter; import top.continew.starter.security.crypto.annotation.FieldEncrypt; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java index dc3a19d9..105f23f7 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java @@ -20,11 +20,11 @@ import cn.crane4j.annotation.Assemble; import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.constant.ContainerConstants; import top.continew.admin.common.context.UserContextHolder; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.common.enums.GenderEnum; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import top.continew.starter.security.mask.annotation.JsonMask; import top.continew.starter.security.mask.enums.MaskType; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/ClientService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/ClientService.java index 7c654125..ac2cf2d6 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/ClientService.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/ClientService.java @@ -18,7 +18,6 @@ package top.continew.admin.system.service; import top.continew.admin.system.model.query.ClientQuery; import top.continew.admin.system.model.req.ClientReq; -import top.continew.admin.system.model.resp.ClientDetailResp; import top.continew.admin.system.model.resp.ClientResp; import top.continew.starter.extension.crud.service.BaseService; @@ -29,7 +28,7 @@ import top.continew.starter.extension.crud.service.BaseService; * @author Charles7c * @since 2024/12/03 16:04 */ -public interface ClientService extends BaseService { +public interface ClientService extends BaseService { /** * 根据客户端 ID 查詢 diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/MenuService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/MenuService.java index c1c7fe87..8fc2af20 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/MenuService.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/MenuService.java @@ -20,8 +20,8 @@ import top.continew.admin.system.model.entity.MenuDO; import top.continew.admin.system.model.query.MenuQuery; import top.continew.admin.system.model.req.MenuReq; import top.continew.admin.system.model.resp.MenuResp; -import top.continew.starter.extension.crud.service.BaseService; import top.continew.starter.data.mp.service.IService; +import top.continew.starter.extension.crud.service.BaseService; import java.util.List; import java.util.Set; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/MessageService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/MessageService.java index 67fe7f74..235c6baa 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/MessageService.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/MessageService.java @@ -16,14 +16,14 @@ package top.continew.admin.system.service; -import java.util.List; - import top.continew.admin.system.model.query.MessageQuery; import top.continew.admin.system.model.req.MessageReq; import top.continew.admin.system.model.resp.MessageResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; +import java.util.List; + /** * 消息业务接口 * diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/MessageUserService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/MessageUserService.java index f53f3140..84e3221f 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/MessageUserService.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/MessageUserService.java @@ -16,10 +16,10 @@ package top.continew.admin.system.service; -import java.util.List; - import top.continew.admin.system.model.resp.MessageUnreadResp; +import java.util.List; + /** * 消息和用户关联业务接口 * diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/NoticeService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/NoticeService.java index c7e2f9ea..795d9a2e 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/NoticeService.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/NoticeService.java @@ -22,8 +22,8 @@ import top.continew.admin.system.model.req.NoticeReq; import top.continew.admin.system.model.resp.NoticeDetailResp; import top.continew.admin.system.model.resp.NoticeResp; import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp; -import top.continew.starter.extension.crud.service.BaseService; import top.continew.starter.data.mp.service.IService; +import top.continew.starter.extension.crud.service.BaseService; import java.util.List; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java index 5a48306d..0d96925e 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java @@ -16,11 +16,10 @@ package top.continew.admin.system.service; -import java.util.List; - +import me.zhyd.oauth.model.AuthUser; import top.continew.admin.system.model.entity.UserSocialDO; -import me.zhyd.oauth.model.AuthUser; +import java.util.List; /** * 用户社会化关联业务接口 diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java index 2eccf838..dc9df9ce 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java @@ -24,7 +24,6 @@ import top.continew.admin.system.mapper.ClientMapper; import top.continew.admin.system.model.entity.ClientDO; import top.continew.admin.system.model.query.ClientQuery; import top.continew.admin.system.model.req.ClientReq; -import top.continew.admin.system.model.resp.ClientDetailResp; import top.continew.admin.system.model.resp.ClientResp; import top.continew.admin.system.service.ClientService; import top.continew.starter.core.constant.StringConstants; @@ -41,7 +40,7 @@ import java.util.List; * @since 2024/12/03 16:04 */ @Service -public class ClientServiceImpl extends BaseServiceImpl implements ClientService { +public class ClientServiceImpl extends BaseServiceImpl implements ClientService { @Override public void beforeAdd(ClientReq req) { diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java index b71df4b4..371e70f3 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java @@ -23,9 +23,9 @@ import top.continew.admin.system.mapper.NoticeMapper; import top.continew.admin.system.model.entity.NoticeDO; import top.continew.admin.system.model.query.NoticeQuery; import top.continew.admin.system.model.req.NoticeReq; -import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp; import top.continew.admin.system.model.resp.NoticeDetailResp; import top.continew.admin.system.model.resp.NoticeResp; +import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp; import top.continew.admin.system.service.NoticeService; import top.continew.starter.extension.crud.service.BaseServiceImpl; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index cb46a4a0..11550fc6 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -81,8 +81,8 @@ import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.PageResp; -import top.continew.starter.extension.crud.service.CommonUserService; import top.continew.starter.extension.crud.service.BaseServiceImpl; +import top.continew.starter.extension.crud.service.CommonUserService; import top.continew.starter.web.util.FileUploadUtils; import java.io.IOException; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java index 2b4e3ce9..c508aac8 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java @@ -16,24 +16,20 @@ package top.continew.admin.system.service.impl; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import lombok.RequiredArgsConstructor; - -import org.springframework.stereotype.Service; - import cn.hutool.json.JSONUtil; - +import lombok.RequiredArgsConstructor; +import me.zhyd.oauth.model.AuthUser; +import org.springframework.stereotype.Service; import top.continew.admin.system.enums.SocialSourceEnum; import top.continew.admin.system.mapper.UserSocialMapper; import top.continew.admin.system.model.entity.UserSocialDO; import top.continew.admin.system.service.UserSocialService; import top.continew.starter.core.validation.CheckUtils; -import me.zhyd.oauth.model.AuthUser; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * 用户社会化关联业务实现 diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java index e7b99c69..c610975e 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java @@ -18,7 +18,6 @@ package top.continew.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; - import top.continew.starter.core.enums.BaseEnum; /** diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java index dc0a258f..6ae357e5 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java @@ -16,22 +16,19 @@ package top.continew.admin.generator.model.req; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import top.continew.admin.generator.model.entity.FieldConfigDO; +import top.continew.admin.generator.model.entity.GenConfigDO; + import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; - -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import top.continew.admin.generator.model.entity.FieldConfigDO; -import top.continew.admin.generator.model.entity.GenConfigDO; - /** * 代码生成配置信息 * diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl index 5f8dfc7d..1a3d69f7 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl @@ -15,7 +15,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; +import top.continew.admin.common.base.BaseDetailResp; /** * ${businessName}详情信息 diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Resp.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Resp.ftl index 1c12bd96..cbeafa77 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Resp.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Resp.ftl @@ -12,7 +12,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.continew.starter.extension.crud.model.resp.BaseResp; +import top.continew.admin.common.base.BaseResp; /** * ${businessName}信息 diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl index de1744ff..8db65a6d 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl @@ -4,8 +4,8 @@ :title="title" :mask-closable="false" :esc-to-close="false" - draggable :width="width >= 600 ? 600 : '100%'" + draggable @before-ok="save" @close="reset" > diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl index 0b9f7128..3c8adb20 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl @@ -51,9 +51,7 @@ /> <#else> - - - + diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java index 66d6de52..7f30762b 100644 --- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java +++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java @@ -18,8 +18,8 @@ package top.continew.admin.open.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.continew.starter.data.mp.base.BaseMapper; import top.continew.admin.open.model.entity.AppDO; +import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.security.crypto.annotation.FieldEncrypt; /** @@ -32,7 +32,7 @@ public interface AppMapper extends BaseMapper { /** * 根据 Access Key 查询 - * + * * @param accessKey Access Key * @return 应用信息 */ diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppDetailResp.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppDetailResp.java index 70627d65..d92f9099 100644 --- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppDetailResp.java +++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppDetailResp.java @@ -20,8 +20,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppResp.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppResp.java index 637d067d..dd4e9279 100644 --- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppResp.java +++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppResp.java @@ -18,8 +18,8 @@ package top.continew.admin.open.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.base.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobInstanceLogPageResult.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobInstanceLogPageResult.java index c0ee56db..341c79ef 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobInstanceLogPageResult.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobInstanceLogPageResult.java @@ -18,10 +18,10 @@ package top.continew.admin.schedule.model; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.util.List; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * 任务实例日志分页信息 diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobLogService.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobLogService.java index 9a1b63e2..c13bf89d 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobLogService.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobLogService.java @@ -18,10 +18,10 @@ package top.continew.admin.schedule.service; import top.continew.admin.schedule.model.JobInstanceLogPageResult; import top.continew.admin.schedule.model.query.JobInstanceLogQuery; -import top.continew.admin.schedule.model.query.JobLogQuery; import top.continew.admin.schedule.model.query.JobInstanceQuery; -import top.continew.admin.schedule.model.resp.JobLogResp; +import top.continew.admin.schedule.model.query.JobLogQuery; import top.continew.admin.schedule.model.resp.JobInstanceResp; +import top.continew.admin.schedule.model.resp.JobLogResp; import top.continew.starter.extension.crud.model.resp.PageResp; import java.util.List; diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobService.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobService.java index b485d331..0f526615 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobService.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobService.java @@ -85,7 +85,7 @@ public interface JobService { /** * 查询分组列表 - * + * * @return 分组列表 */ List listGroup(); diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java b/continew-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java index d3de85eb..4254c38e 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java @@ -16,19 +16,15 @@ package top.continew.admin.controller.monitor; -import lombok.RequiredArgsConstructor; - +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.stp.StpUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; - +import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.stp.StpUtil; - import top.continew.admin.auth.model.query.OnlineUserQuery; import top.continew.admin.auth.model.resp.OnlineUserResp; import top.continew.admin.auth.service.OnlineUserService; diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/open/AppController.java b/continew-webapi/src/main/java/top/continew/admin/controller/open/AppController.java index 5bfad28b..7c079133 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/open/AppController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/open/AppController.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import top.continew.admin.common.base.BaseController; import top.continew.admin.open.model.query.AppQuery; import top.continew.admin.open.model.req.AppReq; import top.continew.admin.open.model.resp.AppDetailResp; @@ -33,7 +34,6 @@ import top.continew.admin.open.model.resp.AppResp; import top.continew.admin.open.model.resp.AppSecretResp; import top.continew.admin.open.service.AppService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.continew.admin.common.base.BaseController; import top.continew.starter.extension.crud.enums.Api; /** diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java b/continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java index 826f6fe4..4301572e 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java @@ -26,10 +26,10 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import top.continew.admin.schedule.model.JobInstanceLogPageResult; import top.continew.admin.schedule.model.query.JobInstanceLogQuery; -import top.continew.admin.schedule.model.query.JobLogQuery; import top.continew.admin.schedule.model.query.JobInstanceQuery; -import top.continew.admin.schedule.model.resp.JobLogResp; +import top.continew.admin.schedule.model.query.JobLogQuery; import top.continew.admin.schedule.model.resp.JobInstanceResp; +import top.continew.admin.schedule.model.resp.JobLogResp; import top.continew.admin.schedule.service.JobLogService; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/system/ClientController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/ClientController.java index a3e4a20d..4daaef34 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/system/ClientController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/system/ClientController.java @@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController; import top.continew.admin.common.base.BaseController; import top.continew.admin.system.model.query.ClientQuery; import top.continew.admin.system.model.req.ClientReq; -import top.continew.admin.system.model.resp.ClientDetailResp; import top.continew.admin.system.model.resp.ClientResp; import top.continew.admin.system.service.ClientService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; @@ -36,5 +35,5 @@ import top.continew.starter.extension.crud.enums.Api; @Tag(name = "客户端管理 API") @RestController @CrudRequestMapping(value = "/system/client", api = {Api.PAGE, Api.DETAIL, Api.ADD, Api.UPDATE, Api.DELETE}) -public class ClientController extends BaseController { +public class ClientController extends BaseController { } \ No newline at end of file diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/system/DictController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/DictController.java index b14f39aa..bfd610e6 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/system/DictController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/system/DictController.java @@ -18,12 +18,12 @@ package top.continew.admin.controller.system; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; +import top.continew.admin.common.base.BaseController; import top.continew.admin.system.model.query.DictQuery; import top.continew.admin.system.model.req.DictReq; import top.continew.admin.system.model.resp.DictResp; import top.continew.admin.system.service.DictService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.continew.admin.common.base.BaseController; import top.continew.starter.extension.crud.enums.Api; /** diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java index 95c69f36..cc63532c 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java @@ -18,12 +18,12 @@ package top.continew.admin.controller.system; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; +import top.continew.admin.common.base.BaseController; import top.continew.admin.system.model.query.DictItemQuery; import top.continew.admin.system.model.req.DictItemReq; import top.continew.admin.system.model.resp.DictItemResp; import top.continew.admin.system.service.DictItemService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.continew.admin.common.base.BaseController; import top.continew.starter.extension.crud.enums.Api; import top.continew.starter.log.annotation.Log; diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/system/FileController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/FileController.java index 6c23bfc5..6563dd8d 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/system/FileController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/system/FileController.java @@ -20,14 +20,15 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import top.continew.admin.common.base.BaseController; import top.continew.admin.system.model.query.FileQuery; import top.continew.admin.system.model.req.FileReq; import top.continew.admin.system.model.resp.FileResp; import top.continew.admin.system.model.resp.FileStatisticsResp; import top.continew.admin.system.service.FileService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.continew.admin.common.base.BaseController; import top.continew.starter.extension.crud.enums.Api; import top.continew.starter.log.annotation.Log; diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java index 4f747cdb..3b2d7d17 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java @@ -21,12 +21,11 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; - import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - +import top.continew.admin.common.base.BaseController; import top.continew.admin.system.model.query.RoleQuery; import top.continew.admin.system.model.req.RoleReq; import top.continew.admin.system.model.resp.RoleDetailResp; @@ -34,7 +33,6 @@ import top.continew.admin.system.model.resp.RoleResp; import top.continew.admin.system.service.RoleService; import top.continew.admin.system.service.UserRoleService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.continew.admin.common.base.BaseController; import top.continew.starter.extension.crud.enums.Api; import java.util.List; diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java index 277167e0..4a8d5305 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java @@ -18,12 +18,12 @@ package top.continew.admin.controller.system; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RestController; +import top.continew.admin.common.base.BaseController; import top.continew.admin.system.model.query.StorageQuery; import top.continew.admin.system.model.req.StorageReq; import top.continew.admin.system.model.resp.StorageResp; import top.continew.admin.system.service.StorageService; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.continew.admin.common.base.BaseController; import top.continew.starter.extension.crud.enums.Api; /** diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/system/UserController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/UserController.java index a4a1059b..ce49d33f 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/system/UserController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/system/UserController.java @@ -29,6 +29,7 @@ import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import top.continew.admin.common.base.BaseController; import top.continew.admin.common.constant.RegexConstants; import top.continew.admin.common.util.SecureUtils; import top.continew.admin.system.model.query.UserQuery; @@ -44,7 +45,6 @@ import top.continew.admin.system.service.UserService; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.continew.admin.common.base.BaseController; import top.continew.starter.extension.crud.enums.Api; import top.continew.starter.extension.crud.model.resp.BaseIdResp; import top.continew.starter.extension.crud.validation.CrudValidationGroup;