From 770fb0922312d742bf67f8a77790cce7d01fe658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=90=8C=E5=AD=A6?= Date: Tue, 2 Dec 2025 08:44:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor(harmonic):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=85=8D=E7=BD=AE=E5=B9=B6=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为 RStatLimitRateDetailDServiceImpl 和 RStatLimitRateDServiceImpl 添加 @DS 注解以支持多数据源切换 - 在 harmonic-common 模块中引入 dynamic-datasource-spring-boot-starter 依赖 - 移除 harmonic-boot 模块中对 harmonic-common 的冗余依赖声明 - 调整 AlarmClientFallbackFactory 组件名称以避免命名冲突 --- .../device/pq/api/fallback/AlarmClientFallbackFactory.java | 5 +++-- pqs-harmonic/harmonic-boot/pom.xml | 6 ------ pqs-harmonic/harmonic-common/pom.xml | 7 +++++-- .../service/impl/RStatLimitRateDServiceImpl.java | 2 ++ .../service/impl/RStatLimitRateDetailDServiceImpl.java | 3 ++- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/AlarmClientFallbackFactory.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/AlarmClientFallbackFactory.java index 68e95089f..524867cee 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/AlarmClientFallbackFactory.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/AlarmClientFallbackFactory.java @@ -3,9 +3,9 @@ package com.njcn.device.pq.api.fallback; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.device.biz.utils.DeviceEnumUtil; import com.njcn.device.pq.api.AlarmClient; import com.njcn.device.pq.pojo.vo.AlarmStrategyVO; -import com.njcn.device.biz.utils.DeviceEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -14,11 +14,12 @@ import java.util.List; /** * 告警管理熔断降级 + * * @author yzh * @date 2022/9/19 */ @Slf4j -@Component +@Component("deviceAlarmClientFallbackFactory") public class AlarmClientFallbackFactory implements FallbackFactory { @Override public AlarmClient create(Throwable throwable) { diff --git a/pqs-harmonic/harmonic-boot/pom.xml b/pqs-harmonic/harmonic-boot/pom.xml index 0a6849a13..8efd6ebe4 100644 --- a/pqs-harmonic/harmonic-boot/pom.xml +++ b/pqs-harmonic/harmonic-boot/pom.xml @@ -131,12 +131,6 @@ 1.0.0 compile - - - com.njcn - harmonic-common - 1.0.0 - diff --git a/pqs-harmonic/harmonic-common/pom.xml b/pqs-harmonic/harmonic-common/pom.xml index e112fb5a3..d0fa700bc 100644 --- a/pqs-harmonic/harmonic-common/pom.xml +++ b/pqs-harmonic/harmonic-common/pom.xml @@ -30,8 +30,11 @@ 1.0.0 compile - - + + com.baomidou + dynamic-datasource-spring-boot-starter + 3.5.1 + \ No newline at end of file diff --git a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/service/impl/RStatLimitRateDServiceImpl.java b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/service/impl/RStatLimitRateDServiceImpl.java index a44b99187..700c12344 100644 --- a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/service/impl/RStatLimitRateDServiceImpl.java +++ b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/service/impl/RStatLimitRateDServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -42,6 +43,7 @@ import java.util.stream.Collectors; * @author wr * @since 2023-04-03 */ +@DS("sjzx") @RequiredArgsConstructor @Service public class RStatLimitRateDServiceImpl extends ServiceImpl implements IRStatLimitRateDService { diff --git a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/service/impl/RStatLimitRateDetailDServiceImpl.java b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/service/impl/RStatLimitRateDetailDServiceImpl.java index b5110ebf0..2687a4c60 100644 --- a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/service/impl/RStatLimitRateDetailDServiceImpl.java +++ b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/service/impl/RStatLimitRateDetailDServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -36,7 +37,7 @@ import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; - +@DS("sjzx") @RequiredArgsConstructor @Service public class RStatLimitRateDetailDServiceImpl extends ServiceImpl implements IRStatLimitRateDetailDService {