diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/OverLimitClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsOverLimitClient.java similarity index 83% rename from cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/OverLimitClient.java rename to cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsOverLimitClient.java index 9eeb5bb..a47e73b 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/OverLimitClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsOverLimitClient.java @@ -2,7 +2,7 @@ package com.njcn.csdevice.api; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.csdevice.api.fallback.OverLimitFallbackFactory; +import com.njcn.csdevice.api.fallback.CsOverLimitFallbackFactory; import com.njcn.csdevice.pojo.po.Overlimit; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -18,8 +18,8 @@ import java.util.Map; */ @FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/overLimit", - fallbackFactory = OverLimitFallbackFactory.class,contextId = "overLimit") -public interface OverLimitClient { + fallbackFactory = CsOverLimitFallbackFactory.class,contextId = "overLimit") +public interface CsOverLimitClient { /** * diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/OverLimitFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsOverLimitFallbackFactory.java similarity index 87% rename from cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/OverLimitFallbackFactory.java rename to cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsOverLimitFallbackFactory.java index 85b6c17..2beabdb 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/OverLimitFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsOverLimitFallbackFactory.java @@ -3,7 +3,7 @@ package com.njcn.csdevice.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.csdevice.api.OverLimitClient; +import com.njcn.csdevice.api.CsOverLimitClient; import com.njcn.csdevice.pojo.po.Overlimit; import com.njcn.device.biz.utils.DeviceEnumUtil; import feign.hystrix.FallbackFactory; @@ -20,9 +20,9 @@ import java.util.Map; */ @Slf4j @Component -public class OverLimitFallbackFactory implements FallbackFactory { +public class CsOverLimitFallbackFactory implements FallbackFactory { @Override - public OverLimitClient create(Throwable throwable) { + public CsOverLimitClient create(Throwable throwable) { //判断抛出异常是否为解码器抛出的业务异常 Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if (throwable.getCause() instanceof BusinessException) { @@ -30,7 +30,7 @@ public class OverLimitFallbackFactory implements FallbackFactory finalExceptionEnum = exceptionEnum; - return new OverLimitClient() { + return new CsOverLimitClient() { @Override public HttpResult> getOverLimitByLineIds(List lineIds) { log.error("{}异常,降级处理,异常为:{}", "监测点限值", throwable.toString()); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RStatLimitRateDetailDServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RStatLimitRateDetailDServiceImpl.java index 7a69435..3030ec0 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RStatLimitRateDetailDServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RStatLimitRateDetailDServiceImpl.java @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.api.CsLineFeignClient; -import com.njcn.csdevice.api.OverLimitClient; +import com.njcn.csdevice.api.CsOverLimitClient; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.pojo.po.Overlimit; import com.njcn.csharmonic.mapper.RStatLimitRateDetailDMapper; @@ -42,7 +42,7 @@ import java.util.stream.Collectors; public class RStatLimitRateDetailDServiceImpl extends ServiceImpl implements IRStatLimitRateDetailDService { private final CsLineFeignClient csLineFeignClient; - private final OverLimitClient overLimitClient; + private final CsOverLimitClient overLimitClient; private final DecimalFormat df = new DecimalFormat("#0.00");