diff --git a/kernel-a-rule/pom.xml b/kernel-a-rule/pom.xml index 22a45cd07..f2c4f414c 100644 --- a/kernel-a-rule/pom.xml +++ b/kernel-a-rule/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/response/BaseResponse.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/response/BaseResponse.java new file mode 100644 index 000000000..8786f94a6 --- /dev/null +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/response/BaseResponse.java @@ -0,0 +1,85 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * 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. + * + * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点，可申请商业授权 + */ +package cn.stylefeng.roses.kernel.rule.pojo.response; + +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 返回基类，返回参数可继承此类 + *

+ * 可以用于封装通用返回包装器 + *

+ * + * @author yxx + * @date 2023/03/28 18:08 + */ +@Data +public class BaseResponse implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 创建时间 + */ + @ChineseDescription("创建时间") + private Date createTime; + + /** + * 创建人 + */ + @ChineseDescription("创建人") + private Long createUser; + + /** + * 创建人姓名 + */ + @ChineseDescription("创建人姓名") + private String createUserName; + + /** + * 更新时间 + */ + @ChineseDescription("更新时间") + private Date updateTime; + + /** + * 更新人 + */ + @ChineseDescription("更新人") + private Long updateUser; + + /** + * 更新人姓名 + */ + @ChineseDescription("更新人姓名") + private String updateUserName; + +} diff --git a/kernel-d-auth/auth-api/pom.xml b/kernel-d-auth/auth-api/pom.xml index ef9eca0c9..43fb838d2 100644 --- a/kernel-d-auth/auth-api/pom.xml +++ b/kernel-d-auth/auth-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-auth - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-auth/auth-sdk/pom.xml b/kernel-d-auth/auth-sdk/pom.xml index 4dca409a9..7e9de3ff6 100644 --- a/kernel-d-auth/auth-sdk/pom.xml +++ b/kernel-d-auth/auth-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-auth - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java index 71afd5e75..037143541 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java @@ -85,6 +85,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; +import java.util.HashMap; +import java.util.Map; import static cn.stylefeng.roses.kernel.auth.api.exception.enums.AuthExceptionEnum.AUTH_EXPIRED_ERROR; import static cn.stylefeng.roses.kernel.auth.api.exception.enums.AuthExceptionEnum.TOKEN_PARSE_ERROR; @@ -293,6 +295,13 @@ public class AuthServiceImpl implements AuthServiceApi { LoginUser loginUser = userLoginInfo.getLoginUser(); loginUser.setTenantCode(tenantCode); + // 设置websocket url + String webSocketWsUrl = WebSocketConfigExpander.getWebSocketWsUrl(); + Map params = new HashMap<>(1); + params.put("token", token); + webSocketWsUrl = StrUtil.format(webSocketWsUrl, params); + loginUser.setWsUrl(webSocketWsUrl); + // 创建用户会话信息 sessionManagerApi.updateSession(token, loginUser); } finally { diff --git a/kernel-d-auth/auth-spring-boot-starter/pom.xml b/kernel-d-auth/auth-spring-boot-starter/pom.xml index eae232c23..8b9e6bc7c 100644 --- a/kernel-d-auth/auth-spring-boot-starter/pom.xml +++ b/kernel-d-auth/auth-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-auth - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-auth/pom.xml b/kernel-d-auth/pom.xml index 382fa6846..9c54772f5 100644 --- a/kernel-d-auth/pom.xml +++ b/kernel-d-auth/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-cache/cache-api/pom.xml b/kernel-d-cache/cache-api/pom.xml index 6268cd0d6..6600a174f 100644 --- a/kernel-d-cache/cache-api/pom.xml +++ b/kernel-d-cache/cache-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-cache - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-cache/cache-sdk-memory/pom.xml b/kernel-d-cache/cache-sdk-memory/pom.xml index 532008973..560144d88 100644 --- a/kernel-d-cache/cache-sdk-memory/pom.xml +++ b/kernel-d-cache/cache-sdk-memory/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-cache - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-cache/cache-sdk-redis/pom.xml b/kernel-d-cache/cache-sdk-redis/pom.xml index ff5993c13..ca9b63e18 100644 --- a/kernel-d-cache/cache-sdk-redis/pom.xml +++ b/kernel-d-cache/cache-sdk-redis/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-cache - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-cache/memory-cache-spring-boot-starter/pom.xml b/kernel-d-cache/memory-cache-spring-boot-starter/pom.xml index 6d768bfe2..8e195be3c 100644 --- a/kernel-d-cache/memory-cache-spring-boot-starter/pom.xml +++ b/kernel-d-cache/memory-cache-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-cache - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-cache/pom.xml b/kernel-d-cache/pom.xml index cc0e97cc7..29b512943 100644 --- a/kernel-d-cache/pom.xml +++ b/kernel-d-cache/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-cache/redis-spring-boot-starter/pom.xml b/kernel-d-cache/redis-spring-boot-starter/pom.xml index 123681922..2a3d30d16 100644 --- a/kernel-d-cache/redis-spring-boot-starter/pom.xml +++ b/kernel-d-cache/redis-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-cache - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-config/config-api/pom.xml b/kernel-d-config/config-api/pom.xml index ea679150c..76107ffc8 100644 --- a/kernel-d-config/config-api/pom.xml +++ b/kernel-d-config/config-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-config - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-config/config-business/pom.xml b/kernel-d-config/config-business/pom.xml index cdf197cbd..a1f4c59fb 100644 --- a/kernel-d-config/config-business/pom.xml +++ b/kernel-d-config/config-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-config - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-config/config-sdk-map/pom.xml b/kernel-d-config/config-sdk-map/pom.xml index b6e553474..c737bf090 100644 --- a/kernel-d-config/config-sdk-map/pom.xml +++ b/kernel-d-config/config-sdk-map/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-config - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-config/config-sdk-redis/pom.xml b/kernel-d-config/config-sdk-redis/pom.xml index 4289c838f..35b6ea540 100644 --- a/kernel-d-config/config-sdk-redis/pom.xml +++ b/kernel-d-config/config-sdk-redis/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-config - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-config/config-spring-boot-starter/pom.xml b/kernel-d-config/config-spring-boot-starter/pom.xml index 6ec6627c6..6bffba218 100644 --- a/kernel-d-config/config-spring-boot-starter/pom.xml +++ b/kernel-d-config/config-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-config - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-config/pom.xml b/kernel-d-config/pom.xml index c56b23421..b493c045a 100644 --- a/kernel-d-config/pom.xml +++ b/kernel-d-config/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-db/db-api/pom.xml b/kernel-d-db/db-api/pom.xml index efd2c917b..b1c9837df 100644 --- a/kernel-d-db/db-api/pom.xml +++ b/kernel-d-db/db-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-db - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-db/db-sdk-flyway/pom.xml b/kernel-d-db/db-sdk-flyway/pom.xml index 97a3a97cc..68b48ab90 100644 --- a/kernel-d-db/db-sdk-flyway/pom.xml +++ b/kernel-d-db/db-sdk-flyway/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-db - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-db/db-sdk-init/pom.xml b/kernel-d-db/db-sdk-init/pom.xml index 62a3f7fea..6826e1f8f 100644 --- a/kernel-d-db/db-sdk-init/pom.xml +++ b/kernel-d-db/db-sdk-init/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-db - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-db/db-sdk-mp/pom.xml b/kernel-d-db/db-sdk-mp/pom.xml index c5df2c84d..959a91043 100644 --- a/kernel-d-db/db-sdk-mp/pom.xml +++ b/kernel-d-db/db-sdk-mp/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-db - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-db/db-spring-boot-starter/pom.xml b/kernel-d-db/db-spring-boot-starter/pom.xml index 3b351dd12..f79c98bad 100644 --- a/kernel-d-db/db-spring-boot-starter/pom.xml +++ b/kernel-d-db/db-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-db - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-db/pom.xml b/kernel-d-db/pom.xml index cc14fd847..9695f42da 100644 --- a/kernel-d-db/pom.xml +++ b/kernel-d-db/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-ds-container/ds-container-api/pom.xml b/kernel-d-ds-container/ds-container-api/pom.xml index 1ee0c48ae..7a96fd926 100644 --- a/kernel-d-ds-container/ds-container-api/pom.xml +++ b/kernel-d-ds-container/ds-container-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-ds-container - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-ds-container/ds-container-business/pom.xml b/kernel-d-ds-container/ds-container-business/pom.xml index dd0250f3d..64b6ddaa4 100644 --- a/kernel-d-ds-container/ds-container-business/pom.xml +++ b/kernel-d-ds-container/ds-container-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-ds-container - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-ds-container/ds-container-sdk/pom.xml b/kernel-d-ds-container/ds-container-sdk/pom.xml index 172b24265..9c5ff7c7c 100644 --- a/kernel-d-ds-container/ds-container-sdk/pom.xml +++ b/kernel-d-ds-container/ds-container-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-ds-container - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-ds-container/ds-container-spring-boot-starter/pom.xml b/kernel-d-ds-container/ds-container-spring-boot-starter/pom.xml index 5bf8d4ff1..2ce14c05b 100644 --- a/kernel-d-ds-container/ds-container-spring-boot-starter/pom.xml +++ b/kernel-d-ds-container/ds-container-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-ds-container - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-ds-container/pom.xml b/kernel-d-ds-container/pom.xml index 22d68f603..b461e0489 100644 --- a/kernel-d-ds-container/pom.xml +++ b/kernel-d-ds-container/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-email/email-api/pom.xml b/kernel-d-email/email-api/pom.xml index 71aa29a56..0533d7dc6 100644 --- a/kernel-d-email/email-api/pom.xml +++ b/kernel-d-email/email-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-email - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-email/email-sdk-aliyun/pom.xml b/kernel-d-email/email-sdk-aliyun/pom.xml index 5078337f5..52fb5b40b 100644 --- a/kernel-d-email/email-sdk-aliyun/pom.xml +++ b/kernel-d-email/email-sdk-aliyun/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-email - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-email/email-sdk-java/pom.xml b/kernel-d-email/email-sdk-java/pom.xml index fcb30c7fe..c00320adf 100644 --- a/kernel-d-email/email-sdk-java/pom.xml +++ b/kernel-d-email/email-sdk-java/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-email - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-email/email-spring-boot-starter/pom.xml b/kernel-d-email/email-spring-boot-starter/pom.xml index 6c889a024..50c0be79e 100644 --- a/kernel-d-email/email-spring-boot-starter/pom.xml +++ b/kernel-d-email/email-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-email - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-email/pom.xml b/kernel-d-email/pom.xml index e91c5269a..edb927510 100644 --- a/kernel-d-email/pom.xml +++ b/kernel-d-email/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-file/file-api/pom.xml b/kernel-d-file/file-api/pom.xml index 086191be3..496a4e513 100644 --- a/kernel-d-file/file-api/pom.xml +++ b/kernel-d-file/file-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileBusinessApi.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileBusinessApi.java new file mode 100644 index 000000000..9ed08a6a8 --- /dev/null +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileBusinessApi.java @@ -0,0 +1,68 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * 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. + * + * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点，可申请商业授权 + */ +package cn.stylefeng.roses.kernel.file.api; + +import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse; + +import java.util.List; + +/** + * 文件业务信息绑定的API + * + * @author fengshuonan + * @date 2023/3/31 13:38 + */ +public interface FileBusinessApi { + + /** + * 添加业务和文件的绑定 + * + * @param businessCode 业务编码 + * @param businessId 业务id + * @param fileIdList 文件id集合 + * @author fengshuonan + * @date 2023/3/31 13:43 + */ + void addFileBusinessBind(String businessCode, Long businessId, List fileIdList); + + /** + * 获取业务绑定的文件列表信息 + * + * @param businessId 业务id + * @return 文件的信息，不包含文件本身的字节信息 + * @author fengshuonan + * @date 2020/11/29 16:26 + */ + List getBusinessFileInfoList(Long businessId); + + /** + * 新增文件下载次数 + * + * @author fengshuonan + * @date 2023/3/31 14:23 + */ + void addFileDownloadCount(Long businessId, Long fileId); + +} diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/format/FileUrlFormatProcess.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/format/FileUrlFormatProcess.java new file mode 100644 index 000000000..0c3dc77e9 --- /dev/null +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/format/FileUrlFormatProcess.java @@ -0,0 +1,27 @@ +package cn.stylefeng.roses.kernel.file.api.format; + +import cn.hutool.core.convert.Convert; +import cn.hutool.extra.spring.SpringUtil; +import cn.stylefeng.roses.kernel.file.api.FileInfoApi; +import cn.stylefeng.roses.kernel.rule.format.BaseSimpleFieldFormatProcess; + +/** + * Json响应，针对返回的文件信息，响应一个文件的具体url + * + * @author fengshuonan + * @date 2023/3/28 9:30 + */ +public class FileUrlFormatProcess extends BaseSimpleFieldFormatProcess { + + @Override + public Class getItemClass() { + return Long.class; + } + + @Override + public Object simpleItemFormat(Object businessId) { + FileInfoApi fileInfoApi = SpringUtil.getBean(FileInfoApi.class); + return fileInfoApi.getFileUnAuthUrl(Convert.toLong(businessId)); + } + +} diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java index 95e9497b9..83d626acf 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java @@ -27,6 +27,8 @@ package cn.stylefeng.roses.kernel.file.api.pojo.response; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; +import java.util.Date; + /** * 文件信息结果集 * @@ -130,4 +132,22 @@ public class SysFileInfoResponse { @ChineseDescription("文件访问路径") private String fileUrl; + /** + * 下载次数 + */ + @ChineseDescription("下载次数") + private Integer downloadCount; + + /** + * 上传人id + */ + @ChineseDescription("上传人id") + private Long uploadUserId; + + /** + * 上传时间 + */ + @ChineseDescription("上传时间") + private Date uploadTime; + } diff --git a/kernel-d-file/file-business/pom.xml b/kernel-d-file/file-business/pom.xml index 5c5662c6f..730629c71 100644 --- a/kernel-d-file/file-business/pom.xml +++ b/kernel-d-file/file-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 7.3.3 + 7.3.4 ../pom.xml @@ -24,6 +24,13 @@ ${roses.version} + + + cn.stylefeng.roses + system-api + ${roses.version} + + diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileBusinessController.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileBusinessController.java new file mode 100644 index 000000000..0a53b46f7 --- /dev/null +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileBusinessController.java @@ -0,0 +1,99 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * 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. + * + * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点，可申请商业授权 + */ +package cn.stylefeng.roses.kernel.file.modular.controller; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.ListUtil; +import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse; +import cn.stylefeng.roses.kernel.file.modular.pojo.request.SysFileBusinessRequest; +import cn.stylefeng.roses.kernel.file.modular.pojo.vo.SysFileInfoRes; +import cn.stylefeng.roses.kernel.file.modular.service.SysFileBusinessService; +import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; +import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; +import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; +import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; +import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; +import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 文件和业务绑定的接口 + * + * @author fengshuonan + * @date 2023/3/31 15:31 + */ +@RestController +@ApiResource(name = "文件和业务绑定的接口", resBizType = ResBizTypeEnum.SYSTEM) +public class SysFileBusinessController { + + @Resource + private SysFileBusinessService sysFileBusinessService; + + /** + * 增加文件下载次数 + * + * @author fengshuonan + * @date 2023/3/31 15:31 + */ + @PostResource(name = "增加文件下载次数", path = "/sysFileInfo/addFileDownloadCount", requiredPermission = false, requiredLogin = false) + public ResponseData upload(@RequestBody @Validated(SysFileBusinessRequest.addFileDownloadCount.class) SysFileBusinessRequest sysFileBusinessRequest) { + sysFileBusinessService.addFileDownloadCount(sysFileBusinessRequest.getBusinessId(), sysFileBusinessRequest.getFileId()); + return new SuccessResponseData<>(); + } + + /** + * 获取业务关联的文件信息列表 + * + * @author fengshuonan + * @since 2023/4/5 16:00 + */ + @GetResource(name = "获取业务关联的文件信息列表", path = "/sysFileInfo/getBusinessFileList") + public ResponseData> getBusinessFileList(@Validated(SysFileBusinessRequest.getBusinessFileList.class) SysFileBusinessRequest sysFileBusinessRequest) { + List list = sysFileBusinessService.getBusinessFileInfoList(sysFileBusinessRequest.getBusinessId()); + List sysFileInfoRes = BeanUtil.copyToList(list, SysFileInfoRes.class); + return new SuccessResponseData<>(sysFileInfoRes); + } + + /** + * 新增绑定业务和文件 + * + * @author fengshuonan + * @since 2023/4/4 20:56 + */ + @PostResource(name = "新增绑定业务和文件", path = "/sysFileInfo/bindFile") + public ResponseData bindFile(@RequestBody @Validated(SysFileBusinessRequest.bindFile.class) SysFileBusinessRequest sysFileBusinessRequest) { + sysFileBusinessService.addFileBusinessBind( + sysFileBusinessRequest.getBusinessCode(), + sysFileBusinessRequest.getBusinessId(), + ListUtil.list(false, sysFileBusinessRequest.getFileId())); + return new SuccessResponseData<>(); + } + +} diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileBusiness.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileBusiness.java new file mode 100644 index 000000000..2db649852 --- /dev/null +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileBusiness.java @@ -0,0 +1,65 @@ +package cn.stylefeng.roses.kernel.file.modular.entity; + +import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 业务关联的文件实例类 + * + * @author fengshuonan + * @date 2023/03/31 13:30 + */ +@TableName("sys_file_business") +@Data +@EqualsAndHashCode(callSuper = true) +public class SysFileBusiness extends BaseEntity { + + /** + * 主键id + */ + @TableId(value = "file_business_id", type = IdType.ASSIGN_ID) + @ChineseDescription("主键id") + private Long fileBusinessId; + + /** + * 业务的编码，业务自定义 + */ + @TableField("business_code") + @ChineseDescription("业务的编码，业务自定义") + private String businessCode; + + /** + * 业务主键id + */ + @TableField("business_id") + @ChineseDescription("业务主键id") + private Long businessId; + + /** + * 关联文件表的id + */ + @TableField("file_id") + @ChineseDescription("关联文件表的id") + private Long fileId; + + /** + * 下载次数 + */ + @TableField("download_count") + @ChineseDescription("下载次数") + private Integer downloadCount; + + /** + * 租户id + */ + @TableField("tenant_id") + @ChineseDescription("租户id") + private Long tenantId; + +} diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/enums/SysFileBusinessExceptionEnum.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/enums/SysFileBusinessExceptionEnum.java new file mode 100644 index 000000000..5879f4dae --- /dev/null +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/enums/SysFileBusinessExceptionEnum.java @@ -0,0 +1,36 @@ +package cn.stylefeng.roses.kernel.file.modular.enums; + +import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; +import lombok.Getter; + +/** + * 业务关联的文件异常相关枚举 + * + * @author fengshuonan + * @date 2023/03/31 13:30 + */ +@Getter +public enum SysFileBusinessExceptionEnum implements AbstractExceptionEnum { + + /** + * 查询结果不存在 + */ + SYS_FILE_BUSINESS_NOT_EXISTED(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10001", "查询结果不存在"); + + /** + * 错误编码 + */ + private final String errorCode; + + /** + * 提示用户信息 + */ + private final String userTip; + + SysFileBusinessExceptionEnum(String errorCode, String userTip) { + this.errorCode = errorCode; + this.userTip = userTip; + } + +} \ No newline at end of file diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/SysFileBusinessMapper.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/SysFileBusinessMapper.java new file mode 100644 index 000000000..15f5baf55 --- /dev/null +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/SysFileBusinessMapper.java @@ -0,0 +1,14 @@ +package cn.stylefeng.roses.kernel.file.modular.mapper; + +import cn.stylefeng.roses.kernel.file.modular.entity.SysFileBusiness; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 业务关联的文件 Mapper 接口 + * + * @author fengshuonan + * @date 2023/03/31 13:30 + */ +public interface SysFileBusinessMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileBusinessMapper.xml b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileBusinessMapper.xml new file mode 100644 index 000000000..4bbd55f49 --- /dev/null +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileBusinessMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/request/SysFileBusinessRequest.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/request/SysFileBusinessRequest.java new file mode 100644 index 000000000..1d3d6edf4 --- /dev/null +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/request/SysFileBusinessRequest.java @@ -0,0 +1,82 @@ +package cn.stylefeng.roses.kernel.file.modular.pojo.request; + +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 业务关联的文件封装类 + * + * @author fengshuonan + * @date 2023/03/31 13:30 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class SysFileBusinessRequest extends BaseRequest { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = {edit.class, delete.class}) + @ChineseDescription("主键id") + private Long fileBusinessId; + + /** + * 业务的编码，业务自定义 + */ + @ChineseDescription("业务的编码，业务自定义") + @NotBlank(message = "业务的编码不能为空", groups = {bindFile.class}) + private String businessCode; + + /** + * 业务主键id + */ + @ChineseDescription("业务主键id") + @NotNull(message = "业务主键id不能为空", groups = {addFileDownloadCount.class, getBusinessFileList.class, bindFile.class}) + private Long businessId; + + /** + * 关联文件表的id + */ + @ChineseDescription("关联文件表的id") + @NotNull(message = "文件id不能为空", groups = {addFileDownloadCount.class, bindFile.class}) + private Long fileId; + + /** + * 下载次数 + */ + @ChineseDescription("下载次数") + private Integer downloadCount; + + /** + * 租户id + */ + @ChineseDescription("租户id") + private Long tenantId; + + /** + * 添加文件下载次数 + */ + public @interface addFileDownloadCount { + + } + + /** + * 获取业务关联的文件信息列表 + */ + public @interface getBusinessFileList { + + } + + /** + * 业务数据绑定文件 + */ + public @interface bindFile { + + } + +} diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/vo/SysFileInfoRes.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/vo/SysFileInfoRes.java new file mode 100644 index 000000000..9a409b708 --- /dev/null +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/vo/SysFileInfoRes.java @@ -0,0 +1,50 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * 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. + * + * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点，可申请商业授权 + */ +package cn.stylefeng.roses.kernel.file.modular.pojo.vo; + +import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse; +import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat; +import cn.stylefeng.roses.kernel.rule.enums.FormatTypeEnum; +import cn.stylefeng.roses.kernel.system.api.format.UserFormatProcess; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 文件信息结果集 + * + * @author stylefeng + * @date 2020/6/7 22:15 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class SysFileInfoRes extends SysFileInfoResponse { + + @Override + @SimpleFieldFormat(formatType = FormatTypeEnum.ADD_FIELD, processClass = UserFormatProcess.class) + public Long getUploadUserId() { + return super.getUploadUserId(); + } + +} diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/SysFileBusinessService.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/SysFileBusinessService.java new file mode 100644 index 000000000..a2cfef381 --- /dev/null +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/SysFileBusinessService.java @@ -0,0 +1,75 @@ +package cn.stylefeng.roses.kernel.file.modular.service; + +import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.file.api.FileBusinessApi; +import cn.stylefeng.roses.kernel.file.modular.entity.SysFileBusiness; +import cn.stylefeng.roses.kernel.file.modular.pojo.request.SysFileBusinessRequest; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * 业务关联的文件 服务类 + * + * @author fengshuonan + * @date 2023/03/31 13:30 + */ +public interface SysFileBusinessService extends IService, FileBusinessApi { + + /** + * 新增 + * + * @param sysFileBusinessRequest 请求参数 + * @author fengshuonan + * @date 2023/03/31 13:30 + */ + void add(SysFileBusinessRequest sysFileBusinessRequest); + + /** + * 删除 + * + * @param sysFileBusinessRequest 请求参数 + * @author fengshuonan + * @date 2023/03/31 13:30 + */ + void del(SysFileBusinessRequest sysFileBusinessRequest); + + /** + * 编辑 + * + * @param sysFileBusinessRequest 请求参数 + * @author fengshuonan + * @date 2023/03/31 13:30 + */ + void edit(SysFileBusinessRequest sysFileBusinessRequest); + + /** + * 查询详情 + * + * @param sysFileBusinessRequest 请求参数 + * @author fengshuonan + * @date 2023/03/31 13:30 + */ + SysFileBusiness detail(SysFileBusinessRequest sysFileBusinessRequest); + + /** + * 获取列表 + * + * @param sysFileBusinessRequest 请求参数 + * @return List 返回结果 + * @author fengshuonan + * @date 2023/03/31 13:30 + */ + List findList(SysFileBusinessRequest sysFileBusinessRequest); + + /** + * 获取列表（带分页） + * + * @param sysFileBusinessRequest 请求参数 + * @return PageResult 返回结果 + * @author fengshuonan + * @date 2023/03/31 13:30 + */ + PageResult findPage(SysFileBusinessRequest sysFileBusinessRequest); + +} \ No newline at end of file diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileBusinessServiceImpl.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileBusinessServiceImpl.java new file mode 100644 index 000000000..31b5d8bda --- /dev/null +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileBusinessServiceImpl.java @@ -0,0 +1,173 @@ +package cn.stylefeng.roses.kernel.file.modular.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; +import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; +import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.file.api.FileInfoApi; +import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse; +import cn.stylefeng.roses.kernel.file.modular.entity.SysFileBusiness; +import cn.stylefeng.roses.kernel.file.modular.enums.SysFileBusinessExceptionEnum; +import cn.stylefeng.roses.kernel.file.modular.mapper.SysFileBusinessMapper; +import cn.stylefeng.roses.kernel.file.modular.pojo.request.SysFileBusinessRequest; +import cn.stylefeng.roses.kernel.file.modular.service.SysFileBusinessService; +import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 业务关联的文件业务实现层 + * + * @author fengshuonan + * @date 2023/03/31 13:30 + */ +@Service +public class SysFileBusinessServiceImpl extends ServiceImpl implements SysFileBusinessService { + + @Resource + private FileInfoApi fileInfoApi; + + @Override + public void add(SysFileBusinessRequest sysFileBusinessRequest) { + SysFileBusiness sysFileBusiness = new SysFileBusiness(); + BeanUtil.copyProperties(sysFileBusinessRequest, sysFileBusiness); + this.save(sysFileBusiness); + } + + @Override + public void del(SysFileBusinessRequest sysFileBusinessRequest) { + SysFileBusiness sysFileBusiness = this.querySysFileBusiness(sysFileBusinessRequest); + this.removeById(sysFileBusiness.getFileBusinessId()); + } + + @Override + public void edit(SysFileBusinessRequest sysFileBusinessRequest) { + SysFileBusiness sysFileBusiness = this.querySysFileBusiness(sysFileBusinessRequest); + BeanUtil.copyProperties(sysFileBusinessRequest, sysFileBusiness); + this.updateById(sysFileBusiness); + } + + @Override + public SysFileBusiness detail(SysFileBusinessRequest sysFileBusinessRequest) { + return this.querySysFileBusiness(sysFileBusinessRequest); + } + + @Override + public PageResult findPage(SysFileBusinessRequest sysFileBusinessRequest) { + LambdaQueryWrapper wrapper = createWrapper(sysFileBusinessRequest); + Page sysRolePage = this.page(PageFactory.defaultPage(), wrapper); + return PageResultFactory.createPageResult(sysRolePage); + } + + @Override + public List findList(SysFileBusinessRequest sysFileBusinessRequest) { + LambdaQueryWrapper wrapper = this.createWrapper(sysFileBusinessRequest); + return this.list(wrapper); + } + + @Override + public void addFileBusinessBind(String businessCode, Long businessId, List fileIdList) { + + if (ObjectUtil.isEmpty(fileIdList) || ObjectUtil.isEmpty(businessCode) || ObjectUtil.isEmpty(businessId)) { + return; + } + + ArrayList sysFileBusinesses = new ArrayList<>(); + for (Long fileId : fileIdList) { + SysFileBusiness sysFileBusiness = new SysFileBusiness(); + sysFileBusiness.setBusinessCode(businessCode); + sysFileBusiness.setBusinessId(businessId); + sysFileBusiness.setFileId(fileId); + sysFileBusinesses.add(sysFileBusiness); + } + + this.saveBatch(sysFileBusinesses); + } + + @Override + public List getBusinessFileInfoList(Long businessId) { + + // 获取业务下绑定的文件列表 + LambdaQueryWrapper sysFileBusinessLambdaQueryWrapper = new LambdaQueryWrapper<>(); + sysFileBusinessLambdaQueryWrapper.eq(SysFileBusiness::getBusinessId, businessId); + List list = this.list(sysFileBusinessLambdaQueryWrapper); + + if (ObjectUtil.isEmpty(list)) { + return new ArrayList<>(); + } + + // 填充文件的详细信息 + ArrayList sysFileInfoResponses = new ArrayList<>(); + for (SysFileBusiness sysFileBusiness : list) { + + // 获取每个文件的详情 + Long fileId = sysFileBusiness.getFileId(); + SysFileInfoResponse fileInfoWithoutContent = fileInfoApi.getFileInfoWithoutContent(fileId); + if (fileInfoWithoutContent != null) { + // 设置下载次数 + fileInfoWithoutContent.setDownloadCount(sysFileBusiness.getDownloadCount()); + + // 设置上传人id + fileInfoWithoutContent.setUploadUserId(sysFileBusiness.getCreateUser()); + + // 设置上传时间 + fileInfoWithoutContent.setUploadTime(sysFileBusiness.getCreateTime()); + sysFileInfoResponses.add(fileInfoWithoutContent); + } + } + + return sysFileInfoResponses; + } + + @Override + public void addFileDownloadCount(Long businessId, Long fileId) { + + LambdaQueryWrapper sysFileBusinessLambdaQueryWrapper = new LambdaQueryWrapper<>(); + sysFileBusinessLambdaQueryWrapper.eq(SysFileBusiness::getBusinessId, businessId); + sysFileBusinessLambdaQueryWrapper.eq(SysFileBusiness::getFileId, fileId); + SysFileBusiness sysFileBusiness = this.getOne(sysFileBusinessLambdaQueryWrapper, false); + + if (sysFileBusiness != null) { + sysFileBusiness.setDownloadCount(sysFileBusiness.getDownloadCount() + 1); + this.updateById(sysFileBusiness); + } + + } + + /** + * 获取信息 + * + * @author fengshuonan + * @date 2023/03/31 13:30 + */ + private SysFileBusiness querySysFileBusiness(SysFileBusinessRequest sysFileBusinessRequest) { + SysFileBusiness sysFileBusiness = this.getById(sysFileBusinessRequest.getFileBusinessId()); + if (ObjectUtil.isEmpty(sysFileBusiness)) { + throw new ServiceException(SysFileBusinessExceptionEnum.SYS_FILE_BUSINESS_NOT_EXISTED); + } + return sysFileBusiness; + } + + /** + * 创建查询wrapper + * + * @author fengshuonan + * @date 2023/03/31 13:30 + */ + private LambdaQueryWrapper createWrapper(SysFileBusinessRequest sysFileBusinessRequest) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + Long businessId = sysFileBusinessRequest.getBusinessId(); + queryWrapper.eq(ObjectUtil.isNotNull(businessId), SysFileBusiness::getBusinessId, businessId); + + return queryWrapper; + } + +} \ No newline at end of file diff --git a/kernel-d-file/file-sdk-aliyun/pom.xml b/kernel-d-file/file-sdk-aliyun/pom.xml index f090ab362..980c91352 100644 --- a/kernel-d-file/file-sdk-aliyun/pom.xml +++ b/kernel-d-file/file-sdk-aliyun/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-file/file-sdk-local/pom.xml b/kernel-d-file/file-sdk-local/pom.xml index c7eb7e166..28bb16b66 100644 --- a/kernel-d-file/file-sdk-local/pom.xml +++ b/kernel-d-file/file-sdk-local/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-file/file-sdk-minio/pom.xml b/kernel-d-file/file-sdk-minio/pom.xml index 1c7ca38e6..c14c1d137 100644 --- a/kernel-d-file/file-sdk-minio/pom.xml +++ b/kernel-d-file/file-sdk-minio/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-file/file-sdk-tencent/pom.xml b/kernel-d-file/file-sdk-tencent/pom.xml index de026e7a0..633337168 100644 --- a/kernel-d-file/file-sdk-tencent/pom.xml +++ b/kernel-d-file/file-sdk-tencent/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-file/file-spring-boot-starter/pom.xml b/kernel-d-file/file-spring-boot-starter/pom.xml index 6ee108a3b..57710c872 100644 --- a/kernel-d-file/file-spring-boot-starter/pom.xml +++ b/kernel-d-file/file-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-file/pom.xml b/kernel-d-file/pom.xml index a00db149f..bbb906aee 100644 --- a/kernel-d-file/pom.xml +++ b/kernel-d-file/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-groovy/groovy-api/pom.xml b/kernel-d-groovy/groovy-api/pom.xml index 90bf8127d..f90e80e99 100644 --- a/kernel-d-groovy/groovy-api/pom.xml +++ b/kernel-d-groovy/groovy-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-groovy - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-groovy/groovy-sdk/pom.xml b/kernel-d-groovy/groovy-sdk/pom.xml index ce13123fd..d30c364fe 100644 --- a/kernel-d-groovy/groovy-sdk/pom.xml +++ b/kernel-d-groovy/groovy-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-groovy - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-groovy/groovy-spring-boot-starter/pom.xml b/kernel-d-groovy/groovy-spring-boot-starter/pom.xml index 9d5ca7896..f9d04049c 100644 --- a/kernel-d-groovy/groovy-spring-boot-starter/pom.xml +++ b/kernel-d-groovy/groovy-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-groovy - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-groovy/pom.xml b/kernel-d-groovy/pom.xml index c8651bb5d..6e23f996b 100644 --- a/kernel-d-groovy/pom.xml +++ b/kernel-d-groovy/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-i18n/i18n-api/pom.xml b/kernel-d-i18n/i18n-api/pom.xml index c9f7d2a25..4eba87e7f 100644 --- a/kernel-d-i18n/i18n-api/pom.xml +++ b/kernel-d-i18n/i18n-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-i18n - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-i18n/i18n-business/pom.xml b/kernel-d-i18n/i18n-business/pom.xml index 75a0a1561..8fce380d3 100644 --- a/kernel-d-i18n/i18n-business/pom.xml +++ b/kernel-d-i18n/i18n-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-i18n - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-i18n/i18n-sdk/pom.xml b/kernel-d-i18n/i18n-sdk/pom.xml index 387643dc5..716a63df6 100644 --- a/kernel-d-i18n/i18n-sdk/pom.xml +++ b/kernel-d-i18n/i18n-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-i18n - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-i18n/i18n-spring-boot-starter/pom.xml b/kernel-d-i18n/i18n-spring-boot-starter/pom.xml index 8897c5075..f27735a00 100644 --- a/kernel-d-i18n/i18n-spring-boot-starter/pom.xml +++ b/kernel-d-i18n/i18n-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-i18n - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-i18n/pom.xml b/kernel-d-i18n/pom.xml index c025c603c..c0287ec9a 100644 --- a/kernel-d-i18n/pom.xml +++ b/kernel-d-i18n/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-jwt/jwt-api/pom.xml b/kernel-d-jwt/jwt-api/pom.xml index 76584d11f..be3b998fb 100644 --- a/kernel-d-jwt/jwt-api/pom.xml +++ b/kernel-d-jwt/jwt-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-jwt - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-jwt/jwt-sdk/pom.xml b/kernel-d-jwt/jwt-sdk/pom.xml index dbecc2520..4e7fb8da0 100644 --- a/kernel-d-jwt/jwt-sdk/pom.xml +++ b/kernel-d-jwt/jwt-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-jwt - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-jwt/jwt-spring-boot-starter/pom.xml b/kernel-d-jwt/jwt-spring-boot-starter/pom.xml index b67089776..026656702 100644 --- a/kernel-d-jwt/jwt-spring-boot-starter/pom.xml +++ b/kernel-d-jwt/jwt-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-jwt - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-jwt/pom.xml b/kernel-d-jwt/pom.xml index e9c557740..248233d07 100644 --- a/kernel-d-jwt/pom.xml +++ b/kernel-d-jwt/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-log/log-api/pom.xml b/kernel-d-log/log-api/pom.xml index a77c2bbfd..88aa132d6 100644 --- a/kernel-d-log/log-api/pom.xml +++ b/kernel-d-log/log-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-log/log-business-login-log/pom.xml b/kernel-d-log/log-business-login-log/pom.xml index c3427e49d..ab07736d7 100644 --- a/kernel-d-log/log-business-login-log/pom.xml +++ b/kernel-d-log/log-business-login-log/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-log/log-business-manage/pom.xml b/kernel-d-log/log-business-manage/pom.xml index 9fab04f61..8019d9996 100644 --- a/kernel-d-log/log-business-manage/pom.xml +++ b/kernel-d-log/log-business-manage/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-log/log-business-requestapi/pom.xml b/kernel-d-log/log-business-requestapi/pom.xml index 5a8c83bd1..89135661f 100644 --- a/kernel-d-log/log-business-requestapi/pom.xml +++ b/kernel-d-log/log-business-requestapi/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-log/log-sdk-db/pom.xml b/kernel-d-log/log-sdk-db/pom.xml index ab6e34654..cac1dd61b 100644 --- a/kernel-d-log/log-sdk-db/pom.xml +++ b/kernel-d-log/log-sdk-db/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-log/log-sdk-file/pom.xml b/kernel-d-log/log-sdk-file/pom.xml index e5a4a532b..02afebab5 100644 --- a/kernel-d-log/log-sdk-file/pom.xml +++ b/kernel-d-log/log-sdk-file/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-log/log-spring-boot-starter/pom.xml b/kernel-d-log/log-spring-boot-starter/pom.xml index 072783728..d46c3c218 100644 --- a/kernel-d-log/log-spring-boot-starter/pom.xml +++ b/kernel-d-log/log-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-log/pom.xml b/kernel-d-log/pom.xml index fec26b837..600cec15b 100644 --- a/kernel-d-log/pom.xml +++ b/kernel-d-log/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-mongodb/mongodb-api/pom.xml b/kernel-d-mongodb/mongodb-api/pom.xml index 284a85fb0..e2fc089bb 100644 --- a/kernel-d-mongodb/mongodb-api/pom.xml +++ b/kernel-d-mongodb/mongodb-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-mongodb - 7.3.3 + 7.3.4 mongodb-api diff --git a/kernel-d-mongodb/mongodb-integration-beetl/pom.xml b/kernel-d-mongodb/mongodb-integration-beetl/pom.xml index fc05a8e29..57e1600c9 100644 --- a/kernel-d-mongodb/mongodb-integration-beetl/pom.xml +++ b/kernel-d-mongodb/mongodb-integration-beetl/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-mongodb - 7.3.3 + 7.3.4 mongodb-integration-beetl diff --git a/kernel-d-mongodb/mongodb-sdk-file/pom.xml b/kernel-d-mongodb/mongodb-sdk-file/pom.xml index 601a10744..f9ec8a133 100644 --- a/kernel-d-mongodb/mongodb-sdk-file/pom.xml +++ b/kernel-d-mongodb/mongodb-sdk-file/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-mongodb - 7.3.3 + 7.3.4 mongodb-sdk-file diff --git a/kernel-d-mongodb/mongodb-sdk-springboot/pom.xml b/kernel-d-mongodb/mongodb-sdk-springboot/pom.xml index b857b0c9c..c8fe2c205 100644 --- a/kernel-d-mongodb/mongodb-sdk-springboot/pom.xml +++ b/kernel-d-mongodb/mongodb-sdk-springboot/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-mongodb - 7.3.3 + 7.3.4 mongodb-sdk-springboot diff --git a/kernel-d-mongodb/mongodb-spring-boot-starter/pom.xml b/kernel-d-mongodb/mongodb-spring-boot-starter/pom.xml index f8e9a2eb5..4a37119bf 100644 --- a/kernel-d-mongodb/mongodb-spring-boot-starter/pom.xml +++ b/kernel-d-mongodb/mongodb-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-mongodb - 7.3.3 + 7.3.4 mongodb-spring-boot-starter diff --git a/kernel-d-mongodb/pom.xml b/kernel-d-mongodb/pom.xml index 57252b232..1221322b0 100644 --- a/kernel-d-mongodb/pom.xml +++ b/kernel-d-mongodb/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 kernel-d-mongodb diff --git a/kernel-d-office/office-api/pom.xml b/kernel-d-office/office-api/pom.xml index cee2adffa..9dd49e52f 100644 --- a/kernel-d-office/office-api/pom.xml +++ b/kernel-d-office/office-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-office - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-office/office-sdk-excel/pom.xml b/kernel-d-office/office-sdk-excel/pom.xml index 0b23b5274..463beee3b 100644 --- a/kernel-d-office/office-sdk-excel/pom.xml +++ b/kernel-d-office/office-sdk-excel/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-office - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-office/office-spring-boot-starter/pom.xml b/kernel-d-office/office-spring-boot-starter/pom.xml index 88f1a20a0..104d36bb1 100644 --- a/kernel-d-office/office-spring-boot-starter/pom.xml +++ b/kernel-d-office/office-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-office - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-office/pom.xml b/kernel-d-office/pom.xml index eccafb2dc..9c5b1cdf0 100644 --- a/kernel-d-office/pom.xml +++ b/kernel-d-office/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-openapi/openapi-api/pom.xml b/kernel-d-openapi/openapi-api/pom.xml index f4c019a40..132bd43a8 100644 --- a/kernel-d-openapi/openapi-api/pom.xml +++ b/kernel-d-openapi/openapi-api/pom.xml @@ -5,7 +5,7 @@ kernel-d-openapi cn.stylefeng.roses - 7.3.3 + 7.3.4 ../pom.xml 4.0.0 diff --git a/kernel-d-openapi/openapi-sdk-springdoc/pom.xml b/kernel-d-openapi/openapi-sdk-springdoc/pom.xml index b5dc1f741..52fe4377d 100644 --- a/kernel-d-openapi/openapi-sdk-springdoc/pom.xml +++ b/kernel-d-openapi/openapi-sdk-springdoc/pom.xml @@ -5,7 +5,7 @@ kernel-d-openapi cn.stylefeng.roses - 7.3.3 + 7.3.4 ../pom.xml 4.0.0 diff --git a/kernel-d-openapi/openapi-spring-boot-starter/pom.xml b/kernel-d-openapi/openapi-spring-boot-starter/pom.xml index 56fee9d89..a0e0f9bb1 100644 --- a/kernel-d-openapi/openapi-spring-boot-starter/pom.xml +++ b/kernel-d-openapi/openapi-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ kernel-d-openapi cn.stylefeng.roses - 7.3.3 + 7.3.4 ../pom.xml 4.0.0 diff --git a/kernel-d-openapi/pom.xml b/kernel-d-openapi/pom.xml index b55f4554c..b65725ac5 100644 --- a/kernel-d-openapi/pom.xml +++ b/kernel-d-openapi/pom.xml @@ -5,7 +5,7 @@ roses-kernel cn.stylefeng.roses - 7.3.3 + 7.3.4 ../pom.xml 4.0.0 diff --git a/kernel-d-pinyin/pinyin-api/pom.xml b/kernel-d-pinyin/pinyin-api/pom.xml index 0cdcda296..219907b28 100644 --- a/kernel-d-pinyin/pinyin-api/pom.xml +++ b/kernel-d-pinyin/pinyin-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-pinyin - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-pinyin/pinyin-sdk-pinyin4j/pom.xml b/kernel-d-pinyin/pinyin-sdk-pinyin4j/pom.xml index 0bde9c6f6..21eee9f2b 100644 --- a/kernel-d-pinyin/pinyin-sdk-pinyin4j/pom.xml +++ b/kernel-d-pinyin/pinyin-sdk-pinyin4j/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-pinyin - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-pinyin/pinyin-spring-boot-starter/pom.xml b/kernel-d-pinyin/pinyin-spring-boot-starter/pom.xml index f95c14420..a1b4d5cfc 100644 --- a/kernel-d-pinyin/pinyin-spring-boot-starter/pom.xml +++ b/kernel-d-pinyin/pinyin-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-pinyin - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-pinyin/pom.xml b/kernel-d-pinyin/pom.xml index 3735ba5db..3f377f7ff 100644 --- a/kernel-d-pinyin/pom.xml +++ b/kernel-d-pinyin/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-scanner/pom.xml b/kernel-d-scanner/pom.xml index 7ac746642..813695ee9 100644 --- a/kernel-d-scanner/pom.xml +++ b/kernel-d-scanner/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-scanner/scanner-api/pom.xml b/kernel-d-scanner/scanner-api/pom.xml index 3a234dab5..430b5814e 100644 --- a/kernel-d-scanner/scanner-api/pom.xml +++ b/kernel-d-scanner/scanner-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-scanner - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-scanner/scanner-sdk-scanner/pom.xml b/kernel-d-scanner/scanner-sdk-scanner/pom.xml index aaed27d07..350ad7125 100644 --- a/kernel-d-scanner/scanner-sdk-scanner/pom.xml +++ b/kernel-d-scanner/scanner-sdk-scanner/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-scanner - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-scanner/scanner-spring-boot-starter/pom.xml b/kernel-d-scanner/scanner-spring-boot-starter/pom.xml index 2a6b341b9..f898b788e 100644 --- a/kernel-d-scanner/scanner-spring-boot-starter/pom.xml +++ b/kernel-d-scanner/scanner-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-scanner - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-seata/pom.xml b/kernel-d-seata/pom.xml index e38b4a331..24bd1b272 100644 --- a/kernel-d-seata/pom.xml +++ b/kernel-d-seata/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-seata/seata-demo-order/pom.xml b/kernel-d-seata/seata-demo-order/pom.xml index 0459c7b5a..f79331dac 100644 --- a/kernel-d-seata/seata-demo-order/pom.xml +++ b/kernel-d-seata/seata-demo-order/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-seata - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-seata/seata-demo-storage-api/pom.xml b/kernel-d-seata/seata-demo-storage-api/pom.xml index 8b789a873..a474e3edd 100644 --- a/kernel-d-seata/seata-demo-storage-api/pom.xml +++ b/kernel-d-seata/seata-demo-storage-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-seata - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-seata/seata-demo-wallet-api/pom.xml b/kernel-d-seata/seata-demo-wallet-api/pom.xml index 3e5a2fcf4..3db5206ec 100644 --- a/kernel-d-seata/seata-demo-wallet-api/pom.xml +++ b/kernel-d-seata/seata-demo-wallet-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-seata - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/pom.xml b/kernel-d-security/pom.xml index 89ec774eb..a5a4795f8 100644 --- a/kernel-d-security/pom.xml +++ b/kernel-d-security/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/security-api/pom.xml b/kernel-d-security/security-api/pom.xml index 9be06044b..c229e108d 100644 --- a/kernel-d-security/security-api/pom.xml +++ b/kernel-d-security/security-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/security-sdk-black-white/pom.xml b/kernel-d-security/security-sdk-black-white/pom.xml index 9e76ef96c..9acc3f75d 100644 --- a/kernel-d-security/security-sdk-black-white/pom.xml +++ b/kernel-d-security/security-sdk-black-white/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/security-sdk-captcha/pom.xml b/kernel-d-security/security-sdk-captcha/pom.xml index 9a17d9777..03b6879f8 100644 --- a/kernel-d-security/security-sdk-captcha/pom.xml +++ b/kernel-d-security/security-sdk-captcha/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/security-sdk-clear-threadlocal/pom.xml b/kernel-d-security/security-sdk-clear-threadlocal/pom.xml index 66cc8b58f..f185ecc71 100644 --- a/kernel-d-security/security-sdk-clear-threadlocal/pom.xml +++ b/kernel-d-security/security-sdk-clear-threadlocal/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/security-sdk-cors/pom.xml b/kernel-d-security/security-sdk-cors/pom.xml index 353c4acd4..351b249b9 100644 --- a/kernel-d-security/security-sdk-cors/pom.xml +++ b/kernel-d-security/security-sdk-cors/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/security-sdk-count/pom.xml b/kernel-d-security/security-sdk-count/pom.xml index b485c2ba8..4d78fd853 100644 --- a/kernel-d-security/security-sdk-count/pom.xml +++ b/kernel-d-security/security-sdk-count/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/security-sdk-database-field/pom.xml b/kernel-d-security/security-sdk-database-field/pom.xml index 50f3782e1..d8d067773 100644 --- a/kernel-d-security/security-sdk-database-field/pom.xml +++ b/kernel-d-security/security-sdk-database-field/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/security-sdk-request-encrypt-and-decode/pom.xml b/kernel-d-security/security-sdk-request-encrypt-and-decode/pom.xml index d3d24aab0..15241e461 100644 --- a/kernel-d-security/security-sdk-request-encrypt-and-decode/pom.xml +++ b/kernel-d-security/security-sdk-request-encrypt-and-decode/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/security-sdk-xss/pom.xml b/kernel-d-security/security-sdk-xss/pom.xml index 32f02005c..1e355a4bf 100644 --- a/kernel-d-security/security-sdk-xss/pom.xml +++ b/kernel-d-security/security-sdk-xss/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-security/security-spring-boot-starter/pom.xml b/kernel-d-security/security-spring-boot-starter/pom.xml index 958929940..d9cb8714a 100644 --- a/kernel-d-security/security-spring-boot-starter/pom.xml +++ b/kernel-d-security/security-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-sms/pom.xml b/kernel-d-sms/pom.xml index 6875598fc..326d0f255 100644 --- a/kernel-d-sms/pom.xml +++ b/kernel-d-sms/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-sms/sms-api/pom.xml b/kernel-d-sms/sms-api/pom.xml index 82c169863..be2c0a45f 100644 --- a/kernel-d-sms/sms-api/pom.xml +++ b/kernel-d-sms/sms-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-sms - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-sms/sms-business-validation/pom.xml b/kernel-d-sms/sms-business-validation/pom.xml index a79af50c6..e2ebb49f2 100644 --- a/kernel-d-sms/sms-business-validation/pom.xml +++ b/kernel-d-sms/sms-business-validation/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-sms - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-sms/sms-sdk-aliyun/pom.xml b/kernel-d-sms/sms-sdk-aliyun/pom.xml index 314cd4217..f4c85ab38 100644 --- a/kernel-d-sms/sms-sdk-aliyun/pom.xml +++ b/kernel-d-sms/sms-sdk-aliyun/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-sms - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-sms/sms-sdk-tencent/pom.xml b/kernel-d-sms/sms-sdk-tencent/pom.xml index e99049510..d041219d3 100644 --- a/kernel-d-sms/sms-sdk-tencent/pom.xml +++ b/kernel-d-sms/sms-sdk-tencent/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-sms - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-sms/sms-spring-boot-starter/pom.xml b/kernel-d-sms/sms-spring-boot-starter/pom.xml index e69594ded..556e84ed4 100644 --- a/kernel-d-sms/sms-spring-boot-starter/pom.xml +++ b/kernel-d-sms/sms-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-sms - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-socket/pom.xml b/kernel-d-socket/pom.xml index 325af017d..c83a19105 100644 --- a/kernel-d-socket/pom.xml +++ b/kernel-d-socket/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-socket/socket-api/pom.xml b/kernel-d-socket/socket-api/pom.xml index 911ca9f9e..287ae468f 100644 --- a/kernel-d-socket/socket-api/pom.xml +++ b/kernel-d-socket/socket-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-socket - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-socket/socket-business-websocket/pom.xml b/kernel-d-socket/socket-business-websocket/pom.xml index f724d4d58..38e36e60b 100644 --- a/kernel-d-socket/socket-business-websocket/pom.xml +++ b/kernel-d-socket/socket-business-websocket/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-socket - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-socket/socket-spring-boot-starter/pom.xml b/kernel-d-socket/socket-spring-boot-starter/pom.xml index 81777b610..3bead89ce 100644 --- a/kernel-d-socket/socket-spring-boot-starter/pom.xml +++ b/kernel-d-socket/socket-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-socket - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-timer/pom.xml b/kernel-d-timer/pom.xml index c7b037014..a902decd1 100644 --- a/kernel-d-timer/pom.xml +++ b/kernel-d-timer/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-timer/timer-api/pom.xml b/kernel-d-timer/timer-api/pom.xml index 17b344697..7ce6af7af 100644 --- a/kernel-d-timer/timer-api/pom.xml +++ b/kernel-d-timer/timer-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-timer - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-timer/timer-business/pom.xml b/kernel-d-timer/timer-business/pom.xml index eecd134a5..fe8e5e3f2 100644 --- a/kernel-d-timer/timer-business/pom.xml +++ b/kernel-d-timer/timer-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-timer - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-timer/timer-sdk-hutool/pom.xml b/kernel-d-timer/timer-sdk-hutool/pom.xml index e8b3dcd6b..57e98332c 100644 --- a/kernel-d-timer/timer-sdk-hutool/pom.xml +++ b/kernel-d-timer/timer-sdk-hutool/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-timer - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-timer/timer-spring-boot-starter/pom.xml b/kernel-d-timer/timer-spring-boot-starter/pom.xml index 1780359d6..a3c581d08 100644 --- a/kernel-d-timer/timer-spring-boot-starter/pom.xml +++ b/kernel-d-timer/timer-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-timer - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-validator/pom.xml b/kernel-d-validator/pom.xml index d96d0e6cc..10378f0a6 100644 --- a/kernel-d-validator/pom.xml +++ b/kernel-d-validator/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-validator/validator-api-table-unique/pom.xml b/kernel-d-validator/validator-api-table-unique/pom.xml index ecd4c778c..ee290ec34 100644 --- a/kernel-d-validator/validator-api-table-unique/pom.xml +++ b/kernel-d-validator/validator-api-table-unique/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-validator - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-validator/validator-api/pom.xml b/kernel-d-validator/validator-api/pom.xml index d608e8a71..bd786e377 100644 --- a/kernel-d-validator/validator-api/pom.xml +++ b/kernel-d-validator/validator-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-validator - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-validator/validator-spring-boot-starter/pom.xml b/kernel-d-validator/validator-spring-boot-starter/pom.xml index f7f98b3ec..e13ad525e 100644 --- a/kernel-d-validator/validator-spring-boot-starter/pom.xml +++ b/kernel-d-validator/validator-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-validator - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-wrapper/pom.xml b/kernel-d-wrapper/pom.xml index ffd49d482..b87ce3958 100644 --- a/kernel-d-wrapper/pom.xml +++ b/kernel-d-wrapper/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-wrapper/wrapper-api/pom.xml b/kernel-d-wrapper/wrapper-api/pom.xml index d55e7c930..e8f4ef307 100644 --- a/kernel-d-wrapper/wrapper-api/pom.xml +++ b/kernel-d-wrapper/wrapper-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-wrapper - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-wrapper/wrapper-field-sdk/pom.xml b/kernel-d-wrapper/wrapper-field-sdk/pom.xml index 2c44de497..3d3602154 100644 --- a/kernel-d-wrapper/wrapper-field-sdk/pom.xml +++ b/kernel-d-wrapper/wrapper-field-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-wrapper - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-wrapper/wrapper-sdk/pom.xml b/kernel-d-wrapper/wrapper-sdk/pom.xml index a7268205f..1ebf6f95c 100644 --- a/kernel-d-wrapper/wrapper-sdk/pom.xml +++ b/kernel-d-wrapper/wrapper-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-wrapper - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-d-wrapper/wrapper-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/WrapperAop.java b/kernel-d-wrapper/wrapper-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/WrapperAop.java index 970fe5b2d..c20faa42b 100644 --- a/kernel-d-wrapper/wrapper-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/WrapperAop.java +++ b/kernel-d-wrapper/wrapper-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/WrapperAop.java @@ -202,13 +202,14 @@ public class WrapperAop { private Map wrapPureObject(Object originModel, Class>[] baseWrapperClasses) { // 首先将原始的对象转化为map - Map originMap = BeanUtil.beanToMap(originModel); + Map originMap = null; // 经过多个包装类填充属性 try { for (Class> baseWrapperClass : baseWrapperClasses) { BaseWrapper baseWrapper = baseWrapperClass.newInstance(); Map incrementFieldsMap = baseWrapper.doWrap(originModel); + originMap = BeanUtil.beanToMap(originModel); originMap.putAll(incrementFieldsMap); } } catch (Exception e) { diff --git a/kernel-d-wrapper/wrapper-spring-boot-starter/pom.xml b/kernel-d-wrapper/wrapper-spring-boot-starter/pom.xml index 4e52ea493..845accb18 100644 --- a/kernel-d-wrapper/wrapper-spring-boot-starter/pom.xml +++ b/kernel-d-wrapper/wrapper-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-wrapper - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-o-monitor/monitor-api/pom.xml b/kernel-o-monitor/monitor-api/pom.xml index 92eba1a37..8a948413c 100644 --- a/kernel-o-monitor/monitor-api/pom.xml +++ b/kernel-o-monitor/monitor-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-o-monitor - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-o-monitor/monitor-business-system-info/pom.xml b/kernel-o-monitor/monitor-business-system-info/pom.xml index 01160a236..37a623630 100644 --- a/kernel-o-monitor/monitor-business-system-info/pom.xml +++ b/kernel-o-monitor/monitor-business-system-info/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-o-monitor - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-o-monitor/monitor-spring-boot-starter/pom.xml b/kernel-o-monitor/monitor-spring-boot-starter/pom.xml index f8162e537..c474e1e4b 100644 --- a/kernel-o-monitor/monitor-spring-boot-starter/pom.xml +++ b/kernel-o-monitor/monitor-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-o-monitor - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-o-monitor/pom.xml b/kernel-o-monitor/pom.xml index 91b853efd..5acdd849a 100644 --- a/kernel-o-monitor/pom.xml +++ b/kernel-o-monitor/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-customer/customer-api/pom.xml b/kernel-s-customer/customer-api/pom.xml index 4b220a344..b9da02f80 100644 --- a/kernel-s-customer/customer-api/pom.xml +++ b/kernel-s-customer/customer-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-customer - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-customer/customer-business/pom.xml b/kernel-s-customer/customer-business/pom.xml index bac347d45..80082eda3 100644 --- a/kernel-s-customer/customer-business/pom.xml +++ b/kernel-s-customer/customer-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-customer - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-customer/customer-spring-boot-starter/pom.xml b/kernel-s-customer/customer-spring-boot-starter/pom.xml index 6e314f691..67e40298f 100644 --- a/kernel-s-customer/customer-spring-boot-starter/pom.xml +++ b/kernel-s-customer/customer-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-customer - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-customer/pom.xml b/kernel-s-customer/pom.xml index 6a3467032..490d4854b 100644 --- a/kernel-s-customer/pom.xml +++ b/kernel-s-customer/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-demo/demo-api/pom.xml b/kernel-s-demo/demo-api/pom.xml index 843817cd8..d99144e5c 100644 --- a/kernel-s-demo/demo-api/pom.xml +++ b/kernel-s-demo/demo-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-demo - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-demo/demo-business/pom.xml b/kernel-s-demo/demo-business/pom.xml index a22736412..89a811c8b 100644 --- a/kernel-s-demo/demo-business/pom.xml +++ b/kernel-s-demo/demo-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-demo - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-demo/demo-spring-boot-starter/pom.xml b/kernel-s-demo/demo-spring-boot-starter/pom.xml index 4d03a87e9..1fa058b87 100644 --- a/kernel-s-demo/demo-spring-boot-starter/pom.xml +++ b/kernel-s-demo/demo-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-demo - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-demo/pom.xml b/kernel-s-demo/pom.xml index 8d3d4f4f5..5fbb0ddec 100644 --- a/kernel-s-demo/pom.xml +++ b/kernel-s-demo/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-dict/dict-api/pom.xml b/kernel-s-dict/dict-api/pom.xml index 9e444119d..80ef7bafd 100644 --- a/kernel-s-dict/dict-api/pom.xml +++ b/kernel-s-dict/dict-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-dict - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-dict/dict-business/pom.xml b/kernel-s-dict/dict-business/pom.xml index 3c0061faf..72240dbb1 100644 --- a/kernel-s-dict/dict-business/pom.xml +++ b/kernel-s-dict/dict-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-dict - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-dict/dict-spring-boot-starter/pom.xml b/kernel-s-dict/dict-spring-boot-starter/pom.xml index ec113d02f..0a2cb24a4 100644 --- a/kernel-s-dict/dict-spring-boot-starter/pom.xml +++ b/kernel-s-dict/dict-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-dict - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-dict/pom.xml b/kernel-s-dict/pom.xml index 31e111541..33ff6502d 100644 --- a/kernel-s-dict/pom.xml +++ b/kernel-s-dict/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-expand/expand-api/pom.xml b/kernel-s-expand/expand-api/pom.xml index 4f8c48975..3446be7ba 100644 --- a/kernel-s-expand/expand-api/pom.xml +++ b/kernel-s-expand/expand-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-expand - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-expand/expand-business/pom.xml b/kernel-s-expand/expand-business/pom.xml index 95378c788..0cacf55dd 100644 --- a/kernel-s-expand/expand-business/pom.xml +++ b/kernel-s-expand/expand-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-expand - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-expand/expand-spring-boot-starter/pom.xml b/kernel-s-expand/expand-spring-boot-starter/pom.xml index 5ac3fa64e..bae64c7c3 100644 --- a/kernel-s-expand/expand-spring-boot-starter/pom.xml +++ b/kernel-s-expand/expand-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-expand - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-expand/pom.xml b/kernel-s-expand/pom.xml index de6ab856b..f49e8caec 100644 --- a/kernel-s-expand/pom.xml +++ b/kernel-s-expand/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-group/group-api/pom.xml b/kernel-s-group/group-api/pom.xml index 17135f50e..c9cbf5242 100644 --- a/kernel-s-group/group-api/pom.xml +++ b/kernel-s-group/group-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-group - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-group/group-business/pom.xml b/kernel-s-group/group-business/pom.xml index 91e15a379..82574b339 100644 --- a/kernel-s-group/group-business/pom.xml +++ b/kernel-s-group/group-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-group - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-group/group-spring-boot-starter/pom.xml b/kernel-s-group/group-spring-boot-starter/pom.xml index 6908f24a8..3a74ef8d6 100644 --- a/kernel-s-group/group-spring-boot-starter/pom.xml +++ b/kernel-s-group/group-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-group - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-group/pom.xml b/kernel-s-group/pom.xml index 82d6f0db5..e591b70da 100644 --- a/kernel-s-group/pom.xml +++ b/kernel-s-group/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-message/message-api/pom.xml b/kernel-s-message/message-api/pom.xml index 743491a20..2d7199829 100644 --- a/kernel-s-message/message-api/pom.xml +++ b/kernel-s-message/message-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-message - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-message/message-business/pom.xml b/kernel-s-message/message-business/pom.xml index 38cebea83..0bac47795 100644 --- a/kernel-s-message/message-business/pom.xml +++ b/kernel-s-message/message-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-message - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-message/message-sdk-db/pom.xml b/kernel-s-message/message-sdk-db/pom.xml index 01f044b39..4758a2cf8 100644 --- a/kernel-s-message/message-sdk-db/pom.xml +++ b/kernel-s-message/message-sdk-db/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-message - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-message/message-spring-boot-starter/pom.xml b/kernel-s-message/message-spring-boot-starter/pom.xml index 85ced5bd9..e334097db 100644 --- a/kernel-s-message/message-spring-boot-starter/pom.xml +++ b/kernel-s-message/message-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-message - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-message/pom.xml b/kernel-s-message/pom.xml index 848e2038a..84e8abc22 100644 --- a/kernel-s-message/pom.xml +++ b/kernel-s-message/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-migration/migration-api/pom.xml b/kernel-s-migration/migration-api/pom.xml index ce39c71d3..15508c971 100644 --- a/kernel-s-migration/migration-api/pom.xml +++ b/kernel-s-migration/migration-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-migration - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-migration/migration-business-web/pom.xml b/kernel-s-migration/migration-business-web/pom.xml index 690dd2b1f..62f321793 100644 --- a/kernel-s-migration/migration-business-web/pom.xml +++ b/kernel-s-migration/migration-business-web/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-migration - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-migration/migration-sdk-data-aggregation/pom.xml b/kernel-s-migration/migration-sdk-data-aggregation/pom.xml index 7e5f12eea..d91987941 100644 --- a/kernel-s-migration/migration-sdk-data-aggregation/pom.xml +++ b/kernel-s-migration/migration-sdk-data-aggregation/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-migration - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-migration/migration-spring-boot-starter/pom.xml b/kernel-s-migration/migration-spring-boot-starter/pom.xml index 2c54e735d..87af31677 100644 --- a/kernel-s-migration/migration-spring-boot-starter/pom.xml +++ b/kernel-s-migration/migration-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-migration - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-migration/pom.xml b/kernel-s-migration/pom.xml index 21c3af67b..b39b7e2b1 100644 --- a/kernel-s-migration/pom.xml +++ b/kernel-s-migration/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/pom.xml b/kernel-s-system/pom.xml index 8c7c5b6ac..ddc922147 100644 --- a/kernel-s-system/pom.xml +++ b/kernel-s-system/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-api/pom.xml b/kernel-s-system/system-api/pom.xml index f035e9961..1f29ecbe8 100644 --- a/kernel-s-system/system-api/pom.xml +++ b/kernel-s-system/system-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuRequest.java index 5a4441a06..fec1c1460 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuRequest.java @@ -63,13 +63,6 @@ public class SysMenuRequest extends BaseRequest { * 菜单名称 */ @NotBlank(message = "菜单名称不能为空", groups = {add.class, edit.class}) - @TableUniqueValue( - message = "菜单名称存在重复", - groups = {add.class, edit.class}, - tableName = "sys_menu", - columnName = "menu_name", - idFieldName = "menu_id", - excludeLogicDeleteItems = true) @ChineseDescription("菜单名称") private String menuName; diff --git a/kernel-s-system/system-business-app/pom.xml b/kernel-s-system/system-business-app/pom.xml index e3bf4ac0a..f9ff687b1 100644 --- a/kernel-s-system/system-business-app/pom.xml +++ b/kernel-s-system/system-business-app/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-business-home/pom.xml b/kernel-s-system/system-business-home/pom.xml index f710736b3..427fb189c 100644 --- a/kernel-s-system/system-business-home/pom.xml +++ b/kernel-s-system/system-business-home/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-business-menu/pom.xml b/kernel-s-system/system-business-menu/pom.xml index 30fbc7c8a..823282622 100644 --- a/kernel-s-system/system-business-menu/pom.xml +++ b/kernel-s-system/system-business-menu/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java index 52e57aa3d..48eef445b 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java @@ -68,6 +68,8 @@ import cn.stylefeng.roses.kernel.system.modular.menu.mapper.SysMenuMapper; import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuButtonService; import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuResourceService; import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuService; +import cn.stylefeng.roses.kernel.validator.api.exception.ParamValidateException; +import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -106,6 +108,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public void add(SysMenuRequest sysMenuRequest) { + // 校验菜单名称是否重复 + validateMenu(sysMenuRequest); + // 如果父节点为空，则填充为默认的父节点id if (sysMenuRequest.getMenuParentId() == null) { sysMenuRequest.setMenuParentId(TreeConstants.DEFAULT_PARENT_ID); @@ -165,6 +170,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void edit(SysMenuRequest sysMenuRequest) { + // 校验菜单名称是否重复 + validateMenu(sysMenuRequest); + // 获取库中的菜单信息 SysMenu oldMenu = this.querySysMenu(sysMenuRequest); @@ -929,4 +937,35 @@ public class SysMenuServiceImpl extends ServiceImpl impl return ListUtil.toList(firstLevelMenus.values()); } + /** + * 校验菜单，是否在通应用下重复 + * + * @author fengshuonan + * @date 2023/3/14 14:37 + */ + private void validateMenu(SysMenuRequest request) { + SysMenuRequest param = new SysMenuRequest(); + param.setAppCode(request.getAppCode()); + param.setMenuName(request.getMenuName()); + + // 查询应用编码下是否存在该名称的菜单 + List list = findList(param); + if (ObjectUtil.isNotEmpty(list)) { + + boolean haveSameFlag = true; + + // 如果请求参数中有菜单id，则为编辑菜单操作，可以和本菜单重复 + for (SysMenu sysMenu : list) { + if (sysMenu.getMenuId().equals(request.getMenuId())) { + haveSameFlag = false; + break; + } + } + + if (haveSameFlag) { + throw new ParamValidateException(ValidatorExceptionEnum.TABLE_UNIQUE_VALIDATE_ERROR, request.getMenuName()); + } + } + } + } diff --git a/kernel-s-system/system-business-notice/pom.xml b/kernel-s-system/system-business-notice/pom.xml index c8e220271..4a7bf176f 100644 --- a/kernel-s-system/system-business-notice/pom.xml +++ b/kernel-s-system/system-business-notice/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-business-organization/pom.xml b/kernel-s-system/system-business-organization/pom.xml index 6803457ca..1d3d2850f 100644 --- a/kernel-s-system/system-business-organization/pom.xml +++ b/kernel-s-system/system-business-organization/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java index 076e530cf..1f1b3f76b 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java @@ -27,6 +27,7 @@ package cn.stylefeng.roses.kernel.system.modular.organization.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; @@ -37,6 +38,7 @@ import cn.stylefeng.roses.kernel.system.api.enums.OrgTypeEnum; import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO; import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationRequest; import cn.stylefeng.roses.kernel.system.api.pojo.organization.OrganizationTreeNode; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization; import cn.stylefeng.roses.kernel.system.modular.organization.service.HrOrganizationService; import cn.stylefeng.roses.kernel.system.modular.organization.wrapper.OrgExpandWrapper; @@ -254,4 +256,16 @@ public class HrOrganizationController { return new SuccessResponseData<>(orgDetailList); } + /** + * 组织下拉列表，可以根据组织名称搜索 + * + * @param request 请求参数 + * @return 返回组织信息 + * @author yxx + * @date 2023/03/05 09:49 + */ + @GetResource(name = "组织机构_选择器", path = "/hrOrganization/selector",requiredPermission = false) + public ResponseData> selector(HrOrganizationRequest request) { + return new SuccessResponseData<>(hrOrganizationService.selector(request)); + } } diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java index 009cccff6..287dcdd7c 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.system.modular.organization.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.api.OrganizationServiceApi; import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationRequest; @@ -140,4 +141,10 @@ public interface HrOrganizationService extends IService, Organiz */ Set findAllLevelParentIdsByOrganizations(Set organizationIds); + /** + * 组织机构选择器 + * @param request 请求参数 + * @return 选择列表 + */ + List selector(HrOrganizationRequest request); } diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java index 91f0c4654..12082a2aa 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java @@ -44,6 +44,7 @@ import cn.stylefeng.roses.kernel.rule.constants.SymbolConstant; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.api.RoleDataScopeServiceApi; @@ -313,6 +314,37 @@ public class HrOrganizationServiceImpl extends ServiceImpl selector(HrOrganizationRequest request) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + String orgName = request.getOrgName(); + String orgCode = request.getOrgCode(); + Long orgId = request.getOrgId(); + + // 查询未删除状态的 + queryWrapper.eq(HrOrganization::getDelFlag, YesOrNotEnum.N.getCode()); + // 拼接组织机构名称条件 + queryWrapper.like(ObjectUtil.isNotEmpty(orgName), HrOrganization::getOrgName, orgName); + // 拼接组织机构编码条件 + queryWrapper.like(ObjectUtil.isNotEmpty(orgCode), HrOrganization::getOrgCode, orgCode); + // 拼接机构id查询条件 + queryWrapper.eq(ObjectUtil.isNotEmpty(orgId), HrOrganization::getOrgId, orgId); + + queryWrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgCode, HrOrganization::getOrgName); + List list = this.list(queryWrapper); + + ArrayList results = new ArrayList<>(); + for (HrOrganization org : list) { + SimpleDict simpleDict = new SimpleDict(); + simpleDict.setId(org.getOrgId()); + simpleDict.setName(org.getOrgName()); + simpleDict.setCode(org.getOrgCode()); + results.add(simpleDict); + } + + return results; + } + @Override public List orgList() { diff --git a/kernel-s-system/system-business-resource/pom.xml b/kernel-s-system/system-business-resource/pom.xml index 370c3aae9..78ce529f1 100644 --- a/kernel-s-system/system-business-resource/pom.xml +++ b/kernel-s-system/system-business-resource/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-business-role/pom.xml b/kernel-s-system/system-business-role/pom.xml index 61af77d8c..517a91ab4 100644 --- a/kernel-s-system/system-business-role/pom.xml +++ b/kernel-s-system/system-business-role/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-business-theme/pom.xml b/kernel-s-system/system-business-theme/pom.xml index 9fc68043a..88f938668 100644 --- a/kernel-s-system/system-business-theme/pom.xml +++ b/kernel-s-system/system-business-theme/pom.xml @@ -7,7 +7,7 @@ kernel-s-system cn.stylefeng.roses - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-business-user/pom.xml b/kernel-s-system/system-business-user/pom.xml index 50f316282..2b1a51415 100644 --- a/kernel-s-system/system-business-user/pom.xml +++ b/kernel-s-system/system-business-user/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-integration-beetl/pom.xml b/kernel-s-system/system-integration-beetl/pom.xml index ed37e8fa4..344392cd2 100644 --- a/kernel-s-system/system-integration-beetl/pom.xml +++ b/kernel-s-system/system-integration-beetl/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-integration-rest/pom.xml b/kernel-s-system/system-integration-rest/pom.xml index 70c56c0c9..b34a60b81 100644 --- a/kernel-s-system/system-integration-rest/pom.xml +++ b/kernel-s-system/system-integration-rest/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/kernel-s-system/system-spring-boot-starter/pom.xml b/kernel-s-system/system-spring-boot-starter/pom.xml index 7b560647a..81dc52902 100644 --- a/kernel-s-system/system-spring-boot-starter/pom.xml +++ b/kernel-s-system/system-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 7.3.3 + 7.3.4 ../pom.xml diff --git a/pom.xml b/pom.xml index d1b3999d9..a4432a1ba 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ cn.stylefeng.roses roses-kernel - 7.3.3 + 7.3.4 pom @@ -124,13 +124,13 @@ 1.8 UTF-8 UTF-8 - 7.3.3 - 5.7.6 - 1.2.83 - 1.18.24 - 3.5.2 + 7.3.4 + 5.8.16 + 2.0.26 + 1.18.26 + 3.5.3.1 8.0.21 - 1.2.4 + 1.2.16 0.9.1 1.4.7 3.8.0 @@ -152,7 +152,7 @@ 3.0.0 3.1.0 1.1.1 - 2.2.6 + 3.2.1 2.5.0 2.2.6.RELEASE 1.3.0