diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index 9328c5256..f10c10c3a 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -31,7 +31,7 @@ jobs: run: | echo "profile=pro" >> $GITHUB_OUTPUT echo "version=${GITHUB_REF#refs/tags/dc3.develop.}" >> $GITHUB_OUTPUT - echo "service_version=2025.2.5" >> $GITHUB_OUTPUT + echo "service_version=2025.6.0" >> $GITHUB_OUTPUT echo "service_name_gateway=dc3-gateway" >> $GITHUB_OUTPUT echo "service_path_gateway=dc3-gateway" >> $GITHUB_OUTPUT echo "service_name_center_auth=dc3-center-auth" >> $GITHUB_OUTPUT diff --git a/dc3-api/dc3-api-auth/pom.xml b/dc3-api/dc3-api-auth/pom.xml index a779792c6..194ac1e6d 100644 --- a/dc3-api/dc3-api-auth/pom.xml +++ b/dc3-api/dc3-api-auth/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker dc3-api - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-api-auth - 2025.2.5 + 2025.6.0 jar IoT DC3 平台 Auth Service gRpc API。 diff --git a/dc3-api/dc3-api-data/pom.xml b/dc3-api/dc3-api-data/pom.xml index bbf261366..631406f0c 100644 --- a/dc3-api/dc3-api-data/pom.xml +++ b/dc3-api/dc3-api-data/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker dc3-api - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-api-data - 2025.2.5 + 2025.6.0 jar IoT DC3 平台 Data Service gRpc API。 diff --git a/dc3-api/dc3-api-driver/pom.xml b/dc3-api/dc3-api-driver/pom.xml index f5efbabc1..d05277eaa 100644 --- a/dc3-api/dc3-api-driver/pom.xml +++ b/dc3-api/dc3-api-driver/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker dc3-api - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-api-driver - 2025.2.5 + 2025.6.0 jar IoT DC3 平台 Driver Service gRpc API。 diff --git a/dc3-api/dc3-api-manager/pom.xml b/dc3-api/dc3-api-manager/pom.xml index 7c8dc76ba..9e26f8a4d 100644 --- a/dc3-api/dc3-api-manager/pom.xml +++ b/dc3-api/dc3-api-manager/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker dc3-api - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-api-manager - 2025.2.5 + 2025.6.0 jar IoT DC3 平台 Manager Service gRpc API。 diff --git a/dc3-api/pom.xml b/dc3-api/pom.xml index e4dcff969..5fab3251e 100644 --- a/dc3-api/pom.xml +++ b/dc3-api/pom.xml @@ -24,13 +24,13 @@ io.github.pnoker dc3-parent - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-api - 2025.2.5 + 2025.6.0 pom 2016-2022 @@ -68,7 +68,7 @@ - 2025.2.5 + 2025.6.0 diff --git a/dc3-center/dc3-center-auth/pom.xml b/dc3-center/dc3-center-auth/pom.xml index c6afceace..a045150a8 100644 --- a/dc3-center/dc3-center-auth/pom.xml +++ b/dc3-center/dc3-center-auth/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-center - 2025.2.5 + 2025.6.0 dc3-center-auth diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/AuthApplication.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/AuthApplication.java index 2fc3031c6..5b4f4231f 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/AuthApplication.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/AuthApplication.java @@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * 权限中心服务启动入口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-center/dc3-center-data/pom.xml b/dc3-center/dc3-center-data/pom.xml index 67f86a465..2d7045d50 100644 --- a/dc3-center/dc3-center-data/pom.xml +++ b/dc3-center/dc3-center-data/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-center - 2025.2.5 + 2025.6.0 dc3-center-data diff --git a/dc3-center/dc3-center-data/src/main/java/io/github/pnoker/center/data/DataApplication.java b/dc3-center/dc3-center-data/src/main/java/io/github/pnoker/center/data/DataApplication.java index 1559fd556..7f3bf12d6 100644 --- a/dc3-center/dc3-center-data/src/main/java/io/github/pnoker/center/data/DataApplication.java +++ b/dc3-center/dc3-center-data/src/main/java/io/github/pnoker/center/data/DataApplication.java @@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * 数据中心服务启动入口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-center/dc3-center-manager/pom.xml b/dc3-center/dc3-center-manager/pom.xml index 3619b8750..1b3c09cd2 100644 --- a/dc3-center/dc3-center-manager/pom.xml +++ b/dc3-center/dc3-center-manager/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-center - 2025.2.5 + 2025.6.0 dc3-center-manager diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/ManagerApplication.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/ManagerApplication.java index 78be54de2..c14a27ac1 100644 --- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/ManagerApplication.java +++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/ManagerApplication.java @@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * 管理中心服务启动入口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-center/dc3-center-single/pom.xml b/dc3-center/dc3-center-single/pom.xml index 286dfe63d..504ec1023 100644 --- a/dc3-center/dc3-center-single/pom.xml +++ b/dc3-center/dc3-center-single/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-center - 2025.2.5 + 2025.6.0 dc3-center-single diff --git a/dc3-center/dc3-center-single/src/main/java/io/github/pnoker/center/SingleApplication.java b/dc3-center/dc3-center-single/src/main/java/io/github/pnoker/center/SingleApplication.java index 989822cec..7f108aa2a 100644 --- a/dc3-center/dc3-center-single/src/main/java/io/github/pnoker/center/SingleApplication.java +++ b/dc3-center/dc3-center-single/src/main/java/io/github/pnoker/center/SingleApplication.java @@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * 服务启动入口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-center/pom.xml b/dc3-center/pom.xml index 19066841c..820f3024e 100644 --- a/dc3-center/pom.xml +++ b/dc3-center/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker iot-dc3 - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-center - 2025.2.5 + 2025.6.0 pom 2016-2022 diff --git a/dc3-common/dc3-common-api/pom.xml b/dc3-common/dc3-common-api/pom.xml index 67dc79893..77c77b7d3 100644 --- a/dc3-common/dc3-common-api/pom.xml +++ b/dc3-common/dc3-common-api/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-api - 2025.2.5 + 2025.6.0 jar IoT DC3 平台 Api 通用 gRpc Proto。 diff --git a/dc3-common/dc3-common-api/src/main/java/io/github/pnoker/common/utils/GrpcBuilderUtil.java b/dc3-common/dc3-common-api/src/main/java/io/github/pnoker/common/utils/GrpcBuilderUtil.java index 99cde294a..3ace4521a 100644 --- a/dc3-common/dc3-common-api/src/main/java/io/github/pnoker/common/utils/GrpcBuilderUtil.java +++ b/dc3-common/dc3-common-api/src/main/java/io/github/pnoker/common/utils/GrpcBuilderUtil.java @@ -33,7 +33,7 @@ import java.util.Optional; * Grpc Builder 工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class GrpcBuilderUtil { diff --git a/dc3-common/dc3-common-auth/pom.xml b/dc3-common/dc3-common-auth/pom.xml index 24efea74d..b3cd5b5e0 100644 --- a/dc3-common/dc3-common-auth/pom.xml +++ b/dc3-common/dc3-common-auth/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-auth - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/DictionaryForAuthService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/DictionaryForAuthService.java index 0ccec680e..204be23b8 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/DictionaryForAuthService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/DictionaryForAuthService.java @@ -24,7 +24,7 @@ import java.util.List; * Dictionary Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DictionaryForAuthService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/TokenService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/TokenService.java index bc01ae6f2..2f0904d29 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/TokenService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/TokenService.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.auth.entity.bean.TokenValid; * Token Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface TokenService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/impl/DictionaryForAuthServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/impl/DictionaryForAuthServiceImpl.java index 15f46bd02..41d3094d6 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/impl/DictionaryForAuthServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/impl/DictionaryForAuthServiceImpl.java @@ -31,7 +31,7 @@ import java.util.List; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/impl/TokenServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/impl/TokenServiceImpl.java index 72a8f1d79..b16d1f675 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/impl/TokenServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/biz/impl/TokenServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Objects; * 令牌服务接口实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/DictionaryForAuthController.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/DictionaryForAuthController.java index 7f93134db..adcec73b2 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/DictionaryForAuthController.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/DictionaryForAuthController.java @@ -35,7 +35,7 @@ import java.util.List; * 字典 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/TenantController.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/TenantController.java index 66b06e0a9..632e40db9 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/TenantController.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/TenantController.java @@ -40,7 +40,7 @@ import java.util.Objects; * 用户 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/TokenController.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/TokenController.java index aed181a49..dc9560f65 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/TokenController.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/TokenController.java @@ -37,7 +37,7 @@ import java.util.Objects; * 令牌 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/UserLoginController.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/UserLoginController.java index 3c1972ef0..7613bdc79 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/UserLoginController.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/controller/UserLoginController.java @@ -41,7 +41,7 @@ import java.util.Objects; * 用户 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/ApiManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/ApiManager.java index ad0959c8d..4ff5999c0 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/ApiManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/ApiManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.ApiDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ApiManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/DriverTokenManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/DriverTokenManager.java index 2efacbeda..ceb0c677e 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/DriverTokenManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/DriverTokenManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.DriverTokenDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverTokenManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/MenuManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/MenuManager.java index dbe464b51..f72983405 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/MenuManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/MenuManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.MenuDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface MenuManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/ResourceManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/ResourceManager.java index ea6d559c2..f899b461e 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/ResourceManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/ResourceManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.ResourceDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ResourceManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleManager.java index 4a892247a..c9725820f 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.RoleDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RoleManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleResourceBindManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleResourceBindManager.java index 15aed87a0..ae83b076a 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleResourceBindManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleResourceBindManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.RoleResourceBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RoleResourceBindManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleUserBindManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleUserBindManager.java index 2eee02bf5..306acfbc7 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleUserBindManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/RoleUserBindManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.RoleUserBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RoleUserBindManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/TenantBindManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/TenantBindManager.java index bb309abe7..e857a12b8 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/TenantBindManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/TenantBindManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.TenantBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface TenantBindManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/TenantManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/TenantManager.java index b522e365b..957af8836 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/TenantManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/TenantManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.TenantDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface TenantManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserLoginManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserLoginManager.java index 485b31c12..6810769d5 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserLoginManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserLoginManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.UserLoginDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface UserLoginManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserManager.java index c9d7b01fe..ec10d94ab 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.UserDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface UserManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserPasswordManager.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserPasswordManager.java index e2d24a325..83b2faa94 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserPasswordManager.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/UserPasswordManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.UserPasswordDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface UserPasswordManager extends IService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/ApiManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/ApiManagerImpl.java index d03e64a7b..41f2e8331 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/ApiManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/ApiManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/DriverTokenManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/DriverTokenManagerImpl.java index 53971e9dd..d68c467ab 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/DriverTokenManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/DriverTokenManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/MenuManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/MenuManagerImpl.java index f271e3900..674c76d09 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/MenuManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/MenuManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/ResourceManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/ResourceManagerImpl.java index 71d593bbc..2fa583f9c 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/ResourceManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/ResourceManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleManagerImpl.java index 31c844638..869cb7a41 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleResourceBindManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleResourceBindManagerImpl.java index 3acfa6e84..7e04574dd 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleResourceBindManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleResourceBindManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleUserBindManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleUserBindManagerImpl.java index 053ee6469..f010a3d3b 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleUserBindManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/RoleUserBindManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/TenantBindManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/TenantBindManagerImpl.java index 52830c591..331bace9b 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/TenantBindManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/TenantBindManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/TenantManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/TenantManagerImpl.java index f0d0ea290..16566b0a8 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/TenantManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/TenantManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserLoginManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserLoginManagerImpl.java index 5d320e644..808c0f1a4 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserLoginManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserLoginManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserManagerImpl.java index a5b9b1785..ebdb8a51a 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserPasswordManagerImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserPasswordManagerImpl.java index c66e3ba49..b08a75c04 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserPasswordManagerImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/dal/impl/UserPasswordManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/AuthHeader.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/AuthHeader.java index 49fe111e7..fbb5db6ad 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/AuthHeader.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/AuthHeader.java @@ -23,7 +23,7 @@ import java.io.Serializable; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/Login.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/Login.java index fac3b04f7..0c3f578a0 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/Login.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/Login.java @@ -29,7 +29,7 @@ import java.io.Serializable; * Login * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/TokenValid.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/TokenValid.java index 5a8b27759..dec56bb3f 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/TokenValid.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bean/TokenValid.java @@ -24,7 +24,7 @@ import java.util.Date; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ApiBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ApiBO.java index 7a017c99e..e61e4b621 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ApiBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ApiBO.java @@ -26,7 +26,7 @@ import lombok.*; * Api BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/DriverTokenBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/DriverTokenBO.java index 1d9dddd02..474601695 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/DriverTokenBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/DriverTokenBO.java @@ -27,7 +27,7 @@ import java.time.LocalDateTime; * DriverToken BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/MenuBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/MenuBO.java index 666419675..5962dccef 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/MenuBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/MenuBO.java @@ -27,7 +27,7 @@ import lombok.*; * Menu BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ResourceBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ResourceBO.java index a3cadf536..5dbc3abcb 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ResourceBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ResourceBO.java @@ -27,7 +27,7 @@ import lombok.*; * Resource BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleBO.java index 69794e446..65ec693b7 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleBO.java @@ -25,7 +25,7 @@ import lombok.*; * Role BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleResourceBindBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleResourceBindBO.java index b6c3343ea..3347217f5 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleResourceBindBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleResourceBindBO.java @@ -23,7 +23,7 @@ import lombok.*; * RoleResourceBind BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleUserBindBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleUserBindBO.java index 35e97dc97..f2b40a42f 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleUserBindBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleUserBindBO.java @@ -23,7 +23,7 @@ import lombok.*; * RoleUserBind BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/TenantBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/TenantBO.java index 4ed03820e..5b710567c 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/TenantBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/TenantBO.java @@ -25,7 +25,7 @@ import lombok.*; * Tenant BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/TenantBindBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/TenantBindBO.java index c367ae5f8..d958da965 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/TenantBindBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/TenantBindBO.java @@ -23,7 +23,7 @@ import lombok.*; * TenantBind BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserBO.java index ebc56a494..bb87d6004 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserBO.java @@ -25,7 +25,7 @@ import lombok.*; * User BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserLoginBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserLoginBO.java index 29c8f528c..9a5400595 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserLoginBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserLoginBO.java @@ -24,7 +24,7 @@ import lombok.*; * UserLogin BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserPasswordBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserPasswordBO.java index 25a057359..46d71556f 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserPasswordBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/UserPasswordBO.java @@ -23,7 +23,7 @@ import lombok.*; * UserPassword BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/ApiBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/ApiBuilder.java index 06bdb8183..9d2b6831e 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/ApiBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/ApiBuilder.java @@ -41,7 +41,7 @@ import java.util.Optional; * Api Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/DictionaryForAuthBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/DictionaryForAuthBuilder.java index 82bf3d0e7..f5be81ee6 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/DictionaryForAuthBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/DictionaryForAuthBuilder.java @@ -29,7 +29,7 @@ import org.mapstruct.Mapping; * Dictionary For Auth Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/MenuBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/MenuBuilder.java index d6167165a..0197d1185 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/MenuBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/MenuBuilder.java @@ -42,7 +42,7 @@ import java.util.Optional; * Menu Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/ResourceBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/ResourceBuilder.java index d9b365c1f..433395a66 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/ResourceBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/ResourceBuilder.java @@ -42,7 +42,7 @@ import java.util.Optional; * Resource Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleBuilder.java index 3e9ab95d6..5370de4c7 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleBuilder.java @@ -40,7 +40,7 @@ import java.util.Optional; * Role Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleResourceBindBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleResourceBindBuilder.java index 04fd15003..f5aeca4e7 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleResourceBindBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleResourceBindBuilder.java @@ -30,7 +30,7 @@ import java.util.List; * RoleResourceBind Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleUserBindBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleUserBindBuilder.java index f05097541..fa75e083f 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleUserBindBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/RoleUserBindBuilder.java @@ -30,7 +30,7 @@ import java.util.List; * RoleUserBind Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/TenantBindBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/TenantBindBuilder.java index 9e855dfc8..12a18e0e5 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/TenantBindBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/TenantBindBuilder.java @@ -30,7 +30,7 @@ import java.util.List; * TenantBind Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/TenantBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/TenantBuilder.java index cbac1db04..8dcdfdcdb 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/TenantBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/TenantBuilder.java @@ -40,7 +40,7 @@ import java.util.Optional; * Tenant Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserBuilder.java index 146300545..c767dd5b7 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserBuilder.java @@ -37,7 +37,7 @@ import java.util.Objects; * User Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserLoginBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserLoginBuilder.java index 70f514644..7e0d40d5a 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserLoginBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserLoginBuilder.java @@ -34,7 +34,7 @@ import java.util.Optional; * UserLogin Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserPasswordBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserPasswordBuilder.java index d180b89fd..b992ead91 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserPasswordBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/builder/UserPasswordBuilder.java @@ -30,7 +30,7 @@ import java.util.List; * UserPassword Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/ApiDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/ApiDO.java index 18d584b4f..420109f03 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/ApiDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/ApiDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/DriverTokenDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/DriverTokenDO.java index 82e8e93e3..bff1d3519 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/DriverTokenDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/DriverTokenDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/MenuDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/MenuDO.java index 095a66d4a..90c9e9161 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/MenuDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/MenuDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/ResourceDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/ResourceDO.java index 483905feb..ee70b63b5 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/ResourceDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/ResourceDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleDO.java index 121727b3e..65572fd81 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleResourceBindDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleResourceBindDO.java index a39e953de..98fc4c81c 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleResourceBindDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleResourceBindDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleUserBindDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleUserBindDO.java index 94fbeb457..1651ee154 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleUserBindDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/RoleUserBindDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/TenantBindDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/TenantBindDO.java index 6aabd8052..b7c2e9858 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/TenantBindDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/TenantBindDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/TenantDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/TenantDO.java index 745010a1e..c373ed6c3 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/TenantDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/TenantDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserDO.java index 3163539a5..0c231bc3e 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserLoginDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserLoginDO.java index c924c521e..287824418 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserLoginDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserLoginDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserPasswordDO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserPasswordDO.java index c1eef4eb0..cc8b1f4ec 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserPasswordDO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/model/UserPasswordDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/ApiQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/ApiQuery.java index 8b0ddf98b..1ae40c0b2 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/ApiQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/ApiQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; /** * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/DriverTokenQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/DriverTokenQuery.java index 61c1e2b3a..b7ef0d552 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/DriverTokenQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/DriverTokenQuery.java @@ -28,7 +28,7 @@ import java.io.Serializable; * DriverToken Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/MenuQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/MenuQuery.java index b5c8d4810..72e525fb4 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/MenuQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/MenuQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; /** * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/ResourceQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/ResourceQuery.java index ee9c6e75c..471d927e5 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/ResourceQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/ResourceQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; /** * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleQuery.java index aac496cd5..c15109832 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleQuery.java @@ -25,7 +25,7 @@ import java.io.Serializable; /** * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleResourceBindQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleResourceBindQuery.java index ad9cb23b3..c7a416114 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleResourceBindQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleResourceBindQuery.java @@ -24,7 +24,7 @@ import java.io.Serializable; /** * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleUserBindQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleUserBindQuery.java index c83c1c916..9f988cafb 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleUserBindQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/RoleUserBindQuery.java @@ -24,7 +24,7 @@ import java.io.Serializable; /** * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TenantBindQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TenantBindQuery.java index d90e42812..25cc98b12 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TenantBindQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TenantBindQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; * TenantBind Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TenantQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TenantQuery.java index c31a6e2b3..8593d1191 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TenantQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TenantQuery.java @@ -27,7 +27,7 @@ import java.io.Serializable; * User Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TokenQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TokenQuery.java index 5e34b30a5..2a17a1ffa 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TokenQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/TokenQuery.java @@ -27,7 +27,7 @@ import lombok.Setter; * GenerateTokenVO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserLoginQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserLoginQuery.java index 3441cd3ed..8854eeae4 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserLoginQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserLoginQuery.java @@ -27,7 +27,7 @@ import java.io.Serializable; * User Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserPasswordQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserPasswordQuery.java index 454d3438e..81571660f 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserPasswordQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserPasswordQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; * UserPassword Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserQuery.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserQuery.java index 12a894b9b..801d6eb3c 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserQuery.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/query/UserQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; * User Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ApiVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ApiVO.java index 251796193..2d4e1db1f 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ApiVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ApiVO.java @@ -32,7 +32,7 @@ import lombok.*; * Api VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/DriverTokenVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/DriverTokenVO.java index 399149796..7587878c6 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/DriverTokenVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/DriverTokenVO.java @@ -28,7 +28,7 @@ import java.time.LocalDateTime; * DriverToken VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/MenuVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/MenuVO.java index ce339bb93..8883b0e25 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/MenuVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/MenuVO.java @@ -33,7 +33,7 @@ import lombok.*; * Menu VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ResourceVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ResourceVO.java index ea3f88455..7e88ab53d 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ResourceVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ResourceVO.java @@ -34,7 +34,7 @@ import lombok.*; * Resource VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleResourceBindVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleResourceBindVO.java index 33ac092f5..20bff62f2 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleResourceBindVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleResourceBindVO.java @@ -27,7 +27,7 @@ import lombok.*; * RoleResourceBind VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleUserBindVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleUserBindVO.java index 0ea272e3c..119dbdff4 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleUserBindVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleUserBindVO.java @@ -27,7 +27,7 @@ import lombok.*; * RoleUserBind VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleVO.java index fc1abc657..f0de7d3b9 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleVO.java @@ -32,7 +32,7 @@ import lombok.*; * Role VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/TenantBindVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/TenantBindVO.java index 450f73af0..e5cabd9d0 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/TenantBindVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/TenantBindVO.java @@ -27,7 +27,7 @@ import lombok.*; * TenantBind VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/TenantVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/TenantVO.java index c85c6cd21..3b1f0f568 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/TenantVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/TenantVO.java @@ -31,7 +31,7 @@ import lombok.*; * Tenant VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserLoginVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserLoginVO.java index bd8bf7d98..8f91907df 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserLoginVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserLoginVO.java @@ -25,7 +25,7 @@ import lombok.*; * UserLogin VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserPasswordVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserPasswordVO.java index 897b98ea9..750f26b78 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserPasswordVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserPasswordVO.java @@ -29,7 +29,7 @@ import lombok.*; * UserPassword VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserVO.java index d8edacdaf..2a0b68c4a 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/UserVO.java @@ -31,7 +31,7 @@ import lombok.*; * User VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/generator/MybatisGenerator.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/generator/MybatisGenerator.java index f9fb52c0e..c7ef77ac8 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/generator/MybatisGenerator.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/generator/MybatisGenerator.java @@ -29,7 +29,7 @@ import io.github.pnoker.common.utils.MybatisUtil; * 当前配置仅用于 dc3-common-auth 服务模块, 如果需要用于其他模块请重新配置 path 参数。 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class MybatisGenerator { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/TenantServer.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/TenantServer.java index 491a8a9ec..3a569a1f9 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/TenantServer.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/TenantServer.java @@ -36,7 +36,7 @@ import java.util.Objects; * Tenant Api * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/TokenServer.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/TokenServer.java index 2474603aa..595158635 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/TokenServer.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/TokenServer.java @@ -36,7 +36,7 @@ import java.util.Objects; * Token Api * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/UserLoginServer.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/UserLoginServer.java index f30e3f838..1755a1270 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/UserLoginServer.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/UserLoginServer.java @@ -36,7 +36,7 @@ import java.util.Objects; * UserLogin Api * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/UserServer.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/UserServer.java index 6c81786c8..256a3540e 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/UserServer.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/UserServer.java @@ -36,7 +36,7 @@ import java.util.Objects; * User Api * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcTenantBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcTenantBuilder.java index 9e555910a..f1eb6223a 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcTenantBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcTenantBuilder.java @@ -33,7 +33,7 @@ import java.util.Optional; * GrpcTenant Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcUserBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcUserBuilder.java index 1a0a092c9..3864315f3 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcUserBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcUserBuilder.java @@ -33,7 +33,7 @@ import java.util.Optional; * GrpcUser Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcUserLoginBuilder.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcUserLoginBuilder.java index 9d769e455..1fb2a6c5d 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcUserLoginBuilder.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/grpc/builder/GrpcUserLoginBuilder.java @@ -33,7 +33,7 @@ import java.util.Optional; * GrpcUserLogin Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/ApiMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/ApiMapper.java index ca8e981b7..194d39e37 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/ApiMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/ApiMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.ApiDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ApiMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/DriverTokenMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/DriverTokenMapper.java index 4081b6e91..50928b168 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/DriverTokenMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/DriverTokenMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.DriverTokenDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverTokenMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/MenuMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/MenuMapper.java index 90475a0c6..cc018ae95 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/MenuMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/MenuMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.MenuDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface MenuMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/ResourceMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/ResourceMapper.java index 1a279bd26..b553ab5fa 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/ResourceMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/ResourceMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.ResourceDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ResourceMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleMapper.java index 20b3d3442..5ab58866e 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.RoleDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RoleMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleResourceBindMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleResourceBindMapper.java index a07be6351..a7f35b3de 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleResourceBindMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleResourceBindMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.RoleResourceBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RoleResourceBindMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleUserBindMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleUserBindMapper.java index 6d02572f2..3eb63e713 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleUserBindMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/RoleUserBindMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.RoleUserBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RoleUserBindMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/TenantBindMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/TenantBindMapper.java index c23e4a5c7..2a511be6c 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/TenantBindMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/TenantBindMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.TenantBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface TenantBindMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/TenantMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/TenantMapper.java index 0b53febd0..9290a7a30 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/TenantMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/TenantMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.TenantDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface TenantMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserLoginMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserLoginMapper.java index 70fd4d455..5abcfa574 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserLoginMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserLoginMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.UserLoginDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface UserLoginMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserMapper.java index b97b3cf2c..432e7c78d 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.UserDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface UserMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserPasswordMapper.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserPasswordMapper.java index eb386dccb..426731241 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserPasswordMapper.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/mapper/UserPasswordMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.auth.entity.model.UserPasswordDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface UserPasswordMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/ApiService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/ApiService.java index 1e7ffe8ef..6563e908d 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/ApiService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/ApiService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.base.service.BaseService; * Api Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ApiService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/MenuService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/MenuService.java index 30ac9d2a3..5dbd3419a 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/MenuService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/MenuService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.base.service.BaseService; * Menu Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface MenuService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/ResourceService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/ResourceService.java index 48e4a8154..e0f0d1223 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/ResourceService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/ResourceService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.base.service.BaseService; * Resource Interface * * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ResourceService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleResourceBindService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleResourceBindService.java index 62d1bca53..6f86d87fd 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleResourceBindService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleResourceBindService.java @@ -27,7 +27,7 @@ import java.util.List; * RoleResourceBind Interface * * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RoleResourceBindService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleService.java index 2a0841425..cdf0c1473 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.base.service.BaseService; * Role Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RoleService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleUserBindService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleUserBindService.java index 6015ea0b1..1d03674ea 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleUserBindService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/RoleUserBindService.java @@ -27,7 +27,7 @@ import java.util.List; * RoleUserBind Interface * * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RoleUserBindService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/TenantBindService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/TenantBindService.java index 85bf735b4..8c7a3cc47 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/TenantBindService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/TenantBindService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.base.service.BaseService; * TenantBind Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface TenantBindService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/TenantService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/TenantService.java index 55ba30085..0fca5037b 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/TenantService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/TenantService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.base.service.BaseService; * Tenant Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface TenantService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserLoginService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserLoginService.java index 29d8908a9..fdd17a973 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserLoginService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserLoginService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.base.service.BaseService; * UserLogin Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface UserLoginService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserPasswordService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserPasswordService.java index fb3975524..65c7cc630 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserPasswordService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserPasswordService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.base.service.BaseService; * UserPassword Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface UserPasswordService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserService.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserService.java index 223faf584..6b9f71a19 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserService.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/UserService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.base.service.BaseService; * User Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface UserService extends BaseService { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/ApiServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/ApiServiceImpl.java index d59b58356..6ae00fb1b 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/ApiServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/ApiServiceImpl.java @@ -42,7 +42,7 @@ import java.util.Objects; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/MenuServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/MenuServiceImpl.java index 795b52aaf..06614923b 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/MenuServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/MenuServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Objects; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/ResourceServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/ResourceServiceImpl.java index c3bab5ce6..fb3252069 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/ResourceServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/ResourceServiceImpl.java @@ -38,7 +38,7 @@ import java.util.Objects; /** * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleResourceBindServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleResourceBindServiceImpl.java index cde16494e..786c57b7a 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleResourceBindServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleResourceBindServiceImpl.java @@ -45,7 +45,7 @@ import java.util.Objects; /** * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleServiceImpl.java index 9f221be3a..06b7882a6 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Objects; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleUserBindServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleUserBindServiceImpl.java index a8a386545..22d23f7da 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleUserBindServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/RoleUserBindServiceImpl.java @@ -45,7 +45,7 @@ import java.util.Objects; /** * @author linys - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/TenantBindServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/TenantBindServiceImpl.java index 1547a3773..afdad1241 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/TenantBindServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/TenantBindServiceImpl.java @@ -40,7 +40,7 @@ import java.util.Objects; * TenantBindService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/TenantServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/TenantServiceImpl.java index 87ec6f091..d764ea46c 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/TenantServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/TenantServiceImpl.java @@ -41,7 +41,7 @@ import java.util.Objects; * 租户服务接口实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserLoginServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserLoginServiceImpl.java index 36fa8d2ad..fdea450c6 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserLoginServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserLoginServiceImpl.java @@ -41,7 +41,7 @@ import java.util.Objects; * 用户服务接口实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserPasswordServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserPasswordServiceImpl.java index 49a788a0f..9599ec351 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserPasswordServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserPasswordServiceImpl.java @@ -41,7 +41,7 @@ import java.util.Objects; * 用户密码服务接口实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserServiceImpl.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserServiceImpl.java index e06a63899..529489890 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserServiceImpl.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/service/impl/UserServiceImpl.java @@ -41,7 +41,7 @@ import java.util.Objects; * 用户服务接口实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/config/ActiveAuthProfileConfig.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/config/ActiveAuthProfileConfig.java index 6a159cf70..e4580be2f 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/config/ActiveAuthProfileConfig.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/config/ActiveAuthProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/init/AuthInitRunner.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/init/AuthInitRunner.java index 5069a1dd6..655f0b0ec 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/init/AuthInitRunner.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/init/AuthInitRunner.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; * Auth initialization runner * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-constant/pom.xml b/dc3-common/dc3-common-constant/pom.xml index b6ba78c80..201cc300f 100644 --- a/dc3-common/dc3-common-constant/pom.xml +++ b/dc3-common/dc3-common-constant/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-constant - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/cache/TimeoutConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/cache/TimeoutConstant.java index 193e9aff3..6128d8b56 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/cache/TimeoutConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/cache/TimeoutConstant.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.constant.common.ExceptionConstant; * 超时 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class TimeoutConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/AlgorithmConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/AlgorithmConstant.java index 3e53aa878..9dee5ddde 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/AlgorithmConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/AlgorithmConstant.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.constant.common; * 算法 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class AlgorithmConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/DefaultConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/DefaultConstant.java index e38c4cb86..a7f8da635 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/DefaultConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/DefaultConstant.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.constant.common; * 默认 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class DefaultConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/EnvironmentConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/EnvironmentConstant.java index da7293a1e..91b2bea85 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/EnvironmentConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/EnvironmentConstant.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.constant.common; * 环境变量, 配置变量 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class EnvironmentConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/FolderConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/FolderConstant.java index db0643211..62dac49b0 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/FolderConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/FolderConstant.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.constant.common; * 文件夹 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class FolderConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/PrefixConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/PrefixConstant.java index 964b6428e..7b156763a 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/PrefixConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/PrefixConstant.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.constant.common; * 前缀 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class PrefixConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/QueryWrapperConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/QueryWrapperConstant.java index 4295b61ce..db219cafd 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/QueryWrapperConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/QueryWrapperConstant.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.constant.common; * 查询 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class QueryWrapperConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/RequestConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/RequestConstant.java index fc0ca1ac0..0755bd571 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/RequestConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/RequestConstant.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.constant.common; * 请求 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class RequestConstant { @@ -38,7 +38,7 @@ public class RequestConstant { * 自定义请求 Header 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class Header { @@ -77,7 +77,7 @@ public class RequestConstant { * 自定义请求 Message 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class Message { @@ -96,7 +96,7 @@ public class RequestConstant { * 自定义请求 Key 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class Key { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/SuffixConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/SuffixConstant.java index 8b88dd237..5e3920aaa 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/SuffixConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/SuffixConstant.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.constant.common; * 后缀 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class SuffixConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/SymbolConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/SymbolConstant.java index ee2bb1f61..b34b06041 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/SymbolConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/SymbolConstant.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.constant.common; * 符号 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class SymbolConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/TimeConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/TimeConstant.java index 6d8b6369e..81c89e4d9 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/TimeConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/TimeConstant.java @@ -22,7 +22,7 @@ import java.time.ZoneId; * 时间 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class TimeConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/EventConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/EventConstant.java index 3c019791b..2d94e3c97 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/EventConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/EventConstant.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.constant.common.ExceptionConstant; * 事件 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class EventConstant { @@ -35,7 +35,7 @@ public class EventConstant { * 驱动事件 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class Driver { @@ -60,7 +60,7 @@ public class EventConstant { * 设备事件 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class Device { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/MetadataConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/MetadataConstant.java index 13966fc04..36d2e24d2 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/MetadataConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/MetadataConstant.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.constant.common.SuffixConstant; * 元数据 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class MetadataConstant { @@ -37,7 +37,7 @@ public class MetadataConstant { * 模板元数据 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class Profile { @@ -55,7 +55,7 @@ public class MetadataConstant { * 模板元数据 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class Point { @@ -73,7 +73,7 @@ public class MetadataConstant { * 设备元数据 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class Device { @@ -91,7 +91,7 @@ public class MetadataConstant { * 驱动信息元数据 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class DriverConfig { @@ -109,7 +109,7 @@ public class MetadataConstant { * 位号信息元数据 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class PointConfig { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/RabbitConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/RabbitConstant.java index 453c5b587..71a6ef81a 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/RabbitConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/RabbitConstant.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.constant.common.ExceptionConstant; * 消息 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class RabbitConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/ScheduleConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/ScheduleConstant.java index f9afb6309..f2e670d00 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/ScheduleConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/ScheduleConstant.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.constant.common.ExceptionConstant; * 任务调度 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class ScheduleConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/StorageConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/StorageConstant.java index 2ca099aff..9fa9227fe 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/StorageConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/StorageConstant.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.constant.common.SymbolConstant; * 存储 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class StorageConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/StrategyConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/StrategyConstant.java index d8f91c6ab..2f9af5be6 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/StrategyConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/driver/StrategyConstant.java @@ -23,7 +23,7 @@ import io.github.pnoker.common.constant.common.SymbolConstant; * 策略工厂 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class StrategyConstant { @@ -36,7 +36,7 @@ public class StrategyConstant { * 存储相关的策略工厂 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public static class Storage { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/AuthConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/AuthConstant.java index 6d1438f7d..e5cbe8013 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/AuthConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/AuthConstant.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.constant.common.ExceptionConstant; * 权限服务 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class AuthConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DataConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DataConstant.java index a4ff710fb..2bc8f6826 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DataConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DataConstant.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.constant.common.ExceptionConstant; * 数据服务 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class DataConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DriverConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DriverConstant.java index 74e957e98..c21c51e1f 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DriverConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DriverConstant.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.constant.common.ExceptionConstant; * 驱动服务 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class DriverConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/ManagerConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/ManagerConstant.java index 9670140d9..9f6fc802e 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/ManagerConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/ManagerConstant.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.constant.common.ExceptionConstant; * 管理服务 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class ManagerConstant { diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AccrueFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AccrueFlagEnum.java index 79cec000f..9a72bcadf 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AccrueFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AccrueFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用累计类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AlarmMessageLevelFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AlarmMessageLevelFlagEnum.java index 6c7d865ab..c7e39085b 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AlarmMessageLevelFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AlarmMessageLevelFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用报警等级类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AlarmTypeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AlarmTypeFlagEnum.java index aba566da1..282563ec0 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AlarmTypeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AlarmTypeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用报警类型类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ApiTypeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ApiTypeFlagEnum.java index a3c47e3ea..91f2bab26 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ApiTypeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ApiTypeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用菜单类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AttributeTypeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AttributeTypeFlagEnum.java index 60d56130a..d53b1ad69 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AttributeTypeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AttributeTypeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用属性类型标识枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AutoConfirmFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AutoConfirmFlagEnum.java index 29a05d72a..60e9fb2c5 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AutoConfirmFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/AutoConfirmFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用报警类型类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceCommandTypeEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceCommandTypeEnum.java index 838b668f3..d7ff0e281 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceCommandTypeEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceCommandTypeEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用驱动事件枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceEventTypeEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceEventTypeEnum.java index 8f117d2da..2c6e7cbc3 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceEventTypeEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceEventTypeEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用驱动事件枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceStatusEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceStatusEnum.java index ef14bf7fa..c5cf88515 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceStatusEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DeviceStatusEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 设备状态枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverCommandTypeEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverCommandTypeEnum.java index d75bac8cb..316b34ef1 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverCommandTypeEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverCommandTypeEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用驱动事件枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverEventTypeEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverEventTypeEnum.java index 9e82fc677..a0ea2a651 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverEventTypeEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverEventTypeEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用驱动事件枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverStatusEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverStatusEnum.java index be07af442..f2abc09e3 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverStatusEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverStatusEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 驱动状态枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverTypeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverTypeFlagEnum.java index 555a0c757..ca372f3ca 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverTypeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/DriverTypeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用驱动类型标识枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/EnableFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/EnableFlagEnum.java index 04e3631b8..0a882c670 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/EnableFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/EnableFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用使能标识 枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/EntityTypeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/EntityTypeFlagEnum.java index ce0ff4c6c..7ae4ed091 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/EntityTypeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/EntityTypeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用实体类型标识枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ExpireFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ExpireFlagEnum.java index d4729288b..9eda3a633 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ExpireFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ExpireFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用失效类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/GroupTypeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/GroupTypeFlagEnum.java index 9791454c3..2c040a145 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/GroupTypeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/GroupTypeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用实体分组标识枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MenuLevelFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MenuLevelFlagEnum.java index 3aaa82026..bffb25052 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MenuLevelFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MenuLevelFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用报警等级类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MenuTypeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MenuTypeFlagEnum.java index 87838c6d7..a2a8afb0a 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MenuTypeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MenuTypeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用菜单类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MetadataOperateTypeEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MetadataOperateTypeEnum.java index f3d65bf08..32affd904 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MetadataOperateTypeEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MetadataOperateTypeEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用元数据操作类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MetadataTypeEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MetadataTypeEnum.java index e14f6803c..094c597ed 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MetadataTypeEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/MetadataTypeEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用元数据类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/PointTypeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/PointTypeFlagEnum.java index 9b9ddb599..657b27630 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/PointTypeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/PointTypeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用位号类型标识枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ProfileShareFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ProfileShareFlagEnum.java index 1c0f13614..4b49fe6e0 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ProfileShareFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ProfileShareFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用模板共享类型标识枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ProfileTypeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ProfileTypeFlagEnum.java index 4d6dee572..d97ab34b2 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ProfileTypeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ProfileTypeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用模板类型标识枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResourceScopeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResourceScopeFlagEnum.java index 42ed433b4..eb84cd588 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResourceScopeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResourceScopeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用权限范围类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResourceTypeFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResourceTypeFlagEnum.java index 82deca5c9..ec1b90f16 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResourceTypeFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResourceTypeFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用权限类型枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResponseEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResponseEnum.java index 331784117..005da9a1e 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResponseEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/ResponseEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用返回结果枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/RwFlagEnum.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/RwFlagEnum.java index 7795173b1..169010b46 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/RwFlagEnum.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/enums/RwFlagEnum.java @@ -27,7 +27,7 @@ import java.util.Optional; * 通用读写标识枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/pom.xml b/dc3-common/dc3-common-dal/pom.xml index 876971fb4..576fd6255 100644 --- a/dc3-common/dc3-common-dal/pom.xml +++ b/dc3-common/dc3-common-dal/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-dal - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/GroupBindManager.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/GroupBindManager.java index 2fa936f62..e1fae6d6b 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/GroupBindManager.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/GroupBindManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.dal.entity.model.GroupBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface GroupBindManager extends IService { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/GroupManager.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/GroupManager.java index f6ddef0f5..f7eae700b 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/GroupManager.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/GroupManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.dal.entity.model.GroupDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface GroupManager extends IService { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/LabelBindManager.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/LabelBindManager.java index 341bca735..cde5ec53b 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/LabelBindManager.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/LabelBindManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.dal.entity.model.LabelBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface LabelBindManager extends IService { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/LabelManager.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/LabelManager.java index 90be083d0..41d2d06d2 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/LabelManager.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/LabelManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.dal.entity.model.LabelDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface LabelManager extends IService { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/GroupBindManagerImpl.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/GroupBindManagerImpl.java index 4abae5704..9b9e03784 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/GroupBindManagerImpl.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/GroupBindManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/GroupManagerImpl.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/GroupManagerImpl.java index 00d0846df..804fe64f8 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/GroupManagerImpl.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/GroupManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/LabelBindManagerImpl.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/LabelBindManagerImpl.java index f14288501..49cfe48b9 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/LabelBindManagerImpl.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/LabelBindManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/LabelManagerImpl.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/LabelManagerImpl.java index 59e72d901..719120178 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/LabelManagerImpl.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/dal/impl/LabelManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/DictionaryBO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/DictionaryBO.java index e54f2e2ab..f7ff085bf 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/DictionaryBO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/DictionaryBO.java @@ -26,7 +26,7 @@ import java.util.List; * Dictionary BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/GroupBO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/GroupBO.java index bc00f268c..c7e2e591c 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/GroupBO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/GroupBO.java @@ -25,7 +25,7 @@ import lombok.*; * Group BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/LabelBO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/LabelBO.java index 2f713216b..6ac490bb7 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/LabelBO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/LabelBO.java @@ -25,7 +25,7 @@ import lombok.*; * Label BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/LabelBindBO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/LabelBindBO.java index 666b0f202..fbbd50503 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/LabelBindBO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/bo/LabelBindBO.java @@ -24,7 +24,7 @@ import lombok.*; * LabelBind BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/DictionaryBuilder.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/DictionaryBuilder.java index 49fbe4dd2..349213fef 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/DictionaryBuilder.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/DictionaryBuilder.java @@ -29,7 +29,7 @@ import java.util.List; * Dictionary Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/GroupBuilder.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/GroupBuilder.java index 00dc62513..d76d24d75 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/GroupBuilder.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/GroupBuilder.java @@ -37,7 +37,7 @@ import java.util.Optional; * Group Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/LabelBindBuilder.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/LabelBindBuilder.java index de47c07d2..350c68074 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/LabelBindBuilder.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/LabelBindBuilder.java @@ -34,7 +34,7 @@ import java.util.Optional; * LabelBind Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/LabelBuilder.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/LabelBuilder.java index 5b8ee9974..edede9715 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/LabelBuilder.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/builder/LabelBuilder.java @@ -37,7 +37,7 @@ import java.util.Optional; * Label Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/GroupBindDO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/GroupBindDO.java index be5786c2c..d5ed0ed5c 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/GroupBindDO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/GroupBindDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/GroupDO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/GroupDO.java index 780a1b536..36ac6518a 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/GroupDO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/GroupDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/LabelBindDO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/LabelBindDO.java index 0e2f2f4ce..a28783528 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/LabelBindDO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/LabelBindDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/LabelDO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/LabelDO.java index 861492dad..4a0487012 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/LabelDO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/model/LabelDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/GroupQuery.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/GroupQuery.java index ce622dafd..65d627c06 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/GroupQuery.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/GroupQuery.java @@ -28,7 +28,7 @@ import java.io.Serializable; * Group Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/LabelBindQuery.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/LabelBindQuery.java index 6a84b5818..7fd5be280 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/LabelBindQuery.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/LabelBindQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; * LabelBind Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/LabelQuery.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/LabelQuery.java index 8bedfa9e0..947d7643d 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/LabelQuery.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/query/LabelQuery.java @@ -28,7 +28,7 @@ import java.io.Serializable; * Label Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/DictionaryVO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/DictionaryVO.java index 5692a43a5..4de8ca731 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/DictionaryVO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/DictionaryVO.java @@ -27,7 +27,7 @@ import java.util.List; * Dictionary VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/GroupVO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/GroupVO.java index c78b89d1d..bf063d582 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/GroupVO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/GroupVO.java @@ -30,7 +30,7 @@ import lombok.*; * Group VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/LabelBindVO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/LabelBindVO.java index b1f550207..d47f9db3f 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/LabelBindVO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/LabelBindVO.java @@ -28,7 +28,7 @@ import lombok.*; * LabelBind VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/LabelVO.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/LabelVO.java index 21ad31edc..890c94b20 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/LabelVO.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/entity/vo/LabelVO.java @@ -30,7 +30,7 @@ import lombok.*; * Label VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/generator/MybatisGenerator.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/generator/MybatisGenerator.java index f0a40a2bf..051df3f8d 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/generator/MybatisGenerator.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/generator/MybatisGenerator.java @@ -29,7 +29,7 @@ import io.github.pnoker.common.utils.MybatisUtil; * 当前配置仅用于 dc3-common-dal 服务模块, 如果需要用于其他模块请重新配置 path 参数。 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class MybatisGenerator { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/GroupBindMapper.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/GroupBindMapper.java index 3d84cac9b..b7d11824c 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/GroupBindMapper.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/GroupBindMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.dal.entity.model.GroupBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface GroupBindMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/GroupMapper.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/GroupMapper.java index 1a6a2341a..eb84d9a09 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/GroupMapper.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/GroupMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.dal.entity.model.GroupDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface GroupMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/LabelBindMapper.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/LabelBindMapper.java index b2f68d5f0..3d11c6370 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/LabelBindMapper.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/LabelBindMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.dal.entity.model.LabelBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface LabelBindMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/LabelMapper.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/LabelMapper.java index 8fc5c2b63..60473e02e 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/LabelMapper.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/mapper/LabelMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.dal.entity.model.LabelDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface LabelMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/GroupService.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/GroupService.java index c3410a035..12ff80ec4 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/GroupService.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/GroupService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.dal.entity.query.GroupQuery; * Group Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface GroupService extends BaseService { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/LabelBindService.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/LabelBindService.java index edebab72f..b77b0fc43 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/LabelBindService.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/LabelBindService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.dal.entity.query.LabelBindQuery; * LabelBind Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface LabelBindService extends BaseService { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/LabelService.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/LabelService.java index 6123c69e2..844a8db84 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/LabelService.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/LabelService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.dal.entity.query.LabelQuery; * Label Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface LabelService extends BaseService { diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/GroupServiceImpl.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/GroupServiceImpl.java index d1de2b7c3..e8058acf1 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/GroupServiceImpl.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/GroupServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Objects; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/LabelBindServiceImpl.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/LabelBindServiceImpl.java index 3ae5e4692..aefbcebf5 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/LabelBindServiceImpl.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/LabelBindServiceImpl.java @@ -40,7 +40,7 @@ import java.util.Objects; * LabelBindService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/LabelServiceImpl.java b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/LabelServiceImpl.java index ce2bd1453..894bbb259 100644 --- a/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/LabelServiceImpl.java +++ b/dc3-common/dc3-common-dal/src/main/java/io/github/pnoker/common/dal/service/impl/LabelServiceImpl.java @@ -42,7 +42,7 @@ import java.util.Objects; * LabelService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/pom.xml b/dc3-common/dc3-common-data/pom.xml index e159b21b7..4328ff670 100644 --- a/dc3-common/dc3-common-data/pom.xml +++ b/dc3-common/dc3-common-data/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-data - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/config/ActiveDataProfileConfig.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/config/ActiveDataProfileConfig.java index afe53d8a8..77058ccd7 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/config/ActiveDataProfileConfig.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/config/ActiveDataProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/config/DataTopicConfig.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/config/DataTopicConfig.java index 3a7308638..1e9328fd9 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/config/DataTopicConfig.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/config/DataTopicConfig.java @@ -34,7 +34,7 @@ import java.util.Map; * Topic Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DeviceEventService.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DeviceEventService.java index 7e2533331..0bc285bcf 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DeviceEventService.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DeviceEventService.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.entity.dto.DeviceEventDTO; * 设备事件相关接口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceEventService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DeviceStatusService.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DeviceStatusService.java index 13524aa8e..34e9cf8fd 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DeviceStatusService.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DeviceStatusService.java @@ -25,7 +25,7 @@ import java.util.Map; * 设备 Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceStatusService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DriverEventService.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DriverEventService.java index af78bc1a3..f63822168 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DriverEventService.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DriverEventService.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.entity.dto.DriverEventDTO; * 驱动事件相关接口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverEventService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DriverStatusService.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DriverStatusService.java index 98742b601..1efff9d32 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DriverStatusService.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/DriverStatusService.java @@ -26,7 +26,7 @@ import java.util.Map; * 设备 Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverStatusService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/PointValueCommandService.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/PointValueCommandService.java index 4332af99d..8826690bf 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/PointValueCommandService.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/PointValueCommandService.java @@ -21,7 +21,7 @@ import io.github.pnoker.common.data.entity.vo.PointValueWriteVO; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointValueCommandService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/PointValueService.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/PointValueService.java index fcd03c85d..ffb01b76f 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/PointValueService.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/PointValueService.java @@ -24,7 +24,7 @@ import java.util.List; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointValueService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/ScheduleForDataService.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/ScheduleForDataService.java index 945573513..a65b12f3c 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/ScheduleForDataService.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/ScheduleForDataService.java @@ -18,7 +18,7 @@ package io.github.pnoker.common.data.biz; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ScheduleForDataService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceEventServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceEventServiceImpl.java index 4858f9d17..ce779be08 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceEventServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceEventServiceImpl.java @@ -31,7 +31,7 @@ import java.util.Objects; * DeviceService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceStatusServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceStatusServiceImpl.java index 5f025f926..d89100e75 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceStatusServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceStatusServiceImpl.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; * DeviceService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverEventServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverEventServiceImpl.java index ab931d9e2..06fac6ceb 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverEventServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverEventServiceImpl.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; * DriverService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverStatusServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverStatusServiceImpl.java index 7caee5fc7..cede9f8d5 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverStatusServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverStatusServiceImpl.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * DriverService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PointValueCommandServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PointValueCommandServiceImpl.java index dffdeda0e..8b3f6747a 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PointValueCommandServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PointValueCommandServiceImpl.java @@ -36,7 +36,7 @@ import org.springframework.stereotype.Service; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PointValueServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PointValueServiceImpl.java index 7258f202c..547eeb19a 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PointValueServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PointValueServiceImpl.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PostgresRepositoryServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PostgresRepositoryServiceImpl.java index 9e6cd3b63..b164daf46 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PostgresRepositoryServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PostgresRepositoryServiceImpl.java @@ -30,7 +30,7 @@ import java.util.List; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/ScheduleForDataServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/ScheduleForDataServiceImpl.java index f652532e7..0c2ac89c4 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/ScheduleForDataServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/ScheduleForDataServiceImpl.java @@ -30,7 +30,7 @@ import org.springframework.stereotype.Service; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/DeviceStatusController.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/DeviceStatusController.java index ffe001800..2919cbcb6 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/DeviceStatusController.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/DeviceStatusController.java @@ -35,7 +35,7 @@ import java.util.Map; * 设备 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/DriverStatusController.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/DriverStatusController.java index 7d47743fd..1a0eecd62 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/DriverStatusController.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/DriverStatusController.java @@ -36,7 +36,7 @@ import java.util.Objects; * 设备 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/PointValueCommandController.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/PointValueCommandController.java index 4be6123c9..e577cfc02 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/PointValueCommandController.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/PointValueCommandController.java @@ -34,7 +34,7 @@ import reactor.core.publisher.Mono; * PointValue Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/PointValueController.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/PointValueController.java index 23fcde201..6ba137dc3 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/PointValueController.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/controller/PointValueController.java @@ -37,7 +37,7 @@ import java.util.Objects; * PointValue Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceEventManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceEventManager.java index af6fe9f93..b5d51b402 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceEventManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceEventManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.DeviceEventDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceEventManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceRunHistoryManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceRunHistoryManager.java index 233a30c06..a718d2b60 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceRunHistoryManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceRunHistoryManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.DeviceRunHistoryDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceRunHistoryManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceRunManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceRunManager.java index 63291247c..c93014e18 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceRunManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceRunManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.DeviceRunDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceRunManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceStatusHistoryManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceStatusHistoryManager.java index 22154333d..8522641f5 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceStatusHistoryManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DeviceStatusHistoryManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.DeviceStatusHistoryDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceStatusHistoryManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverEventManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverEventManager.java index 676365c17..7dc1a1325 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverEventManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverEventManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.DriverEventDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverEventManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverRunHistoryManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverRunHistoryManager.java index 072107a0f..10faabf50 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverRunHistoryManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverRunHistoryManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.DriverRunHistoryDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverRunHistoryManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverRunManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverRunManager.java index 34c10026c..f1380bcb3 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverRunManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverRunManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.DriverRunDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverRunManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverStatusHistoryManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverStatusHistoryManager.java index 3698e25ca..4594160c6 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverStatusHistoryManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/DriverStatusHistoryManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.DriverStatusHistoryDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverStatusHistoryManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/MessageManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/MessageManager.java index 0d4becc7b..735c02792 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/MessageManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/MessageManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.MessageDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface MessageManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/NotifyManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/NotifyManager.java index 8d5d372b3..e07eb93e2 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/NotifyManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/NotifyManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.NotifyDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface NotifyManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/PointValueManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/PointValueManager.java index 193b91b2f..aa2662d4f 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/PointValueManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/PointValueManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.PointValueDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointValueManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/RuleManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/RuleManager.java index 9f54945c4..9e7003fc1 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/RuleManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/RuleManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.RuleDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RuleManager extends IService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceEventManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceEventManagerImpl.java index b6de4441e..7f1e41d0e 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceEventManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceEventManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceRunHistoryManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceRunHistoryManagerImpl.java index c3a05c1cc..1fadfe21a 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceRunHistoryManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceRunHistoryManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceRunManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceRunManagerImpl.java index b363a19f8..ef2311d67 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceRunManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceRunManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceStatusHistoryManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceStatusHistoryManagerImpl.java index 6760493af..9a2860a5e 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceStatusHistoryManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DeviceStatusHistoryManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverEventManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverEventManagerImpl.java index b593f8fe8..d57ce8cd7 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverEventManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverEventManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverRunHistoryManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverRunHistoryManagerImpl.java index f80ca1aee..48b44e3d7 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverRunHistoryManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverRunHistoryManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverRunManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverRunManagerImpl.java index 57be09de0..393cf79f1 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverRunManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverRunManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverStatusHistoryManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverStatusHistoryManagerImpl.java index 3784eebf7..7aba0b589 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverStatusHistoryManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/DriverStatusHistoryManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/MessageManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/MessageManagerImpl.java index 72474ca94..748b0e88a 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/MessageManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/MessageManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/NotifyManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/NotifyManagerImpl.java index 724eaba44..78d3ea148 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/NotifyManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/NotifyManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/PointValueManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/PointValueManagerImpl.java index 35c98d5b7..07432132c 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/PointValueManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/PointValueManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/RuleManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/RuleManagerImpl.java index 24ad6d6f7..7493a3485 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/RuleManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/RuleManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/DeviceEvent.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/DeviceEvent.java index c820aef5b..bf0915bd0 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/DeviceEvent.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/DeviceEvent.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/DriverEvent.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/DriverEvent.java index 125130831..d29bdc699 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/DriverEvent.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/DriverEvent.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/MessageBO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/MessageBO.java index e7b788677..ca8b042cb 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/MessageBO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/MessageBO.java @@ -28,7 +28,7 @@ import lombok.*; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/NotifyBO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/NotifyBO.java index 3cf894cb9..587044193 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/NotifyBO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/NotifyBO.java @@ -28,7 +28,7 @@ import lombok.*; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/RuleBO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/RuleBO.java index c8c6deaf0..987d68022 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/RuleBO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/bo/RuleBO.java @@ -28,7 +28,7 @@ import lombok.*; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/MessageBuilder.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/MessageBuilder.java index d03204833..55cb894e8 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/MessageBuilder.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/MessageBuilder.java @@ -41,7 +41,7 @@ import java.util.Optional; * AlarmMessageProfile Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/NotifyBuilder.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/NotifyBuilder.java index 9168d6e85..d19e69add 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/NotifyBuilder.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/NotifyBuilder.java @@ -41,7 +41,7 @@ import java.util.Optional; * AlarmNotifyProfile Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/PointValueBuilder.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/PointValueBuilder.java index a0fdc7f4b..ad48d8f88 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/PointValueBuilder.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/PointValueBuilder.java @@ -29,7 +29,7 @@ import java.util.List; * Group Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/RuleBuilder.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/RuleBuilder.java index df0eff76d..351271359 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/RuleBuilder.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/builder/RuleBuilder.java @@ -41,7 +41,7 @@ import java.util.Optional; * AlarmRule Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceEventDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceEventDO.java index c2945455c..73ae6fb92 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceEventDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceEventDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceRunDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceRunDO.java index c213ec278..6d2cca419 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceRunDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceRunDO.java @@ -30,7 +30,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceRunHistoryDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceRunHistoryDO.java index 38f51988f..45866eb79 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceRunHistoryDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceRunHistoryDO.java @@ -30,7 +30,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceStatusHistoryDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceStatusHistoryDO.java index 448538c71..39b74f8cd 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceStatusHistoryDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DeviceStatusHistoryDO.java @@ -30,7 +30,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverEventDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverEventDO.java index de72d1e9a..372367268 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverEventDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverEventDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverRunDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverRunDO.java index 3f334aa4a..d18997d3f 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverRunDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverRunDO.java @@ -30,7 +30,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverRunHistoryDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverRunHistoryDO.java index 041a72cd9..9b3125a7a 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverRunHistoryDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverRunHistoryDO.java @@ -30,7 +30,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverStatusHistoryDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverStatusHistoryDO.java index 2db1357ca..f8e4ee2fd 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverStatusHistoryDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/DriverStatusHistoryDO.java @@ -30,7 +30,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/MessageDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/MessageDO.java index 1e601d84c..98a9e5989 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/MessageDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/MessageDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/NotifyDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/NotifyDO.java index dd29f74bd..a6c718eae 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/NotifyDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/NotifyDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/PointValueDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/PointValueDO.java index 14be92111..f66a9c99f 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/PointValueDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/PointValueDO.java @@ -32,7 +32,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/RuleDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/RuleDO.java index 6e403633f..0e0ff41af 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/RuleDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/RuleDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DeviceEventQuery.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DeviceEventQuery.java index fa5036b8f..60af546b6 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DeviceEventQuery.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DeviceEventQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; * DeviceEvent Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DeviceQuery.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DeviceQuery.java index d1e076626..5b2e29492 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DeviceQuery.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DeviceQuery.java @@ -27,7 +27,7 @@ import java.io.Serializable; * 设备 Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DriverEventQuery.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DriverEventQuery.java index 9fe8868ef..4120c026b 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DriverEventQuery.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DriverEventQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; * DriverEvent Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DriverQuery.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DriverQuery.java index 500e12d03..0abc9d576 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DriverQuery.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/DriverQuery.java @@ -28,7 +28,7 @@ import java.io.Serializable; * Driver Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/MessageQuery.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/MessageQuery.java index a8c79a1cb..04602116b 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/MessageQuery.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/MessageQuery.java @@ -31,7 +31,7 @@ import java.io.Serializable; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/NotifyQuery.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/NotifyQuery.java index ada17d46e..2642fae85 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/NotifyQuery.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/NotifyQuery.java @@ -31,7 +31,7 @@ import java.io.Serializable; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/RuleQuery.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/RuleQuery.java index c3ed8162a..3a6499759 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/RuleQuery.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/query/RuleQuery.java @@ -31,7 +31,7 @@ import java.io.Serializable; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/MessageVO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/MessageVO.java index f031df3d9..e6c0b47bd 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/MessageVO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/MessageVO.java @@ -29,7 +29,7 @@ import lombok.*; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/NotifyVO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/NotifyVO.java index 79e807b07..f44a8962b 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/NotifyVO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/NotifyVO.java @@ -29,7 +29,7 @@ import lombok.*; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueReadVO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueReadVO.java index fadec730b..29c60bb69 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueReadVO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueReadVO.java @@ -26,7 +26,7 @@ import java.io.Serializable; * PointValueRead VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueVO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueVO.java index 4b4cf7cc6..c79853876 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueVO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueVO.java @@ -28,7 +28,7 @@ import java.time.LocalDateTime; * PointValue VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueWriteVO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueWriteVO.java index 4b84f2693..2f6512c1e 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueWriteVO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/PointValueWriteVO.java @@ -27,7 +27,7 @@ import java.io.Serializable; * PointValueWrite VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/RuleVO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/RuleVO.java index 2bd1d4387..214bab86c 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/RuleVO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/vo/RuleVO.java @@ -29,7 +29,7 @@ import lombok.*; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/generator/MybatisGenerator.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/generator/MybatisGenerator.java index 0ce237ba2..c82593252 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/generator/MybatisGenerator.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/generator/MybatisGenerator.java @@ -29,7 +29,7 @@ import io.github.pnoker.common.utils.MybatisUtil; * 当前配置仅用于 dc3-common-data 服务模块, 如果需要用于其他模块请重新配置 path 参数。 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class MybatisGenerator { @@ -58,10 +58,11 @@ public class MybatisGenerator { .strategyConfig(builder -> builder .addInclude( "dc3_driver_event", - "dc3_device_event"/*, + "dc3_device_event", + "dc3_point_value", "dc3_message", "dc3_notify", - "dc3_rule"*/ + "dc3_rule" ) ).execute(); } diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/job/HourlyJobForData.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/job/HourlyJobForData.java index 05f5357b8..c74423c81 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/job/HourlyJobForData.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/job/HourlyJobForData.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; * 通用: 每小时执行任务 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/job/PointValueJob.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/job/PointValueJob.java index af47d684a..b79e738f8 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/job/PointValueJob.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/job/PointValueJob.java @@ -34,7 +34,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceEventMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceEventMapper.java index bbf37810d..aecdd22d4 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceEventMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceEventMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.DeviceEventDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceEventMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceRunHistoryMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceRunHistoryMapper.java index 9508b9377..954671d03 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceRunHistoryMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceRunHistoryMapper.java @@ -29,7 +29,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceRunHistoryMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceRunMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceRunMapper.java index bf804caf5..a0d1afdd4 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceRunMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceRunMapper.java @@ -28,7 +28,7 @@ import java.util.List; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceRunMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceStatusHistoryMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceStatusHistoryMapper.java index c01f0d809..11f879b2d 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceStatusHistoryMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DeviceStatusHistoryMapper.java @@ -28,7 +28,7 @@ import java.util.List; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceStatusHistoryMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverEventMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverEventMapper.java index 90256d527..e03155e60 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverEventMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverEventMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.DriverEventDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverEventMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverRunHistoryMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverRunHistoryMapper.java index 909f09322..e9a9202c5 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverRunHistoryMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverRunHistoryMapper.java @@ -29,7 +29,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverRunHistoryMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverRunMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverRunMapper.java index 01c8cea55..76bbab7af 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverRunMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverRunMapper.java @@ -28,7 +28,7 @@ import java.util.List; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverRunMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverStatusHistoryMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverStatusHistoryMapper.java index a5c856659..3a11bbc88 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverStatusHistoryMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/DriverStatusHistoryMapper.java @@ -28,7 +28,7 @@ import java.util.List; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverStatusHistoryMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/MessageMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/MessageMapper.java index e1fb06598..0ce86e0b1 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/MessageMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/MessageMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.MessageDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface MessageMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/NotifyMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/NotifyMapper.java index c55f7c26f..dd492d7ae 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/NotifyMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/NotifyMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.NotifyDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface NotifyMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/PointValueMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/PointValueMapper.java index fea46b578..cfdd9a184 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/PointValueMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/PointValueMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.PointValueDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointValueMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/RuleMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/RuleMapper.java index b0d6495fd..63ded52a0 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/RuleMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/RuleMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.data.entity.model.RuleDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RuleMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/DeviceEventReceiver.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/DeviceEventReceiver.java index 10b27e28a..fd489a98d 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/DeviceEventReceiver.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/DeviceEventReceiver.java @@ -34,7 +34,7 @@ import java.util.Objects; * 接收驱动发送过来的设备事件 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/DriverEventReceiver.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/DriverEventReceiver.java index afc7b5486..e113016c2 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/DriverEventReceiver.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/DriverEventReceiver.java @@ -35,7 +35,7 @@ import java.util.Objects; * 其中包括: 驱动心跳事件, 在线, 离线, 故障等其他事件 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/PointValueReceiver.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/PointValueReceiver.java index 7de509662..8900d07d1 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/PointValueReceiver.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/rabbit/PointValueReceiver.java @@ -38,7 +38,7 @@ import java.util.concurrent.ThreadPoolExecutor; * 200万条SinglePointValue会产生: 60M的索引数据以及400M的数据 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/MessageService.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/MessageService.java index b053719df..6a9e8d83e 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/MessageService.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/MessageService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.data.entity.query.MessageQuery; * AlarmMessageProfile Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface MessageService extends BaseService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/NotifyService.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/NotifyService.java index d60491494..cc7743aa1 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/NotifyService.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/NotifyService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.data.entity.query.NotifyQuery; * AlarmNotifyProfile Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface NotifyService extends BaseService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/RuleService.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/RuleService.java index 2904219d7..fcf222e5a 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/RuleService.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/RuleService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.data.entity.query.RuleQuery; * AlarmRule Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RuleService extends BaseService { diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/MessageServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/MessageServiceImpl.java index f908f51df..388adc5a7 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/MessageServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/MessageServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Objects; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/NotifyServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/NotifyServiceImpl.java index 5a8f183ab..44b087417 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/NotifyServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/NotifyServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Objects; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/RuleServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/RuleServiceImpl.java index e283fb5f5..c0938260e 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/RuleServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/service/impl/RuleServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Objects; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/init/DataInitRunner.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/init/DataInitRunner.java index 731f7ee38..9b8d502ac 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/init/DataInitRunner.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/init/DataInitRunner.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; * Data initialization runner * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-common/dc3-common-data/src/main/resources/mapping/DeviceStatusHistoryMapper.xml b/dc3-common/dc3-common-data/src/main/resources/mapping/DeviceStatusHistoryMapper.xml index 5d9b75e62..f6b117ec5 100644 --- a/dc3-common/dc3-common-data/src/main/resources/mapping/DeviceStatusHistoryMapper.xml +++ b/dc3-common/dc3-common-data/src/main/resources/mapping/DeviceStatusHistoryMapper.xml @@ -29,6 +29,7 @@ from dc3_device_status_history where device_id = #{id} and deleted = 0 - order by create_time desc limit 2; + order by create_time desc + limit 2; diff --git a/dc3-common/dc3-common-data/src/main/resources/mapping/DriverStatusHistoryMapper.xml b/dc3-common/dc3-common-data/src/main/resources/mapping/DriverStatusHistoryMapper.xml index 529c62673..fa5f9a70a 100644 --- a/dc3-common/dc3-common-data/src/main/resources/mapping/DriverStatusHistoryMapper.xml +++ b/dc3-common/dc3-common-data/src/main/resources/mapping/DriverStatusHistoryMapper.xml @@ -28,6 +28,7 @@ from dc3_driver_status_history where driver_id = #{id} and deleted = 0 - order by create_time desc limit 2; + order by create_time desc + limit 2; diff --git a/dc3-common/dc3-common-driver/pom.xml b/dc3-common/dc3-common-driver/pom.xml index a44881bbe..d4310550f 100644 --- a/dc3-common/dc3-common-driver/pom.xml +++ b/dc3-common/dc3-common-driver/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-driver - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/ActiveDriverProfileConfig.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/ActiveDriverProfileConfig.java index 317389f63..68feb20ea 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/ActiveDriverProfileConfig.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/ActiveDriverProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/DriverEnvironmentConfig.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/DriverEnvironmentConfig.java index 26b6ceca4..621ff1aa7 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/DriverEnvironmentConfig.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/DriverEnvironmentConfig.java @@ -37,7 +37,7 @@ import java.util.Map; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/DriverTopicConfig.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/DriverTopicConfig.java index f88b90a2b..aed152661 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/DriverTopicConfig.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/config/DriverTopicConfig.java @@ -34,7 +34,7 @@ import java.util.Map; * Topic Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/PointValue.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/PointValue.java index 0b869f81b..5c329d84b 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/PointValue.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/PointValue.java @@ -28,7 +28,7 @@ import java.time.LocalDateTime; * MongoDB 位号数据 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/RValue.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/RValue.java index 6bf219c41..057c5ffa8 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/RValue.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/RValue.java @@ -34,7 +34,7 @@ import java.util.Optional; * 读数据实体类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/WValue.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/WValue.java index a1293b292..6cf3cbaec 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/WValue.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bean/WValue.java @@ -31,7 +31,7 @@ import java.util.Objects; * 写数据实体类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/AttributeBO.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/AttributeBO.java index f64b67d58..f2fa70b61 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/AttributeBO.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/AttributeBO.java @@ -31,7 +31,7 @@ import java.util.Objects; * 属性配置 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/DeviceBO.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/DeviceBO.java index b6196dbdc..170572fe4 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/DeviceBO.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/DeviceBO.java @@ -30,7 +30,7 @@ import java.util.Set; * 设备 BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/DriverBO.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/DriverBO.java index 479f67fb8..170060887 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/DriverBO.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/DriverBO.java @@ -26,7 +26,7 @@ import lombok.*; * Driver BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/PointBO.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/PointBO.java index 5b3aa5d1b..0834de957 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/PointBO.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/PointBO.java @@ -29,7 +29,7 @@ import java.math.BigDecimal; * Point BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/RegisterBO.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/RegisterBO.java index c5c48cb52..6f7ff827d 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/RegisterBO.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/bo/RegisterBO.java @@ -26,7 +26,7 @@ import java.util.List; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/DeviceBuilder.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/DeviceBuilder.java index 3f90e6fea..c08443c71 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/DeviceBuilder.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/DeviceBuilder.java @@ -36,7 +36,7 @@ import java.util.HashSet; * 设备 Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/DriverBuilder.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/DriverBuilder.java index e436b1e7b..cea1da493 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/DriverBuilder.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/DriverBuilder.java @@ -38,7 +38,7 @@ import java.util.Optional; * Driver Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcDriverAttributeBuilder.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcDriverAttributeBuilder.java index aef80b818..5affed09f 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcDriverAttributeBuilder.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcDriverAttributeBuilder.java @@ -38,7 +38,7 @@ import java.util.Optional; * DriverAttribute Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcDriverAttributeConfigBuilder.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcDriverAttributeConfigBuilder.java index 1e01256ad..189557299 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcDriverAttributeConfigBuilder.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcDriverAttributeConfigBuilder.java @@ -30,7 +30,7 @@ import org.mapstruct.MappingTarget; * DriverAttributeConfig Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcPointAttributeBuilder.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcPointAttributeBuilder.java index 87959edfb..0dd74ab10 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcPointAttributeBuilder.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcPointAttributeBuilder.java @@ -38,7 +38,7 @@ import java.util.Optional; * PointAttribute Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcPointAttributeConfigBuilder.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcPointAttributeConfigBuilder.java index 9abe8f344..b5bb3a8e6 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcPointAttributeConfigBuilder.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/GrpcPointAttributeConfigBuilder.java @@ -30,7 +30,7 @@ import org.mapstruct.MappingTarget; * PointAttributeConfig Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/PointBuilder.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/PointBuilder.java index 70208256c..1340aeb1c 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/PointBuilder.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/builder/PointBuilder.java @@ -37,7 +37,7 @@ import java.util.Optional; * Point Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/DriverAttributeConfigDTO.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/DriverAttributeConfigDTO.java index f8f929b9b..fe4e01929 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/DriverAttributeConfigDTO.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/DriverAttributeConfigDTO.java @@ -27,7 +27,7 @@ import lombok.Setter; * DriverAttributeConfig BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/DriverAttributeDTO.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/DriverAttributeDTO.java index 8874a58b9..ca060bd8f 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/DriverAttributeDTO.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/DriverAttributeDTO.java @@ -29,7 +29,7 @@ import lombok.Setter; * 驱动属性BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/PointAttributeConfigDTO.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/PointAttributeConfigDTO.java index 7048f095a..52802418f 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/PointAttributeConfigDTO.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/PointAttributeConfigDTO.java @@ -27,7 +27,7 @@ import lombok.Setter; * PointAttributeConfig BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/PointAttributeDTO.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/PointAttributeDTO.java index 2ff683c26..de6356e22 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/PointAttributeDTO.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/dto/PointAttributeDTO.java @@ -29,7 +29,7 @@ import lombok.Setter; * 位号属性BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/property/DriverProperties.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/property/DriverProperties.java index cd7da7170..64b28f742 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/property/DriverProperties.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/entity/property/DriverProperties.java @@ -35,7 +35,7 @@ import java.util.List; * 驱动配置文件 driver 字段内容 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter @@ -121,7 +121,7 @@ public class DriverProperties { * 驱动配置文件 driver.schedule 字段内容 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter @@ -142,7 +142,7 @@ public class DriverProperties { * 驱动调度任务配置 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/event/metadata/MetadataEventListener.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/event/metadata/MetadataEventListener.java index 8f18c8407..930018d9f 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/event/metadata/MetadataEventListener.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/event/metadata/MetadataEventListener.java @@ -30,7 +30,7 @@ import org.springframework.stereotype.Component; * 元数据事件 Listener * * @author zhangzi - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/event/metadata/MetadataEventPublisher.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/event/metadata/MetadataEventPublisher.java index 03f28bfe8..a9b7363a0 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/event/metadata/MetadataEventPublisher.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/event/metadata/MetadataEventPublisher.java @@ -26,7 +26,7 @@ import org.springframework.stereotype.Component; * 元数据事件 Publisher * * @author zhangzi - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverCustomScheduleJob.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverCustomScheduleJob.java index 418c81e65..87572eea5 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverCustomScheduleJob.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverCustomScheduleJob.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; * 自定义调度任务 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverReadScheduleJob.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverReadScheduleJob.java index 5558cd7d1..778bcd638 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverReadScheduleJob.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverReadScheduleJob.java @@ -39,7 +39,7 @@ import java.util.Set; * 系统内置定时任务 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverStatusScheduleJob.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverStatusScheduleJob.java index f5fda838b..15573b8f8 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverStatusScheduleJob.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/job/DriverStatusScheduleJob.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Component; * 自定义调度任务 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/DeviceMetadata.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/DeviceMetadata.java index f3ee9cfd4..440891ca2 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/DeviceMetadata.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/DeviceMetadata.java @@ -44,7 +44,7 @@ import java.util.stream.Collectors; * 设备元数据 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/DriverMetadata.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/DriverMetadata.java index 9c5dc0e63..708fb4f93 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/DriverMetadata.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/DriverMetadata.java @@ -33,7 +33,7 @@ import java.util.Set; * 驱动元数据 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/PointMetadata.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/PointMetadata.java index ba5f5858e..3851dc295 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/PointMetadata.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/metadata/PointMetadata.java @@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit; * 位号元数据 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/DeviceCommandReceiver.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/DeviceCommandReceiver.java index 8000ae345..2deedecf1 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/DeviceCommandReceiver.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/DeviceCommandReceiver.java @@ -35,7 +35,7 @@ import java.util.Objects; * 接收设备指令 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/DriverCommandReceiver.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/DriverCommandReceiver.java index 3105d448d..d18332f2e 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/DriverCommandReceiver.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/DriverCommandReceiver.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Component; * 接收驱动指令 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/MetadataReceiver.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/MetadataReceiver.java index 84e5a4cc8..721aab77c 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/MetadataReceiver.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/receiver/rabbit/MetadataReceiver.java @@ -39,7 +39,7 @@ import java.util.Objects; * 接收驱动元数据 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverCustomService.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverCustomService.java index 442e2d11d..3564963a3 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverCustomService.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverCustomService.java @@ -32,7 +32,7 @@ import java.util.Map; * 可以参考已提供的驱动模块实现方式。 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverCustomService { diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverReadService.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverReadService.java index a3f4ba834..c5b16c666 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverReadService.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverReadService.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.entity.dto.DeviceCommandDTO; * 驱动指令服务 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverReadService { diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverRegisterService.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverRegisterService.java index 102faa7da..fca056182 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverRegisterService.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverRegisterService.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.driver.service; * 驱动注册相关接口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverRegisterService { diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverScheduleService.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverScheduleService.java index a9070161c..7429d279e 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverScheduleService.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverScheduleService.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.driver.service; * Driver Schedule Service * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverScheduleService { diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverSenderService.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverSenderService.java index 41692f1e5..db3705a20 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverSenderService.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverSenderService.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverSenderService { diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverWriteService.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverWriteService.java index 5a69ab51e..aebbaeda8 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverWriteService.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/DriverWriteService.java @@ -22,7 +22,7 @@ import io.github.pnoker.common.entity.dto.DeviceCommandDTO; * 驱动指令服务 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverWriteService { diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverReadServiceImpl.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverReadServiceImpl.java index 2a617008c..fd38f6166 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverReadServiceImpl.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverReadServiceImpl.java @@ -38,7 +38,7 @@ import java.util.Objects; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverRegisterServiceImpl.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverRegisterServiceImpl.java index 78459caf1..8b663d47f 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverRegisterServiceImpl.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverRegisterServiceImpl.java @@ -30,7 +30,7 @@ import org.springframework.stereotype.Service; * 驱动注册相关接口实现 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverScheduleServiceImpl.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverScheduleServiceImpl.java index 35677e402..5dfb93701 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverScheduleServiceImpl.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverScheduleServiceImpl.java @@ -33,7 +33,7 @@ import java.util.Objects; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverSenderServiceImpl.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverSenderServiceImpl.java index 793bbafce..a0e9f3047 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverSenderServiceImpl.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverSenderServiceImpl.java @@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverWriteServiceImpl.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverWriteServiceImpl.java index a192b8a86..694f9a0d2 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverWriteServiceImpl.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/driver/service/impl/DriverWriteServiceImpl.java @@ -38,7 +38,7 @@ import java.util.Objects; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/init/DriverInitRunner.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/init/DriverInitRunner.java index f7c01974c..09b1b577c 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/init/DriverInitRunner.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/init/DriverInitRunner.java @@ -31,7 +31,7 @@ import org.springframework.stereotype.Component; * Driver initialization runner * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/utils/CodecUtil.java b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/utils/CodecUtil.java index 14214dbf4..c88af6acb 100644 --- a/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/utils/CodecUtil.java +++ b/dc3-common/dc3-common-driver/src/main/java/io/github/pnoker/common/utils/CodecUtil.java @@ -26,7 +26,7 @@ import java.util.Base64; * 编码工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-exception/pom.xml b/dc3-common/dc3-common-exception/pom.xml index 2bf301d20..96b9ef8e8 100644 --- a/dc3-common/dc3-common-exception/pom.xml +++ b/dc3-common/dc3-common-exception/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-exception - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/constant/common/ExceptionConstant.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/constant/common/ExceptionConstant.java index cacb8a799..9236fdf31 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/constant/common/ExceptionConstant.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/constant/common/ExceptionConstant.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.constant.common; * 异常 相关常量 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class ExceptionConstant { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/AddException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/AddException.java index f2caeb81b..f2f85f02c 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/AddException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/AddException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义新增异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class AddException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/AssociatedException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/AssociatedException.java index c0a9d9f69..9aae81631 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/AssociatedException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/AssociatedException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义关联异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class AssociatedException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ConfigException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ConfigException.java index 120f4e7e2..85813b4e1 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ConfigException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ConfigException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 配置 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class ConfigException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ConnectorException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ConnectorException.java index 9ad113768..a655304f2 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ConnectorException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ConnectorException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义连接异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class ConnectorException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/CronException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/CronException.java index 9e141939b..6599497a0 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/CronException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/CronException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 Cron 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class CronException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/DeleteException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/DeleteException.java index 985cee710..25689797d 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/DeleteException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/DeleteException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义删除异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class DeleteException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/DuplicateException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/DuplicateException.java index 4a4ba2ac8..6a1a03f93 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/DuplicateException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/DuplicateException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义重复异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class DuplicateException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/EmptyException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/EmptyException.java index 3339cdc20..bf2d9bc80 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/EmptyException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/EmptyException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义空异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class EmptyException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ImportException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ImportException.java index dd4ddc628..27d66abcd 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ImportException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ImportException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 导入 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class ImportException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/JsonException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/JsonException.java index c683aa5b5..3f21221b5 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/JsonException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/JsonException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 Json 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class JsonException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/NotFoundException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/NotFoundException.java index 92250f7f3..4186f1cb4 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/NotFoundException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/NotFoundException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 NotFound 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class NotFoundException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/OutRangeException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/OutRangeException.java index c57bd6f6c..51097765f 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/OutRangeException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/OutRangeException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 超出范围 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class OutRangeException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ReadPointException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ReadPointException.java index 9939755e0..a81ee9216 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ReadPointException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ReadPointException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 读取位号值 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class ReadPointException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RegisterException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RegisterException.java index 6b692ec71..6a0c86b6f 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RegisterException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RegisterException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 注册 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class RegisterException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RepositoryException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RepositoryException.java index f61f89638..a512fbe82 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RepositoryException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RepositoryException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 数据存储异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class RepositoryException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RequestException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RequestException.java index 97f140437..9fdac2a31 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RequestException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/RequestException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 Request 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class RequestException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/SecurityException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/SecurityException.java index c28d84813..874525629 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/SecurityException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/SecurityException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 安全相关 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class SecurityException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ServiceException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ServiceException.java index a4334e8f0..207657850 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ServiceException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/ServiceException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 服务 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class ServiceException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/TypeException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/TypeException.java index 7a81f73a8..f8726cc2e 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/TypeException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/TypeException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义类型异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class TypeException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UnAuthorizedException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UnAuthorizedException.java index 87754bdbe..dcf7c5a53 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UnAuthorizedException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UnAuthorizedException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 未授权 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class UnAuthorizedException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UnSupportException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UnSupportException.java index a4ac90390..27fcc0ba6 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UnSupportException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UnSupportException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 未支持 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class UnSupportException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UpdateException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UpdateException.java index d84a993d7..18595e727 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UpdateException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/UpdateException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义更新异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class UpdateException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/WritePointException.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/WritePointException.java index 440c182d5..38c6b7f4b 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/WritePointException.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/exception/WritePointException.java @@ -22,7 +22,7 @@ import cn.hutool.core.text.CharSequenceUtil; * 自定义 写入位号值 异常 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class WritePointException extends RuntimeException { diff --git a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/utils/ExceptionUtil.java b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/utils/ExceptionUtil.java index e0085569e..9cb055688 100644 --- a/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/utils/ExceptionUtil.java +++ b/dc3-common/dc3-common-exception/src/main/java/io/github/pnoker/common/utils/ExceptionUtil.java @@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; * 异常 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-gateway/pom.xml b/dc3-common/dc3-common-gateway/pom.xml index 931b24a1a..bf80df886 100644 --- a/dc3-common/dc3-common-gateway/pom.xml +++ b/dc3-common/dc3-common-gateway/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-gateway - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/config/ActiveGatewayProfileConfig.java b/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/config/ActiveGatewayProfileConfig.java index c2275a21e..d9dbef56c 100644 --- a/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/config/ActiveGatewayProfileConfig.java +++ b/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/config/ActiveGatewayProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/filter/AuthenticGatewayFilterFactory.java b/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/filter/AuthenticGatewayFilterFactory.java index 6fc3bce15..5441b3b72 100644 --- a/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/filter/AuthenticGatewayFilterFactory.java +++ b/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/filter/AuthenticGatewayFilterFactory.java @@ -26,7 +26,7 @@ import org.springframework.stereotype.Component; * 自定义 Request Header 校验过滤器工厂类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/service/FilterService.java b/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/service/FilterService.java index c099b676d..2eaa727a3 100644 --- a/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/service/FilterService.java +++ b/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/service/FilterService.java @@ -23,7 +23,7 @@ import org.springframework.http.server.reactive.ServerHttpRequest; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface FilterService { diff --git a/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/service/impl/FilterServiceImpl.java b/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/service/impl/FilterServiceImpl.java index 3698c04de..caff0be18 100644 --- a/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/service/impl/FilterServiceImpl.java +++ b/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/gateway/service/impl/FilterServiceImpl.java @@ -35,7 +35,7 @@ import java.util.Objects; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/init/GatewayInitRunner.java b/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/init/GatewayInitRunner.java index d4e98f7ef..58e187069 100644 --- a/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/init/GatewayInitRunner.java +++ b/dc3-common/dc3-common-gateway/src/main/java/io/github/pnoker/common/init/GatewayInitRunner.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; * Gateway initialization runner * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-common/dc3-common-job/READEME.md b/dc3-common/dc3-common-job/READEME.md deleted file mode 100644 index 537631b93..000000000 --- a/dc3-common/dc3-common-job/READEME.md +++ /dev/null @@ -1 +0,0 @@ -IoT DC3 平台 公共的 Job 配置。 \ No newline at end of file diff --git a/dc3-common/dc3-common-job/pom.xml b/dc3-common/dc3-common-job/pom.xml deleted file mode 100644 index cedfee064..000000000 --- a/dc3-common/dc3-common-job/pom.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - 4.0.0 - - - io.github.pnoker - dc3-common - 2025.2.5 - - - ${project.artifactId} - dc3-common-job - 2025.2.5 - jar - - 2016-2022 - https://github.com/pnoker/iot-dc3 - - IoT DC3 平台 公共的 Job 配置。 - - - - - pnoker - pnoker - pnokers@icloud.com - - PMC - - pnoker.github.io - https://github.com/pnoker/iot-dc3 - - - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - https://github.com/pnoker/iot-dc3 - https://github.com/pnoker/iot-dc3.git - https://github.com/pnoker/iot-dc3.git - - - - - - - org.springframework.boot - spring-boot - - - - - com.xuxueli - xxl-job-core - - - - - - io.github.pnoker - dc3-common-exception - - - - - \ No newline at end of file diff --git a/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/config/ActiveJobProfileConfig.java b/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/config/ActiveJobProfileConfig.java deleted file mode 100644 index 184d2c1fb..000000000 --- a/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/config/ActiveJobProfileConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2016-present the IoT DC3 original author or authors. - * - * 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 - * - * https://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 io.github.pnoker.common.config; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.env.EnvironmentPostProcessor; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; -import org.springframework.core.env.ConfigurableEnvironment; - -/** - * Environment Config - * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Slf4j -@Configuration -@Order(Ordered.HIGHEST_PRECEDENCE) -public class ActiveJobProfileConfig implements EnvironmentPostProcessor { - - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { - environment.addActiveProfile("job"); - } -} diff --git a/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/config/JobConfig.java b/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/config/JobConfig.java deleted file mode 100644 index ebf5f7183..000000000 --- a/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/config/JobConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2016-present the IoT DC3 original author or authors. - * - * 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 - * - * https://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 io.github.pnoker.common.config; - -import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; -import io.github.pnoker.common.job.entity.property.JobProperties; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * XxlJob配置 - * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Slf4j -@Configuration -public class JobConfig { - - private final JobProperties jobProperties; - - public JobConfig(JobProperties jobProperties) { - this.jobProperties = jobProperties; - } - - @Bean - public XxlJobSpringExecutor xxlJobExecutor() { - XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); - xxlJobSpringExecutor.setAdminAddresses(jobProperties.getAdminAddresses()); - xxlJobSpringExecutor.setAppname(jobProperties.getAppName()); - xxlJobSpringExecutor.setAddress(jobProperties.getAddress()); - xxlJobSpringExecutor.setIp(jobProperties.getIp()); - xxlJobSpringExecutor.setPort(jobProperties.getExecutorPort()); - xxlJobSpringExecutor.setAccessToken(jobProperties.getAccessToken()); - xxlJobSpringExecutor.setLogPath(jobProperties.getLogPath()); - xxlJobSpringExecutor.setLogRetentionDays(jobProperties.getLogRetentionDays()); - return xxlJobSpringExecutor; - } - -} \ No newline at end of file diff --git a/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/init/XxlJobInitRunner.java b/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/init/XxlJobInitRunner.java deleted file mode 100644 index b4b099c60..000000000 --- a/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/init/XxlJobInitRunner.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2016-present the IoT DC3 original author or authors. - * - * 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 - * - * https://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 io.github.pnoker.common.init; - -import io.github.pnoker.common.job.entity.property.JobProperties; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.stereotype.Component; - -/** - * XXL JOB initialization runner - * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Component -@ComponentScan(basePackages = { - "io.github.pnoker.common.job.*" -}) -@EnableConfigurationProperties({JobProperties.class}) -public class XxlJobInitRunner implements ApplicationRunner { - - @Override - public void run(ApplicationArguments args) throws Exception { - // nothing to do - } -} diff --git a/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/job/entity/property/JobProperties.java b/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/job/entity/property/JobProperties.java deleted file mode 100644 index 63f98c5ec..000000000 --- a/dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/job/entity/property/JobProperties.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2016-present the IoT DC3 original author or authors. - * - * 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 - * - * https://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 io.github.pnoker.common.job.entity.property; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.validation.annotation.Validated; - -/** - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Getter -@Setter -@Validated -@ConfigurationProperties(prefix = "xxl.job") -public class JobProperties { - - /** - * Xxl Job admin server addresses - */ - private String adminAddresses; - - /** - * Xxl Job access token - */ - private String accessToken; - - /** - * Xxl Job executor app name - */ - private String appName; - - /** - * Xxl Job address - */ - private String address; - - /** - * Xxl Job ip - */ - private String ip; - - /** - * Xxl Job executor port - */ - private int executorPort; - - /** - * Xxl Job log retention path - */ - private String logPath; - - /** - * Xxl Job log retention days - */ - private int logRetentionDays; -} diff --git a/dc3-common/dc3-common-job/src/main/resources/META-INF/spring.factories b/dc3-common/dc3-common-job/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 51ca527ee..000000000 --- a/dc3-common/dc3-common-job/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright 2016-present the IoT DC3 original author or authors. -# -# 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 -# -# https://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. -# -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - io.github.pnoker.common.config.JobConfig,\ - io.github.pnoker.common.init.XxlJobInitRunner -org.springframework.boot.env.EnvironmentPostProcessor=\ - io.github.pnoker.common.config.ActiveJobProfileConfig diff --git a/dc3-common/dc3-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dc3-common/dc3-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 4b5636ca8..000000000 --- a/dc3-common/dc3-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright 2016-present the IoT DC3 original author or authors. -# -# 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 -# -# https://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. -# - -io.github.pnoker.common.config.JobConfig -io.github.pnoker.common.init.XxlJobInitRunner \ No newline at end of file diff --git a/dc3-common/dc3-common-job/src/main/resources/application-job.yml b/dc3-common/dc3-common-job/src/main/resources/application-job.yml deleted file mode 100644 index c63a8d858..000000000 --- a/dc3-common/dc3-common-job/src/main/resources/application-job.yml +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2016-present the IoT DC3 original author or authors. -# -# 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 -# -# https://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. -# - -# # The following content will be overwritten by application-[dev|test|pre|pro].yml, -# that is: if the following properties are configured in application-[dev|test|pre|pro].yml, -# the property values configured in application.yml will be the main ones. -xxl: - job: - access-token: default_token - # 不同服务需要设置为不同的端口 - executor-port: ${EXECUTOR_PORT:7500} - admin-addresses: http://${XXL_JOB_HOST:dc3-job}:${XXL_JOB_PORT:8100}/xxl-job-admin - app-name: ${spring.application.name}-executor - log-path: dc3/logs/center/job/handler - log-retention-days: 7 \ No newline at end of file diff --git a/dc3-common/dc3-common-log/pom.xml b/dc3-common/dc3-common-log/pom.xml index 471e19dc8..13eba8c8f 100644 --- a/dc3-common/dc3-common-log/pom.xml +++ b/dc3-common/dc3-common-log/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-log - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/Logs.java b/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/Logs.java index 0b8e037cc..dd22668a9 100644 --- a/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/Logs.java +++ b/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/Logs.java @@ -22,7 +22,7 @@ import java.lang.annotation.*; * 日志切点 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Documented diff --git a/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/LogsAspect.java b/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/LogsAspect.java index ec52c0238..fe7e8755b 100644 --- a/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/LogsAspect.java +++ b/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/LogsAspect.java @@ -29,7 +29,7 @@ import java.util.UUID; * 日志切片 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/LogsType.java b/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/LogsType.java index a9e2022f7..8b9d29e59 100644 --- a/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/LogsType.java +++ b/dc3-common/dc3-common-log/src/main/java/io/github/pnoker/common/annotation/LogsType.java @@ -20,7 +20,7 @@ package io.github.pnoker.common.annotation; * 日志类型 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public enum LogsType { diff --git a/dc3-common/dc3-common-manager/pom.xml b/dc3-common/dc3-common-manager/pom.xml index f23adec02..de67b9ed2 100644 --- a/dc3-common/dc3-common-manager/pom.xml +++ b/dc3-common/dc3-common-manager/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-manager - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/config/ActiveManagerProfileConfig.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/config/ActiveManagerProfileConfig.java index 95cb0c58e..29286ab10 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/config/ActiveManagerProfileConfig.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/config/ActiveManagerProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/init/ManagerInitRunner.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/init/ManagerInitRunner.java index c72f2a36c..a8189b09d 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/init/ManagerInitRunner.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/init/ManagerInitRunner.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; * Manager initialization runner * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/DictionaryForManagerService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/DictionaryForManagerService.java index 3a8b5ad91..13aea58d0 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/DictionaryForManagerService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/DictionaryForManagerService.java @@ -24,7 +24,7 @@ import io.github.pnoker.common.manager.entity.query.DictionaryQuery; * Dictionary Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DictionaryForManagerService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/DriverRegisterService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/DriverRegisterService.java index d87479aff..ebf1f1042 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/DriverRegisterService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/DriverRegisterService.java @@ -27,7 +27,7 @@ import java.util.List; * 驱动注册相关接口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverRegisterService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/ImportDeviceService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/ImportDeviceService.java index 2a1ea70d7..c6b70aeaf 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/ImportDeviceService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/ImportDeviceService.java @@ -28,7 +28,7 @@ import java.util.List; * 导入相关接口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ImportDeviceService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/ScheduleForManagerService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/ScheduleForManagerService.java index 06ecc9f69..1d4abb20e 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/ScheduleForManagerService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/ScheduleForManagerService.java @@ -18,7 +18,7 @@ package io.github.pnoker.common.manager.biz; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ScheduleForManagerService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/DictionaryForManagerServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/DictionaryForManagerServiceImpl.java index 2d41c037a..08d84c5f7 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/DictionaryForManagerServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/DictionaryForManagerServiceImpl.java @@ -38,7 +38,7 @@ import java.util.Objects; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/DriverRegisterServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/DriverRegisterServiceImpl.java index f766a9f8a..ac034188d 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/DriverRegisterServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/DriverRegisterServiceImpl.java @@ -49,7 +49,7 @@ import java.util.stream.Collectors; * 驱动同步相关接口实现 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/ImportDeviceServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/ImportDeviceServiceImpl.java index 15a325261..49aef9147 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/ImportDeviceServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/ImportDeviceServiceImpl.java @@ -41,7 +41,7 @@ import java.util.List; * 驱动同步相关接口实现 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/ScheduleForManagerServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/ScheduleForManagerServiceImpl.java index 64a9b0d3f..32a969c26 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/ScheduleForManagerServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/biz/impl/ScheduleForManagerServiceImpl.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Service; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DeviceController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DeviceController.java index 38c38a0e1..9e8a437e7 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DeviceController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DeviceController.java @@ -51,7 +51,7 @@ import java.util.stream.Collectors; * 设备 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DictionaryForManagerController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DictionaryForManagerController.java index 50df80fe3..98cfe6aac 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DictionaryForManagerController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DictionaryForManagerController.java @@ -40,7 +40,7 @@ import java.util.Objects; * 字典 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverAttributeConfigController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverAttributeConfigController.java index f4f50c29e..9f7938929 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverAttributeConfigController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverAttributeConfigController.java @@ -41,7 +41,7 @@ import java.util.Objects; * 驱动属性配置信息 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverAttributeController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverAttributeController.java index a810a114f..e38723f30 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverAttributeController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverAttributeController.java @@ -43,7 +43,7 @@ import java.util.Objects; * 驱动连接配置信息 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverController.java index 0a2a18836..f33a08f78 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/DriverController.java @@ -44,7 +44,7 @@ import java.util.stream.Collectors; * 驱动 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/GroupController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/GroupController.java index cae0f5d50..11ab93af8 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/GroupController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/GroupController.java @@ -40,7 +40,7 @@ import java.util.Objects; * 分组 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/LabelController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/LabelController.java index 26663b4d1..d9c6d2e55 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/LabelController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/LabelController.java @@ -40,7 +40,7 @@ import java.util.Objects; * 标签 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointAttributeConfigController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointAttributeConfigController.java index 27accb7c3..4f65c8b10 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointAttributeConfigController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointAttributeConfigController.java @@ -41,7 +41,7 @@ import java.util.Objects; * 位号属性配置信息 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointAttributeController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointAttributeController.java index 4d9e371a0..583fc9bbb 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointAttributeController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointAttributeController.java @@ -43,7 +43,7 @@ import java.util.Objects; * 驱动属性配置信息 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointController.java index dbd51aa5e..fd92b1e53 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/PointController.java @@ -46,7 +46,7 @@ import java.util.stream.Collectors; * 位号 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/ProfileController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/ProfileController.java index b79d17f97..ad57381ca 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/ProfileController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/ProfileController.java @@ -44,7 +44,7 @@ import java.util.stream.Collectors; * 模版 Controller * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DeviceManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DeviceManager.java index 11e87a61a..ee4d351d8 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DeviceManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DeviceManager.java @@ -26,7 +26,7 @@ import io.github.pnoker.common.manager.entity.model.DeviceDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverAttributeConfigManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverAttributeConfigManager.java index 3a8ed7c7c..9c6ede14c 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverAttributeConfigManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverAttributeConfigManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.DriverAttributeConfigDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverAttributeConfigManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverAttributeManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverAttributeManager.java index 8a4ce971d..6fbdfc8bc 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverAttributeManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverAttributeManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.DriverAttributeDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverAttributeManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverManager.java index e2f9cd0c6..8eb55eb50 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/DriverManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.DriverDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointAttributeConfigManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointAttributeConfigManager.java index bfca474c2..8a56c2a17 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointAttributeConfigManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointAttributeConfigManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.PointAttributeConfigDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointAttributeConfigManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointAttributeManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointAttributeManager.java index 2d104a42c..5d3277ece 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointAttributeManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointAttributeManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.PointAttributeDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointAttributeManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointDataVolumeHistoryManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointDataVolumeHistoryManager.java index 327c8afbd..407dc1e1f 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointDataVolumeHistoryManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointDataVolumeHistoryManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.PointDataVolumeHistoryDO; *

* * @author fukq - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointDataVolumeHistoryManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointDataVolumeRunManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointDataVolumeRunManager.java index 1747c55b6..dc01f1b55 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointDataVolumeRunManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointDataVolumeRunManager.java @@ -26,7 +26,7 @@ import io.github.pnoker.common.manager.entity.model.PointDataVolumeRunDO; *

* * @author fukq - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointDataVolumeRunManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointManager.java index 71b6ba720..424d654a5 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/PointManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.PointDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/ProfileBindManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/ProfileBindManager.java index 52a431391..4c768d7ce 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/ProfileBindManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/ProfileBindManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.ProfileBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ProfileBindManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/ProfileManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/ProfileManager.java index 0a111d435..6e6aeec6d 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/ProfileManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/ProfileManager.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.ProfileDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ProfileManager extends IService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DeviceManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DeviceManagerImpl.java index c7645bf57..5e03ce45b 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DeviceManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DeviceManagerImpl.java @@ -36,7 +36,7 @@ import java.util.Objects; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverAttributeConfigManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverAttributeConfigManagerImpl.java index e46550e64..79abd7ead 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverAttributeConfigManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverAttributeConfigManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverAttributeManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverAttributeManagerImpl.java index 83f0f8855..895b9df94 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverAttributeManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverAttributeManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverManagerImpl.java index 5b9f076b0..008845c3a 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/DriverManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointAttributeConfigManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointAttributeConfigManagerImpl.java index 6fb8488b4..367644354 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointAttributeConfigManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointAttributeConfigManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointAttributeManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointAttributeManagerImpl.java index 745510728..c6f8790fa 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointAttributeManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointAttributeManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointDataVolumeHistoryManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointDataVolumeHistoryManagerImpl.java index 5cf0f5f51..dae06f6b8 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointDataVolumeHistoryManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointDataVolumeHistoryManagerImpl.java @@ -29,7 +29,7 @@ import org.springframework.stereotype.Service; *

* * @author fukq - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointDataVolumeRunManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointDataVolumeRunManagerImpl.java index 9659e29fc..36b7f89ee 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointDataVolumeRunManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointDataVolumeRunManagerImpl.java @@ -29,7 +29,7 @@ import org.springframework.stereotype.Service; *

* * @author fukq - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointManagerImpl.java index c5bf8353b..2a98cf526 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/PointManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/ProfileBindManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/ProfileBindManagerImpl.java index 5f0bcb3ce..5a5581c3b 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/ProfileBindManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/ProfileBindManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/ProfileManagerImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/ProfileManagerImpl.java index 79d485bd8..7806ae9df 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/ProfileManagerImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/dal/impl/ProfileManagerImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Service diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DeviceBO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DeviceBO.java index 3af64f252..68c9a71cc 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DeviceBO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DeviceBO.java @@ -27,7 +27,7 @@ import java.util.List; * 设备 BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverAttributeBO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverAttributeBO.java index e896da1d7..78a48d0c5 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverAttributeBO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverAttributeBO.java @@ -26,7 +26,7 @@ import lombok.*; * 驱动属性BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverAttributeConfigBO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverAttributeConfigBO.java index 42f54c3b2..ed45387c6 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverAttributeConfigBO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverAttributeConfigBO.java @@ -25,7 +25,7 @@ import lombok.*; * DriverAttributeConfig BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverBO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverBO.java index 57fa74798..0166d042c 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverBO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/DriverBO.java @@ -26,7 +26,7 @@ import lombok.*; * Driver BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointAttributeBO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointAttributeBO.java index 3ce7236b1..f51ccddaa 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointAttributeBO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointAttributeBO.java @@ -26,7 +26,7 @@ import lombok.*; * 位号属性BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointAttributeConfigBO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointAttributeConfigBO.java index 987dc1cce..ec9649f3d 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointAttributeConfigBO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointAttributeConfigBO.java @@ -25,7 +25,7 @@ import lombok.*; * PointAttributeConfig BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointBO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointBO.java index ac7e0b773..ecbbccaad 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointBO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/PointBO.java @@ -29,7 +29,7 @@ import java.math.BigDecimal; * Point BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/ProfileBO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/ProfileBO.java index 8c6fccdfd..f5802727f 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/ProfileBO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/ProfileBO.java @@ -27,7 +27,7 @@ import lombok.*; * Profile BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/ProfileBindBO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/ProfileBindBO.java index 944fbb236..405594621 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/ProfileBindBO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/bo/ProfileBindBO.java @@ -23,7 +23,7 @@ import lombok.*; * ProfileBind BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DeviceBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DeviceBuilder.java index 1e1abc242..64c8b774c 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DeviceBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DeviceBuilder.java @@ -42,7 +42,7 @@ import java.util.Optional; * 设备 Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DictionaryForManagerBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DictionaryForManagerBuilder.java index 6f9873ad8..b09c42ca6 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DictionaryForManagerBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DictionaryForManagerBuilder.java @@ -31,7 +31,7 @@ import org.mapstruct.Mapping; * Dictionary For Manager Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverAttributeBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverAttributeBuilder.java index e4906e060..2fed07e50 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverAttributeBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverAttributeBuilder.java @@ -39,7 +39,7 @@ import java.util.Optional; * 驱动属性Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverAttributeConfigBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverAttributeConfigBuilder.java index 3e7af0118..228894511 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverAttributeConfigBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverAttributeConfigBuilder.java @@ -34,7 +34,7 @@ import java.util.Optional; * DriverAttributeConfig Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverBuilder.java index d8a2e8e50..3410c52eb 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/DriverBuilder.java @@ -41,7 +41,7 @@ import java.util.Optional; * Driver Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointAttributeBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointAttributeBuilder.java index 33578ed4f..4ca083646 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointAttributeBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointAttributeBuilder.java @@ -39,7 +39,7 @@ import java.util.Optional; * 位号属性Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointAttributeConfigBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointAttributeConfigBuilder.java index cdd6fe75e..4972bf87a 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointAttributeConfigBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointAttributeConfigBuilder.java @@ -34,7 +34,7 @@ import java.util.Optional; * PointAttributeConfig Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointBuilder.java index f7f40bda5..246b07a99 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/PointBuilder.java @@ -42,7 +42,7 @@ import java.util.Optional; * Point Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/ProfileBindBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/ProfileBindBuilder.java index 3cc003e18..07c3139d8 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/ProfileBindBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/ProfileBindBuilder.java @@ -30,7 +30,7 @@ import java.util.List; * ProfileBind Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/ProfileBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/ProfileBuilder.java index ca43d3d6d..6ce37db1e 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/ProfileBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/builder/ProfileBuilder.java @@ -42,7 +42,7 @@ import java.util.Optional; * Profile Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DeviceDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DeviceDO.java index fb9a6a2d4..325aa6fad 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DeviceDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DeviceDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverAttributeConfigDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverAttributeConfigDO.java index 4e985c0ab..b7ce70d61 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverAttributeConfigDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverAttributeConfigDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverAttributeDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverAttributeDO.java index a84a1265e..bec1b8866 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverAttributeDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverAttributeDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverDO.java index 13ee472db..573e93deb 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/DriverDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointAttributeConfigDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointAttributeConfigDO.java index 772e34234..dd5a7a8a6 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointAttributeConfigDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointAttributeConfigDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointAttributeDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointAttributeDO.java index 3c67f7e37..d3dad5ee1 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointAttributeDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointAttributeDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDO.java index 2bbe35077..62f52b4f3 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDataVolumeHistoryDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDataVolumeHistoryDO.java index e695f2a9a..fee7a7496 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDataVolumeHistoryDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDataVolumeHistoryDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author fukq - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Data diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDataVolumeRunDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDataVolumeRunDO.java index 834f49187..c1eb63125 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDataVolumeRunDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/PointDataVolumeRunDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author fukq - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Data diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/ProfileBindDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/ProfileBindDO.java index db15a380e..cf131a335 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/ProfileBindDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/ProfileBindDO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/ProfileDO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/ProfileDO.java index 8f6ebe06f..fbbe51306 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/ProfileDO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/model/ProfileDO.java @@ -33,7 +33,7 @@ import java.time.LocalDateTime; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DeviceQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DeviceQuery.java index 05efeb72c..017c549ce 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DeviceQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DeviceQuery.java @@ -27,7 +27,7 @@ import java.io.Serializable; * 设备 Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DictionaryQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DictionaryQuery.java index 83d16098f..9f12c51d8 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DictionaryQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DictionaryQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; * 字典查询实体类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverAttributeConfigQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverAttributeConfigQuery.java index 87ca8b198..4c264fd7b 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverAttributeConfigQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverAttributeConfigQuery.java @@ -27,7 +27,7 @@ import java.io.Serializable; * DriverConfig Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverAttributeQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverAttributeQuery.java index 111b9d234..16f37c4c0 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverAttributeQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverAttributeQuery.java @@ -28,7 +28,7 @@ import java.io.Serializable; * ConnectInfo Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverQuery.java index 6e34dac43..e48a7a1ca 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/DriverQuery.java @@ -28,7 +28,7 @@ import java.io.Serializable; * Driver Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointAttributeConfigQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointAttributeConfigQuery.java index 7026a2ddd..4d1aae0c7 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointAttributeConfigQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointAttributeConfigQuery.java @@ -27,7 +27,7 @@ import java.io.Serializable; * PointConfig Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointAttributeQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointAttributeQuery.java index cf3e95322..43a02e827 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointAttributeQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointAttributeQuery.java @@ -28,7 +28,7 @@ import java.io.Serializable; * 位号属性Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointQuery.java index 550f51e9b..35528045e 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/PointQuery.java @@ -29,7 +29,7 @@ import java.io.Serializable; * Point Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/ProfileBindQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/ProfileBindQuery.java index 38a2fb236..37bd0cda5 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/ProfileBindQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/ProfileBindQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; * ProfileBind Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/ProfileQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/ProfileQuery.java index efd2b9bd8..16d652edb 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/ProfileQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/ProfileQuery.java @@ -29,7 +29,7 @@ import java.io.Serializable; * Profile Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/TopicQuery.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/TopicQuery.java index 119c37ffc..bd2594802 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/TopicQuery.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/query/TopicQuery.java @@ -26,7 +26,7 @@ import java.io.Serializable; * Topic Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DeviceVO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DeviceVO.java index c021b2184..fc10e65a3 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DeviceVO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DeviceVO.java @@ -34,7 +34,7 @@ import java.util.Set; * 设备 VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverAttributeConfigVO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverAttributeConfigVO.java index 9fddc61bb..6c1df7915 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverAttributeConfigVO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverAttributeConfigVO.java @@ -29,7 +29,7 @@ import lombok.*; * DriverAttributeConfig VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverAttributeVO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverAttributeVO.java index e77632fd9..2ecdae961 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverAttributeVO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverAttributeVO.java @@ -32,7 +32,7 @@ import lombok.*; * 驱动属性VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverVO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverVO.java index fe31edae3..13b669922 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverVO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/DriverVO.java @@ -31,7 +31,7 @@ import lombok.*; * Driver VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointAttributeConfigVO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointAttributeConfigVO.java index c63ecbd64..3e9238ec2 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointAttributeConfigVO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointAttributeConfigVO.java @@ -29,7 +29,7 @@ import lombok.*; * PointAttributeConfig BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointAttributeVO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointAttributeVO.java index 49aef7dc1..14bcc54b4 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointAttributeVO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointAttributeVO.java @@ -32,7 +32,7 @@ import lombok.*; * 位号属性BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointVO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointVO.java index 18bebedf1..c9292528f 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointVO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/PointVO.java @@ -35,7 +35,7 @@ import java.math.BigDecimal; * Point BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/ProfileBindVO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/ProfileBindVO.java index 4714bc4d0..4417df7b3 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/ProfileBindVO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/ProfileBindVO.java @@ -27,7 +27,7 @@ import lombok.*; * ProfileBind BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/ProfileVO.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/ProfileVO.java index 36c3b593e..e3167b0af 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/ProfileVO.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/entity/vo/ProfileVO.java @@ -32,7 +32,7 @@ import lombok.*; * Profile VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/event/metadata/MetadataEventListener.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/event/metadata/MetadataEventListener.java index f91d95fa8..41b04cec0 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/event/metadata/MetadataEventListener.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/event/metadata/MetadataEventListener.java @@ -37,7 +37,7 @@ import java.util.List; * 元数据事件 Listener * * @author zhangzi - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/event/metadata/MetadataEventPublisher.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/event/metadata/MetadataEventPublisher.java index bcada3880..477a51e91 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/event/metadata/MetadataEventPublisher.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/event/metadata/MetadataEventPublisher.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; * 元数据事件 Publisher * * @author zhangzi - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/generator/MybatisGenerator.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/generator/MybatisGenerator.java index e54f1b7e4..756f36b13 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/generator/MybatisGenerator.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/generator/MybatisGenerator.java @@ -29,7 +29,7 @@ import io.github.pnoker.common.utils.MybatisUtil; * 当前配置仅用于 dc3-common-manager 服务模块, 如果需要用于其他模块请重新配置 path 参数。 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class MybatisGenerator { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDeviceBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDeviceBuilder.java index ee6692da0..29b5bae2f 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDeviceBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDeviceBuilder.java @@ -39,7 +39,7 @@ import java.util.Optional; * GrpcDevice Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverAttributeBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverAttributeBuilder.java index caa5cdea0..a6dea758a 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverAttributeBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverAttributeBuilder.java @@ -38,7 +38,7 @@ import java.util.Optional; * GrpcDriverAttribute Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverAttributeConfigBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverAttributeConfigBuilder.java index 2e81fe688..501107153 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverAttributeConfigBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverAttributeConfigBuilder.java @@ -33,7 +33,7 @@ import java.util.Optional; * GrpcDriverAttributeConfig Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverBuilder.java index aabf0f463..06eab6dec 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcDriverBuilder.java @@ -41,7 +41,7 @@ import java.util.Optional; * GrpcDriver Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointAttributeBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointAttributeBuilder.java index 4411646b3..c9fc09e67 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointAttributeBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointAttributeBuilder.java @@ -38,7 +38,7 @@ import java.util.Optional; * GrpcPointAttribute Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointAttributeConfigBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointAttributeConfigBuilder.java index 323c25b4a..69eed9bd8 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointAttributeConfigBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointAttributeConfigBuilder.java @@ -33,7 +33,7 @@ import java.util.Optional; * GrpcPointAttributeConfig Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointBuilder.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointBuilder.java index 3f942b8bc..30103fea4 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointBuilder.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/builder/GrpcPointBuilder.java @@ -40,7 +40,7 @@ import java.util.Optional; * GrpcPoint Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverDeviceServer.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverDeviceServer.java index 05df77359..c5f9eb747 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverDeviceServer.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverDeviceServer.java @@ -47,7 +47,7 @@ import java.util.Objects; * 设备 Api * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverDriverServer.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverDriverServer.java index cf20469a0..e48ef9f65 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverDriverServer.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverDriverServer.java @@ -43,7 +43,7 @@ import java.util.List; * 设备 Api * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverPointServer.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverPointServer.java index dfce0f3e1..25545231f 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverPointServer.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/driver/DriverPointServer.java @@ -38,7 +38,7 @@ import java.util.Objects; * 设备 Api * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerDeviceServer.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerDeviceServer.java index c55eda89c..e8edf31d5 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerDeviceServer.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerDeviceServer.java @@ -40,7 +40,7 @@ import java.util.Objects; * 设备 Api * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerDriverServer.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerDriverServer.java index 463fa6a0e..666db96fa 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerDriverServer.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerDriverServer.java @@ -39,7 +39,7 @@ import java.util.Objects; * Driver Api * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerPointServer.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerPointServer.java index 2a13c201f..17bff7644 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerPointServer.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/grpc/server/manager/ManagerPointServer.java @@ -42,7 +42,7 @@ import java.util.Objects; * Point Api * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/job/HourlyJobForManager.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/job/HourlyJobForManager.java index 131c7830f..ea3ee525e 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/job/HourlyJobForManager.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/job/HourlyJobForManager.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; * 通用: 每小时执行任务 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DeviceMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DeviceMapper.java index 38d347d76..81d485e78 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DeviceMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DeviceMapper.java @@ -29,7 +29,7 @@ import org.apache.ibatis.annotations.Param; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverAttributeConfigMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverAttributeConfigMapper.java index 6a63b1991..100fa66ad 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverAttributeConfigMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverAttributeConfigMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.DriverAttributeConfigDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverAttributeConfigMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverAttributeMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverAttributeMapper.java index e4317d178..a623cd96d 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverAttributeMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverAttributeMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.DriverAttributeDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverAttributeMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverMapper.java index f37c440d0..11dc78865 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/DriverMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.DriverDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointAttributeConfigMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointAttributeConfigMapper.java index 6bcf92e97..b8c27b942 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointAttributeConfigMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointAttributeConfigMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.PointAttributeConfigDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointAttributeConfigMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointAttributeMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointAttributeMapper.java index 7d7c5ca04..66229c866 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointAttributeMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointAttributeMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.PointAttributeDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointAttributeMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointDataVolumeHistoryMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointDataVolumeHistoryMapper.java index 5632d3612..d58db3598 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointDataVolumeHistoryMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointDataVolumeHistoryMapper.java @@ -26,7 +26,7 @@ import io.github.pnoker.common.manager.entity.model.PointDataVolumeHistoryDO; *

* * @author fukq - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointDataVolumeHistoryMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointDataVolumeRunMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointDataVolumeRunMapper.java index 150bf9daa..ca9c3a1ad 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointDataVolumeRunMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointDataVolumeRunMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.PointDataVolumeRunDO; *

* * @author fukq - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointDataVolumeRunMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointMapper.java index bad24db38..bf4d952f3 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/PointMapper.java @@ -29,7 +29,7 @@ import org.apache.ibatis.annotations.Param; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/ProfileBindMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/ProfileBindMapper.java index 1c9da884e..cbf7643f5 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/ProfileBindMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/ProfileBindMapper.java @@ -25,7 +25,7 @@ import io.github.pnoker.common.manager.entity.model.ProfileBindDO; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ProfileBindMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/ProfileMapper.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/ProfileMapper.java index 4250f4712..d2e7867b4 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/ProfileMapper.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/mapper/ProfileMapper.java @@ -29,7 +29,7 @@ import org.apache.ibatis.annotations.Param; *

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ProfileMapper extends BaseMapper { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DeviceService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DeviceService.java index 54dcd5da8..78fa6b724 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DeviceService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DeviceService.java @@ -28,7 +28,7 @@ import java.util.List; * 设备 Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DeviceService extends BaseService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverAttributeConfigService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverAttributeConfigService.java index fa9272e14..c5ec47aed 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverAttributeConfigService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverAttributeConfigService.java @@ -27,7 +27,7 @@ import java.util.List; * DriverConfig Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverAttributeConfigService extends BaseService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverAttributeService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverAttributeService.java index 61946c5ab..aad7e01ca 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverAttributeService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverAttributeService.java @@ -26,7 +26,7 @@ import java.util.List; * 驱动属性Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverAttributeService extends BaseService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverService.java index 9b6003627..c75cf82db 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/DriverService.java @@ -27,7 +27,7 @@ import java.util.Set; * Driver Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface DriverService extends BaseService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointAttributeConfigService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointAttributeConfigService.java index 4a92b37d5..4e8ce7c87 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointAttributeConfigService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointAttributeConfigService.java @@ -27,7 +27,7 @@ import java.util.List; * PointConfig Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointAttributeConfigService extends BaseService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointAttributeService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointAttributeService.java index 01bd1a56d..8f90b6bf6 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointAttributeService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointAttributeService.java @@ -26,7 +26,7 @@ import java.util.List; * 位号属性Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointAttributeService extends BaseService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointService.java index b4a56423d..f90796cd5 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/PointService.java @@ -29,7 +29,7 @@ import java.util.Set; * Point Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface PointService extends BaseService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/ProfileBindService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/ProfileBindService.java index 5f9d9655e..77eca867f 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/ProfileBindService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/ProfileBindService.java @@ -26,7 +26,7 @@ import java.util.List; * ProfileBind Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ProfileBindService extends BaseService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/ProfileService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/ProfileService.java index 0abb6fca5..351fd5210 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/ProfileService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/ProfileService.java @@ -28,7 +28,7 @@ import java.util.Set; * Profile Interface * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface ProfileService extends BaseService { diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DeviceServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DeviceServiceImpl.java index 4da364d7e..ba87fe9d1 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DeviceServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DeviceServiceImpl.java @@ -68,7 +68,7 @@ import java.util.Objects; * DeviceService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverAttributeConfigServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverAttributeConfigServiceImpl.java index a96f62a89..94c682d19 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverAttributeConfigServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverAttributeConfigServiceImpl.java @@ -46,7 +46,7 @@ import java.util.Objects; * DriverConfigService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverAttributeServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverAttributeServiceImpl.java index 881978fb2..75d0bc316 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverAttributeServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverAttributeServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Objects; * DriverAttributeService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverServiceImpl.java index be0a35a4a..77abd8068 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/DriverServiceImpl.java @@ -51,7 +51,7 @@ import java.util.stream.Collectors; * DriverService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointAttributeConfigServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointAttributeConfigServiceImpl.java index b95427347..90b56eee2 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointAttributeConfigServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointAttributeConfigServiceImpl.java @@ -52,7 +52,7 @@ import java.util.stream.Collectors; * PointConfigService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointAttributeServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointAttributeServiceImpl.java index 6e08ab61c..3dab3255c 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointAttributeServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointAttributeServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Objects; * PointAttributeService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointServiceImpl.java index 426a225f6..8e99e3cbd 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/PointServiceImpl.java @@ -59,7 +59,7 @@ import java.util.stream.Collectors; * PointService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/ProfileBindServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/ProfileBindServiceImpl.java index c040dcdcf..c10c4eb78 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/ProfileBindServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/ProfileBindServiceImpl.java @@ -42,7 +42,7 @@ import java.util.Objects; * ProfileBindService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/ProfileServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/ProfileServiceImpl.java index f8ca98dc8..24f18979d 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/ProfileServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/ProfileServiceImpl.java @@ -53,7 +53,7 @@ import java.util.stream.Collectors; * ProfileService Impl * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-model/pom.xml b/dc3-common/dc3-common-model/pom.xml index 7b172ac3e..d7b9271a1 100644 --- a/dc3-common/dc3-common-model/pom.xml +++ b/dc3-common/dc3-common-model/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-model - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseBO.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseBO.java index ade2f2575..937a2ae28 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseBO.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseBO.java @@ -26,7 +26,7 @@ import java.time.LocalDateTime; * Base BO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseDTO.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseDTO.java index 1b3a1800e..842225bd5 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseDTO.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseDTO.java @@ -29,7 +29,7 @@ import java.time.LocalDateTime; * Base DTO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseVO.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseVO.java index b38eb5f6b..ad9b41aac 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseVO.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/base/BaseVO.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; * Base VO * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/builder/BaseBuilder.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/builder/BaseBuilder.java index 7b3cfd54f..c76c17cde 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/builder/BaseBuilder.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/builder/BaseBuilder.java @@ -28,7 +28,7 @@ import java.util.List; * Base Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/CmdParameterDTO.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/CmdParameterDTO.java index d05d2e980..ff9aee293 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/CmdParameterDTO.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/CmdParameterDTO.java @@ -25,7 +25,7 @@ import java.io.Serializable; * 指令参数 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DeviceCommandDTO.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DeviceCommandDTO.java index 426f703a8..c8b92538f 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DeviceCommandDTO.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DeviceCommandDTO.java @@ -28,7 +28,7 @@ import java.time.LocalDateTime; * 设备指令 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter @@ -67,7 +67,7 @@ public class DeviceCommandDTO implements Serializable { * 设备读指令 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter @@ -105,7 +105,7 @@ public class DeviceCommandDTO implements Serializable { * 设备写指令 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DeviceEventDTO.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DeviceEventDTO.java index 33758898d..7c3620187 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DeviceEventDTO.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DeviceEventDTO.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; * 设备事件 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter @@ -69,7 +69,7 @@ public class DeviceEventDTO implements Serializable { * 设备状态 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DriverCommandDTO.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DriverCommandDTO.java index 22714e31a..46a086991 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DriverCommandDTO.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DriverCommandDTO.java @@ -27,7 +27,7 @@ import java.time.LocalDateTime; * 驱动指令 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DriverEventDTO.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DriverEventDTO.java index ce02ffc34..ca00ee9b4 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DriverEventDTO.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/DriverEventDTO.java @@ -29,7 +29,7 @@ import java.time.LocalDateTime; * 驱动事件 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter @@ -68,7 +68,7 @@ public class DriverEventDTO implements Serializable { * 驱动状态 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/MetadataEventDTO.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/MetadataEventDTO.java index e4f7a2884..fcbc0ed52 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/MetadataEventDTO.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/dto/MetadataEventDTO.java @@ -30,7 +30,7 @@ import java.io.Serializable; * 元数据事件 DTO * * @author zhangzi - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/event/MetadataEvent.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/event/MetadataEvent.java index 3ebe2fbd2..a25d4c58d 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/event/MetadataEvent.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/event/MetadataEvent.java @@ -25,7 +25,7 @@ import org.springframework.context.ApplicationEvent; * 元数据事件 * * @author zhangzi - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ApiExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ApiExt.java index 4ece85b19..5c36de7e2 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ApiExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ApiExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 接口相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/BaseExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/BaseExt.java index 083ecc3b8..e851fac2a 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/BaseExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/BaseExt.java @@ -25,7 +25,7 @@ import java.io.Serializable; * Base Ext * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DeviceExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DeviceExt.java index 5db34213c..5715f5ea7 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DeviceExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DeviceExt.java @@ -30,7 +30,7 @@ import java.io.Serializable; * 设备相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DriverAttributeExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DriverAttributeExt.java index d2d2c81d0..19408e8ee 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DriverAttributeExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DriverAttributeExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 驱动属性相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DriverExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DriverExt.java index 470a67efe..a97b155fe 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DriverExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/DriverExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 驱动相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/JsonExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/JsonExt.java index 72813c932..22e540e0a 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/JsonExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/JsonExt.java @@ -25,7 +25,7 @@ import java.io.Serializable; * Json Ext * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/MenuExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/MenuExt.java index df6ca2694..c990ee8e9 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/MenuExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/MenuExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 菜单相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/MessageExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/MessageExt.java index e87c739fa..90c2791ea 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/MessageExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/MessageExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 消息相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/NotifyExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/NotifyExt.java index 7dce62f1b..13bf49d0a 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/NotifyExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/NotifyExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 通知相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/PointAttributeExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/PointAttributeExt.java index 7f0e01f22..750b0cca4 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/PointAttributeExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/PointAttributeExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 位号属性相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/PointExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/PointExt.java index 000d9542e..b8aea595d 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/PointExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/PointExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 位号相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ProfileExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ProfileExt.java index 524005480..a9bc62c9f 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ProfileExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ProfileExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 模版相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ResourceExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ResourceExt.java index bd12e376e..ba8e4a4b1 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ResourceExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/ResourceExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 资源相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/RoleExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/RoleExt.java index 734794525..4c4835388 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/RoleExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/RoleExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 角色相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/RuleExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/RuleExt.java index ec6f42685..24d6899b0 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/RuleExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/RuleExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 规则相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/TenantExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/TenantExt.java index 737a7b56d..eec8798e1 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/TenantExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/TenantExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 租户相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/UserIdentityExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/UserIdentityExt.java index f507eedde..7d50dd534 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/UserIdentityExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/UserIdentityExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 用户身份相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/UserSocialExt.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/UserSocialExt.java index ad43dc51d..f598ab707 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/UserSocialExt.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/entity/ext/UserSocialExt.java @@ -27,7 +27,7 @@ import lombok.Setter; * 用户社交相关拓展信息 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Add.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Add.java index 8511e4a7e..a6d943739 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Add.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Add.java @@ -23,7 +23,7 @@ package io.github.pnoker.common.valid; * 注解后添加具体校验的分组名, 可实现不同场景的校验需求 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface Add { diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Auth.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Auth.java index 113be108d..0a6c3da85 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Auth.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Auth.java @@ -23,7 +23,7 @@ package io.github.pnoker.common.valid; * 注解后添加具体校验的分组名, 可实现不同场景的校验需求 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface Auth { diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Check.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Check.java index 6ce8437cb..f8bfe7da4 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Check.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Check.java @@ -23,7 +23,7 @@ package io.github.pnoker.common.valid; * 注解后添加具体校验的分组名, 可实现不同场景的校验需求 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface Check { diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Parent.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Parent.java index 9b23361e2..86e271b0d 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Parent.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Parent.java @@ -23,7 +23,7 @@ package io.github.pnoker.common.valid; * 注解后添加具体校验的分组名, 可实现不同场景的校验需求 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface Parent { diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Read.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Read.java index 4bf4db2bf..a117a0e98 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Read.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Read.java @@ -23,7 +23,7 @@ package io.github.pnoker.common.valid; * 注解后添加具体校验的分组名, 可实现不同场景的校验需求 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface Read { diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Select.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Select.java index 773955319..2c62b9419 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Select.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Select.java @@ -23,7 +23,7 @@ package io.github.pnoker.common.valid; * 注解后添加具体校验的分组名, 可实现不同场景的校验需求 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface Select { diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Update.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Update.java index 6542a361b..08657438d 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Update.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Update.java @@ -23,7 +23,7 @@ package io.github.pnoker.common.valid; * 注解后添加具体校验的分组名, 可实现不同场景的校验需求 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface Update { diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Upload.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Upload.java index b7f9d894d..fbe465f84 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Upload.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Upload.java @@ -23,7 +23,7 @@ package io.github.pnoker.common.valid; * 注解后添加具体校验的分组名, 可实现不同场景的校验需求 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface Upload { diff --git a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Write.java b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Write.java index 209f63903..6fae95f38 100644 --- a/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Write.java +++ b/dc3-common/dc3-common-model/src/main/java/io/github/pnoker/common/valid/Write.java @@ -23,7 +23,7 @@ package io.github.pnoker.common.valid; * 注解后添加具体校验的分组名, 可实现不同场景的校验需求 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface Write { diff --git a/dc3-common/dc3-common-mqtt/pom.xml b/dc3-common/dc3-common-mqtt/pom.xml index 4acc39794..d67008ea5 100644 --- a/dc3-common/dc3-common-mqtt/pom.xml +++ b/dc3-common/dc3-common-mqtt/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-mqtt - 2025.2.5 + 2025.6.0 jar 2016-2022 @@ -84,6 +84,11 @@ org.springframework.integration spring-integration-mqtt + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/ActiveMqttProfileConfig.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/ActiveMqttProfileConfig.java index 1aec49a79..1c6b565bd 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/ActiveMqttProfileConfig.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/ActiveMqttProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/MqttConfig.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/MqttConfig.java index 0c6834747..4ed547690 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/MqttConfig.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/MqttConfig.java @@ -41,7 +41,7 @@ import java.util.Objects; * Mqtt 配置 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/MqttEnvironmentConfig.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/MqttEnvironmentConfig.java index 9dc268ac8..d47f343c4 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/MqttEnvironmentConfig.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/config/MqttEnvironmentConfig.java @@ -35,7 +35,7 @@ import java.util.Map; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/init/MqttInitRunner.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/init/MqttInitRunner.java index ddb1962c2..a24e21280 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/init/MqttInitRunner.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/init/MqttInitRunner.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Component; * Mqtt initialization runner * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/MessageHeader.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/MessageHeader.java index 6493ca7e4..e67ceb655 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/MessageHeader.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/MessageHeader.java @@ -27,7 +27,7 @@ import java.util.UUID; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/MqttMessage.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/MqttMessage.java index 89fe1d5cf..516b8d8ad 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/MqttMessage.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/MqttMessage.java @@ -22,7 +22,7 @@ import java.io.Serializable; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/property/MqttProperties.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/property/MqttProperties.java index 78fbda14b..bbfef9d6e 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/property/MqttProperties.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/entity/property/MqttProperties.java @@ -28,7 +28,7 @@ import java.util.List; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/handler/MqttReceiveHandler.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/handler/MqttReceiveHandler.java index 467a62970..fbddb67fd 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/handler/MqttReceiveHandler.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/handler/MqttReceiveHandler.java @@ -33,7 +33,7 @@ import java.util.concurrent.ThreadPoolExecutor; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/MqttReceiveService.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/MqttReceiveService.java index d3ff8824a..43ed2de49 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/MqttReceiveService.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/MqttReceiveService.java @@ -23,7 +23,7 @@ import java.util.List; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface MqttReceiveService { diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/MqttScheduleService.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/MqttScheduleService.java index 850d8fc95..750b1f91a 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/MqttScheduleService.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/MqttScheduleService.java @@ -18,7 +18,7 @@ package io.github.pnoker.common.mqtt.service; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface MqttScheduleService { diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/impl/MqttScheduleServiceImpl.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/impl/MqttScheduleServiceImpl.java index cc2b87f61..463fcbf5d 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/impl/MqttScheduleServiceImpl.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/impl/MqttScheduleServiceImpl.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/job/MqttScheduleJob.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/job/MqttScheduleJob.java index 947289d66..de6d35fdc 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/job/MqttScheduleJob.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/mqtt/service/job/MqttScheduleJob.java @@ -34,7 +34,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/utils/MqttUtil.java b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/utils/MqttUtil.java index c34e26342..0218575e9 100644 --- a/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/utils/MqttUtil.java +++ b/dc3-common/dc3-common-mqtt/src/main/java/io/github/pnoker/common/utils/MqttUtil.java @@ -23,7 +23,7 @@ import org.eclipse.paho.client.mqttv3.MqttConnectOptions; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class MqttUtil { diff --git a/dc3-common/dc3-common-postgres/pom.xml b/dc3-common/dc3-common-postgres/pom.xml index 0960929fc..c8161f190 100644 --- a/dc3-common/dc3-common-postgres/pom.xml +++ b/dc3-common/dc3-common-postgres/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-postgres - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/config/ActivePostgresProfileConfig.java b/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/config/ActivePostgresProfileConfig.java index 8c84a8eb2..f81512335 100644 --- a/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/config/ActivePostgresProfileConfig.java +++ b/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/config/ActivePostgresProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/config/MybatisPlusConfig.java b/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/config/MybatisPlusConfig.java index 497109f9a..111c22138 100644 --- a/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/config/MybatisPlusConfig.java +++ b/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/config/MybatisPlusConfig.java @@ -27,7 +27,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * MybatisPlus配置 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Configuration diff --git a/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/utils/MybatisUtil.java b/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/utils/MybatisUtil.java index 3c5dc723b..b23e41c57 100644 --- a/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/utils/MybatisUtil.java +++ b/dc3-common/dc3-common-postgres/src/main/java/io/github/pnoker/common/utils/MybatisUtil.java @@ -34,7 +34,7 @@ import java.sql.Types; * Mybatis 工具类集合 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/pom.xml b/dc3-common/dc3-common-public/pom.xml index ba80e3b8b..3a5ad02e2 100644 --- a/dc3-common/dc3-common-public/pom.xml +++ b/dc3-common/dc3-common-public/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-public - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/base/service/BaseService.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/base/service/BaseService.java index 1f02a91d5..b7aee6ee0 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/base/service/BaseService.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/base/service/BaseService.java @@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; * 基础 Service 类接口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface BaseService { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/OkHttpConfig.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/OkHttpConfig.java index 90b90fc9c..dcdd1124b 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/OkHttpConfig.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/OkHttpConfig.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; * OkHttp Configuration * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/R.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/R.java index 557328644..9a921ac90 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/R.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/R.java @@ -28,7 +28,7 @@ import java.io.Serializable; * Response * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/auth/Keys.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/auth/Keys.java index 7c0f34123..0f2b77283 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/auth/Keys.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/auth/Keys.java @@ -26,7 +26,7 @@ import lombok.Setter; * Aes/Rsa 加密密钥 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class Keys { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/Pages.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/Pages.java index 248fda100..363a8c1c9 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/Pages.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/Pages.java @@ -30,7 +30,7 @@ import java.util.List; * 分页参数配置 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/RequestHeader.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/RequestHeader.java index e1661e656..dfabce029 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/RequestHeader.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/RequestHeader.java @@ -26,7 +26,7 @@ import lombok.Setter; * Request Header * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/TreeNode.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/TreeNode.java index d98bda249..606186f16 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/TreeNode.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/entity/common/TreeNode.java @@ -28,7 +28,7 @@ import java.util.List; * Tree node * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/CollectionOptional.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/CollectionOptional.java index 10e7001b2..4757e2f01 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/CollectionOptional.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/CollectionOptional.java @@ -25,7 +25,7 @@ import java.util.function.Consumer; * 自定义 Collection Optional * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public final class CollectionOptional { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/EnableOptional.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/EnableOptional.java index e28852962..d5ccc80cf 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/EnableOptional.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/EnableOptional.java @@ -25,7 +25,7 @@ import java.util.function.Consumer; * 自定义 Enable Optional * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public final class EnableOptional { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/IntegerOptional.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/IntegerOptional.java index 6622017bc..0e698bc91 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/IntegerOptional.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/IntegerOptional.java @@ -25,7 +25,7 @@ import java.util.function.IntConsumer; * 自定义 Integer Optional * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public final class IntegerOptional { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/JsonOptional.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/JsonOptional.java index f48e45909..23d0d5daf 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/JsonOptional.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/JsonOptional.java @@ -25,7 +25,7 @@ import java.util.function.Consumer; * 自定义 String Optional * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public final class JsonOptional { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/LongOptional.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/LongOptional.java index 76012dd04..08d540c2e 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/LongOptional.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/LongOptional.java @@ -25,7 +25,7 @@ import java.util.function.LongConsumer; * 自定义 Long Optional * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public final class LongOptional { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/StringOptional.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/StringOptional.java index f36e10f70..8ac8a773e 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/StringOptional.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/optional/StringOptional.java @@ -24,7 +24,7 @@ import java.util.function.Consumer; * 自定义 String Optional * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public final class StringOptional { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/ArithmeticUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/ArithmeticUtil.java index 3fac3ba60..8bda5fd63 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/ArithmeticUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/ArithmeticUtil.java @@ -25,7 +25,7 @@ import java.math.RoundingMode; * 提供精确的浮点数运算, 包括加减乘除和四舍五入 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class ArithmeticUtil { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/CmdUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/CmdUtil.java index 5af1a31ee..6e43981d3 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/CmdUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/CmdUtil.java @@ -28,7 +28,7 @@ import java.io.OutputStreamWriter; * 命令行工具类集合 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/CodeUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/CodeUtil.java index 9a4887e1e..7c3fb2ed0 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/CodeUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/CodeUtil.java @@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; * 编码生成工具类, 提供唯一编码生成功能 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/DecodeUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/DecodeUtil.java index de35f6a76..d12b362aa 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/DecodeUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/DecodeUtil.java @@ -28,7 +28,7 @@ import java.util.HexFormat; * 编码 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/EnvironmentUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/EnvironmentUtil.java index 38ffcb6fa..42b29c52e 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/EnvironmentUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/EnvironmentUtil.java @@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j; * 环境相关的工具类集合 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/FieldUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/FieldUtil.java index c6a351531..e24dc5ae2 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/FieldUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/FieldUtil.java @@ -30,7 +30,7 @@ import java.util.Objects; * 字段名称 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/FileUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/FileUtil.java index c18657122..b63119425 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/FileUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/FileUtil.java @@ -25,7 +25,7 @@ import lombok.extern.slf4j.Slf4j; * 文件 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/HostUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/HostUtil.java index 2f3273008..7a49503b7 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/HostUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/HostUtil.java @@ -26,7 +26,7 @@ import java.util.*; * Host 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/JsonUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/JsonUtil.java index f93e77117..a8aed93f0 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/JsonUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/JsonUtil.java @@ -44,7 +44,7 @@ import java.util.List; * 基于 Jackson 实现 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public final class JsonUtil { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/KeyStoreUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/KeyStoreUtil.java index 87c55809a..903a817ab 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/KeyStoreUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/KeyStoreUtil.java @@ -37,7 +37,7 @@ import java.security.cert.CertificateFactory; * 证书导入工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/KeyUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/KeyUtil.java index f0cd0a5b3..2b7ca3b00 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/KeyUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/KeyUtil.java @@ -43,7 +43,7 @@ import java.util.Date; * AES, RSA, JWT 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/LocalDateTimeUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/LocalDateTimeUtil.java index 590b5eec0..902f19596 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/LocalDateTimeUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/LocalDateTimeUtil.java @@ -30,7 +30,7 @@ import java.time.temporal.ChronoUnit; * 时间(不时区, 默认上海时区) 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/MapStructUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/MapStructUtil.java index 4d24f1ea1..5547a83b4 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/MapStructUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/MapStructUtil.java @@ -26,7 +26,7 @@ import org.mapstruct.Condition; * MapStruct 工具类集合 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/PageUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/PageUtil.java index 65272de3c..8299da819 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/PageUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/PageUtil.java @@ -31,7 +31,7 @@ import java.util.Objects; * 分页 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/PoiUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/PoiUtil.java index b92c72abb..68fa2dd9b 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/PoiUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/PoiUtil.java @@ -27,7 +27,7 @@ import java.util.Objects; * 表格操作 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/RegexUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/RegexUtil.java index 85fb51e02..44393de5f 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/RegexUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/RegexUtil.java @@ -25,7 +25,7 @@ import java.math.BigDecimal; * 常用正则工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class RegexUtil { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/TimeUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/TimeUtil.java index fb6aecf3d..612a5e6af 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/TimeUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/TimeUtil.java @@ -29,7 +29,7 @@ import java.util.Date; * 时间 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/TreeUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/TreeUtil.java index 314512c57..8e3142c95 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/TreeUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/TreeUtil.java @@ -26,7 +26,7 @@ import java.util.List; * 树 相关工具类集合 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/X509Util.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/X509Util.java index c1f7497f7..74aec06c6 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/X509Util.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/X509Util.java @@ -41,7 +41,7 @@ import java.util.Objects; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/ZoneDateTimeUtil.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/ZoneDateTimeUtil.java index f57eafcf7..dfc37a5a4 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/ZoneDateTimeUtil.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/utils/ZoneDateTimeUtil.java @@ -30,7 +30,7 @@ import java.time.temporal.ChronoUnit; * 时间(带时区, 默认上海时区) 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-public/src/main/resources/banner.txt b/dc3-common/dc3-common-public/src/main/resources/banner.txt index 4ff16e6ce..dfd8585df 100644 --- a/dc3-common/dc3-common-public/src/main/resources/banner.txt +++ b/dc3-common/dc3-common-public/src/main/resources/banner.txt @@ -4,4 +4,4 @@ | ( <_> ) | | ` \ \____/ \ |___|\____/|____| /_______ /\______ /______ / \/ \/ \/ -${AnsiColor.BRIGHT_CYAN}IoT DC3 Platform V2025.2.5 +${AnsiColor.BRIGHT_CYAN}IoT DC3 Platform V2025.6.0 diff --git a/dc3-common/dc3-common-quartz/pom.xml b/dc3-common/dc3-common-quartz/pom.xml index b05ab22b5..09a361d74 100644 --- a/dc3-common/dc3-common-quartz/pom.xml +++ b/dc3-common/dc3-common-quartz/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-quartz - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-quartz/src/main/java/io/github/pnoker/common/config/ActiveQuartzProfileConfig.java b/dc3-common/dc3-common-quartz/src/main/java/io/github/pnoker/common/config/ActiveQuartzProfileConfig.java index af38d5fce..1d1b7da7d 100644 --- a/dc3-common/dc3-common-quartz/src/main/java/io/github/pnoker/common/config/ActiveQuartzProfileConfig.java +++ b/dc3-common/dc3-common-quartz/src/main/java/io/github/pnoker/common/config/ActiveQuartzProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-quartz/src/main/java/io/github/pnoker/common/quartz/QuartzService.java b/dc3-common/dc3-common-quartz/src/main/java/io/github/pnoker/common/quartz/QuartzService.java index 8fb633656..1f37c26fb 100644 --- a/dc3-common/dc3-common-quartz/src/main/java/io/github/pnoker/common/quartz/QuartzService.java +++ b/dc3-common/dc3-common-quartz/src/main/java/io/github/pnoker/common/quartz/QuartzService.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; * Scheduler 工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-rabbitmq/pom.xml b/dc3-common/dc3-common-rabbitmq/pom.xml index 924d0101b..e35e38b07 100644 --- a/dc3-common/dc3-common-rabbitmq/pom.xml +++ b/dc3-common/dc3-common-rabbitmq/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-rabbitmq - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/ActiveRabbitProfileConfig.java b/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/ActiveRabbitProfileConfig.java index e560f9d8a..49a727e92 100644 --- a/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/ActiveRabbitProfileConfig.java +++ b/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/ActiveRabbitProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/ExchangeConfig.java b/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/ExchangeConfig.java index cca272d8d..b3f15fc41 100644 --- a/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/ExchangeConfig.java +++ b/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/ExchangeConfig.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/RabbitConfig.java b/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/RabbitConfig.java index d7c5df2e4..141e7f9d6 100644 --- a/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/RabbitConfig.java +++ b/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/RabbitConfig.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/RabbitmqEnvironmentConfig.java b/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/RabbitmqEnvironmentConfig.java index b73b940d3..0bf6468b7 100644 --- a/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/RabbitmqEnvironmentConfig.java +++ b/dc3-common/dc3-common-rabbitmq/src/main/java/io/github/pnoker/common/config/RabbitmqEnvironmentConfig.java @@ -30,7 +30,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-redis/pom.xml b/dc3-common/dc3-common-redis/pom.xml index 509e6111f..c5340bbe6 100644 --- a/dc3-common/dc3-common-redis/pom.xml +++ b/dc3-common/dc3-common-redis/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-redis - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/ActiveRedisProfileConfig.java b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/ActiveRedisProfileConfig.java index 4a8edb425..b738ccc24 100644 --- a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/ActiveRedisProfileConfig.java +++ b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/ActiveRedisProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/RedisCacheConfig.java b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/RedisCacheConfig.java index 690787f1a..baa49ba0f 100644 --- a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/RedisCacheConfig.java +++ b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/RedisCacheConfig.java @@ -38,7 +38,7 @@ import java.time.Duration; * Redis Cache * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Configuration diff --git a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/RedisTemplateConfig.java b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/RedisTemplateConfig.java index 41197c1ca..f4bad06f5 100644 --- a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/RedisTemplateConfig.java +++ b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/config/RedisTemplateConfig.java @@ -33,7 +33,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; * RedisTemplate * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Configuration diff --git a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/init/RedisInitRunner.java b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/init/RedisInitRunner.java index 29498f78d..515d48a83 100644 --- a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/init/RedisInitRunner.java +++ b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/init/RedisInitRunner.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; * Redis initialization runner * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/entity/builder/RedisPointValueBuilder.java b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/entity/builder/RedisPointValueBuilder.java index db0a0b927..c6f4bc4a4 100644 --- a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/entity/builder/RedisPointValueBuilder.java +++ b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/entity/builder/RedisPointValueBuilder.java @@ -27,7 +27,7 @@ import java.util.List; * PointValue Builder * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Mapper(componentModel = "spring", uses = {MapStructUtil.class}) diff --git a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/entity/model/RedisPointValueDO.java b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/entity/model/RedisPointValueDO.java index 2ab444b81..951f5666f 100644 --- a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/entity/model/RedisPointValueDO.java +++ b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/entity/model/RedisPointValueDO.java @@ -28,7 +28,7 @@ import java.time.LocalDateTime; * Redis 位号数据 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/service/RedisRepositoryService.java b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/service/RedisRepositoryService.java index 8d2b68bdd..66bbbf61a 100644 --- a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/service/RedisRepositoryService.java +++ b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/service/RedisRepositoryService.java @@ -35,7 +35,7 @@ import java.util.stream.Collectors; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/service/RedisService.java b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/service/RedisService.java index cb8e5849e..93ca14932 100644 --- a/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/service/RedisService.java +++ b/dc3-common/dc3-common-redis/src/main/java/io/github/pnoker/common/redis/service/RedisService.java @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; * Redis 工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-register/README.md b/dc3-common/dc3-common-register/README.md deleted file mode 100644 index 462078967..000000000 --- a/dc3-common/dc3-common-register/README.md +++ /dev/null @@ -1 +0,0 @@ -IoT DC3 平台 公共的注册中心配置。 \ No newline at end of file diff --git a/dc3-common/dc3-common-register/pom.xml b/dc3-common/dc3-common-register/pom.xml deleted file mode 100644 index 86d0a2687..000000000 --- a/dc3-common/dc3-common-register/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - 4.0.0 - - - io.github.pnoker - dc3-common - 2025.2.5 - - - ${project.artifactId} - dc3-common-register - 2025.2.5 - jar - - 2016-2022 - https://github.com/pnoker/iot-dc3 - - IoT DC3 平台 公共的注册中心配置。 - - - - - pnoker - pnoker - pnokers@icloud.com - - PMC - - pnoker.github.io - https://github.com/pnoker/iot-dc3 - - - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - https://github.com/pnoker/iot-dc3 - https://github.com/pnoker/iot-dc3.git - https://github.com/pnoker/iot-dc3.git - - - - - deploy - - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-gpg-plugin - - - org.sonatype.plugins - nexus-staging-maven-plugin - - - - - - - pnoker - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - pnoker - https://s01.oss.sonatype.org/content/repositories/snapshots - - - - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.micrometer - micrometer-registry-prometheus - - - - - com.github.ben-manes.caffeine - caffeine - - - - - diff --git a/dc3-common/dc3-common-register/src/main/java/io/github/pnoker/common/config/ActiveRegisterProfileConfig.java b/dc3-common/dc3-common-register/src/main/java/io/github/pnoker/common/config/ActiveRegisterProfileConfig.java deleted file mode 100644 index a7ac1ed2e..000000000 --- a/dc3-common/dc3-common-register/src/main/java/io/github/pnoker/common/config/ActiveRegisterProfileConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2016-present the IoT DC3 original author or authors. - * - * 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 - * - * https://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 io.github.pnoker.common.config; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.env.EnvironmentPostProcessor; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; -import org.springframework.core.env.ConfigurableEnvironment; - -/** - * Environment Config - * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Slf4j -@Configuration -@Order(Ordered.HIGHEST_PRECEDENCE) -public class ActiveRegisterProfileConfig implements EnvironmentPostProcessor { - - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { - environment.addActiveProfile("register"); - } -} diff --git a/dc3-common/dc3-common-register/src/main/resources/META-INF/spring.factories b/dc3-common/dc3-common-register/src/main/resources/META-INF/spring.factories deleted file mode 100644 index a548c8c4f..000000000 --- a/dc3-common/dc3-common-register/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright 2016-present the IoT DC3 original author or authors. -# -# 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 -# -# https://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. -# -org.springframework.boot.env.EnvironmentPostProcessor=\ - io.github.pnoker.common.config.ActiveRegisterProfileConfig \ No newline at end of file diff --git a/dc3-common/dc3-common-register/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dc3-common/dc3-common-register/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index b64bdcf9d..000000000 --- a/dc3-common/dc3-common-register/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright 2016-present the IoT DC3 original author or authors. -# -# 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 -# -# https://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. -# - diff --git a/dc3-common/dc3-common-register/src/main/resources/application-register.yml b/dc3-common/dc3-common-register/src/main/resources/application-register.yml deleted file mode 100644 index bb06240c8..000000000 --- a/dc3-common/dc3-common-register/src/main/resources/application-register.yml +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2016-present Pnoker 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. -# - -# # The following content will be overwritten by application-[dev|test|pre|pro].yml, -# that is: if the following properties are configured in application-[dev|test|pre|pro].yml, -# the property values configured in application.yml will be the main ones. -spring: - cloud: - nacos: - discovery: - ip: ${NODE_HOST:${spring.application.name}} - watch-delay: 5000 - -management: - endpoints: - # false:禁用 - enabled-by-default: false - web: - base-path: /actuator - exposure: - include: '*' - endpoint: - health: - enabled: true - # always:显示详情 - # never: 不显示 - show-details: always \ No newline at end of file diff --git a/dc3-common/dc3-common-register/src/main/resources/nacos-logback.xml b/dc3-common/dc3-common-register/src/main/resources/nacos-logback.xml deleted file mode 100644 index 5b93dc4f7..000000000 --- a/dc3-common/dc3-common-register/src/main/resources/nacos-logback.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - ${logPath}/nacos/config.log - - - ${logPath}/nacos/config.log.%i - ${logRetainCount} - - - - ${logFileSize} - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n - - - - - 0 - 1024 - true - - - - - ${logPath}/nacos/naming.log - - - ${logPath}/nacos/naming.log.%i - ${logRetainCount} - - - - ${logFileSize} - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n - - - - - 0 - 1024 - true - - - - - ${logPath}/nacos/remote.log - - - ${logPath}/nacos/remote.log.%i - ${logRetainCount} - - - - ${logFileSize} - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n - - - - - 0 - 1024 - true - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dc3-common/dc3-common-repository/pom.xml b/dc3-common/dc3-common-repository/pom.xml index f76ba2e15..32c3d8a84 100644 --- a/dc3-common/dc3-common-repository/pom.xml +++ b/dc3-common/dc3-common-repository/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-repository - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/config/ActiveRepositoryProfileConfig.java b/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/config/ActiveRepositoryProfileConfig.java index eb5abb6af..744c17c68 100644 --- a/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/config/ActiveRepositoryProfileConfig.java +++ b/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/config/ActiveRepositoryProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/entity/bo/PointValueBO.java b/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/entity/bo/PointValueBO.java index 4bf0b22f1..a728a637e 100644 --- a/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/entity/bo/PointValueBO.java +++ b/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/entity/bo/PointValueBO.java @@ -26,7 +26,7 @@ import java.time.LocalDateTime; * 位号值 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/entity/query/PointValueQuery.java b/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/entity/query/PointValueQuery.java index b9f8e6190..2f39dd4b5 100644 --- a/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/entity/query/PointValueQuery.java +++ b/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/entity/query/PointValueQuery.java @@ -27,7 +27,7 @@ import java.io.Serializable; * PointValue Query * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/repository/RepositoryService.java b/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/repository/RepositoryService.java index def0a7674..215d49f65 100644 --- a/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/repository/RepositoryService.java +++ b/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/repository/RepositoryService.java @@ -28,7 +28,7 @@ import java.util.List; * 数据存储策略服务接口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface RepositoryService { diff --git a/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/strategy/RepositoryStrategyFactory.java b/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/strategy/RepositoryStrategyFactory.java index 2e28144e3..9dc1ea1e0 100644 --- a/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/strategy/RepositoryStrategyFactory.java +++ b/dc3-common/dc3-common-repository/src/main/java/io/github/pnoker/common/strategy/RepositoryStrategyFactory.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; * 数据存储策略工厂 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class RepositoryStrategyFactory { diff --git a/dc3-common/dc3-common-thread/pom.xml b/dc3-common/dc3-common-thread/pom.xml index 08471f0ce..d7bc6a81f 100644 --- a/dc3-common/dc3-common-thread/pom.xml +++ b/dc3-common/dc3-common-thread/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-thread - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/config/ActiveThreadProfileConfig.java b/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/config/ActiveThreadProfileConfig.java index aceda70c4..73a58e060 100644 --- a/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/config/ActiveThreadProfileConfig.java +++ b/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/config/ActiveThreadProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/config/ThreadPoolConfig.java b/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/config/ThreadPoolConfig.java index 1c5424cb5..e9ed6ae7c 100644 --- a/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/config/ThreadPoolConfig.java +++ b/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/config/ThreadPoolConfig.java @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger; * 通用线程池配置 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j @@ -78,7 +78,7 @@ public class ThreadPoolConfig { * 自定义 RejectedExecutionHandler * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ private static class BlockingRejectedExecutionHandler implements RejectedExecutionHandler { diff --git a/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/init/ThreadInitRunner.java b/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/init/ThreadInitRunner.java index d9c9eaa8d..6522c04f9 100644 --- a/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/init/ThreadInitRunner.java +++ b/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/init/ThreadInitRunner.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; * Thread initialization runner * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/thread/entity/property/ThreadProperties.java b/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/thread/entity/property/ThreadProperties.java index 0bd3c6cc7..946ad97fe 100644 --- a/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/thread/entity/property/ThreadProperties.java +++ b/dc3-common/dc3-common-thread/src/main/java/io/github/pnoker/common/thread/entity/property/ThreadProperties.java @@ -25,7 +25,7 @@ import org.springframework.validation.annotation.Validated; * 通用线程池属性 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-common/dc3-common-transfer/pom.xml b/dc3-common/dc3-common-transfer/pom.xml index 1437e6ed7..97e7c552f 100644 --- a/dc3-common/dc3-common-transfer/pom.xml +++ b/dc3-common/dc3-common-transfer/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-transfer - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/TransformAspect.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/TransformAspect.java index c4980aa2b..4eb4c3d8c 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/TransformAspect.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/TransformAspect.java @@ -28,7 +28,7 @@ import org.springframework.core.convert.support.GenericConversionService; * 转换器AOP * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Aspect diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/annotation/Transform.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/annotation/Transform.java index cd6b8ad66..26ff2d5dd 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/annotation/Transform.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/annotation/Transform.java @@ -25,7 +25,7 @@ import java.lang.annotation.*; * 最基本的注解, 可以被其他自定义注解衍生 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Retention(RetentionPolicy.RUNTIME) diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/BaseEnum.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/BaseEnum.java index 513a24122..7667c0e43 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/BaseEnum.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/BaseEnum.java @@ -23,7 +23,7 @@ import java.util.Optional; * 基础枚举 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface BaseEnum { diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/EnumBean.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/EnumBean.java index 7ab2ce88a..ce8899ccc 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/EnumBean.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/EnumBean.java @@ -21,7 +21,7 @@ package io.github.pnoker.common.base.enums; * 枚举对象 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public class EnumBean implements BaseEnum { diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/EnumPool.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/EnumPool.java index 9509c206c..fce816c9d 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/EnumPool.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/base/enums/EnumPool.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; * 枚举池, 所有Dict的实现类都会在这里注册 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface EnumPool { diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/TransformClass.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/TransformClass.java index c57fade0a..74810590d 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/TransformClass.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/TransformClass.java @@ -31,7 +31,7 @@ import java.util.*; * 缓存相关信息, 提高性能 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Data diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/TransformField.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/TransformField.java index 20cbad9c0..030834168 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/TransformField.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/TransformField.java @@ -38,7 +38,7 @@ import java.util.concurrent.ConcurrentHashMap; * 缓存相关信息, 提高性能 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Data diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/UnWrapper.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/UnWrapper.java index faabefc21..df2060df7 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/UnWrapper.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/component/UnWrapper.java @@ -27,7 +27,7 @@ import org.springframework.lang.NonNull; * 注意解包之后的返回参数必须是某个bean或者集合类型 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface UnWrapper extends Converter { diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/transformer/SimpleTransformer.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/transformer/SimpleTransformer.java index 0f1fc07aa..4668dc280 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/transformer/SimpleTransformer.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/transformer/SimpleTransformer.java @@ -25,7 +25,7 @@ import org.springframework.lang.NonNull; * 自定义转换场景中如果自定义注解里不需要额外属性(除开from属性), 直接实现该接口即可 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface SimpleTransformer extends Transformer { diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/transformer/Transformer.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/transformer/Transformer.java index 8adcec4dd..3f7419e64 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/transformer/Transformer.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/transformer/Transformer.java @@ -26,7 +26,7 @@ import java.lang.annotation.Annotation; * 支持自定义注解 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface Transformer { diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/util/SpringContextUtil.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/util/SpringContextUtil.java index 87296bb3c..0c972eac6 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/util/SpringContextUtil.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/util/SpringContextUtil.java @@ -26,7 +26,7 @@ import org.springframework.stereotype.Component; * Spring上下文工具 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/util/TransformUtil.java b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/util/TransformUtil.java index a50a2fdaa..35429d7de 100644 --- a/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/util/TransformUtil.java +++ b/dc3-common/dc3-common-transfer/src/main/java/io/github/pnoker/common/util/TransformUtil.java @@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentHashMap; * 转换工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-web/pom.xml b/dc3-common/dc3-common-web/pom.xml index 2642b7223..8724e1524 100644 --- a/dc3-common/dc3-common-web/pom.xml +++ b/dc3-common/dc3-common-web/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker dc3-common - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common-web - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/base/BaseController.java b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/base/BaseController.java index 50ccf8454..e01603c37 100644 --- a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/base/BaseController.java +++ b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/base/BaseController.java @@ -24,7 +24,7 @@ import reactor.core.publisher.Mono; * 基础 Controller 类接口 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public interface BaseController { diff --git a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/ActiveWebProfileConfig.java b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/ActiveWebProfileConfig.java index 8b5101c61..7a22328cd 100644 --- a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/ActiveWebProfileConfig.java +++ b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/ActiveWebProfileConfig.java @@ -28,7 +28,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * Environment Config * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/ExceptionConfig.java b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/ExceptionConfig.java index a975ed55e..9514485c1 100644 --- a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/ExceptionConfig.java +++ b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/ExceptionConfig.java @@ -38,7 +38,7 @@ import java.util.List; * Exception 配置 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/WebFilterConfig.java b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/WebFilterConfig.java index 9a1565ce2..42e0268b2 100644 --- a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/WebFilterConfig.java +++ b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/WebFilterConfig.java @@ -36,7 +36,7 @@ import java.util.Optional; * WebFilter 配置 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/WebFluxConfig.java b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/WebFluxConfig.java index 845ace5f0..393740500 100644 --- a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/WebFluxConfig.java +++ b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/config/WebFluxConfig.java @@ -30,7 +30,7 @@ import org.springframework.web.reactive.config.WebFluxConfigurer; * WebFlux 配置 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/RequestUtil.java b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/RequestUtil.java index 6f0c2df2b..96a8e1e1a 100644 --- a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/RequestUtil.java +++ b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/RequestUtil.java @@ -30,7 +30,7 @@ import java.util.Objects; * 请求 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/ResponseUtil.java b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/ResponseUtil.java index 54990707e..706fc7e04 100644 --- a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/ResponseUtil.java +++ b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/ResponseUtil.java @@ -32,7 +32,7 @@ import java.nio.file.Path; * 响应 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/UserHeaderUtil.java b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/UserHeaderUtil.java index ae02baaf5..8b85145e9 100644 --- a/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/UserHeaderUtil.java +++ b/dc3-common/dc3-common-web/src/main/java/io/github/pnoker/common/utils/UserHeaderUtil.java @@ -30,7 +30,7 @@ import java.util.Objects; * 用户请求头 相关工具类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-common/pom.xml b/dc3-common/pom.xml index c5da5b8fd..9b1413257 100644 --- a/dc3-common/pom.xml +++ b/dc3-common/pom.xml @@ -24,13 +24,13 @@ io.github.pnoker dc3-parent - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-common - 2025.2.5 + 2025.6.0 pom 2016-2022 @@ -70,35 +70,33 @@ true - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 @@ -110,7 +108,6 @@ dc3-common-driver dc3-common-exception dc3-common-gateway - dc3-common-job dc3-common-log dc3-common-manager dc3-common-model @@ -120,7 +117,6 @@ dc3-common-quartz dc3-common-rabbitmq dc3-common-redis - dc3-common-register dc3-common-repository dc3-common-thread dc3-common-transfer @@ -250,11 +246,6 @@ dc3-common-gateway ${dc3.common.gateway.version} - - io.github.pnoker - dc3-common-job - ${dc3.common.job.version} - io.github.pnoker dc3-common-log @@ -300,11 +291,6 @@ dc3-common-redis ${dc3.common.redis.version} - - io.github.pnoker - dc3-common-register - ${dc3.common.register.version} - io.github.pnoker dc3-common-repository diff --git a/dc3-driver/dc3-driver-listening-virtual/pom.xml b/dc3-driver/dc3-driver-listening-virtual/pom.xml index efe40fefd..dd0a9b84e 100644 --- a/dc3-driver/dc3-driver-listening-virtual/pom.xml +++ b/dc3-driver/dc3-driver-listening-virtual/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-driver - 2025.2.5 + 2025.6.0 dc3-driver-listening-virtual diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/ListeningVirtualDriverApplication.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/ListeningVirtualDriverApplication.java index 9be778952..8ec1c2b89 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/ListeningVirtualDriverApplication.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/ListeningVirtualDriverApplication.java @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; *

该类是Spring Boot应用的入口类, 用于启动监听虚拟驱动应用。

* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java index 3aaca5c08..484ec400d 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java @@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit; * 驱动自定义服务实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/NettyServerHandler.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/NettyServerHandler.java index 8c0c65973..b1ea74aef 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/NettyServerHandler.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/NettyServerHandler.java @@ -40,7 +40,7 @@ import java.util.Map; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServer.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServer.java index e0ad11d3d..5318edaf0 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServer.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServer.java @@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServerHandler.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServerHandler.java index e47b35dbf..54e43e2eb 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServerHandler.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServerHandler.java @@ -44,7 +44,7 @@ import javax.annotation.PostConstruct; * lg:[4C 69 73 74 65 6E 69 6E 67 56 69 72 74 75 61 6C 44 65 76 69 63 65 62 44 C3 E7 5C 40 46 D5 C2 8F 5C 28 F6 00 00 00 00 00 00 00 0C 00 00 00 2D 01 31 33 31 2E 32 33 31 34 35 36 2C 30 32 31 2E 35 36 38 32 31 31] * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServer.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServer.java index 15e9310f1..1053810d7 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServer.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServer.java @@ -31,7 +31,7 @@ import java.net.InetSocketAddress; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServerHandler.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServerHandler.java index 7ef98a150..ef6039cb2 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServerHandler.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServerHandler.java @@ -44,7 +44,7 @@ import javax.annotation.PostConstruct; * lg:[4C 69 73 74 65 6E 69 6E 67 56 69 72 74 75 61 6C 44 65 76 69 63 65 62 44 C3 E7 5C 40 46 D5 C2 8F 5C 28 F6 00 00 00 00 00 00 00 0C 00 00 00 2D 01 31 33 31 2E 32 33 31 34 35 36 2C 30 32 31 2E 35 36 38 32 31 31] * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-modbus-tcp/pom.xml b/dc3-driver/dc3-driver-modbus-tcp/pom.xml index d594f9925..185ba13dd 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/pom.xml +++ b/dc3-driver/dc3-driver-modbus-tcp/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-driver - 2025.2.5 + 2025.6.0 dc3-driver-modbus-tcp diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BasicProcessImage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BasicProcessImage.java index 212e64d4b..9797500ff 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BasicProcessImage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BasicProcessImage.java @@ -34,7 +34,7 @@ import java.util.Map; *

BasicProcessImage class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class BasicProcessImage implements ProcessImage { private final int slaveId; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchRead.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchRead.java index 8a0ead037..fc8dd58dc 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchRead.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchRead.java @@ -37,7 +37,7 @@ import java.util.*; * * @param - Type of read * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class BatchRead { private final List> requestValues = new ArrayList<>(); diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchResults.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchResults.java index dba2e670e..cdbb97c3a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchResults.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchResults.java @@ -22,7 +22,7 @@ import java.util.Map; *

BatchResults class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class BatchResults { private final Map data = new HashMap<>(); diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ExceptionResult.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ExceptionResult.java index d07630f9a..aae54a7d0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ExceptionResult.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ExceptionResult.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.code.ExceptionCode; *

ExceptionResult class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ExceptionResult { private final byte exceptionCode; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/Modbus.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/Modbus.java index ccfad7c1a..144b4f632 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/Modbus.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/Modbus.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.MessagingExceptionHandler; * TODO: - handle echoing in RS485 * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class Modbus { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusFactory.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusFactory.java index 5395a4153..aefc1eb19 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusFactory.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusFactory.java @@ -36,7 +36,7 @@ import com.serotonin.modbus4j.serial.rtu.RtuSlave; *

ModbusFactory class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ModbusFactory { // diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusMaster.java index a86ab6238..5344b9292 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusMaster.java @@ -45,7 +45,7 @@ import java.util.Map; *

Abstract ModbusMaster class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusMaster extends Modbus { private final Map slaveProfiles = new HashMap<>(); diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusSlaveSet.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusSlaveSet.java index ef8c71dfe..cac9e7982 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusSlaveSet.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusSlaveSet.java @@ -27,7 +27,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; *

Abstract ModbusSlaveSet class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusSlaveSet extends Modbus { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/NodeScanListener.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/NodeScanListener.java index 5e5cd8cec..8c23ed5f0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/NodeScanListener.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/NodeScanListener.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.sero.util.ProgressiveTaskListener; *

NodeScanListener interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface NodeScanListener extends ProgressiveTaskListener { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImage.java index 6c778b70e..3e686f249 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImage.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.exception.IllegalDataAddressException; * Used by slave implementors. Provides an interface by which slaves can easily manage data. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface ProcessImage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImageListener.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImageListener.java index ec0b8d4e8..6a223c413 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImageListener.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImageListener.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j; *

ProcessImageListener interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface ProcessImageListener { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseMessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseMessageParser.java index 8469ea2df..0a79e9ea2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseMessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseMessageParser.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

Abstract BaseMessageParser class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class BaseMessageParser implements MessageParser { protected final boolean master; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseRequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseRequestHandler.java index 140e2e1ca..449316654 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseRequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseRequestHandler.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.RequestHandler; *

Abstract BaseRequestHandler class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class BaseRequestHandler implements RequestHandler { protected ModbusSlaveSet slave; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/KeyedModbusLocator.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/KeyedModbusLocator.java index 36acface6..20621b455 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/KeyedModbusLocator.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/KeyedModbusLocator.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.locator.BaseLocator; *

KeyedModbusLocator class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class KeyedModbusLocator { private final K key; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ModbusUtils.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ModbusUtils.java index 6dd4eac1f..932cf889e 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ModbusUtils.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ModbusUtils.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

ModbusUtils class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ModbusUtils { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/RangeAndOffset.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/RangeAndOffset.java index adbf8fc86..f1f0848e3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/RangeAndOffset.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/RangeAndOffset.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.code.RegisterRange; *

RangeAndOffset class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RangeAndOffset { private int range; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ReadFunctionGroup.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ReadFunctionGroup.java index 7e8c3ed4b..c22853629 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ReadFunctionGroup.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ReadFunctionGroup.java @@ -24,7 +24,7 @@ import java.util.List; *

ReadFunctionGroup class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadFunctionGroup { private final SlaveAndRange slaveAndRange; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveAndRange.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveAndRange.java index 226d87f3d..105a5e978 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveAndRange.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveAndRange.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.base; *

SlaveAndRange class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class SlaveAndRange { private final int slaveId; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveProfile.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveProfile.java index 0c57be9ed..1b15fce8f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveProfile.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveProfile.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.base; * featured, and then we note function failures so that we know how requests should subsequently be sent. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class SlaveProfile { private boolean writeMaskRegister = true; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/DataType.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/DataType.java index 0e7dd65e1..1c61a292a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/DataType.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/DataType.java @@ -21,7 +21,7 @@ import java.math.BigInteger; *

DataType class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class DataType { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/ExceptionCode.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/ExceptionCode.java index 8c1e9f3ec..d3c0d477b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/ExceptionCode.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/ExceptionCode.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.code; *

ExceptionCode class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ExceptionCode { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/FunctionCode.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/FunctionCode.java index 22a7776ea..c9d77f3d3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/FunctionCode.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/FunctionCode.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.code; *

FunctionCode class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class FunctionCode { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/RegisterRange.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/RegisterRange.java index bb4438982..97d3b5f6d 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/RegisterRange.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/RegisterRange.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.code; *

RegisterRange class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RegisterRange { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ErrorResponseException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ErrorResponseException.java index 25102dea6..0a68900a2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ErrorResponseException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ErrorResponseException.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.msg.ModbusResponse; *

ErrorResponseException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ErrorResponseException extends Exception { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataAddressException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataAddressException.java index 438d0c967..7cbbef6f2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataAddressException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataAddressException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *

IllegalDataAddressException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IllegalDataAddressException extends ModbusTransportException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataTypeException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataTypeException.java index 7ffce6cbe..9c407ef5a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataTypeException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataTypeException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *

IllegalDataTypeException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IllegalDataTypeException extends ModbusIdException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalFunctionException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalFunctionException.java index 220bbe0f9..de826f0cd 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalFunctionException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalFunctionException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *

IllegalFunctionException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IllegalFunctionException extends ModbusTransportException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalSlaveIdException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalSlaveIdException.java index 98730fadf..6aeedca9b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalSlaveIdException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalSlaveIdException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *

IllegalSlaveIdException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IllegalSlaveIdException extends ModbusIdException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/InvalidDataConversionException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/InvalidDataConversionException.java index 961a55145..e1d42df9f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/InvalidDataConversionException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/InvalidDataConversionException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *

InvalidDataConversionException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class InvalidDataConversionException extends RuntimeException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusIdException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusIdException.java index 21d138ef8..41da29aba 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusIdException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusIdException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *

ModbusIdException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ModbusIdException extends RuntimeException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusInitException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusInitException.java index 2d2aac4b2..f63a749c6 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusInitException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusInitException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *

ModbusInitException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ModbusInitException extends Exception { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusTransportException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusTransportException.java index e12329c6b..29b6a4aa0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusTransportException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusTransportException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *

ModbusTransportException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ModbusTransportException extends Exception { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessage.java index 43aac3cb1..4a008e8b0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessage.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.msg.ModbusMessage; *

Abstract IpMessage class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class IpMessage { protected final ModbusMessage modbusMessage; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessageResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessageResponse.java index 9c840c681..2bd190863 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessageResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessageResponse.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.messaging.OutgoingResponseMessage; *

IpMessageResponse interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface IpMessageResponse extends OutgoingResponseMessage, IncomingResponseMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpParameters.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpParameters.java index 8bd84d259..d5a2033c0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpParameters.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpParameters.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.base.ModbusUtils; *

IpParameters class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IpParameters { private String host; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessage.java index 376294269..e8bdc782b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessage.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

EncapMessage class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapMessage extends IpMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageParser.java index 0a07cca27..62ad24a2c 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageParser.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

EncapMessageParser class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapMessageParser extends BaseMessageParser { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageRequest.java index d8691a667..5ffe7e3c0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

EncapMessageRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapMessageRequest extends EncapMessage implements OutgoingRequestMessage, IncomingRequestMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageResponse.java index b672204a2..5a8fbdef1 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageResponse.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

EncapMessageResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapMessageResponse extends EncapMessage implements IpMessageResponse { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapRequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapRequestHandler.java index c62ba50a2..12838b7de 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapRequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapRequestHandler.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.OutgoingResponseMessage; *

EncapRequestHandler class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapRequestHandler extends BaseRequestHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapWaitingRoomKeyFactory.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapWaitingRoomKeyFactory.java index 51950346d..1f265947d 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapWaitingRoomKeyFactory.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapWaitingRoomKeyFactory.java @@ -27,7 +27,7 @@ import com.serotonin.modbus4j.sero.messaging.WaitingRoomKeyFactory; *

EncapWaitingRoomKeyFactory class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapWaitingRoomKeyFactory implements WaitingRoomKeyFactory { @Override diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/listener/TcpListener.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/listener/TcpListener.java index e4b080447..f1788e4bc 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/listener/TcpListener.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/listener/TcpListener.java @@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit; *

TcpListener class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class TcpListener extends ModbusMaster { // Configuration fields. diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpMaster.java index 88a2c520c..c663f2e09 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpMaster.java @@ -42,7 +42,7 @@ import java.util.Arrays; *

TcpMaster class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class TcpMaster extends ModbusMaster { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpSlave.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpSlave.java index 41551677f..3a25d600c 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpSlave.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpSlave.java @@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit; *

TcpSlave class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class TcpSlave extends ModbusSlaveSet { final boolean encapsulated; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpMaster.java index 0b64291c4..826ada02a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpMaster.java @@ -37,7 +37,7 @@ import java.net.*; *

UdpMaster class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class UdpMaster extends ModbusMaster { private static final int MESSAGE_LENGTH = 1024; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpSlave.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpSlave.java index b56cf48ff..a0f3973d2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpSlave.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpSlave.java @@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit; *

UdpSlave class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class UdpSlave extends ModbusSlaveSet { final BaseMessageParser messageParser; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessage.java index ebc065ec8..e4304983f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessage.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

XaMessage class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaMessage extends IpMessage { protected final int transactionId; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageParser.java index ea38374f7..35bec85b4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageParser.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

XaMessageParser class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaMessageParser extends BaseMessageParser { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageRequest.java index 7208908d7..a6818402d 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

XaMessageRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaMessageRequest extends XaMessage implements OutgoingRequestMessage, IncomingRequestMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageResponse.java index 70cd26dc5..31742f09c 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageResponse.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

XaMessageResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaMessageResponse extends XaMessage implements IpMessageResponse { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaRequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaRequestHandler.java index 387810a2c..089dfdb1c 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaRequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaRequestHandler.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.OutgoingResponseMessage; *

XaRequestHandler class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaRequestHandler extends BaseRequestHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaWaitingRoomKeyFactory.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaWaitingRoomKeyFactory.java index cfe77ac2f..a4bd0d263 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaWaitingRoomKeyFactory.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaWaitingRoomKeyFactory.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.WaitingRoomKeyFactory; *

XaWaitingRoomKeyFactory class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaWaitingRoomKeyFactory implements WaitingRoomKeyFactory { @Override diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BaseLocator.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BaseLocator.java index 17c3c968e..487e8c6b4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BaseLocator.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BaseLocator.java @@ -29,7 +29,7 @@ import java.nio.charset.Charset; *

Abstract BaseLocator class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class BaseLocator { // diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BinaryLocator.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BinaryLocator.java index b3e02e169..6a142136b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BinaryLocator.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BinaryLocator.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.NotImplementedException; *

BinaryLocator class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class BinaryLocator extends BaseLocator { private int bit = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/NumericLocator.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/NumericLocator.java index ab6142067..cee9a3ed7 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/NumericLocator.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/NumericLocator.java @@ -29,7 +29,7 @@ import java.math.RoundingMode; *

NumericLocator class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class NumericLocator extends BaseLocator { private static final int[] DATA_TYPES = { // diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/StringLocator.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/StringLocator.java index 41d6b0448..78f7fdca7 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/StringLocator.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/StringLocator.java @@ -26,7 +26,7 @@ import java.nio.charset.Charset; *

StringLocator class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class StringLocator extends BaseLocator { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionRequest.java index 4c79206d1..d0ea825b9 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionRequest.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

ExceptionRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ExceptionRequest extends ModbusRequest { private final byte functionCode; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionResponse.java index 130a1ed81..9255e8a10 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionResponse.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

ExceptionResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ExceptionResponse extends ModbusResponse { private final byte functionCode; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusMessage.java index 2c57f146f..0c5b9dba6 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusMessage.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

Abstract ModbusMessage class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusMessage { protected int slaveId; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusRequest.java index 4ccf5d560..dc2fe7b2a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusRequest.java @@ -28,7 +28,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

Abstract ModbusRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusRequest extends ModbusMessage { ModbusRequest(int slaveId) throws ModbusTransportException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusResponse.java index ebd1a6177..b7ae60dec 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusResponse.java @@ -27,7 +27,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

Abstract ModbusResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusResponse extends ModbusMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadBinaryRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadBinaryRequest.java index 69d078a00..35c1657d3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadBinaryRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadBinaryRequest.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

Abstract ReadBinaryRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ReadBinaryRequest extends ModbusRequest { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsRequest.java index 5a4992451..73ac59e30 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsRequest.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *

ReadCoilsRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadCoilsRequest extends ReadBinaryRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsResponse.java index ece20902b..c5150b2aa 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsResponse.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *

ReadCoilsResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadCoilsResponse extends ReadResponse { ReadCoilsResponse(int slaveId, byte[] data) throws ModbusTransportException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsRequest.java index 970052f2d..b49f5bbbc 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsRequest.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *

ReadDiscreteInputsRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadDiscreteInputsRequest extends ReadBinaryRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsResponse.java index 2cddf5d37..6511d3f9e 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsResponse.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *

ReadDiscreteInputsResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadDiscreteInputsResponse extends ReadResponse { ReadDiscreteInputsResponse(int slaveId, byte[] data) throws ModbusTransportException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusRequest.java index 019e1f068..390b2cbfa 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusRequest.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

ReadExceptionStatusRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadExceptionStatusRequest extends ModbusRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusResponse.java index 373bb5faa..ae2feee95 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusResponse.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

ReadExceptionStatusResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadExceptionStatusResponse extends ModbusResponse { private byte exceptionStatus; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersRequest.java index 9399f69fa..9c0015ab4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersRequest.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *

ReadHoldingRegistersRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadHoldingRegistersRequest extends ReadNumericRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersResponse.java index 78ab3b7e7..28603cc91 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersResponse.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *

ReadHoldingRegistersResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadHoldingRegistersResponse extends ReadResponse { ReadHoldingRegistersResponse(int slaveId, byte[] data) throws ModbusTransportException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersRequest.java index 1f7e1edfe..88ebc0548 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersRequest.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *

ReadInputRegistersRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadInputRegistersRequest extends ReadNumericRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersResponse.java index 9ebc411fe..c7f7782da 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersResponse.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *

ReadInputRegistersResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadInputRegistersResponse extends ReadResponse { ReadInputRegistersResponse(int slaveId, byte[] data) throws ModbusTransportException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadNumericRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadNumericRequest.java index 89dbac055..43c83eda9 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadNumericRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadNumericRequest.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

Abstract ReadNumericRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ReadNumericRequest extends ModbusRequest { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadResponse.java index f5bd71dfa..1b0bc63d5 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

Abstract ReadResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ReadResponse extends ModbusResponse { private byte[] data; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdRequest.java index 89011431b..dbba9551e 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdRequest.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

ReportSlaveIdRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReportSlaveIdRequest extends ModbusRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdResponse.java index 2b6b8f17a..08ac40b22 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

ReportSlaveIdResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReportSlaveIdResponse extends ModbusResponse { private byte[] data; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilRequest.java index d32a3ffd5..04c2dd036 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

WriteCoilRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteCoilRequest extends ModbusRequest { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilResponse.java index ff7504e5b..78cae403f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

WriteCoilResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteCoilResponse extends ModbusResponse { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsRequest.java index 11f9164f0..7426a1c5a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

WriteCoilsRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteCoilsRequest extends ModbusRequest { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsResponse.java index 961e055f4..c5d64fae3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

WriteCoilsResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteCoilsResponse extends ModbusResponse { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterRequest.java index 887f5fc49..d6cc71e03 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterRequest.java @@ -27,7 +27,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

WriteMaskRegisterRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteMaskRegisterRequest extends ModbusRequest { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterResponse.java index 84089486b..b6ab1abc5 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

WriteMaskRegisterResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteMaskRegisterResponse extends ModbusResponse { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterRequest.java index 80759e00e..278d0ce74 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

WriteRegisterRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteRegisterRequest extends ModbusRequest { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterResponse.java index 0a21f9797..e88988e87 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

WriteRegisterResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteRegisterResponse extends ModbusResponse { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersRequest.java index 1fcbf1c8c..be94636f0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

WriteRegistersRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteRegistersRequest extends ModbusRequest { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersResponse.java index 82cfeada8..d5300e1ef 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

WriteRegistersResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteRegistersResponse extends ModbusResponse { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMaster.java index e56599879..2fc5cd78e 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMaster.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; *

Abstract SerialMaster class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class SerialMaster extends ModbusMaster { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMessage.java index 28445f411..8e45ce0b2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMessage.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.msg.ModbusMessage; *

Abstract SerialMessage class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class SerialMessage { protected final ModbusMessage modbusMessage; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialPortWrapper.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialPortWrapper.java index 1e92ad141..275871f5a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialPortWrapper.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialPortWrapper.java @@ -22,7 +22,7 @@ import java.io.OutputStream; * Wrapper to further aid in abstracting Modbus4J from a serial port implementation * * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public interface SerialPortWrapper { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialSlave.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialSlave.java index 9ce2e9868..3edcff3c8 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialSlave.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialSlave.java @@ -25,7 +25,7 @@ import org.apache.commons.logging.LogFactory; *

Abstract SerialSlave class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class SerialSlave extends ModbusSlaveSet { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialWaitingRoomKeyFactory.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialWaitingRoomKeyFactory.java index d90ccde93..b4d5504d3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialWaitingRoomKeyFactory.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialWaitingRoomKeyFactory.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.messaging.WaitingRoomKeyFactory; *

SerialWaitingRoomKeyFactory class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class SerialWaitingRoomKeyFactory implements WaitingRoomKeyFactory { private static final Sync sync = new Sync(); diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMaster.java index 395c39f37..f4564a01f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMaster.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; *

AsciiMaster class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiMaster extends SerialMaster { private final Log LOG = LogFactory.getLog(SerialMaster.class); diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessage.java index 53046250e..54e0f90e4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessage.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

Abstract AsciiMessage class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class AsciiMessage extends SerialMessage { private static final byte START = ':'; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageParser.java index c9f9070a3..4ceb4e9ee 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageParser.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

AsciiMessageParser class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiMessageParser extends BaseMessageParser { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageRequest.java index c017cff53..72d0c6c17 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

AsciiMessageRequest class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiMessageRequest extends AsciiMessage implements OutgoingRequestMessage, IncomingRequestMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageResponse.java index 2048300cf..9c0478ba3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageResponse.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *

AsciiMessageResponse class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiMessageResponse extends AsciiMessage implements OutgoingResponseMessage, IncomingResponseMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiRequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiRequestHandler.java index 234d2d8c1..b31cddc08 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiRequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiRequestHandler.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.OutgoingResponseMessage; *

AsciiRequestHandler class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiRequestHandler extends BaseRequestHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiSlave.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiSlave.java index 973f5f5b8..0ef6e30d9 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiSlave.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiSlave.java @@ -26,7 +26,7 @@ import java.io.IOException; *

AsciiSlave class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiSlave extends SerialSlave { private MessageControl conn; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMaster.java index b32b5b2b1..1fac264c6 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMaster.java @@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory; *

RtuMaster class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuMaster extends SerialMaster { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessage.java index c28051054..ce890acd4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessage.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; * Convenience superclass primarily for calculating CRC values. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuMessage extends SerialMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageParser.java index 0b3bfc417..b57837d9b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageParser.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; * handling of incomplete messages. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuMessageParser extends BaseMessageParser { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageRequest.java index 9467120d8..c8e2299ac 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; * Handles the RTU enveloping of modbus requests. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuMessageRequest extends RtuMessage implements OutgoingRequestMessage, IncomingRequestMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageResponse.java index 933864936..f1e6572fc 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageResponse.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; * Handles the RTU enveloping of modbus responses. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuMessageResponse extends RtuMessage implements OutgoingResponseMessage, IncomingResponseMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuRequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuRequestHandler.java index dc44feb36..e3fc8bd9b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuRequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuRequestHandler.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.OutgoingResponseMessage; *

RtuRequestHandler class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuRequestHandler extends BaseRequestHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuSlave.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuSlave.java index db0fac21b..c77d4a3c4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuSlave.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuSlave.java @@ -26,7 +26,7 @@ import java.io.IOException; *

RtuSlave class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuSlave extends SerialSlave { // Runtime fields diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/NotImplementedException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/NotImplementedException.java index c3c940d6c..24dcd7f8b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/NotImplementedException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/NotImplementedException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.sero; *

NotImplementedException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class NotImplementedException extends RuntimeException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/ShouldNeverHappenException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/ShouldNeverHappenException.java index 8add92981..287c25845 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/ShouldNeverHappenException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/ShouldNeverHappenException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.sero; *

ShouldNeverHappenException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ShouldNeverHappenException extends RuntimeException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/InputStreamEPollWrapper.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/InputStreamEPollWrapper.java index 903705929..cfffd3e48 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/InputStreamEPollWrapper.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/InputStreamEPollWrapper.java @@ -21,7 +21,7 @@ import java.io.InputStream; *

InputStreamEPollWrapper interface.

* * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public interface InputStreamEPollWrapper { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/Modbus4JInputStreamCallback.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/Modbus4JInputStreamCallback.java index 3cbde4fbd..db7fea40b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/Modbus4JInputStreamCallback.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/Modbus4JInputStreamCallback.java @@ -25,7 +25,7 @@ import java.io.IOException; * notification to this callback. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface Modbus4JInputStreamCallback { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/LineHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/LineHandler.java index d35e6dc60..3a2b81069 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/LineHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/LineHandler.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.sero.io; *

LineHandler interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface LineHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/NullWriter.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/NullWriter.java index eee572169..1658b891e 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/NullWriter.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/NullWriter.java @@ -23,7 +23,7 @@ import java.io.Writer; *

NullWriter class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class NullWriter extends Writer { @Override diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/StreamUtils.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/StreamUtils.java index 250ede990..812c0c6ea 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/StreamUtils.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/StreamUtils.java @@ -32,7 +32,7 @@ import java.util.List; *

StreamUtils class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class StreamUtils { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/BaseIOLog.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/BaseIOLog.java index 84a862541..c5d498874 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/BaseIOLog.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/BaseIOLog.java @@ -31,7 +31,7 @@ import java.util.Date; *

Abstract BaseIOLog class.

* * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public abstract class BaseIOLog { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/IOLog.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/IOLog.java index 662c03865..9f9f67f61 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/IOLog.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/IOLog.java @@ -21,7 +21,7 @@ import java.io.File; *

IOLog class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IOLog extends BaseIOLog { //private static final Log LOG = LogFactory.getLog(IOLog.class); diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/RollingIOLog.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/RollingIOLog.java index 9489f3cda..4ec077d81 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/RollingIOLog.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/RollingIOLog.java @@ -30,7 +30,7 @@ import java.nio.file.StandardCopyOption; * Class to Log IO with the option to keep historical files * * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public class RollingIOLog extends BaseIOLog { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/SimpleLog.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/SimpleLog.java index 68513ebd1..f4d363273 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/SimpleLog.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/SimpleLog.java @@ -24,7 +24,7 @@ import java.util.Date; *

SimpleLog class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class SimpleLog { private final PrintWriter out; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DataConsumer.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DataConsumer.java index de6b6df77..619bc4fcd 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DataConsumer.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DataConsumer.java @@ -22,7 +22,7 @@ import java.io.IOException; *

DataConsumer interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface DataConsumer { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DefaultMessagingExceptionHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DefaultMessagingExceptionHandler.java index 4dac9c6f7..fb12d6eb3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DefaultMessagingExceptionHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DefaultMessagingExceptionHandler.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.messaging; *

DefaultMessagingExceptionHandler class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class DefaultMessagingExceptionHandler implements MessagingExceptionHandler { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransport.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransport.java index 1aa2da2f8..caa581585 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransport.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransport.java @@ -29,7 +29,7 @@ import java.io.OutputStream; * control). * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EpollStreamTransport implements Transport { private final OutputStream out; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransportCharSpaced.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransportCharSpaced.java index 5c00d8fa6..619e873ec 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransportCharSpaced.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransportCharSpaced.java @@ -25,7 +25,7 @@ import java.io.OutputStream; *

EpollStreamTransportCharSpaced class.

* * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public class EpollStreamTransportCharSpaced extends EpollStreamTransport { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingMessage.java index a4f6de75e..3183cdc0f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingMessage.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.messaging; *

IncomingMessage interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface IncomingMessage { // A marker interface diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingRequestMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingRequestMessage.java index b6a1d839f..a740b00bf 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingRequestMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingRequestMessage.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *

IncomingRequestMessage interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface IncomingRequestMessage extends IncomingMessage { // A marker interface. diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingResponseMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingResponseMessage.java index 4713de1b3..5b77dd8ec 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingResponseMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingResponseMessage.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *

IncomingResponseMessage interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface IncomingResponseMessage extends IncomingMessage { // A marker interface diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java index 2a400d5ab..5f039dd33 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java @@ -28,7 +28,7 @@ import java.io.InputStream; * stream listeners to safely listen and still respond when they are told to stop. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class InputStreamListener implements Runnable { private static final int DEFAULT_READ_DELAY = 50; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageControl.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageControl.java index ff59a5521..3ceaeee31 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageControl.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageControl.java @@ -33,7 +33,7 @@ import java.io.IOException; * * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class MessageControl implements DataConsumer { private static int DEFAULT_RETRIES = 2; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageParser.java index f041b45f7..e3495e61d 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageParser.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; * Interface defining methods that are called when data arrives in the connection. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface MessageParser { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessagingExceptionHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessagingExceptionHandler.java index e1648e88b..898fd7f59 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessagingExceptionHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessagingExceptionHandler.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.messaging; *

MessagingExceptionHandler interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface MessagingExceptionHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingMessage.java index bc57cefdf..88602f865 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingMessage.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.messaging; *

OutgoingMessage interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface OutgoingMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingRequestMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingRequestMessage.java index 16aa39757..ed5a1f0f6 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingRequestMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingRequestMessage.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *

OutgoingRequestMessage interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface OutgoingRequestMessage extends OutgoingMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingResponseMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingResponseMessage.java index 3b2ab0c69..2640e1136 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingResponseMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingResponseMessage.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *

OutgoingResponseMessage interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface OutgoingResponseMessage extends OutgoingMessage { // A marker interface. diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/RequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/RequestHandler.java index c06bc8ae9..faae1a476 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/RequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/RequestHandler.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *

RequestHandler interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface RequestHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransport.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransport.java index c7d236939..151591734 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransport.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransport.java @@ -28,7 +28,7 @@ import java.io.OutputStream; * control). * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class StreamTransport implements Transport, Runnable { protected OutputStream out; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransportCharSpaced.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransportCharSpaced.java index d9ee93091..99297dd3f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransportCharSpaced.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransportCharSpaced.java @@ -23,7 +23,7 @@ import java.io.OutputStream; *

StreamTransportCharSpaced class.

* * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public class StreamTransportCharSpaced extends StreamTransport { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TestableTransport.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TestableTransport.java index ce08fab4c..b4c7e0ae4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TestableTransport.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TestableTransport.java @@ -25,7 +25,7 @@ import java.io.OutputStream; * Provides synchronization on the input stream read by wrapping it. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class TestableTransport extends StreamTransport { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TimeoutException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TimeoutException.java index 3cdae2d24..1ab988e28 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TimeoutException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TimeoutException.java @@ -23,7 +23,7 @@ import java.io.Serial; *

TimeoutException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class TimeoutException extends IOException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/Transport.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/Transport.java index 356b327a0..df3c229d8 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/Transport.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/Transport.java @@ -23,7 +23,7 @@ import java.io.IOException; * ports, sockets, UDP, email, etc. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface Transport { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomException.java index d86d9045b..0fef52710 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomException.java @@ -23,7 +23,7 @@ import java.io.Serial; *

WaitingRoomException class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WaitingRoomException extends IOException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKey.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKey.java index da50e33d7..79c0715e8 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKey.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKey.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; * definitions. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface WaitingRoomKey { // Implementation needs to have hashcode and equals implementations. diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKeyFactory.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKeyFactory.java index 6f703c5c1..5c89c421f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKeyFactory.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKeyFactory.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *

WaitingRoomKeyFactory interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface WaitingRoomKeyFactory { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/SystemTimeSource.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/SystemTimeSource.java index fb368e805..2f6fce536 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/SystemTimeSource.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/SystemTimeSource.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.timer; * An implementation of TimeSource that returns the host time via System. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class SystemTimeSource implements TimeSource { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/TimeSource.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/TimeSource.java index f08583758..e41571bfc 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/TimeSource.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/TimeSource.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.timer; * the time is controlled explicitly. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface TimeSource { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ArrayUtils.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ArrayUtils.java index 31791cba6..d065cf0e2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ArrayUtils.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ArrayUtils.java @@ -22,7 +22,7 @@ import java.util.List; *

ArrayUtils class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ArrayUtils { private static int[] bitFromMask = {0xff, 0x7f, 0x3f, 0x1f, 0xf, 0x7, 0x3, 0x1}; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTask.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTask.java index d4ab466b9..4dc49e913 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTask.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTask.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.util; *

Abstract ProgressiveTask class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ProgressiveTask implements Runnable { protected boolean completed = false; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTaskListener.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTaskListener.java index 1d70ed062..620a60fa4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTaskListener.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTaskListener.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.util; *

ProgressiveTaskListener interface.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface ProgressiveTaskListener { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/queue/ByteQueue.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/queue/ByteQueue.java index 3977a3310..336390c69 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/queue/ByteQueue.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/queue/ByteQueue.java @@ -25,7 +25,7 @@ import java.nio.charset.Charset; *

ByteQueue class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ByteQueue implements Cloneable { private byte[] queue; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/value/ModbusValue.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/value/ModbusValue.java index c66791645..9fd31b9a1 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/value/ModbusValue.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/value/ModbusValue.java @@ -24,7 +24,7 @@ import java.math.BigInteger; *

Abstract ModbusValue class.

* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusValue { private final DataType type; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/ModbusTcpDriverApplication.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/ModbusTcpDriverApplication.java index 88e77abeb..ec5333532 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/ModbusTcpDriverApplication.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/ModbusTcpDriverApplication.java @@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java index 179e18dd7..03498ec28 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java @@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit; * 驱动自定义服务实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-mqtt/pom.xml b/dc3-driver/dc3-driver-mqtt/pom.xml index 127b39165..ec8ac0cf2 100644 --- a/dc3-driver/dc3-driver-mqtt/pom.xml +++ b/dc3-driver/dc3-driver-mqtt/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-driver - 2025.2.5 + 2025.6.0 dc3-driver-mqtt diff --git a/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/MqttDriverApplication.java b/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/MqttDriverApplication.java index 6357ee00d..80c64ed5f 100644 --- a/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/MqttDriverApplication.java +++ b/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/MqttDriverApplication.java @@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/mqtt/service/impl/MqttReceiveServiceImpl.java b/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/mqtt/service/impl/MqttReceiveServiceImpl.java index f06f2f901..affb5d02d 100644 --- a/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/mqtt/service/impl/MqttReceiveServiceImpl.java +++ b/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/mqtt/service/impl/MqttReceiveServiceImpl.java @@ -30,7 +30,7 @@ import java.util.List; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/service/MqttSendService.java b/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/service/MqttSendService.java index 89d1ba85d..fde8fc5e7 100644 --- a/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/service/MqttSendService.java +++ b/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/service/MqttSendService.java @@ -22,7 +22,7 @@ import org.springframework.messaging.handler.annotation.Header; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @MessagingGateway(defaultRequestChannel = "mqttOutboundChannel") diff --git a/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java b/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java index 4a3939a59..97e1f47c3 100644 --- a/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java +++ b/dc3-driver/dc3-driver-mqtt/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java @@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit; * 驱动自定义服务实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-opc-da/pom.xml b/dc3-driver/dc3-driver-opc-da/pom.xml index 429ce5cb9..a9c1c5676 100644 --- a/dc3-driver/dc3-driver-opc-da/pom.xml +++ b/dc3-driver/dc3-driver-opc-da/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-driver - 2025.2.5 + 2025.6.0 dc3-driver-opc-da diff --git a/dc3-driver/dc3-driver-opc-da/src/main/java/io/github/pnoker/driver/OpcDaApplication.java b/dc3-driver/dc3-driver-opc-da/src/main/java/io/github/pnoker/driver/OpcDaApplication.java index 395bdc050..e9f5fb7dc 100644 --- a/dc3-driver/dc3-driver-opc-da/src/main/java/io/github/pnoker/driver/OpcDaApplication.java +++ b/dc3-driver/dc3-driver-opc-da/src/main/java/io/github/pnoker/driver/OpcDaApplication.java @@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-driver/dc3-driver-opc-da/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java b/dc3-driver/dc3-driver-opc-da/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java index 0051aaaf9..01f6c176e 100644 --- a/dc3-driver/dc3-driver-opc-da/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java +++ b/dc3-driver/dc3-driver-opc-da/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java @@ -56,7 +56,7 @@ import java.util.concurrent.TimeUnit; * 驱动自定义服务实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-opc-ua/pom.xml b/dc3-driver/dc3-driver-opc-ua/pom.xml index 44a3c36df..7f0d79e84 100644 --- a/dc3-driver/dc3-driver-opc-ua/pom.xml +++ b/dc3-driver/dc3-driver-opc-ua/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-driver - 2025.2.5 + 2025.6.0 dc3-driver-opc-ua diff --git a/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/OpcUaApplication.java b/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/OpcUaApplication.java index bf5a6485e..5eac4b9dc 100644 --- a/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/OpcUaApplication.java +++ b/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/OpcUaApplication.java @@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/key/KeyLoader.java b/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/key/KeyLoader.java index 43138f6b9..ac5dc4ff7 100644 --- a/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/key/KeyLoader.java +++ b/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/key/KeyLoader.java @@ -32,7 +32,7 @@ import java.util.regex.Pattern; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java b/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java index bebf98eaa..59c698edf 100644 --- a/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java +++ b/dc3-driver/dc3-driver-opc-ua/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java @@ -56,7 +56,7 @@ import java.util.concurrent.*; * 驱动自定义服务实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-plcs7/pom.xml b/dc3-driver/dc3-driver-plcs7/pom.xml index aa36ac0bc..a837bd390 100644 --- a/dc3-driver/dc3-driver-plcs7/pom.xml +++ b/dc3-driver/dc3-driver-plcs7/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-driver - 2025.2.5 + 2025.6.0 dc3-driver-plcs7 diff --git a/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/PlcS7DriverApplication.java b/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/PlcS7DriverApplication.java index f94e561c2..125a295f7 100644 --- a/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/PlcS7DriverApplication.java +++ b/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/PlcS7DriverApplication.java @@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/api/SiemensPLCS.java b/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/api/SiemensPLCS.java index 929541324..bec4cb61c 100644 --- a/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/api/SiemensPLCS.java +++ b/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/api/SiemensPLCS.java @@ -18,7 +18,7 @@ package io.github.pnoker.driver.api; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ public enum SiemensPLCS { diff --git a/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/bean/PlcS7PointVariable.java b/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/bean/PlcS7PointVariable.java index 42e10d991..55aa7cdec 100644 --- a/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/bean/PlcS7PointVariable.java +++ b/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/bean/PlcS7PointVariable.java @@ -24,7 +24,7 @@ import java.util.Date; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Getter diff --git a/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java b/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java index 5cf8bb619..1104f51ca 100644 --- a/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java +++ b/dc3-driver/dc3-driver-plcs7/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java @@ -56,7 +56,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; * 驱动自定义服务实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-virtual/pom.xml b/dc3-driver/dc3-driver-virtual/pom.xml index 3192849c2..44411c01e 100644 --- a/dc3-driver/dc3-driver-virtual/pom.xml +++ b/dc3-driver/dc3-driver-virtual/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-driver - 2025.2.5 + 2025.6.0 dc3-driver-virtual diff --git a/dc3-driver/dc3-driver-virtual/src/main/java/io/github/pnoker/driver/VirtualDriverApplication.java b/dc3-driver/dc3-driver-virtual/src/main/java/io/github/pnoker/driver/VirtualDriverApplication.java index 737b6fe4e..0a3c3be23 100644 --- a/dc3-driver/dc3-driver-virtual/src/main/java/io/github/pnoker/driver/VirtualDriverApplication.java +++ b/dc3-driver/dc3-driver-virtual/src/main/java/io/github/pnoker/driver/VirtualDriverApplication.java @@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-driver/dc3-driver-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java b/dc3-driver/dc3-driver-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java index 6f067ff8e..6eaa02c4e 100644 --- a/dc3-driver/dc3-driver-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java +++ b/dc3-driver/dc3-driver-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java @@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit; * 驱动自定义服务实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/pom.xml b/dc3-driver/pom.xml index 22d74b3ed..feb0ffb87 100644 --- a/dc3-driver/pom.xml +++ b/dc3-driver/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker iot-dc3 - 2025.2.5 + 2025.6.0 dc3-driver diff --git a/dc3-gateway/pom.xml b/dc3-gateway/pom.xml index d3edf5710..88ecca47a 100644 --- a/dc3-gateway/pom.xml +++ b/dc3-gateway/pom.xml @@ -24,12 +24,12 @@ io.github.pnoker iot-dc3 - 2025.2.5 + 2025.6.0 ${project.artifactId} dc3-gateway - 2025.2.5 + 2025.6.0 jar 2016-2022 diff --git a/dc3-gateway/src/main/java/io/github/pnoker/gateway/GatewayApplication.java b/dc3-gateway/src/main/java/io/github/pnoker/gateway/GatewayApplication.java index ccac21736..c400de0e1 100644 --- a/dc3-gateway/src/main/java/io/github/pnoker/gateway/GatewayApplication.java +++ b/dc3-gateway/src/main/java/io/github/pnoker/gateway/GatewayApplication.java @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * 该类是网关中心服务的启动类, 负责初始化并启动Spring Boot应用。 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3/docker-compose-aliyun.yml b/dc3/docker-compose-aliyun.yml index e6b6e811b..09483ce97 100644 --- a/dc3/docker-compose-aliyun.yml +++ b/dc3/docker-compose-aliyun.yml @@ -16,7 +16,7 @@ services: gateway: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-gateway:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-gateway:2025.6.0 restart: always ports: - "8000:8000" @@ -38,7 +38,7 @@ services: - dc3-gateway auth: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-auth:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-auth:2025.6.0 restart: always ports: - "8300:8300" @@ -61,7 +61,7 @@ services: - dc3-center-auth manager: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-manager:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-manager:2025.6.0 restart: always ports: - "8400:8400" @@ -84,7 +84,7 @@ services: - dc3-center-manager data: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-data:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-data:2025.6.0 restart: always ports: - "8500:8500" @@ -107,7 +107,7 @@ services: - dc3-center-data listening-virtual: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-listening-virtual:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-listening-virtual:2025.6.0 restart: always ports: - "6270:6270" @@ -130,7 +130,7 @@ services: - dc3-driver-listening-virtual modbus-tcp: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-modbus-tcp:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-modbus-tcp:2025.6.0 restart: always environment: - NODE_ENV=test @@ -150,7 +150,7 @@ services: - dc3-driver-modbus-tcp mqtt: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-mqtt:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-mqtt:2025.6.0 restart: always environment: - NODE_ENV=test @@ -170,7 +170,7 @@ services: - dc3-driver-mqtt opc-da: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-da:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-da:2025.6.0 restart: always environment: - NODE_ENV=test @@ -190,7 +190,7 @@ services: - dc3-driver-opc-da opc-ua: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-ua:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-ua:2025.6.0 restart: always environment: - NODE_ENV=test @@ -210,7 +210,7 @@ services: - dc3-driver-opc-ua plcs7: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-plcs7:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-plcs7:2025.6.0 restart: always environment: - NODE_ENV=test @@ -230,7 +230,7 @@ services: - dc3-driver-plcs7 virtual: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-virtual:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-virtual:2025.6.0 restart: always environment: - NODE_ENV=test diff --git a/dc3/docker-compose-dev-aliyun.yml b/dc3/docker-compose-dev-aliyun.yml index af4aeee8f..0ed2517ee 100644 --- a/dc3/docker-compose-dev-aliyun.yml +++ b/dc3/docker-compose-dev-aliyun.yml @@ -19,7 +19,7 @@ services: build: context: ../dc3-gateway/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-gateway:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-gateway:2025.6.0 restart: always ports: - "8000:8000" @@ -44,7 +44,7 @@ services: build: context: ../dc3-center/dc3-center-auth/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-auth:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-auth:2025.6.0 restart: always ports: - "8300:8300" @@ -70,7 +70,7 @@ services: build: context: ../dc3-center/dc3-center-manager/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-manager:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-manager:2025.6.0 restart: always ports: - "8400:8400" @@ -96,7 +96,7 @@ services: build: context: ../dc3-center/dc3-center-data/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-data:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-data:2025.6.0 restart: always ports: - "8500:8500" @@ -122,7 +122,7 @@ services: build: context: ../dc3-driver/dc3-driver-listening-virtual/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-listening-virtual:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-listening-virtual:2025.6.0 restart: always ports: - "6270:6270" @@ -148,7 +148,7 @@ services: build: context: ../dc3-driver/dc3-driver-modbus-tcp/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-modbus-tcp:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-modbus-tcp:2025.6.0 restart: always environment: - NODE_ENV=test @@ -171,7 +171,7 @@ services: build: context: ../dc3-driver/dc3-driver-mqtt/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-mqtt:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-mqtt:2025.6.0 restart: always environment: - NODE_ENV=test @@ -194,7 +194,7 @@ services: build: context: ../dc3-driver/dc3-driver-opc-da/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-da:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-da:2025.6.0 restart: always environment: - NODE_ENV=test @@ -217,7 +217,7 @@ services: build: context: ../dc3-driver/dc3-driver-opc-ua/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-ua:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-ua:2025.6.0 restart: always environment: - NODE_ENV=test @@ -240,7 +240,7 @@ services: build: context: ../dc3-driver/dc3-driver-plcs7/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-plcs7:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-plcs7:2025.6.0 restart: always environment: - NODE_ENV=test @@ -263,7 +263,7 @@ services: build: context: ../dc3-driver/dc3-driver-virtual/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-virtual:2025.2.5 + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-virtual:2025.6.0 restart: always environment: - NODE_ENV=test diff --git a/dc3/docker-compose-dev.yml b/dc3/docker-compose-dev.yml index befafc545..8e298fe42 100644 --- a/dc3/docker-compose-dev.yml +++ b/dc3/docker-compose-dev.yml @@ -19,7 +19,7 @@ services: build: context: ../dc3-gateway/ dockerfile: ./Dockerfile - image: pnoker/dc3-gateway:2025.2.5 + image: pnoker/dc3-gateway:2025.6.0 restart: always ports: - "8000:8000" @@ -44,7 +44,7 @@ services: build: context: ../dc3-center/dc3-center-auth/ dockerfile: ./Dockerfile - image: pnoker/dc3-center-auth:2025.2.5 + image: pnoker/dc3-center-auth:2025.6.0 restart: always ports: - "8300:8300" @@ -70,7 +70,7 @@ services: build: context: ../dc3-center/dc3-center-manager/ dockerfile: ./Dockerfile - image: pnoker/dc3-center-manager:2025.2.5 + image: pnoker/dc3-center-manager:2025.6.0 restart: always ports: - "8400:8400" @@ -96,7 +96,7 @@ services: build: context: ../dc3-center/dc3-center-data/ dockerfile: ./Dockerfile - image: pnoker/dc3-center-data:2025.2.5 + image: pnoker/dc3-center-data:2025.6.0 restart: always ports: - "8500:8500" @@ -122,7 +122,7 @@ services: build: context: ../dc3-driver/dc3-driver-listening-virtual/ dockerfile: ./Dockerfile - image: pnoker/dc3-driver-listening-virtual:2025.2.5 + image: pnoker/dc3-driver-listening-virtual:2025.6.0 restart: always ports: - "6270:6270" @@ -148,7 +148,7 @@ services: build: context: ../dc3-driver/dc3-driver-modbus-tcp/ dockerfile: ./Dockerfile - image: pnoker/dc3-driver-modbus-tcp:2025.2.5 + image: pnoker/dc3-driver-modbus-tcp:2025.6.0 restart: always environment: - NODE_ENV=test @@ -171,7 +171,7 @@ services: build: context: ../dc3-driver/dc3-driver-mqtt/ dockerfile: ./Dockerfile - image: pnoker/dc3-driver-mqtt:2025.2.5 + image: pnoker/dc3-driver-mqtt:2025.6.0 restart: always environment: - NODE_ENV=test @@ -194,7 +194,7 @@ services: build: context: ../dc3-driver/dc3-driver-opc-da/ dockerfile: ./Dockerfile - image: pnoker/dc3-driver-opc-da:2025.2.5 + image: pnoker/dc3-driver-opc-da:2025.6.0 restart: always environment: - NODE_ENV=test @@ -217,7 +217,7 @@ services: build: context: ../dc3-driver/dc3-driver-opc-ua/ dockerfile: ./Dockerfile - image: pnoker/dc3-driver-opc-ua:2025.2.5 + image: pnoker/dc3-driver-opc-ua:2025.6.0 restart: always environment: - NODE_ENV=test @@ -240,7 +240,7 @@ services: build: context: ../dc3-driver/dc3-driver-plcs7/ dockerfile: ./Dockerfile - image: pnoker/dc3-driver-plcs7:2025.2.5 + image: pnoker/dc3-driver-plcs7:2025.6.0 restart: always environment: - NODE_ENV=test @@ -263,7 +263,7 @@ services: build: context: ../dc3-driver/dc3-driver-virtual/ dockerfile: ./Dockerfile - image: pnoker/dc3-driver-virtual:2025.2.5 + image: pnoker/dc3-driver-virtual:2025.6.0 restart: always environment: - NODE_ENV=test diff --git a/dc3/docker-compose.yml b/dc3/docker-compose.yml index 657a2f6f9..2b2cd63c6 100644 --- a/dc3/docker-compose.yml +++ b/dc3/docker-compose.yml @@ -16,7 +16,7 @@ services: gateway: - image: pnoker/dc3-gateway:2025.2.5 + image: pnoker/dc3-gateway:2025.6.0 restart: always ports: - "8000:8000" @@ -38,7 +38,7 @@ services: - dc3-gateway auth: - image: pnoker/dc3-center-auth:2025.2.5 + image: pnoker/dc3-center-auth:2025.6.0 restart: always ports: - "8300:8300" @@ -61,7 +61,7 @@ services: - dc3-center-auth manager: - image: pnoker/dc3-center-manager:2025.2.5 + image: pnoker/dc3-center-manager:2025.6.0 restart: always ports: - "8400:8400" @@ -84,7 +84,7 @@ services: - dc3-center-manager data: - image: pnoker/dc3-center-data:2025.2.5 + image: pnoker/dc3-center-data:2025.6.0 restart: always ports: - "8500:8500" @@ -107,7 +107,7 @@ services: - dc3-center-data listening-virtual: - image: pnoker/dc3-driver-listening-virtual:2025.2.5 + image: pnoker/dc3-driver-listening-virtual:2025.6.0 restart: always ports: - "6270:6270" @@ -130,7 +130,7 @@ services: - dc3-driver-listening-virtual modbus-tcp: - image: pnoker/dc3-driver-modbus-tcp:2025.2.5 + image: pnoker/dc3-driver-modbus-tcp:2025.6.0 restart: always environment: - NODE_ENV=test @@ -150,7 +150,7 @@ services: - dc3-driver-modbus-tcp mqtt: - image: pnoker/dc3-driver-mqtt:2025.2.5 + image: pnoker/dc3-driver-mqtt:2025.6.0 restart: always environment: - NODE_ENV=test @@ -170,7 +170,7 @@ services: - dc3-driver-mqtt opc-da: - image: pnoker/dc3-driver-opc-da:2025.2.5 + image: pnoker/dc3-driver-opc-da:2025.6.0 restart: always environment: - NODE_ENV=test @@ -190,7 +190,7 @@ services: - dc3-driver-opc-da opc-ua: - image: pnoker/dc3-driver-opc-ua:2025.2.5 + image: pnoker/dc3-driver-opc-ua:2025.6.0 restart: always environment: - NODE_ENV=test @@ -210,7 +210,7 @@ services: - dc3-driver-opc-ua plcs7: - image: pnoker/dc3-driver-plcs7:2025.2.5 + image: pnoker/dc3-driver-plcs7:2025.6.0 restart: always environment: - NODE_ENV=test @@ -230,7 +230,7 @@ services: - dc3-driver-plcs7 virtual: - image: pnoker/dc3-driver-virtual:2025.2.5 + image: pnoker/dc3-driver-virtual:2025.6.0 restart: always environment: - NODE_ENV=test diff --git a/pom.xml b/pom.xml index b52c489d7..8d6c6130c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,12 +21,12 @@ io.github.pnoker dc3-parent - 2025.2.5 + 2025.6.0 ${project.artifactId} iot-dc3 - 2025.2.5 + 2025.6.0 pom 2016-2022 @@ -68,36 +68,34 @@ true - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 - 2025.2.5 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 + 2025.6.0 @@ -213,11 +211,6 @@ dc3-common-influx ${dc3.common.influx.version}
- - io.github.pnoker - dc3-common-job - ${dc3.common.job.version} - io.github.pnoker dc3-common-log @@ -263,11 +256,6 @@ dc3-common-redis ${dc3.common.redis.version} - - io.github.pnoker - dc3-common-register - ${dc3.common.register.version} - io.github.pnoker dc3-common-repository