mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-10-31 10:57:13 +08:00 
			
		
		
		
	refactor: 调整 starter 内的 BaseDO、BaseCreateDO、BaseUpdateDO 到 admin 项目
This commit is contained in:
		| @@ -20,7 +20,7 @@ import cn.hutool.core.util.ObjectUtil; | |||||||
| import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; | import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; | ||||||
| import org.apache.ibatis.reflection.MetaObject; | import org.apache.ibatis.reflection.MetaObject; | ||||||
| import top.continew.admin.common.context.UserContextHolder; | 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; | import java.time.LocalDateTime; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import cn.dev33.satoken.session.SaSession; | |||||||
| import cn.dev33.satoken.stp.StpUtil; | import cn.dev33.satoken.stp.StpUtil; | ||||||
| import cn.hutool.core.convert.Convert; | import cn.hutool.core.convert.Convert; | ||||||
| import cn.hutool.extra.spring.SpringUtil; | 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; | import top.continew.starter.core.util.ExceptionUtils; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ | |||||||
|  * limitations under the License. |  * 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.annotation.SaIgnore; | ||||||
| import cn.dev33.satoken.context.SaHolder; | import cn.dev33.satoken.context.SaHolder; | ||||||
| @@ -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; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * 实体类基类 | ||||||
|  |  * | ||||||
|  |  * <p> | ||||||
|  |  * 通用字段:创建人、创建时间 | ||||||
|  |  * </p> | ||||||
|  |  * | ||||||
|  |  * @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; | ||||||
|  | } | ||||||
| @@ -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; | ||||||
|  | } | ||||||
| @@ -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; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * 实体类基类 | ||||||
|  |  * | ||||||
|  |  * <p> | ||||||
|  |  * 通用字段:创建人、创建时间 | ||||||
|  |  * </p> | ||||||
|  |  * | ||||||
|  |  * @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; | ||||||
|  | } | ||||||
| @@ -14,7 +14,7 @@ | |||||||
|  * limitations under the License. |  * 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.Assemble; | ||||||
| import cn.crane4j.annotation.Mapping; | import cn.crane4j.annotation.Mapping; | ||||||
| @@ -14,7 +14,7 @@ | |||||||
|  * limitations under the License. |  * 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.Assemble; | ||||||
| import cn.crane4j.annotation.Mapping; | import cn.crane4j.annotation.Mapping; | ||||||
| @@ -14,7 +14,7 @@ | |||||||
|  * limitations under the License. |  * 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.ContainerMethod; | ||||||
| import cn.crane4j.annotation.MappingType; | import cn.crane4j.annotation.MappingType; | ||||||
| @@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||||||
| import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; | import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | 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.io.Serial; | ||||||
| import java.util.List; | import java.util.List; | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; | |||||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | 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.io.Serial; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; | |||||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.starter.extension.crud.annotation.DictField; | 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; | import java.io.Serial; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.system.model.entity; | |||||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | 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.io.Serial; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ import top.continew.admin.system.enums.FileTypeEnum; | |||||||
| import top.continew.admin.system.enums.StorageTypeEnum; | import top.continew.admin.system.enums.StorageTypeEnum; | ||||||
| import top.continew.starter.core.constant.StringConstants; | import top.continew.starter.core.constant.StringConstants; | ||||||
| import top.continew.starter.core.util.StrUtils; | 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.io.Serial; | ||||||
| import java.net.URL; | import java.net.URL; | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | import top.continew.admin.common.enums.DisEnableStatusEnum; | ||||||
| import top.continew.admin.system.enums.MenuTypeEnum; | 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; | import java.io.Serial; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -20,8 +20,8 @@ import com.baomidou.mybatisplus.annotation.TableField; | |||||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||||
| import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; | import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
|  | import top.continew.admin.common.model.entity.BaseDO; | ||||||
| import top.continew.admin.system.enums.NoticeScopeEnum; | import top.continew.admin.system.enums.NoticeScopeEnum; | ||||||
| import top.continew.starter.extension.crud.model.entity.BaseDO; |  | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
| import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.system.model.entity; | |||||||
|  |  | ||||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.starter.extension.crud.model.entity.BaseUpdateDO; | import top.continew.admin.common.model.entity.BaseUpdateDO; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.enums.DataScopeEnum; | import top.continew.admin.common.enums.DataScopeEnum; | ||||||
| import top.continew.starter.extension.crud.annotation.DictField; | 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; | import java.io.Serial; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | import top.continew.admin.common.enums.DisEnableStatusEnum; | ||||||
| import top.continew.admin.system.enums.StorageTypeEnum; | 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 top.continew.starter.security.crypto.annotation.FieldEncrypt; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|   | |||||||
| @@ -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.DisEnableStatusEnum; | ||||||
| import top.continew.admin.common.enums.GenderEnum; | import top.continew.admin.common.enums.GenderEnum; | ||||||
| import top.continew.starter.extension.crud.annotation.DictField; | 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 top.continew.starter.security.crypto.annotation.FieldEncrypt; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.common.enums.DisEnableStatusEnum; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | |||||||
| import com.alibaba.excel.annotation.ExcelProperty; | import com.alibaba.excel.annotation.ExcelProperty; | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.common.enums.DisEnableStatusEnum; | ||||||
| import top.continew.starter.extension.crud.annotation.TreeField; | import top.continew.starter.extension.crud.annotation.TreeField; | ||||||
| import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; | import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.system.model.resp; | |||||||
| import com.alibaba.excel.annotation.ExcelProperty; | import com.alibaba.excel.annotation.ExcelProperty; | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.common.enums.DisEnableStatusEnum; | ||||||
| import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; | import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.base.BaseDetailResp; | import top.continew.admin.common.model.resp.BaseDetailResp; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.system.model.resp; | |||||||
| import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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 top.continew.admin.system.enums.FileTypeEnum; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.common.enums.DisEnableStatusEnum; | ||||||
| import top.continew.admin.system.enums.MenuTypeEnum; | import top.continew.admin.system.enums.MenuTypeEnum; | ||||||
| import top.continew.starter.extension.crud.annotation.TreeField; | import top.continew.starter.extension.crud.annotation.TreeField; | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | |||||||
| import com.alibaba.excel.annotation.ExcelProperty; | import com.alibaba.excel.annotation.ExcelProperty; | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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 top.continew.admin.system.enums.NoticeScopeEnum; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.NoticeScopeEnum; | ||||||
| import top.continew.admin.system.enums.NoticeStatusEnum; | import top.continew.admin.system.enums.NoticeStatusEnum; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -23,7 +23,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | |||||||
| import com.alibaba.excel.annotation.ExcelProperty; | import com.alibaba.excel.annotation.ExcelProperty; | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.common.enums.DataScopeEnum; | ||||||
| import top.continew.admin.system.service.RoleDeptService; | import top.continew.admin.system.service.RoleDeptService; | ||||||
| import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; | import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.common.enums.DataScopeEnum; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
| @@ -71,9 +71,4 @@ public class RoleResp extends BaseDetailResp { | |||||||
|      */ |      */ | ||||||
|     @Schema(description = "描述", example = "测试人员描述信息") |     @Schema(description = "描述", example = "测试人员描述信息") | ||||||
|     private String description; |     private String description; | ||||||
|  |  | ||||||
|     @Override |  | ||||||
|     public Boolean getDisabled() { |  | ||||||
|         return this.getIsSystem(); |  | ||||||
|     } |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.common.enums.DisEnableStatusEnum; | ||||||
| import top.continew.admin.system.enums.StorageTypeEnum; | import top.continew.admin.system.enums.StorageTypeEnum; | ||||||
| import top.continew.starter.security.mask.annotation.JsonMask; | import top.continew.starter.security.mask.annotation.JsonMask; | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | |||||||
| import com.alibaba.excel.annotation.ExcelProperty; | import com.alibaba.excel.annotation.ExcelProperty; | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.constant.ContainerConstants; | ||||||
| import top.continew.admin.common.context.UserContextHolder; | import top.continew.admin.common.context.UserContextHolder; | ||||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | import top.continew.admin.common.enums.DisEnableStatusEnum; | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import cn.crane4j.annotation.Assemble; | |||||||
| import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; | import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.constant.ContainerConstants; | ||||||
| import top.continew.admin.common.context.UserContextHolder; | import top.continew.admin.common.context.UserContextHolder; | ||||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | import top.continew.admin.common.enums.DisEnableStatusEnum; | ||||||
|   | |||||||
| @@ -54,7 +54,7 @@ import org.springframework.stereotype.Service; | |||||||
| import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||||
| import org.springframework.web.multipart.MultipartFile; | import org.springframework.web.multipart.MultipartFile; | ||||||
| import top.continew.admin.auth.service.OnlineUserService; | 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.CacheConstants; | ||||||
| import top.continew.admin.common.constant.SysConstants; | import top.continew.admin.common.constant.SysConstants; | ||||||
| import top.continew.admin.common.context.UserContext; | import top.continew.admin.common.context.UserContext; | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; | |||||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||||
|  |  | ||||||
| import top.continew.starter.extension.crud.annotation.CrudRequestMapping; | 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.query.${classNamePrefix}Query; | ||||||
| import ${packageName}.model.req.${classNamePrefix}Req; | import ${packageName}.model.req.${classNamePrefix}Req; | ||||||
| import ${packageName}.model.resp.${classNamePrefix}DetailResp; | import ${packageName}.model.resp.${classNamePrefix}DetailResp; | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ import io.swagger.v3.oas.annotations.media.Schema; | |||||||
| import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | ||||||
| import com.alibaba.excel.annotation.ExcelProperty; | import com.alibaba.excel.annotation.ExcelProperty; | ||||||
|  |  | ||||||
| import top.continew.admin.common.base.BaseDetailResp; | import top.continew.admin.common.model.resp.BaseDetailResp; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * ${businessName}详情信息 |  * ${businessName}详情信息 | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ import lombok.Data; | |||||||
|  |  | ||||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||||
|  |  | ||||||
| import top.continew.starter.extension.crud.model.entity.BaseDO; | import top.continew.admin.common.model.entity.BaseDO; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * ${businessName}实体 |  * ${businessName}实体 | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ import lombok.Data; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
|  |  | ||||||
| import top.continew.admin.common.base.BaseResp; | import top.continew.admin.common.model.resp.BaseResp; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * ${businessName}信息 |  * ${businessName}信息 | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ package top.continew.admin.open.model.entity; | |||||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | 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 top.continew.starter.security.crypto.annotation.FieldEncrypt; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | |||||||
| import com.alibaba.excel.annotation.ExcelProperty; | import com.alibaba.excel.annotation.ExcelProperty; | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.common.enums.DisEnableStatusEnum; | ||||||
| import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; | import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.open.model.resp; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.media.Schema; | import io.swagger.v3.oas.annotations.media.Schema; | ||||||
| import lombok.Data; | 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.common.enums.DisEnableStatusEnum; | ||||||
|  |  | ||||||
| import java.io.Serial; | import java.io.Serial; | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.GetMapping; | |||||||
| import org.springframework.web.bind.annotation.PatchMapping; | import org.springframework.web.bind.annotation.PatchMapping; | ||||||
| import org.springframework.web.bind.annotation.PathVariable; | import org.springframework.web.bind.annotation.PathVariable; | ||||||
| import org.springframework.web.bind.annotation.RestController; | 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.query.AppQuery; | ||||||
| import top.continew.admin.open.model.req.AppReq; | import top.continew.admin.open.model.req.AppReq; | ||||||
| import top.continew.admin.open.model.resp.AppDetailResp; | import top.continew.admin.open.model.resp.AppDetailResp; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.controller.system; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.tags.Tag; | import io.swagger.v3.oas.annotations.tags.Tag; | ||||||
| import org.springframework.web.bind.annotation.RestController; | 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.query.ClientQuery; | ||||||
| import top.continew.admin.system.model.req.ClientReq; | import top.continew.admin.system.model.req.ClientReq; | ||||||
| import top.continew.admin.system.model.resp.ClientResp; | import top.continew.admin.system.model.resp.ClientResp; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.controller.system; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.tags.Tag; | import io.swagger.v3.oas.annotations.tags.Tag; | ||||||
| import org.springframework.web.bind.annotation.RestController; | 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.query.DeptQuery; | ||||||
| import top.continew.admin.system.model.req.DeptReq; | import top.continew.admin.system.model.req.DeptReq; | ||||||
| import top.continew.admin.system.model.resp.DeptResp; | import top.continew.admin.system.model.resp.DeptResp; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.controller.system; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.tags.Tag; | import io.swagger.v3.oas.annotations.tags.Tag; | ||||||
| import org.springframework.web.bind.annotation.RestController; | 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.query.DictQuery; | ||||||
| import top.continew.admin.system.model.req.DictReq; | import top.continew.admin.system.model.req.DictReq; | ||||||
| import top.continew.admin.system.model.resp.DictResp; | import top.continew.admin.system.model.resp.DictResp; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.controller.system; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.tags.Tag; | import io.swagger.v3.oas.annotations.tags.Tag; | ||||||
| import org.springframework.web.bind.annotation.RestController; | 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.query.DictItemQuery; | ||||||
| import top.continew.admin.system.model.req.DictItemReq; | import top.continew.admin.system.model.req.DictItemReq; | ||||||
| import top.continew.admin.system.model.resp.DictItemResp; | import top.continew.admin.system.model.resp.DictItemResp; | ||||||
|   | |||||||
| @@ -22,7 +22,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; | |||||||
| import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||||
| import org.springframework.web.bind.annotation.GetMapping; | import org.springframework.web.bind.annotation.GetMapping; | ||||||
| import org.springframework.web.bind.annotation.RestController; | 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.query.FileQuery; | ||||||
| import top.continew.admin.system.model.req.FileReq; | import top.continew.admin.system.model.req.FileReq; | ||||||
| import top.continew.admin.system.model.resp.FileResp; | import top.continew.admin.system.model.resp.FileResp; | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import cn.hutool.core.util.ObjectUtil; | |||||||
| import cn.hutool.core.util.StrUtil; | import cn.hutool.core.util.StrUtil; | ||||||
| import io.swagger.v3.oas.annotations.tags.Tag; | import io.swagger.v3.oas.annotations.tags.Tag; | ||||||
| import org.springframework.web.bind.annotation.RestController; | 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.query.MenuQuery; | ||||||
| import top.continew.admin.system.model.req.MenuReq; | import top.continew.admin.system.model.req.MenuReq; | ||||||
| import top.continew.admin.system.model.resp.MenuResp; | import top.continew.admin.system.model.resp.MenuResp; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.controller.system; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.tags.Tag; | import io.swagger.v3.oas.annotations.tags.Tag; | ||||||
| import org.springframework.web.bind.annotation.RestController; | 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.enums.NoticeScopeEnum; | ||||||
| import top.continew.admin.system.model.query.NoticeQuery; | import top.continew.admin.system.model.query.NoticeQuery; | ||||||
| import top.continew.admin.system.model.req.NoticeReq; | import top.continew.admin.system.model.req.NoticeReq; | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ import jakarta.validation.constraints.NotEmpty; | |||||||
| import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||||
| import org.springframework.validation.annotation.Validated; | import org.springframework.validation.annotation.Validated; | ||||||
| import org.springframework.web.bind.annotation.*; | 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.query.RoleQuery; | ||||||
| import top.continew.admin.system.model.req.RoleReq; | import top.continew.admin.system.model.req.RoleReq; | ||||||
| import top.continew.admin.system.model.resp.RoleDetailResp; | import top.continew.admin.system.model.resp.RoleDetailResp; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package top.continew.admin.controller.system; | |||||||
|  |  | ||||||
| import io.swagger.v3.oas.annotations.tags.Tag; | import io.swagger.v3.oas.annotations.tags.Tag; | ||||||
| import org.springframework.web.bind.annotation.RestController; | 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.query.StorageQuery; | ||||||
| import top.continew.admin.system.model.req.StorageReq; | import top.continew.admin.system.model.req.StorageReq; | ||||||
| import top.continew.admin.system.model.resp.StorageResp; | import top.continew.admin.system.model.resp.StorageResp; | ||||||
|   | |||||||
| @@ -29,7 +29,7 @@ import org.springframework.http.MediaType; | |||||||
| import org.springframework.validation.annotation.Validated; | import org.springframework.validation.annotation.Validated; | ||||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||||
| import org.springframework.web.multipart.MultipartFile; | 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.constant.RegexConstants; | ||||||
| import top.continew.admin.common.util.SecureUtils; | import top.continew.admin.common.util.SecureUtils; | ||||||
| import top.continew.admin.system.model.query.UserQuery; | import top.continew.admin.system.model.query.UserQuery; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user