diff --git a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index fc67499a..30878858 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -20,7 +20,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; import top.continew.admin.common.context.UserContextHolder; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import java.time.LocalDateTime; diff --git a/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java b/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java index 811e4d40..9134a1fe 100644 --- a/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java +++ b/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java @@ -20,7 +20,7 @@ import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.convert.Convert; import cn.hutool.extra.spring.SpringUtil; -import top.continew.admin.common.base.CommonUserService; +import top.continew.admin.common.service.CommonUserService; import top.continew.starter.core.util.ExceptionUtils; /** diff --git a/continew-common/src/main/java/top/continew/admin/common/base/BaseController.java b/continew-common/src/main/java/top/continew/admin/common/controller/BaseController.java similarity index 98% rename from continew-common/src/main/java/top/continew/admin/common/base/BaseController.java rename to continew-common/src/main/java/top/continew/admin/common/controller/BaseController.java index 09e25c67..08d27f62 100644 --- a/continew-common/src/main/java/top/continew/admin/common/base/BaseController.java +++ b/continew-common/src/main/java/top/continew/admin/common/controller/BaseController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.base; +package top.continew.admin.common.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.context.SaHolder; diff --git a/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseCreateDO.java b/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseCreateDO.java new file mode 100644 index 00000000..ff74f486 --- /dev/null +++ b/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseCreateDO.java @@ -0,0 +1,54 @@ +/* + * 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.model.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import top.continew.starter.extension.crud.model.entity.BaseIdDO; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * 实体类基类 + * + *

+ * 通用字段:创建人、创建时间 + *

+ * + * @author Charles7c + * @since 2025/1/12 23:00 + */ +@Data +public class BaseCreateDO extends BaseIdDO { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + private Long createUser; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; +} diff --git a/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseDO.java b/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseDO.java new file mode 100644 index 00000000..7c40af16 --- /dev/null +++ b/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseDO.java @@ -0,0 +1,62 @@ +/* + * 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.model.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import top.continew.starter.extension.crud.model.entity.BaseIdDO; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * 实体类基类 + * + * @author Charles7c + * @since 2025/1/12 23:00 + */ +@Data +public class BaseDO extends BaseIdDO { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + private Long createUser; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + private Long updateUser; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; +} diff --git a/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseUpdateDO.java b/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseUpdateDO.java new file mode 100644 index 00000000..3e3b4eb6 --- /dev/null +++ b/continew-common/src/main/java/top/continew/admin/common/model/entity/BaseUpdateDO.java @@ -0,0 +1,55 @@ +/* + * 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.model.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +import java.io.Serial; +import java.time.LocalDateTime; + +import top.continew.starter.extension.crud.model.entity.BaseIdDO; + +/** + * 实体类基类 + * + *

+ * 通用字段:创建人、创建时间 + *

+ * + * @author Charles7c + * @since 2025/1/12 23:00 + */ +@Data +public class BaseUpdateDO extends BaseIdDO { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + private Long updateUser; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; +} 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/model/resp/BaseDetailResp.java similarity index 97% rename from continew-common/src/main/java/top/continew/admin/common/base/BaseDetailResp.java rename to continew-common/src/main/java/top/continew/admin/common/model/resp/BaseDetailResp.java index f34f5c1b..4e9aa97b 100644 --- a/continew-common/src/main/java/top/continew/admin/common/base/BaseDetailResp.java +++ b/continew-common/src/main/java/top/continew/admin/common/model/resp/BaseDetailResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.base; +package top.continew.admin.common.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; 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/model/resp/BaseResp.java similarity index 97% rename from continew-common/src/main/java/top/continew/admin/common/base/BaseResp.java rename to continew-common/src/main/java/top/continew/admin/common/model/resp/BaseResp.java index c593f6dc..801bcbef 100644 --- a/continew-common/src/main/java/top/continew/admin/common/base/BaseResp.java +++ b/continew-common/src/main/java/top/continew/admin/common/model/resp/BaseResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.base; +package top.continew.admin.common.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; diff --git a/continew-common/src/main/java/top/continew/admin/common/base/CommonUserService.java b/continew-common/src/main/java/top/continew/admin/common/service/CommonUserService.java similarity index 96% rename from continew-common/src/main/java/top/continew/admin/common/base/CommonUserService.java rename to continew-common/src/main/java/top/continew/admin/common/service/CommonUserService.java index 7d1f3739..66649a4e 100644 --- a/continew-common/src/main/java/top/continew/admin/common/base/CommonUserService.java +++ b/continew-common/src/main/java/top/continew/admin/common/service/CommonUserService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.common.base; +package top.continew.admin.common.service; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/ClientDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/ClientDO.java index d6d57cae..f10ba610 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/ClientDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/ClientDO.java @@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import java.io.Serial; import java.util.List; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java index 5a8c87af..0f675564 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java index 2909901f..b514c635 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.starter.extension.crud.annotation.DictField; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java index 4a4af79d..190ccff9 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import java.io.Serial; 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 94df2ab2..95ce396a 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 @@ -25,7 +25,7 @@ import top.continew.admin.system.enums.FileTypeEnum; import top.continew.admin.system.enums.StorageTypeEnum; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.StrUtils; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import java.io.Serial; import java.net.URL; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java index 9a0ded73..ef5afff1 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.MenuTypeEnum; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java index 0e997611..98842c74 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java @@ -20,8 +20,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; +import top.continew.admin.common.model.entity.BaseDO; import top.continew.admin.system.enums.NoticeScopeEnum; -import top.continew.starter.extension.crud.model.entity.BaseDO; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java index 40944636..a6fd33ab 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java @@ -18,7 +18,7 @@ package top.continew.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.continew.starter.extension.crud.model.entity.BaseUpdateDO; +import top.continew.admin.common.model.entity.BaseUpdateDO; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java index bf7be553..69ecff3f 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DataScopeEnum; import top.continew.starter.extension.crud.annotation.DictField; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java index 9a5f8fe0..e6109c43 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.StorageTypeEnum; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java index d5164cf6..ec4fa472 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java @@ -24,7 +24,7 @@ import top.continew.admin.common.config.mybatis.BCryptEncryptor; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.common.enums.GenderEnum; import top.continew.starter.extension.crud.annotation.DictField; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; 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 059a2e41..b59be0b0 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,7 +18,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; 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 94674e73..73d0e8db 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,7 +20,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; 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 e7de4c6d..958e0677 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,7 +19,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; 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 68db3bb8..301738c7 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.admin.common.base.BaseDetailResp; +import top.continew.admin.common.model.resp.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 dd885c5f..381f729d 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,7 +19,7 @@ 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.common.model.resp.BaseDetailResp; import top.continew.admin.system.enums.FileTypeEnum; 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 cb21ba16..e2ac1856 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,7 +18,7 @@ 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.model.resp.BaseResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.MenuTypeEnum; import top.continew.starter.extension.crud.annotation.TreeField; 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 570ee479..82edd45c 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,7 +20,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.system.enums.NoticeScopeEnum; import java.io.Serial; 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 f4ccbc78..8931a0c6 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,7 +18,7 @@ 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.model.resp.BaseResp; import top.continew.admin.system.enums.NoticeScopeEnum; import top.continew.admin.system.enums.NoticeStatusEnum; 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 69cbba21..07f09242 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,7 +23,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DataScopeEnum; import top.continew.admin.system.service.RoleDeptService; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; 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 0c1c44e7..ed624c02 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,7 +18,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DataScopeEnum; import java.io.Serial; @@ -71,9 +71,4 @@ public class RoleResp extends BaseDetailResp { */ @Schema(description = "描述", example = "测试人员描述信息") private String description; - - @Override - public Boolean getDisabled() { - return this.getIsSystem(); - } } 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 95ab30df..439b15bf 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,7 +18,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.enums.StorageTypeEnum; import top.continew.starter.security.mask.annotation.JsonMask; 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 48b90888..e983cb78 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,7 +26,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.common.constant.ContainerConstants; import top.continew.admin.common.context.UserContextHolder; import top.continew.admin.common.enums.DisEnableStatusEnum; 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 105f23f7..c160dc35 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,7 +20,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.common.constant.ContainerConstants; import top.continew.admin.common.context.UserContextHolder; import top.continew.admin.common.enums.DisEnableStatusEnum; 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 53d192ca..5d14ada3 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 @@ -54,7 +54,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import top.continew.admin.auth.service.OnlineUserService; -import top.continew.admin.common.base.CommonUserService; +import top.continew.admin.common.service.CommonUserService; import top.continew.admin.common.constant.CacheConstants; import top.continew.admin.common.constant.SysConstants; import top.continew.admin.common.context.UserContext; diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl index c60098ee..36555cc0 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.continew.admin.common.base.BaseController; +import top.continew.admin.common.controller.BaseController; import ${packageName}.model.query.${classNamePrefix}Query; import ${packageName}.model.req.${classNamePrefix}Req; import ${packageName}.model.resp.${classNamePrefix}DetailResp; 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 1a3d69f7..2eacd0a5 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.admin.common.base.BaseDetailResp; +import top.continew.admin.common.model.resp.BaseDetailResp; /** * ${businessName}详情信息 diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Entity.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Entity.ftl index f5707e97..2c6a49a6 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Entity.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Entity.ftl @@ -12,7 +12,7 @@ import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; /** * ${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 cbeafa77..feb7d053 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.admin.common.base.BaseResp; +import top.continew.admin.common.model.resp.BaseResp; /** * ${businessName}信息 diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java index 0a58ff0b..9b5ce3bd 100644 --- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java +++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java @@ -19,7 +19,7 @@ package top.continew.admin.open.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.admin.common.enums.DisEnableStatusEnum; -import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.admin.common.model.entity.BaseDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; 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 d92f9099..99ae44e6 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,7 +20,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; 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 dd4e9279..771c7796 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,7 +18,7 @@ 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.model.resp.BaseDetailResp; import top.continew.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; 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 7c079133..9c7820ca 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,7 +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.common.controller.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; 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 4daaef34..245138b6 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 @@ -18,7 +18,7 @@ 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.common.controller.BaseController; import top.continew.admin.system.model.query.ClientQuery; import top.continew.admin.system.model.req.ClientReq; import top.continew.admin.system.model.resp.ClientResp; diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java index 7745b0b7..24c66e29 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java @@ -18,7 +18,7 @@ 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.common.controller.BaseController; import top.continew.admin.system.model.query.DeptQuery; import top.continew.admin.system.model.req.DeptReq; import top.continew.admin.system.model.resp.DeptResp; 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 bfd610e6..6f7de440 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,7 +18,7 @@ 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.common.controller.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; 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 cc63532c..055387ef 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,7 +18,7 @@ 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.common.controller.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; 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 6563dd8d..8fc13c38 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 @@ -22,7 +22,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; 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.common.controller.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; diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java index e010f645..1059edfa 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java @@ -20,7 +20,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; 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.common.controller.BaseController; import top.continew.admin.system.model.query.MenuQuery; import top.continew.admin.system.model.req.MenuReq; import top.continew.admin.system.model.resp.MenuResp; diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java index 2648e9b9..ef6c7890 100644 --- a/continew-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java @@ -18,7 +18,7 @@ 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.common.controller.BaseController; import top.continew.admin.system.enums.NoticeScopeEnum; import top.continew.admin.system.model.query.NoticeQuery; import top.continew.admin.system.model.req.NoticeReq; 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 3b2d7d17..a3e7dfcf 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 @@ -25,7 +25,7 @@ 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.common.controller.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; 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 4a8d5305..e6d5f3c4 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,7 +18,7 @@ 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.common.controller.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; 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 d273bd91..23b26c13 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,7 +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.controller.BaseController; import top.continew.admin.common.constant.RegexConstants; import top.continew.admin.common.util.SecureUtils; import top.continew.admin.system.model.query.UserQuery;