diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseEnum.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseEnum.java index 33e216da..06f7bcc5 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseEnum.java @@ -34,6 +34,8 @@ public interface BaseEnum extend /** * 枚举描述 + * + * @return 枚举描述 */ D getDescription(); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java index 1302eafc..b1549e60 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java @@ -81,6 +81,13 @@ public abstract class BaseServiceImpl, T, V, D, Q, C ext return BeanUtil.copyProperties(entity, detailVoClass); } + /** + * 新增 + * + * @param request + * 创建信息 + * @return 自增 ID + */ @Override @Transactional(rollbackFor = Exception.class) public abstract Long create(C request); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/SwaggerConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/SwaggerConfiguration.java index de715b85..0fde1ac1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/SwaggerConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/SwaggerConfiguration.java @@ -16,9 +16,6 @@ package top.charles7c.cnadmin.common.config; -import java.util.HashMap; -import java.util.Map; - import lombok.RequiredArgsConstructor; import io.swagger.v3.oas.models.OpenAPI; @@ -29,6 +26,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.RandomUtil; import top.charles7c.cnadmin.common.config.properties.ContiNewAdminProperties; @@ -50,7 +48,7 @@ public class SwaggerConfiguration { * 接口文档配置 */ @Bean - public OpenAPI openAPI() { + public OpenAPI openApi() { return new OpenAPI().info( new Info().title(continewAdminProperties.getName() + " 接口文档").version(continewAdminProperties.getVersion()) .description(continewAdminProperties.getDescription()).termsOfService(continewAdminProperties.getUrl()) @@ -66,11 +64,8 @@ public class SwaggerConfiguration { public GlobalOpenApiCustomizer orderGlobalOpenApiCustomizer() { return openApi -> { if (openApi.getTags() != null) { - openApi.getTags().forEach(tag -> { - Map map = new HashMap<>(); - map.put("x-order", RandomUtil.randomInt(0, 100)); - tag.setExtensions(map); - }); + openApi.getTags() + .forEach(tag -> tag.setExtensions(MapUtil.of("x-order", RandomUtil.randomInt(0, 100)))); } }; } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/CharConstants.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/CharConstants.java new file mode 100644 index 00000000..7b2dc79c --- /dev/null +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/consts/CharConstants.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package top.charles7c.cnadmin.common.consts; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import cn.hutool.core.text.CharPool; + +/** + * 字符常量 + * + * @author Charles7c + * @since 2023/2/10 20:14 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class CharConstants implements CharPool { + + /** + * 分号 + */ + public static final String SEMICOLON = ";"; +} diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/IpUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/IpUtils.java index e892a9f0..8c43cac0 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/IpUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/IpUtils.java @@ -70,7 +70,7 @@ public class IpUtils { * @return 归属地信息 */ public static String getHttpCityInfo(String ip) { - if (isInnerIP(ip)) { + if (isInnerIp(ip)) { return "内网IP"; } String api = String.format(IP_URL, ip); @@ -86,7 +86,7 @@ public class IpUtils { * @return 归属地信息 */ public static String getLocalCityInfo(String ip) { - if (isInnerIP(ip)) { + if (isInnerIp(ip)) { return "内网IP"; } Ip2regionSearcher ip2regionSearcher = SpringUtil.getBean(Ip2regionSearcher.class); @@ -104,7 +104,7 @@ public class IpUtils { * IP 地址 * @return 是否为内网 IP */ - public static boolean isInnerIP(String ip) { + public static boolean isInnerIp(String ip) { ip = "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip); return NetUtil.isInnerIP(ip); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java index e63c5f96..306062a2 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java @@ -19,6 +19,7 @@ package top.charles7c.cnadmin.common.util; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.Collection; +import java.util.Collections; import java.util.List; import javax.mail.MessagingException; @@ -33,10 +34,10 @@ import org.springframework.mail.javamail.MimeMessageHelper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; +import top.charles7c.cnadmin.common.consts.CharConstants; import top.charles7c.cnadmin.common.util.validate.CheckUtils; /** @@ -186,7 +187,7 @@ public class MailUtils { */ public static void send(Collection tos, Collection ccs, Collection bccs, String subject, String content, boolean isHtml, File... files) throws MessagingException { - CheckUtils.throwIf(() -> CollUtil.isEmpty(tos), "请至少指定一名收件人"); + CheckUtils.throwIfEmpty(tos, "请至少指定一名收件人"); MimeMessage mimeMessage = MAIL_SENDER.createMimeMessage(); MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, StandardCharsets.UTF_8.displayName()); @@ -228,14 +229,14 @@ public class MailUtils { */ private static List splitAddress(String addresses) { if (StrUtil.isBlank(addresses)) { - return null; + return Collections.emptyList(); } List result; - if (StrUtil.contains(addresses, CharUtil.COMMA)) { - result = StrUtil.splitTrim(addresses, CharUtil.COMMA); - } else if (StrUtil.contains(addresses, ';')) { - result = StrUtil.splitTrim(addresses, ';'); + if (StrUtil.contains(addresses, CharConstants.COMMA)) { + result = StrUtil.splitTrim(addresses, CharConstants.COMMA); + } else if (StrUtil.contains(addresses, CharConstants.SEMICOLON)) { + result = StrUtil.splitTrim(addresses, CharConstants.SEMICOLON); } else { result = CollUtil.newArrayList(addresses); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/RedisUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/RedisUtils.java index 8e8cf5b6..2da3e04f 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/RedisUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/RedisUtils.java @@ -205,7 +205,12 @@ public class RedisUtils { return String.join(":", subKeys); } - public static NameMapper getNameMapper() { + /** + * 根据集群或单机配置,获取名称映射器 + * + * @return 名称映射器 + */ + private static NameMapper getNameMapper() { Config config = REDISSON_CLIENT.getConfig(); if (config.isClusterConfig()) { return config.useClusterServers().getNameMapper(); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java index c7f66659..2cf6d88b 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java @@ -35,6 +35,54 @@ public class CheckUtils extends Validator { private static final Class EXCEPTION_TYPE = ServiceException.class; + /** + * 如果为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + */ + public static void throwIfNull(Object obj, String message) { + throwIfNull(obj, message, EXCEPTION_TYPE); + } + + /** + * 如果不为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + */ + public static void throwIfNotNull(Object obj, String message) { + throwIfNotNull(obj, message, EXCEPTION_TYPE); + } + + /** + * 如果为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + */ + public static void throwIfEmpty(Object obj, String message) { + throwIfEmpty(obj, message, EXCEPTION_TYPE); + } + + /** + * 如果不为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + */ + public static void throwIfNotEmpty(Object obj, String message) { + throwIfNotEmpty(obj, message, EXCEPTION_TYPE); + } + /** * 如果为空,抛出异常 * @@ -115,30 +163,6 @@ public class CheckUtils extends Validator { throwIfNotEqualIgnoreCase(str1, str2, message, EXCEPTION_TYPE); } - /** - * 如果为空,抛出异常 - * - * @param obj - * 被检测的对象 - * @param message - * 错误信息 - */ - public static void throwIfNull(Object obj, String message) { - throwIfNull(obj, message, EXCEPTION_TYPE); - } - - /** - * 如果不为空,抛出异常 - * - * @param obj - * 被检测的对象 - * @param message - * 错误信息 - */ - public static void throwIfNotNull(Object obj, String message) { - throwIfNotNull(obj, message, EXCEPTION_TYPE); - } - /** * 如果条件成立,抛出异常 * diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/ValidationUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/ValidationUtils.java index a5f3371a..7e2d5a06 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/ValidationUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/ValidationUtils.java @@ -35,6 +35,54 @@ public class ValidationUtils extends Validator { private static final Class EXCEPTION_TYPE = BadRequestException.class; + /** + * 如果为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + */ + public static void throwIfNull(Object obj, String message) { + throwIfNull(obj, message, EXCEPTION_TYPE); + } + + /** + * 如果不为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + */ + public static void throwIfNotNull(Object obj, String message) { + throwIfNotNull(obj, message, EXCEPTION_TYPE); + } + + /** + * 如果为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + */ + public static void throwIfEmpty(Object obj, String message) { + throwIfEmpty(obj, message, EXCEPTION_TYPE); + } + + /** + * 如果不为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + */ + public static void throwIfNotEmpty(Object obj, String message) { + throwIfNotEmpty(obj, message, EXCEPTION_TYPE); + } + /** * 如果为空,抛出异常 * @@ -115,30 +163,6 @@ public class ValidationUtils extends Validator { throwIfNotEqualIgnoreCase(str1, str2, message, EXCEPTION_TYPE); } - /** - * 如果为空,抛出异常 - * - * @param obj - * 被检测的对象 - * @param message - * 错误信息 - */ - public static void throwIfNull(Object obj, String message) { - throwIfNull(obj, message, EXCEPTION_TYPE); - } - - /** - * 如果不为空,抛出异常 - * - * @param obj - * 被检测的对象 - * @param message - * 错误信息 - */ - public static void throwIfNotNull(Object obj, String message) { - throwIfNotNull(obj, message, EXCEPTION_TYPE); - } - /** * 如果条件成立,抛出异常 * diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/Validator.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/Validator.java index 1441a594..a34d77f1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/Validator.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/Validator.java @@ -34,6 +34,62 @@ import cn.hutool.core.util.StrUtil; @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Validator { + /** + * 如果为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + * @param exceptionType + * 异常类型 + */ + protected static void throwIfNull(Object obj, String message, Class exceptionType) { + throwIf(() -> obj == null, message, exceptionType); + } + + /** + * 如果不为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + * @param exceptionType + * 异常类型 + */ + protected static void throwIfNotNull(Object obj, String message, Class exceptionType) { + throwIf(() -> obj != null, message, exceptionType); + } + + /** + * 如果为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + * @param exceptionType + * 异常类型 + */ + protected static void throwIfEmpty(Object obj, String message, Class exceptionType) { + throwIf(() -> ObjectUtil.isEmpty(obj), message, exceptionType); + } + + /** + * 如果不为空,抛出异常 + * + * @param obj + * 被检测的对象 + * @param message + * 错误信息 + * @param exceptionType + * 异常类型 + */ + protected static void throwIfNotEmpty(Object obj, String message, Class exceptionType) { + throwIf(() -> ObjectUtil.isNotEmpty(obj), message, exceptionType); + } + /** * 如果为空,抛出异常 * @@ -132,34 +188,6 @@ public class Validator { throwIf(() -> !StrUtil.equalsIgnoreCase(str1, str2), message, exceptionType); } - /** - * 如果为空,抛出异常 - * - * @param obj - * 被检测的对象 - * @param message - * 错误信息 - * @param exceptionType - * 异常类型 - */ - protected static void throwIfNull(Object obj, String message, Class exceptionType) { - throwIf(() -> obj == null, message, exceptionType); - } - - /** - * 如果不为空,抛出异常 - * - * @param obj - * 被检测的对象 - * @param message - * 错误信息 - * @param exceptionType - * 异常类型 - */ - protected static void throwIfNotNull(Object obj, String message, Class exceptionType) { - throwIf(() -> obj != null, message, exceptionType); - } - /** * 如果条件成立,抛出异常 * diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java index efb7f5e7..6824d900 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java @@ -314,7 +314,7 @@ public class LogInterceptor implements HandlerInterceptor { } // 2、检查是否需要记录内网 IP 操作 - boolean isInnerIp = IpUtils.isInnerIP(ServletUtil.getClientIP(request)); + boolean isInnerIp = IpUtils.isInnerIp(ServletUtil.getClientIP(request)); if (isInnerIp && Boolean.FALSE.equals(operationLogProperties.getIncludeInnerIp())) { return false; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java index 4f236616..84e7a97b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java @@ -52,16 +52,16 @@ public class DeptDO extends BaseDO { */ private Long parentId; - /** - * 部门排序 - */ - private Integer deptSort; - /** * 描述 */ private String description; + /** + * 部门排序 + */ + private Integer deptSort; + /** * 状态(1启用 2禁用) */ diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java index b5ff0610..1ae0f923 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java @@ -58,7 +58,7 @@ public class RoleDO extends BaseDO { private String roleCode; /** - * 数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定数据权限) + * 数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定义数据权限) */ private DataScopeEnum dataScope; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java index 25d667e4..bf69ef96 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java @@ -66,9 +66,9 @@ public class RoleRequest extends BaseRequest { private String roleCode; /** - * 数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定数据权限) + * 数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定义数据权限) */ - @Schema(description = "数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定数据权限)", type = "Integer", + @Schema(description = "数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定义数据权限)", type = "Integer", allowableValues = {"1", "2", "3", "4", "5"}) private DataScopeEnum dataScope; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java index cf6c44b8..8a16c8b4 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java @@ -61,12 +61,6 @@ public class DeptDetailVO extends BaseDetailVO { @Schema(description = "上级部门 ID") private Long parentId; - /** - * 部门排序 - */ - @Schema(description = "部门排序") - private Integer deptSort; - /** * 描述 */ @@ -74,6 +68,12 @@ public class DeptDetailVO extends BaseDetailVO { @ExcelProperty(value = "描述") private String description; + /** + * 部门排序 + */ + @Schema(description = "部门排序") + private Integer deptSort; + /** * 状态(1启用 2禁用) */ diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java index 652df1e1..35e43842 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java @@ -57,18 +57,18 @@ public class DeptVO extends BaseVO { @Schema(description = "上级部门 ID") private Long parentId; - /** - * 部门排序 - */ - @Schema(description = "部门排序") - private Integer deptSort; - /** * 描述 */ @Schema(description = "描述") private String description; + /** + * 部门排序 + */ + @Schema(description = "部门排序") + private Integer deptSort; + /** * 状态(1启用 2禁用) */ diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java index e6478a8b..e49c16f7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java @@ -65,9 +65,9 @@ public class RoleDetailVO extends BaseDetailVO { private String roleCode; /** - * 数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定数据权限) + * 数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定义数据权限) */ - @Schema(description = "数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定数据权限)") + @Schema(description = "数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定义数据权限)") @ExcelProperty(value = "数据权限", converter = ExcelBaseEnumConverter.class) private DataScopeEnum dataScope; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java index 7ddb0426..60903e7a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java @@ -62,9 +62,9 @@ public class RoleVO extends BaseVO { private String roleCode; /** - * 数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定数据权限) + * 数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定义数据权限) */ - @Schema(description = "数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定数据权限)") + @Schema(description = "数据权限(1全部数据权限 2本部门及以下数据权限 3本部门数据权限 4仅本人数据权限 5自定义数据权限)") private DataScopeEnum dataScope; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DeptService.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DeptService.java index 5ac0863c..88d7a16b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DeptService.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DeptService.java @@ -54,19 +54,6 @@ public interface DeptService extends BaseService> buildTree(List list); - /** - * 检查部门名称是否存在 - * - * @param deptName - * 部门名称 - * @param parentId - * 上级部门 ID - * @param deptId - * 部门 ID - * @return 是否存在 - */ - boolean checkDeptNameExist(String deptName, Long parentId, Long deptId); - /** * 导出 * diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java index a1557aea..262ec677 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java @@ -100,7 +100,7 @@ public class DeptServiceImpl extends BaseServiceImpl isExist, String.format("新增失败,'%s'已存在", deptName)); // 保存部门信息 @@ -110,6 +110,16 @@ public class DeptServiceImpl extends BaseServiceImpl isExist, String.format("新增失败,'%s'已存在", deptName)); + + super.update(request); + } + @Override @Transactional(rollbackFor = Exception.class) public void delete(List ids) { @@ -179,12 +189,6 @@ public class DeptServiceImpl extends BaseServiceImpllambdaQuery().eq(DeptDO::getDeptName, deptName) - .eq(DeptDO::getParentId, parentId).ne(deptId != null, DeptDO::getDeptId, deptId)); - } - @Override public void export(DeptQuery query, HttpServletResponse response) { List deptList = this.listDept(query); @@ -193,6 +197,22 @@ public class DeptServiceImpl extends BaseServiceImpllambdaQuery().eq(DeptDO::getDeptName, deptName) + .eq(DeptDO::getParentId, parentId).ne(deptId != null, DeptDO::getDeptId, deptId)); + } + /** * 填充数据 * diff --git a/continew-admin-system/src/main/resources/mapper/DeptMapper.xml b/continew-admin-system/src/main/resources/mapper/DeptMapper.xml new file mode 100644 index 00000000..85cdefad --- /dev/null +++ b/continew-admin-system/src/main/resources/mapper/DeptMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/continew-admin-ui/src/api/common/index.ts b/continew-admin-ui/src/api/common/index.ts index aee542b2..3d7cfda3 100644 --- a/continew-admin-ui/src/api/common/index.ts +++ b/continew-admin-ui/src/api/common/index.ts @@ -10,4 +10,4 @@ export default function listDeptTree(params: DeptParam) { return qs.stringify(obj); }, }); -} \ No newline at end of file +} diff --git a/continew-admin-ui/src/api/monitor/log.ts b/continew-admin-ui/src/api/monitor/log.ts index b5db5cbe..c8571868 100644 --- a/continew-admin-ui/src/api/monitor/log.ts +++ b/continew-admin-ui/src/api/monitor/log.ts @@ -57,7 +57,7 @@ export function listLoginLog(params: LoginLogParam) { params, paramsSerializer: (obj) => { return qs.stringify(obj); - } + }, }); } @@ -78,7 +78,7 @@ export function listOperationLog(params: OperationLogParam) { params, paramsSerializer: (obj) => { return qs.stringify(obj); - } + }, }); } @@ -98,10 +98,10 @@ export function listSystemLog(params: SystemLogParam) { params, paramsSerializer: (obj) => { return qs.stringify(obj); - } + }, }); } export function getSystemLog(logId: number) { return axios.get(`${BASE_URL}/system/${logId}`); -} \ No newline at end of file +} diff --git a/continew-admin-ui/src/api/monitor/online.ts b/continew-admin-ui/src/api/monitor/online.ts index 79df07fc..9c56baa4 100644 --- a/continew-admin-ui/src/api/monitor/online.ts +++ b/continew-admin-ui/src/api/monitor/online.ts @@ -29,10 +29,10 @@ export function listOnlineUser(params: OnlineUserParam) { params, paramsSerializer: (obj) => { return qs.stringify(obj); - } + }, }); } export function kickout(token: string) { return axios.delete(`${BASE_URL}/${token}`); -} \ No newline at end of file +} diff --git a/continew-admin-ui/src/api/system/dept.ts b/continew-admin-ui/src/api/system/dept.ts index 3ce6b252..10e4fa34 100644 --- a/continew-admin-ui/src/api/system/dept.ts +++ b/continew-admin-ui/src/api/system/dept.ts @@ -56,4 +56,4 @@ export function exportDept(params: DeptParam) { }, responseType: 'blob', }); -} \ No newline at end of file +} diff --git a/continew-admin-ui/src/api/system/user-center.ts b/continew-admin-ui/src/api/system/user-center.ts index 9fbcdb14..ac55f70e 100644 --- a/continew-admin-ui/src/api/system/user-center.ts +++ b/continew-admin-ui/src/api/system/user-center.ts @@ -42,4 +42,4 @@ export interface UpdateEmailReq { export function updateEmail(req: UpdateEmailReq) { return axios.patch(`${BASE_URL}/email`, req); -} \ No newline at end of file +} diff --git a/continew-admin-ui/src/views/system/dept/index.vue b/continew-admin-ui/src/views/system/dept/index.vue index df137b36..a69a8eba 100644 --- a/continew-admin-ui/src/views/system/dept/index.vue +++ b/continew-admin-ui/src/views/system/dept/index.vue @@ -5,7 +5,7 @@
-
+
新增 - + 修改 - + 删除 - + 导出 - +
@@ -85,10 +105,16 @@