From 51bec018f50ca862f470ce8bbc7ed5865d45508d Mon Sep 17 00:00:00 2001 From: Vickey <891607480@qq.com> Date: Wed, 14 May 2025 20:34:08 +0800 Subject: [PATCH] refactor(data): remove dc3-common-data-postgres module and its typed point value classes --- .../src/main/resources/application-dev.yml | 9 +- .../src/main/resources/application-pre.yml | 9 +- .../src/main/resources/application-pro.yml | 9 +- .../src/main/resources/application-test.yml | 9 +- .../src/main/resources/application-dev.yml | 9 +- .../src/main/resources/application-pre.yml | 9 +- .../src/main/resources/application-pro.yml | 9 +- .../src/main/resources/application-test.yml | 9 +- .../src/main/resources/application-dev.yml | 9 +- .../src/main/resources/application-pre.yml | 9 +- .../src/main/resources/application-pro.yml | 9 +- .../src/main/resources/application-test.yml | 9 +- dc3-common/dc3-common-data-postgres/pom.xml | 96 ---------------- .../config/ActivePostgresProfileConfig.java | 43 ------- .../pnoker/common/config/PostgresConfig.java | 41 ------- .../common/init/PostgresInitRunner.java | 41 ------- .../postgres/dal/PointValueBoolManager.java | 33 ------ .../postgres/dal/PointValueByteManager.java | 33 ------ .../dal/PointValueDecimalManager.java | 33 ------ .../postgres/dal/PointValueDoubleManager.java | 33 ------ .../postgres/dal/PointValueFloatManager.java | 33 ------ .../postgres/dal/PointValueIntManager.java | 33 ------ .../postgres/dal/PointValueLongManager.java | 33 ------ .../dal/impl/PointValueBoolManagerImpl.java | 37 ------ .../dal/impl/PointValueByteManagerImpl.java | 37 ------ .../impl/PointValueDecimalManagerImpl.java | 37 ------ .../dal/impl/PointValueDoubleManagerImpl.java | 37 ------ .../dal/impl/PointValueFloatManagerImpl.java | 37 ------ .../dal/impl/PointValueIntManagerImpl.java | 37 ------ .../dal/impl/PointValueLongManagerImpl.java | 37 ------ .../entity/model/PointValueBoolDO.java | 106 ----------------- .../entity/model/PointValueByteDO.java | 106 ----------------- .../entity/model/PointValueDecimalDO.java | 107 ------------------ .../entity/model/PointValueDoubleDO.java | 106 ----------------- .../entity/model/PointValueFloatDO.java | 106 ----------------- .../entity/model/PointValueIntDO.java | 106 ----------------- .../entity/model/PointValueLongDO.java | 106 ----------------- .../postgres/generator/MybatisGenerator.java | 71 ------------ .../postgres/mapper/PointValueBoolMapper.java | 34 ------ .../postgres/mapper/PointValueByteMapper.java | 34 ------ .../mapper/PointValueDecimalMapper.java | 34 ------ .../mapper/PointValueDoubleMapper.java | 34 ------ .../mapper/PointValueFloatMapper.java | 34 ------ .../postgres/mapper/PointValueIntMapper.java | 34 ------ .../postgres/mapper/PointValueLongMapper.java | 34 ------ .../src/main/resources/META-INF/aop.xml | 22 ---- .../main/resources/META-INF/spring.factories | 20 ---- ...ot.autoconfigure.AutoConfiguration.imports | 18 --- .../main/resources/application-mongodb.yml | 19 ---- .../mapping/PointValueBoolMapper.xml | 21 ---- .../mapping/PointValueByteMapper.xml | 21 ---- .../mapping/PointValueDecimalMapper.xml | 21 ---- .../mapping/PointValueDoubleMapper.xml | 21 ---- .../mapping/PointValueFloatMapper.xml | 21 ---- .../resources/mapping/PointValueIntMapper.xml | 21 ---- .../mapping/PointValueLongMapper.xml | 21 ---- dc3-common/dc3-common-data/pom.xml | 4 - .../impl}/PostgresRepositoryServiceImpl.java | 3 +- .../common/data}/dal/PointValueManager.java | 6 +- .../data}/dal/impl/PointValueManagerImpl.java | 10 +- .../data}/entity/model/PointValueDO.java | 6 +- .../common/data}/mapper/PointValueMapper.java | 6 +- .../resources/mapping/PointValueMapper.xml | 2 +- dc3-common/dc3-common-manager/pom.xml | 4 - dc3-common/pom.xml | 6 - pom.xml | 5 - 66 files changed, 88 insertions(+), 2061 deletions(-) delete mode 100644 dc3-common/dc3-common-data-postgres/pom.xml delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/config/ActivePostgresProfileConfig.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/config/PostgresConfig.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/init/PostgresInitRunner.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueBoolManager.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueByteManager.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueDecimalManager.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueDoubleManager.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueFloatManager.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueIntManager.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueLongManager.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueBoolManagerImpl.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueByteManagerImpl.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueDecimalManagerImpl.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueDoubleManagerImpl.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueFloatManagerImpl.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueIntManagerImpl.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueLongManagerImpl.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueBoolDO.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueByteDO.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDecimalDO.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDoubleDO.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueFloatDO.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueIntDO.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueLongDO.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/generator/MybatisGenerator.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueBoolMapper.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueByteMapper.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueDecimalMapper.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueDoubleMapper.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueFloatMapper.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueIntMapper.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueLongMapper.java delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/META-INF/aop.xml delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/META-INF/spring.factories delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/application-mongodb.yml delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueBoolMapper.xml delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueByteMapper.xml delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueDecimalMapper.xml delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueDoubleMapper.xml delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueFloatMapper.xml delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueIntMapper.xml delete mode 100644 dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueLongMapper.xml rename dc3-common/{dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/repository => dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl}/PostgresRepositoryServiceImpl.java (97%) rename dc3-common/{dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres => dc3-common-data/src/main/java/io/github/pnoker/common/data}/dal/PointValueManager.java (82%) rename dc3-common/{dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres => dc3-common-data/src/main/java/io/github/pnoker/common/data}/dal/impl/PointValueManagerImpl.java (75%) rename dc3-common/{dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres => dc3-common-data/src/main/java/io/github/pnoker/common/data}/entity/model/PointValueDO.java (93%) rename dc3-common/{dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres => dc3-common-data/src/main/java/io/github/pnoker/common/data}/mapper/PointValueMapper.java (82%) rename dc3-common/{dc3-common-data-postgres => dc3-common-data}/src/main/resources/mapping/PointValueMapper.xml (91%) diff --git a/dc3-center/dc3-center-auth/src/main/resources/application-dev.yml b/dc3-center/dc3-center-auth/src/main/resources/application-dev.yml index 0c6152e20..61be34d9d 100644 --- a/dc3-center/dc3-center-auth/src/main/resources/application-dev.yml +++ b/dc3-center/dc3-center-auth/src/main/resources/application-dev.yml @@ -19,9 +19,12 @@ spring: env: dev group: ${user.name} datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:35432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_auth}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:35432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_auth}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} data: redis: host: ${REDIS_HOST:dc3-redis} diff --git a/dc3-center/dc3-center-auth/src/main/resources/application-pre.yml b/dc3-center/dc3-center-auth/src/main/resources/application-pre.yml index d0d7deb40..b9c750151 100644 --- a/dc3-center/dc3-center-auth/src/main/resources/application-pre.yml +++ b/dc3-center/dc3-center-auth/src/main/resources/application-pre.yml @@ -17,9 +17,12 @@ # Pre-release environment configuration will overwrite the content configured in application-*.yml spring: datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3_auth}?currentSchema=${POSTGRES_SCHEMA:dc3_auth}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3_auth}?currentSchema=${POSTGRES_SCHEMA:dc3_auth}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} data: redis: host: ${REDIS_HOST:dc3-redis} diff --git a/dc3-center/dc3-center-auth/src/main/resources/application-pro.yml b/dc3-center/dc3-center-auth/src/main/resources/application-pro.yml index c53783b04..ac1894f03 100644 --- a/dc3-center/dc3-center-auth/src/main/resources/application-pro.yml +++ b/dc3-center/dc3-center-auth/src/main/resources/application-pro.yml @@ -17,9 +17,12 @@ # Production environment configuration will overwrite the content configured in application-*.yml spring: datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3_auth}?currentSchema=${POSTGRES_SCHEMA:dc3_auth}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3_auth}?currentSchema=${POSTGRES_SCHEMA:dc3_auth}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} data: redis: host: ${REDIS_HOST:dc3-redis} diff --git a/dc3-center/dc3-center-auth/src/main/resources/application-test.yml b/dc3-center/dc3-center-auth/src/main/resources/application-test.yml index 2b7036efb..678d2f4db 100644 --- a/dc3-center/dc3-center-auth/src/main/resources/application-test.yml +++ b/dc3-center/dc3-center-auth/src/main/resources/application-test.yml @@ -17,9 +17,12 @@ # Test environment configuration will overwrite the content configured in application-*.yml spring: datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_auth}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_auth}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} data: redis: host: ${REDIS_HOST:dc3-redis} diff --git a/dc3-center/dc3-center-manager/src/main/resources/application-dev.yml b/dc3-center/dc3-center-manager/src/main/resources/application-dev.yml index 172016d5c..6db8fbb30 100644 --- a/dc3-center/dc3-center-manager/src/main/resources/application-dev.yml +++ b/dc3-center/dc3-center-manager/src/main/resources/application-dev.yml @@ -19,9 +19,12 @@ spring: env: dev group: ${user.name} datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:35432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_manager}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:35432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_manager}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} rabbitmq: virtual-host: ${RABBITMQ_VIRTUAL_HOST:dc3} host: ${RABBITMQ_HOST:dc3-rabbitmq} diff --git a/dc3-center/dc3-center-manager/src/main/resources/application-pre.yml b/dc3-center/dc3-center-manager/src/main/resources/application-pre.yml index e70bd93c6..0e40fefe5 100644 --- a/dc3-center/dc3-center-manager/src/main/resources/application-pre.yml +++ b/dc3-center/dc3-center-manager/src/main/resources/application-pre.yml @@ -17,9 +17,12 @@ # Pre-release environment configuration will overwrite the content configured in application-*.yml spring: datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_manager}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_manager}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} rabbitmq: virtual-host: ${RABBITMQ_VIRTUAL_HOST:dc3} host: ${RABBITMQ_HOST:dc3-rabbitmq} diff --git a/dc3-center/dc3-center-manager/src/main/resources/application-pro.yml b/dc3-center/dc3-center-manager/src/main/resources/application-pro.yml index e7d942629..66f4581b1 100644 --- a/dc3-center/dc3-center-manager/src/main/resources/application-pro.yml +++ b/dc3-center/dc3-center-manager/src/main/resources/application-pro.yml @@ -17,9 +17,12 @@ # Production environment configuration will overwrite the content configured in application-*.yml spring: datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_manager}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_manager}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} rabbitmq: virtual-host: ${RABBITMQ_VIRTUAL_HOST:dc3} host: ${RABBITMQ_HOST:dc3-rabbitmq} diff --git a/dc3-center/dc3-center-manager/src/main/resources/application-test.yml b/dc3-center/dc3-center-manager/src/main/resources/application-test.yml index f9926de76..c664849ff 100644 --- a/dc3-center/dc3-center-manager/src/main/resources/application-test.yml +++ b/dc3-center/dc3-center-manager/src/main/resources/application-test.yml @@ -17,9 +17,12 @@ # Test environment configuration will overwrite the content configured in application-*.yml spring: datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_manager}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_manager}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} rabbitmq: virtual-host: ${RABBITMQ_VIRTUAL_HOST:dc3} host: ${RABBITMQ_HOST:dc3-rabbitmq} diff --git a/dc3-center/dc3-center-single/src/main/resources/application-dev.yml b/dc3-center/dc3-center-single/src/main/resources/application-dev.yml index 9d2867b61..bd14351f1 100644 --- a/dc3-center/dc3-center-single/src/main/resources/application-dev.yml +++ b/dc3-center/dc3-center-single/src/main/resources/application-dev.yml @@ -19,9 +19,12 @@ spring: env: dev group: ${user.name} datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:35432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_single}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:35432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_single}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} rabbitmq: virtual-host: ${RABBITMQ_VIRTUAL_HOST:dc3} host: ${RABBITMQ_HOST:dc3-rabbitmq} diff --git a/dc3-center/dc3-center-single/src/main/resources/application-pre.yml b/dc3-center/dc3-center-single/src/main/resources/application-pre.yml index c14c74e40..bcf70b3e6 100644 --- a/dc3-center/dc3-center-single/src/main/resources/application-pre.yml +++ b/dc3-center/dc3-center-single/src/main/resources/application-pre.yml @@ -17,9 +17,12 @@ # Pre-release environment configuration will overwrite the content configured in application-*.yml spring: datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_single}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_single}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} data: redis: host: ${REDIS_HOST:dc3-redis} diff --git a/dc3-center/dc3-center-single/src/main/resources/application-pro.yml b/dc3-center/dc3-center-single/src/main/resources/application-pro.yml index f34ac7627..d4c4bda12 100644 --- a/dc3-center/dc3-center-single/src/main/resources/application-pro.yml +++ b/dc3-center/dc3-center-single/src/main/resources/application-pro.yml @@ -17,9 +17,12 @@ # Production environment configuration will overwrite the content configured in application-*.yml spring: datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_single}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_single}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} data: redis: host: ${REDIS_HOST:dc3-redis} diff --git a/dc3-center/dc3-center-single/src/main/resources/application-test.yml b/dc3-center/dc3-center-single/src/main/resources/application-test.yml index a183b0302..80753d845 100644 --- a/dc3-center/dc3-center-single/src/main/resources/application-test.yml +++ b/dc3-center/dc3-center-single/src/main/resources/application-test.yml @@ -17,9 +17,12 @@ # Test environment configuration will overwrite the content configured in application-*.yml spring: datasource: - url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_single}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai - username: ${POSTGRES_USERNAME:dc3} - password: ${POSTGRES_PASSWORD:dc3dc3dc3} + dynamic: + datasource: + master: + url: jdbc:postgresql://${POSTGRES_HOST:dc3-postgres}:${POSTGRES_PORT:5432}/${POSTGRES_DB:dc3}?currentSchema=${POSTGRES_SCHEMA:dc3_single}&applicationName=dc3&ssl=false&stringtype=unspecified&clientEncoding=UTF8&serverTimezone=Asia/Shanghai + username: ${POSTGRES_USERNAME:dc3} + password: ${POSTGRES_PASSWORD:dc3dc3dc3} rabbitmq: virtual-host: ${RABBITMQ_VIRTUAL_HOST:dc3} host: ${RABBITMQ_HOST:dc3-rabbitmq} diff --git a/dc3-common/dc3-common-data-postgres/pom.xml b/dc3-common/dc3-common-data-postgres/pom.xml deleted file mode 100644 index 0dc38ba67..000000000 --- a/dc3-common/dc3-common-data-postgres/pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - 4.0.0 - - - io.github.pnoker - dc3-common - 2025.2.5 - - - ${project.artifactId} - dc3-common-data-postgres - 2025.2.5 - jar - - 2016-2022 - https://github.com/pnoker/iot-dc3 - - IoT DC3 平台 公共的 Postgres 配置。 - - - - - 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 - - - - - - - com.baomidou - mybatis-plus-extension - - - - - io.github.pnoker - dc3-common-model - - - io.github.pnoker - dc3-common-postgres - - - io.github.pnoker - dc3-common-public - - - io.github.pnoker - dc3-common-repository - - - - - \ No newline at end of file diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/config/ActivePostgresProfileConfig.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/config/ActivePostgresProfileConfig.java deleted file mode 100644 index 8c84a8eb2..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/config/ActivePostgresProfileConfig.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 ActivePostgresProfileConfig implements EnvironmentPostProcessor { - - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { - environment.addActiveProfile("postgres"); - } -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/config/PostgresConfig.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/config/PostgresConfig.java deleted file mode 100644 index a2d0911e5..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/config/PostgresConfig.java +++ /dev/null @@ -1,41 +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.mybatis.spring.annotation.MapperScan; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -/** - * Postgres config - * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Slf4j -@Configuration -@ComponentScan(basePackages = { - "io.github.pnoker.common.postgres.*" -}) -@MapperScan(basePackages = { - "io.github.pnoker.common.postgres.mapper" -}) -public class PostgresConfig { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/init/PostgresInitRunner.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/init/PostgresInitRunner.java deleted file mode 100644 index 486eecede..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/init/PostgresInitRunner.java +++ /dev/null @@ -1,41 +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 org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.stereotype.Component; - -/** - * Postgres initialization runner - * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Component -@ComponentScan(basePackages = { - "io.github.pnoker.common.postgres.*" -}) -public class PostgresInitRunner implements ApplicationRunner { - - @Override - public void run(ApplicationArguments args) throws Exception { - // nothing to do - } -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueBoolManager.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueBoolManager.java deleted file mode 100644 index 5d64be083..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueBoolManager.java +++ /dev/null @@ -1,33 +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.postgres.dal; - -import com.baomidou.mybatisplus.extension.service.IService; -import io.github.pnoker.common.postgres.entity.model.PointValueBoolDO; - -/** - *

- * 设备位号历史数据表(Boolean类型) 服务类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueBoolManager extends IService { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueByteManager.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueByteManager.java deleted file mode 100644 index cfde08c7f..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueByteManager.java +++ /dev/null @@ -1,33 +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.postgres.dal; - -import com.baomidou.mybatisplus.extension.service.IService; -import io.github.pnoker.common.postgres.entity.model.PointValueByteDO; - -/** - *

- * 设备位号历史数据表(Byte类型) 服务类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueByteManager extends IService { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueDecimalManager.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueDecimalManager.java deleted file mode 100644 index 160d72795..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueDecimalManager.java +++ /dev/null @@ -1,33 +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.postgres.dal; - -import com.baomidou.mybatisplus.extension.service.IService; -import io.github.pnoker.common.postgres.entity.model.PointValueDecimalDO; - -/** - *

- * 设备位号历史数据表(Decimal类型) 服务类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueDecimalManager extends IService { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueDoubleManager.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueDoubleManager.java deleted file mode 100644 index 7bcc9a82b..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueDoubleManager.java +++ /dev/null @@ -1,33 +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.postgres.dal; - -import com.baomidou.mybatisplus.extension.service.IService; -import io.github.pnoker.common.postgres.entity.model.PointValueDoubleDO; - -/** - *

- * 设备位号历史数据表(Double类型) 服务类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueDoubleManager extends IService { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueFloatManager.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueFloatManager.java deleted file mode 100644 index 1fdd23e67..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueFloatManager.java +++ /dev/null @@ -1,33 +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.postgres.dal; - -import com.baomidou.mybatisplus.extension.service.IService; -import io.github.pnoker.common.postgres.entity.model.PointValueFloatDO; - -/** - *

- * 设备位号历史数据表(Float类型) 服务类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueFloatManager extends IService { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueIntManager.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueIntManager.java deleted file mode 100644 index f2332d89f..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueIntManager.java +++ /dev/null @@ -1,33 +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.postgres.dal; - -import com.baomidou.mybatisplus.extension.service.IService; -import io.github.pnoker.common.postgres.entity.model.PointValueIntDO; - -/** - *

- * 设备位号历史数据表(Integer类型) 服务类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueIntManager extends IService { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueLongManager.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueLongManager.java deleted file mode 100644 index 8b8ca63cc..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueLongManager.java +++ /dev/null @@ -1,33 +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.postgres.dal; - -import com.baomidou.mybatisplus.extension.service.IService; -import io.github.pnoker.common.postgres.entity.model.PointValueLongDO; - -/** - *

- * 设备位号历史数据表(Long类型) 服务类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueLongManager extends IService { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueBoolManagerImpl.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueBoolManagerImpl.java deleted file mode 100644 index 5a0409b96..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueBoolManagerImpl.java +++ /dev/null @@ -1,37 +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.postgres.dal.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.github.pnoker.common.postgres.dal.PointValueBoolManager; -import io.github.pnoker.common.postgres.entity.model.PointValueBoolDO; -import io.github.pnoker.common.postgres.mapper.PointValueBoolMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 设备位号历史数据表(Boolean类型) 服务实现类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Service -public class PointValueBoolManagerImpl extends ServiceImpl implements PointValueBoolManager { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueByteManagerImpl.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueByteManagerImpl.java deleted file mode 100644 index 67270bbe0..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueByteManagerImpl.java +++ /dev/null @@ -1,37 +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.postgres.dal.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.github.pnoker.common.postgres.dal.PointValueByteManager; -import io.github.pnoker.common.postgres.entity.model.PointValueByteDO; -import io.github.pnoker.common.postgres.mapper.PointValueByteMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 设备位号历史数据表(Byte类型) 服务实现类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Service -public class PointValueByteManagerImpl extends ServiceImpl implements PointValueByteManager { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueDecimalManagerImpl.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueDecimalManagerImpl.java deleted file mode 100644 index e3ad0cb88..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueDecimalManagerImpl.java +++ /dev/null @@ -1,37 +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.postgres.dal.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.github.pnoker.common.postgres.dal.PointValueDecimalManager; -import io.github.pnoker.common.postgres.entity.model.PointValueDecimalDO; -import io.github.pnoker.common.postgres.mapper.PointValueDecimalMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 设备位号历史数据表(Decimal类型) 服务实现类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Service -public class PointValueDecimalManagerImpl extends ServiceImpl implements PointValueDecimalManager { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueDoubleManagerImpl.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueDoubleManagerImpl.java deleted file mode 100644 index a480514f5..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueDoubleManagerImpl.java +++ /dev/null @@ -1,37 +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.postgres.dal.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.github.pnoker.common.postgres.dal.PointValueDoubleManager; -import io.github.pnoker.common.postgres.entity.model.PointValueDoubleDO; -import io.github.pnoker.common.postgres.mapper.PointValueDoubleMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 设备位号历史数据表(Double类型) 服务实现类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Service -public class PointValueDoubleManagerImpl extends ServiceImpl implements PointValueDoubleManager { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueFloatManagerImpl.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueFloatManagerImpl.java deleted file mode 100644 index 4ff91b036..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueFloatManagerImpl.java +++ /dev/null @@ -1,37 +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.postgres.dal.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.github.pnoker.common.postgres.dal.PointValueFloatManager; -import io.github.pnoker.common.postgres.entity.model.PointValueFloatDO; -import io.github.pnoker.common.postgres.mapper.PointValueFloatMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 设备位号历史数据表(Float类型) 服务实现类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Service -public class PointValueFloatManagerImpl extends ServiceImpl implements PointValueFloatManager { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueIntManagerImpl.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueIntManagerImpl.java deleted file mode 100644 index 490935e2d..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueIntManagerImpl.java +++ /dev/null @@ -1,37 +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.postgres.dal.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.github.pnoker.common.postgres.dal.PointValueIntManager; -import io.github.pnoker.common.postgres.entity.model.PointValueIntDO; -import io.github.pnoker.common.postgres.mapper.PointValueIntMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 设备位号历史数据表(Integer类型) 服务实现类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Service -public class PointValueIntManagerImpl extends ServiceImpl implements PointValueIntManager { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueLongManagerImpl.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueLongManagerImpl.java deleted file mode 100644 index 82a6985df..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueLongManagerImpl.java +++ /dev/null @@ -1,37 +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.postgres.dal.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.github.pnoker.common.postgres.dal.PointValueLongManager; -import io.github.pnoker.common.postgres.entity.model.PointValueLongDO; -import io.github.pnoker.common.postgres.mapper.PointValueLongMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 设备位号历史数据表(Long类型) 服务实现类 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Service -public class PointValueLongManagerImpl extends ServiceImpl implements PointValueLongManager { - -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueBoolDO.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueBoolDO.java deleted file mode 100644 index 4ae72069e..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueBoolDO.java +++ /dev/null @@ -1,106 +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.postgres.entity.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 设备位号历史数据表(Boolean类型) - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Getter -@Setter -@ToString -@TableName("dc3_point_value_bool") -public class PointValueBoolDO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 设备ID - */ - @TableField("device_id") - private Long deviceId; - - /** - * 位号ID - */ - @TableField("point_id") - private Long pointId; - - /** - * 原始值 - */ - @TableField("raw_value") - private Boolean rawValue; - - /** - * 计算值 - */ - @TableField("cal_value") - private Boolean calValue; - - /** - * 数据信息 - */ - @TableField("value_ext") - private Object valueExt; - - /** - * 驱动ID - */ - @TableField("driver_id") - private Long driverId; - - /** - * 租户ID - */ - @TableField("tenant_id") - private Long tenantId; - - /** - * 原始时间 - */ - @TableField("origin_time") - private LocalDateTime originTime; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 操作时间 - */ - @TableField("operate_time") - private LocalDateTime operateTime; -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueByteDO.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueByteDO.java deleted file mode 100644 index 3f4351f8e..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueByteDO.java +++ /dev/null @@ -1,106 +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.postgres.entity.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 设备位号历史数据表(Byte类型) - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Getter -@Setter -@ToString -@TableName("dc3_point_value_byte") -public class PointValueByteDO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 设备ID - */ - @TableField("device_id") - private Long deviceId; - - /** - * 位号ID - */ - @TableField("point_id") - private Long pointId; - - /** - * 原始值 - */ - @TableField("raw_value") - private Byte rawValue; - - /** - * 计算值 - */ - @TableField("cal_value") - private Byte calValue; - - /** - * 数据信息 - */ - @TableField("value_ext") - private Object valueExt; - - /** - * 驱动ID - */ - @TableField("driver_id") - private Long driverId; - - /** - * 租户ID - */ - @TableField("tenant_id") - private Long tenantId; - - /** - * 原始时间 - */ - @TableField("origin_time") - private LocalDateTime originTime; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 操作时间 - */ - @TableField("operate_time") - private LocalDateTime operateTime; -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDecimalDO.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDecimalDO.java deleted file mode 100644 index 9b9554c00..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDecimalDO.java +++ /dev/null @@ -1,107 +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.postgres.entity.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serial; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - *

- * 设备位号历史数据表(Decimal类型) - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Getter -@Setter -@ToString -@TableName("dc3_point_value_decimal") -public class PointValueDecimalDO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 设备ID - */ - @TableField("device_id") - private Long deviceId; - - /** - * 位号ID - */ - @TableField("point_id") - private Long pointId; - - /** - * 原始值 - */ - @TableField("raw_value") - private BigDecimal rawValue; - - /** - * 计算值 - */ - @TableField("cal_value") - private BigDecimal calValue; - - /** - * 数据信息 - */ - @TableField("value_ext") - private Object valueExt; - - /** - * 驱动ID - */ - @TableField("driver_id") - private Long driverId; - - /** - * 租户ID - */ - @TableField("tenant_id") - private Long tenantId; - - /** - * 原始时间 - */ - @TableField("origin_time") - private LocalDateTime originTime; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 操作时间 - */ - @TableField("operate_time") - private LocalDateTime operateTime; -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDoubleDO.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDoubleDO.java deleted file mode 100644 index 2520c48e0..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDoubleDO.java +++ /dev/null @@ -1,106 +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.postgres.entity.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 设备位号历史数据表(Double类型) - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Getter -@Setter -@ToString -@TableName("dc3_point_value_double") -public class PointValueDoubleDO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 设备ID - */ - @TableField("device_id") - private Long deviceId; - - /** - * 位号ID - */ - @TableField("point_id") - private Long pointId; - - /** - * 原始值 - */ - @TableField("raw_value") - private Double rawValue; - - /** - * 计算值 - */ - @TableField("cal_value") - private Double calValue; - - /** - * 数据信息 - */ - @TableField("value_ext") - private Object valueExt; - - /** - * 驱动ID - */ - @TableField("driver_id") - private Long driverId; - - /** - * 租户ID - */ - @TableField("tenant_id") - private Long tenantId; - - /** - * 原始时间 - */ - @TableField("origin_time") - private LocalDateTime originTime; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 操作时间 - */ - @TableField("operate_time") - private LocalDateTime operateTime; -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueFloatDO.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueFloatDO.java deleted file mode 100644 index 60315cffa..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueFloatDO.java +++ /dev/null @@ -1,106 +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.postgres.entity.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 设备位号历史数据表(Float类型) - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Getter -@Setter -@ToString -@TableName("dc3_point_value_float") -public class PointValueFloatDO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 设备ID - */ - @TableField("device_id") - private Long deviceId; - - /** - * 位号ID - */ - @TableField("point_id") - private Long pointId; - - /** - * 原始值 - */ - @TableField("raw_value") - private Double rawValue; - - /** - * 计算值 - */ - @TableField("cal_value") - private Double calValue; - - /** - * 数据信息 - */ - @TableField("value_ext") - private Object valueExt; - - /** - * 驱动ID - */ - @TableField("driver_id") - private Long driverId; - - /** - * 租户ID - */ - @TableField("tenant_id") - private Long tenantId; - - /** - * 原始时间 - */ - @TableField("origin_time") - private LocalDateTime originTime; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 操作时间 - */ - @TableField("operate_time") - private LocalDateTime operateTime; -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueIntDO.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueIntDO.java deleted file mode 100644 index cfea2e2cd..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueIntDO.java +++ /dev/null @@ -1,106 +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.postgres.entity.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 设备位号历史数据表(Integer类型) - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Getter -@Setter -@ToString -@TableName("dc3_point_value_int") -public class PointValueIntDO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 设备ID - */ - @TableField("device_id") - private Long deviceId; - - /** - * 位号ID - */ - @TableField("point_id") - private Long pointId; - - /** - * 原始值 - */ - @TableField("raw_value") - private Integer rawValue; - - /** - * 计算值 - */ - @TableField("cal_value") - private Integer calValue; - - /** - * 数据信息 - */ - @TableField("value_ext") - private Object valueExt; - - /** - * 驱动ID - */ - @TableField("driver_id") - private Long driverId; - - /** - * 租户ID - */ - @TableField("tenant_id") - private Long tenantId; - - /** - * 原始时间 - */ - @TableField("origin_time") - private LocalDateTime originTime; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 操作时间 - */ - @TableField("operate_time") - private LocalDateTime operateTime; -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueLongDO.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueLongDO.java deleted file mode 100644 index deeca446e..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueLongDO.java +++ /dev/null @@ -1,106 +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.postgres.entity.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 设备位号历史数据表(Long类型) - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -@Getter -@Setter -@ToString -@TableName("dc3_point_value_long") -public class PointValueLongDO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 设备ID - */ - @TableField("device_id") - private Long deviceId; - - /** - * 位号ID - */ - @TableField("point_id") - private Long pointId; - - /** - * 原始值 - */ - @TableField("raw_value") - private Long rawValue; - - /** - * 计算值 - */ - @TableField("cal_value") - private Long calValue; - - /** - * 数据信息 - */ - @TableField("value_ext") - private Object valueExt; - - /** - * 驱动ID - */ - @TableField("driver_id") - private Long driverId; - - /** - * 租户ID - */ - @TableField("tenant_id") - private Long tenantId; - - /** - * 原始时间 - */ - @TableField("origin_time") - private LocalDateTime originTime; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 操作时间 - */ - @TableField("operate_time") - private LocalDateTime operateTime; -} diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/generator/MybatisGenerator.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/generator/MybatisGenerator.java deleted file mode 100644 index 2175ddf84..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/generator/MybatisGenerator.java +++ /dev/null @@ -1,71 +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.postgres.generator; - -import com.baomidou.mybatisplus.generator.config.OutputFile; -import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; -import com.google.common.collect.ImmutableMap; -import io.github.pnoker.common.utils.MybatisUtil; - -/** - * 自动代码生成工具 - *

- * 注意: - *

- * 当前配置仅用于 dc3-common-dal 服务模块, 如果需要用于其他模块请重新配置 path 参数。 - * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public class MybatisGenerator { - public static void main(String[] args) { - generator(); - } - - public static void generator() { - String path = System.getProperty("user.dir") + "/dc3-common/dc3-common-data-postgres/src/main"; - MybatisUtil.defaultGenerator("dc3-postgres", "35432", "dc3", "dc3_data", "dc3", "dc3dc3dc3") - .globalConfig(builder -> MybatisUtil.defaultGlobalConfig(builder, path)) - .dataSourceConfig(MybatisUtil::defaultDataSourceConfig) - .packageConfig(builder -> builder - .parent("io.github.pnoker.common.postgres") - .entity("entity.model") - .service("dal") - .serviceImpl("dal.impl") - .mapper("mapper") - .pathInfo(ImmutableMap.of( - OutputFile.service, path + "/java/io/github/pnoker/common/postgres/dal", - OutputFile.serviceImpl, path + "/java/io/github/pnoker/common/postgres/dal/impl", - OutputFile.xml, path + "/resources/mapping")) - ) - .templateEngine(new FreemarkerTemplateEngine()) - .strategyConfig(MybatisUtil::defaultStrategyConfig) - .strategyConfig(builder -> builder - .addInclude( - "dc3_point_value_string", - "dc3_point_value_bool", - "dc3_point_value_byte", - "dc3_point_value_int", - "dc3_point_value_long", - "dc3_point_value_float", - "dc3_point_value_double", - "dc3_point_value_decimal" - ) - ).execute(); - } -} \ No newline at end of file diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueBoolMapper.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueBoolMapper.java deleted file mode 100644 index 2e0d0b848..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueBoolMapper.java +++ /dev/null @@ -1,34 +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.postgres.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.github.pnoker.common.postgres.entity.model.PointValueBoolDO; - -/** - *

- * 设备位号历史数据表(Boolean类型) Mapper 接口 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueBoolMapper extends BaseMapper { - -} - diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueByteMapper.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueByteMapper.java deleted file mode 100644 index 3e23797b9..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueByteMapper.java +++ /dev/null @@ -1,34 +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.postgres.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.github.pnoker.common.postgres.entity.model.PointValueByteDO; - -/** - *

- * 设备位号历史数据表(Byte类型) Mapper 接口 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueByteMapper extends BaseMapper { - -} - diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueDecimalMapper.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueDecimalMapper.java deleted file mode 100644 index 86a873cb7..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueDecimalMapper.java +++ /dev/null @@ -1,34 +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.postgres.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.github.pnoker.common.postgres.entity.model.PointValueDecimalDO; - -/** - *

- * 设备位号历史数据表(Decimal类型) Mapper 接口 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueDecimalMapper extends BaseMapper { - -} - diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueDoubleMapper.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueDoubleMapper.java deleted file mode 100644 index e2fdd1432..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueDoubleMapper.java +++ /dev/null @@ -1,34 +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.postgres.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.github.pnoker.common.postgres.entity.model.PointValueDoubleDO; - -/** - *

- * 设备位号历史数据表(Double类型) Mapper 接口 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueDoubleMapper extends BaseMapper { - -} - diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueFloatMapper.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueFloatMapper.java deleted file mode 100644 index 1efda2f10..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueFloatMapper.java +++ /dev/null @@ -1,34 +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.postgres.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.github.pnoker.common.postgres.entity.model.PointValueFloatDO; - -/** - *

- * 设备位号历史数据表(Float类型) Mapper 接口 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueFloatMapper extends BaseMapper { - -} - diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueIntMapper.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueIntMapper.java deleted file mode 100644 index d78d8f639..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueIntMapper.java +++ /dev/null @@ -1,34 +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.postgres.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.github.pnoker.common.postgres.entity.model.PointValueIntDO; - -/** - *

- * 设备位号历史数据表(Integer类型) Mapper 接口 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueIntMapper extends BaseMapper { - -} - diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueLongMapper.java b/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueLongMapper.java deleted file mode 100644 index c5da426f2..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueLongMapper.java +++ /dev/null @@ -1,34 +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.postgres.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.github.pnoker.common.postgres.entity.model.PointValueLongDO; - -/** - *

- * 设备位号历史数据表(Long类型) Mapper 接口 - *

- * - * @author pnoker - * @version 2025.2.5 - * @since 2022.1.0 - */ -public interface PointValueLongMapper extends BaseMapper { - -} - diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/META-INF/aop.xml b/dc3-common/dc3-common-data-postgres/src/main/resources/META-INF/aop.xml deleted file mode 100644 index 84f8f3d05..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/resources/META-INF/aop.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/META-INF/spring.factories b/dc3-common/dc3-common-data-postgres/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 46f717317..000000000 --- a/dc3-common/dc3-common-data-postgres/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.PostgresConfig,\ - io.github.pnoker.common.init.PostgresInitRunner -org.springframework.boot.env.EnvironmentPostProcessor=\ - io.github.pnoker.common.config.ActivePostgresProfileConfig diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dc3-common/dc3-common-data-postgres/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 32b8941b1..000000000 --- a/dc3-common/dc3-common-data-postgres/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.PostgresConfig -io.github.pnoker.common.init.PostgresInitRunner \ No newline at end of file diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/application-mongodb.yml b/dc3-common/dc3-common-data-postgres/src/main/resources/application-mongodb.yml deleted file mode 100644 index 581848814..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/resources/application-mongodb.yml +++ /dev/null @@ -1,19 +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. \ No newline at end of file diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueBoolMapper.xml b/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueBoolMapper.xml deleted file mode 100644 index 51a0b8de3..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueBoolMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueByteMapper.xml b/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueByteMapper.xml deleted file mode 100644 index b9e2cda0d..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueByteMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueDecimalMapper.xml b/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueDecimalMapper.xml deleted file mode 100644 index 2c4f1b29c..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueDecimalMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueDoubleMapper.xml b/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueDoubleMapper.xml deleted file mode 100644 index 9b42e9239..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueDoubleMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueFloatMapper.xml b/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueFloatMapper.xml deleted file mode 100644 index 82c291200..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueFloatMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueIntMapper.xml b/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueIntMapper.xml deleted file mode 100644 index ec2c61122..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueIntMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueLongMapper.xml b/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueLongMapper.xml deleted file mode 100644 index 470e2ce83..000000000 --- a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueLongMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/dc3-common/dc3-common-data/pom.xml b/dc3-common/dc3-common-data/pom.xml index bc9b42de5..e159b21b7 100644 --- a/dc3-common/dc3-common-data/pom.xml +++ b/dc3-common/dc3-common-data/pom.xml @@ -62,10 +62,6 @@ io.github.pnoker dc3-common-dal - - io.github.pnoker - dc3-common-data-postgres - io.github.pnoker dc3-common-log diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/repository/PostgresRepositoryServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PostgresRepositoryServiceImpl.java similarity index 97% rename from dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/repository/PostgresRepositoryServiceImpl.java rename to dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PostgresRepositoryServiceImpl.java index d9fb07a48..9e6cd3b63 100644 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/repository/PostgresRepositoryServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/PostgresRepositoryServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.pnoker.common.postgres.repository; +package io.github.pnoker.common.data.biz.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.github.pnoker.common.constant.driver.StrategyConstant; @@ -37,7 +37,6 @@ import java.util.List; @Service("postgresRepositoryService") public class PostgresRepositoryServiceImpl implements RepositoryService, InitializingBean { - @Override public String getRepositoryName() { return StrategyConstant.Storage.POSTGRES; diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueManager.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/PointValueManager.java similarity index 82% rename from dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueManager.java rename to dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/PointValueManager.java index 8747a00dc..193b91b2f 100644 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/PointValueManager.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/PointValueManager.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.github.pnoker.common.postgres.dal; +package io.github.pnoker.common.data.dal; import com.baomidou.mybatisplus.extension.service.IService; -import io.github.pnoker.common.postgres.entity.model.PointValueDO; +import io.github.pnoker.common.data.entity.model.PointValueDO; /** *

- * 设备位号历史数据表(String类型) 服务类 + * 设备位号历史数据表(默认数据表, String类型) 服务类 *

* * @author pnoker diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueManagerImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/PointValueManagerImpl.java similarity index 75% rename from dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueManagerImpl.java rename to dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/PointValueManagerImpl.java index 9fb705774..35c98d5b7 100644 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/dal/impl/PointValueManagerImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/dal/impl/PointValueManagerImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package io.github.pnoker.common.postgres.dal.impl; +package io.github.pnoker.common.data.dal.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.github.pnoker.common.postgres.dal.PointValueManager; -import io.github.pnoker.common.postgres.entity.model.PointValueDO; -import io.github.pnoker.common.postgres.mapper.PointValueMapper; +import io.github.pnoker.common.data.dal.PointValueManager; +import io.github.pnoker.common.data.entity.model.PointValueDO; +import io.github.pnoker.common.data.mapper.PointValueMapper; import org.springframework.stereotype.Service; /** *

- * 设备位号历史数据表(String类型) 服务实现类 + * 设备位号历史数据表(默认数据表, String类型) 服务实现类 *

* * @author pnoker diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDO.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/PointValueDO.java similarity index 93% rename from dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDO.java rename to dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/PointValueDO.java index 48355ea5d..14be92111 100644 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/entity/model/PointValueDO.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/model/PointValueDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.pnoker.common.postgres.entity.model; +package io.github.pnoker.common.data.entity.model; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -28,7 +28,7 @@ import java.time.LocalDateTime; /** *

- * 设备位号历史数据表(String类型) + * 设备位号历史数据表(默认数据表, String类型) *

* * @author pnoker @@ -38,7 +38,7 @@ import java.time.LocalDateTime; @Getter @Setter @ToString -@TableName("dc3_point_value_string") +@TableName("dc3_point_value") public class PointValueDO implements Serializable { @Serial diff --git a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueMapper.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/PointValueMapper.java similarity index 82% rename from dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueMapper.java rename to dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/PointValueMapper.java index 7c11674fa..fea46b578 100644 --- a/dc3-common/dc3-common-data-postgres/src/main/java/io/github/pnoker/common/postgres/mapper/PointValueMapper.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/mapper/PointValueMapper.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.github.pnoker.common.postgres.mapper; +package io.github.pnoker.common.data.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.github.pnoker.common.postgres.entity.model.PointValueDO; +import io.github.pnoker.common.data.entity.model.PointValueDO; /** *

- * 设备位号历史数据表(String类型) Mapper 接口 + * 设备位号历史数据表(默认数据表, String类型) Mapper 接口 *

* * @author pnoker diff --git a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueMapper.xml b/dc3-common/dc3-common-data/src/main/resources/mapping/PointValueMapper.xml similarity index 91% rename from dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueMapper.xml rename to dc3-common/dc3-common-data/src/main/resources/mapping/PointValueMapper.xml index c99b406fe..2c2d2e398 100644 --- a/dc3-common/dc3-common-data-postgres/src/main/resources/mapping/PointValueMapper.xml +++ b/dc3-common/dc3-common-data/src/main/resources/mapping/PointValueMapper.xml @@ -16,6 +16,6 @@ --> - + diff --git a/dc3-common/dc3-common-manager/pom.xml b/dc3-common/dc3-common-manager/pom.xml index 4edf7e4b4..f23adec02 100644 --- a/dc3-common/dc3-common-manager/pom.xml +++ b/dc3-common/dc3-common-manager/pom.xml @@ -66,10 +66,6 @@ io.github.pnoker dc3-common-dal - - io.github.pnoker - dc3-common-data-postgres - io.github.pnoker dc3-common-log diff --git a/dc3-common/pom.xml b/dc3-common/pom.xml index ed47d4f2e..c5da5b8fd 100644 --- a/dc3-common/pom.xml +++ b/dc3-common/pom.xml @@ -107,7 +107,6 @@ dc3-common-constant dc3-common-dal dc3-common-data - dc3-common-data-postgres dc3-common-driver dc3-common-exception dc3-common-gateway @@ -236,11 +235,6 @@ dc3-common-data ${dc3.common.data.version} - - io.github.pnoker - dc3-common-data-postgres - ${dc3.common.postgres.version} - io.github.pnoker dc3-common-driver diff --git a/pom.xml b/pom.xml index 95a7e0e51..b52c489d7 100644 --- a/pom.xml +++ b/pom.xml @@ -193,11 +193,6 @@ dc3-common-data ${dc3.common.data.version} - - io.github.pnoker - dc3-common-data-postgres - ${dc3.common.postgres.version} - io.github.pnoker dc3-common-driver