初始版本提交

This commit is contained in:
hzj
2025-01-17 14:58:27 +08:00
parent 92f98231f2
commit 04e3f48da8
123 changed files with 116 additions and 38 deletions

View File

@@ -1,5 +1,6 @@
package com.njcn.stat.api; package com.njcn.stat.api;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.message.messagedto.MessageDataDTO; import com.njcn.message.messagedto.MessageDataDTO;
@@ -18,7 +19,7 @@ import java.util.List;
* @version V1.0.0 * @version V1.0.0
*/ */
@FeignClient( @FeignClient(
value = "front-analysis-boot", value = ServerInfo.PLATFORM_STAT_BOOT,
path = "/messageAnalysis", path = "/messageAnalysis",
fallbackFactory = MessAnalysisFeignClientFallbackFactory.class, fallbackFactory = MessAnalysisFeignClientFallbackFactory.class,
contextId = "analysis") contextId = "analysis")

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataFlicker", fallbackFactory = DataFlickerFeignClientFallbackFactory.class, contextId = "dataFlicker") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataFlicker", fallbackFactory = DataFlickerFeignClientFallbackFactory.class, contextId = "dataFlicker")
public interface DataFlickerFeignClient { public interface DataFlickerFeignClient {

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataFluc", fallbackFactory = DataFlucFeignClientFallbackFactory.class, contextId = "dataFluc") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataFluc", fallbackFactory = DataFlucFeignClientFallbackFactory.class, contextId = "dataFluc")
public interface DataFlucFeignClient { public interface DataFlucFeignClient {

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataHarmphasicI", fallbackFactory = DataHarmphasicIFeignClientFallbackFactory.class, contextId = "dataHarmphasicI") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmphasicI", fallbackFactory = DataHarmphasicIFeignClientFallbackFactory.class, contextId = "dataHarmphasicI")
public interface DataHarmphasicIFeignClient { public interface DataHarmphasicIFeignClient {

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataHarmphasicV", fallbackFactory = DataIFeignClientFallbackFactory.class, contextId = "dataHarmphasicV") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmphasicV", fallbackFactory = DataIFeignClientFallbackFactory.class, contextId = "dataHarmphasicV")
public interface DataHarmphasicVFeignClient { public interface DataHarmphasicVFeignClient {

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataHarmpowerP", fallbackFactory = DataHarmpowerPFeignClientFallbackFactory.class, contextId = "dataHarmpowerP") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmpowerP", fallbackFactory = DataHarmpowerPFeignClientFallbackFactory.class, contextId = "dataHarmpowerP")
public interface DataHarmpowerPFeignClient { public interface DataHarmpowerPFeignClient {

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataHarmpowerQ", fallbackFactory = DataHarmpowerQFeignClientFallbackFactory.class, contextId = "dataHarmpowerQ") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmpowerQ", fallbackFactory = DataHarmpowerQFeignClientFallbackFactory.class, contextId = "dataHarmpowerQ")
public interface DataHarmpowerQFeignClient { public interface DataHarmpowerQFeignClient {

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataHarmpowerS", fallbackFactory = DataIFeignClientFallbackFactory.class, contextId = "dataHarmpowerS") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmpowerS", fallbackFactory = DataIFeignClientFallbackFactory.class, contextId = "dataHarmpowerS")
public interface DataHarmpowerSFeignClient { public interface DataHarmpowerSFeignClient {

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataI", fallbackFactory = DataIFeignClientFallbackFactory.class, contextId = "dataI") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataI", fallbackFactory = DataIFeignClientFallbackFactory.class, contextId = "dataI")
public interface DataIFeignClient { public interface DataIFeignClient {

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataInharmI", fallbackFactory = DataInharmIFeignClientFallbackFactory.class, contextId = "dataInharmI") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataInharmI", fallbackFactory = DataInharmIFeignClientFallbackFactory.class, contextId = "dataInharmI")
public interface DataInharmIFeignClient { public interface DataInharmIFeignClient {

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataInharmV", fallbackFactory = DataInharmVFeignClientFallbackFactory.class, contextId = "dataInharmV") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataInharmV", fallbackFactory = DataInharmVFeignClientFallbackFactory.class, contextId = "dataInharmV")
public interface DataInharmVFeignClient { public interface DataInharmVFeignClient {

View File

@@ -16,7 +16,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataPlt", fallbackFactory = DataPltFeignClientFallbackFactory.class, contextId = "dataPlt") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataPlt", fallbackFactory = DataPltFeignClientFallbackFactory.class, contextId = "dataPlt")
public interface DataPltFeignClient { public interface DataPltFeignClient {

View File

@@ -18,7 +18,7 @@ import java.util.List;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/dataV", fallbackFactory = DataVFeignClientFallbackFactory.class, contextId = "dataV") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataV", fallbackFactory = DataVFeignClientFallbackFactory.class, contextId = "dataV")
public interface DataVFeignClient { public interface DataVFeignClient {

View File

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/lndata", fallbackFactory = LnDataDealFeignClientFallbackFactory.class, contextId = "lndata") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/lndata", fallbackFactory = LnDataDealFeignClientFallbackFactory.class, contextId = "lndata")
public interface LnDataDealFeignClient { public interface LnDataDealFeignClient {

View File

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @version 1.0.0 * @version 1.0.0
* @date 2022年01月05日 15:11 * @date 2022年01月05日 15:11
*/ */
@FeignClient(value = ServerInfo.DATA_PLATFORM, path = "/rmpEventDetail", fallbackFactory = RmpEventFeignClientFallbackFactory.class, contextId = "rmpEventDetail") @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/rmpEventDetail", fallbackFactory = RmpEventFeignClientFallbackFactory.class, contextId = "rmpEventDetail")
public interface RmpEventDetailFeignClient { public interface RmpEventDetailFeignClient {

View File

@@ -6,7 +6,7 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataFlickerFeignClient; import com.njcn.dataProcess.api.DataFlickerFeignClient;
import com.njcn.dataProcess.dto.DataFlickerDTO; import com.njcn.dataProcess.dto.DataFlickerDTO;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -33,7 +33,7 @@ public class DataFlickerFeignClientFallbackFactory implements FallbackFactory<Da
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataFlickerFeignClient() { return new DataFlickerFeignClient() {

View File

@@ -6,7 +6,7 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataFlucFeignClient; import com.njcn.dataProcess.api.DataFlucFeignClient;
import com.njcn.dataProcess.dto.DataFlucDTO; import com.njcn.dataProcess.dto.DataFlucDTO;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -33,7 +33,7 @@ public class DataFlucFeignClientFallbackFactory implements FallbackFactory<DataF
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataFlucFeignClient() { return new DataFlucFeignClient() {

View File

@@ -6,7 +6,7 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataHarmphasicIFeignClient; import com.njcn.dataProcess.api.DataHarmphasicIFeignClient;
import com.njcn.dataProcess.dto.DataHarmphasicIDTO; import com.njcn.dataProcess.dto.DataHarmphasicIDTO;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -33,7 +33,7 @@ public class DataHarmphasicIFeignClientFallbackFactory implements FallbackFactor
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataHarmphasicIFeignClient() { return new DataHarmphasicIFeignClient() {

View File

@@ -5,7 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataHarmpowerPFeignClient; import com.njcn.dataProcess.api.DataHarmpowerPFeignClient;
import com.njcn.dataProcess.dto.DataHarmpowerPDTO; import com.njcn.dataProcess.dto.DataHarmpowerPDTO;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -32,7 +32,7 @@ public class DataHarmpowerPFeignClientFallbackFactory implements FallbackFactory
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataHarmpowerPFeignClient() { return new DataHarmpowerPFeignClient() {

View File

@@ -4,9 +4,8 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataHarmpowerQFeignClient; import com.njcn.dataProcess.api.DataHarmpowerQFeignClient;
import com.njcn.dataProcess.api.DataHarmpowerQFeignClient;
import com.njcn.dataProcess.dto.DataHarmpowerQDTO; import com.njcn.dataProcess.dto.DataHarmpowerQDTO;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -33,7 +32,7 @@ public class DataHarmpowerQFeignClientFallbackFactory implements FallbackFactory
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataHarmpowerQFeignClient() { return new DataHarmpowerQFeignClient() {

View File

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataHarmpowerSFeignClient; import com.njcn.dataProcess.api.DataHarmpowerSFeignClient;
import com.njcn.dataProcess.dto.DataHarmpowerSDTO; import com.njcn.dataProcess.dto.DataHarmpowerSDTO;
import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.system.utils.SystemEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -32,7 +33,7 @@ public class DataHarmpowerSFeignClientFallbackFactory implements FallbackFactory
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataHarmpowerSFeignClient() { return new DataHarmpowerSFeignClient() {

View File

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataIFeignClient; import com.njcn.dataProcess.api.DataIFeignClient;
import com.njcn.dataProcess.dto.DataIDTO; import com.njcn.dataProcess.dto.DataIDTO;
import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.system.utils.SystemEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -32,7 +33,7 @@ public class DataIFeignClientFallbackFactory implements FallbackFactory<DataIFei
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataIFeignClient() { return new DataIFeignClient() {

View File

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataInharmIFeignClient; import com.njcn.dataProcess.api.DataInharmIFeignClient;
import com.njcn.dataProcess.dto.DataInharmIDTO; import com.njcn.dataProcess.dto.DataInharmIDTO;
import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.system.utils.SystemEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -32,7 +33,7 @@ public class DataInharmIFeignClientFallbackFactory implements FallbackFactory<Da
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataInharmIFeignClient() { return new DataInharmIFeignClient() {

View File

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataInharmVFeignClient; import com.njcn.dataProcess.api.DataInharmVFeignClient;
import com.njcn.dataProcess.dto.DataInharmVDTO; import com.njcn.dataProcess.dto.DataInharmVDTO;
import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.system.utils.SystemEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -32,7 +33,7 @@ public class DataInharmVFeignClientFallbackFactory implements FallbackFactory<Da
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataInharmVFeignClient() { return new DataInharmVFeignClient() {

View File

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataPltFeignClient; import com.njcn.dataProcess.api.DataPltFeignClient;
import com.njcn.dataProcess.dto.DataPltDTO; import com.njcn.dataProcess.dto.DataPltDTO;
import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.system.utils.SystemEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -32,7 +33,7 @@ public class DataPltFeignClientFallbackFactory implements FallbackFactory<DataPl
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataPltFeignClient() { return new DataPltFeignClient() {

View File

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.DataVFeignClient; import com.njcn.dataProcess.api.DataVFeignClient;
import com.njcn.dataProcess.dto.DataVDTO; import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.system.utils.SystemEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -33,7 +34,7 @@ public class DataVFeignClientFallbackFactory implements FallbackFactory<DataVFei
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new DataVFeignClient() { return new DataVFeignClient() {

View File

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.LnDataDealFeignClient; import com.njcn.dataProcess.api.LnDataDealFeignClient;
import com.njcn.dataProcess.dto.LnDataDTO; import com.njcn.dataProcess.dto.LnDataDTO;
import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.system.utils.SystemEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -31,7 +32,7 @@ public class LnDataDealFeignClientFallbackFactory implements FallbackFactory<LnD
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new LnDataDealFeignClient() { return new LnDataDealFeignClient() {

View File

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.RmpEventDetailFeignClient; import com.njcn.dataProcess.api.RmpEventDetailFeignClient;
import com.njcn.dataProcess.dto.RmpEventDetailDTO; import com.njcn.dataProcess.dto.RmpEventDetailDTO;
import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import com.njcn.system.utils.SystemEnumUtil; import com.njcn.system.utils.SystemEnumUtil;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -30,7 +31,7 @@ public class RmpEventFeignClientFallbackFactory implements FallbackFactory<RmpEv
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){ if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause(); BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new RmpEventDetailFeignClient() { return new RmpEventDetailFeignClient() {

View File

@@ -0,0 +1,23 @@
package com.njcn.dataProcess.enums;
import lombok.Getter;
/**
* @author hongawen
* @version 1.0.0
* @date 2021年12月20日 09:56
*/
@Getter
public enum DataProceessResponseEnum {
DATA_PROCESS_COMMON_ERROR("A00550","数据处理模块异常"),
;
private final String code;
private final String message;
DataProceessResponseEnum(String code, String message) {
this.code = code;
this.message = message;
}
}

View File

@@ -0,0 +1,46 @@
package com.njcn.dataProcess.util;
import cn.hutool.core.util.StrUtil;
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.common.utils.EnumUtils;
import com.njcn.dataProcess.enums.DataProceessResponseEnum;
import javax.validation.constraints.NotNull;
import java.util.Objects;
/**
* @author hongawen
* @version 1.0.0
* @date 2021年12月20日 10:03
*/
public class DataProcessingEnumUtil {
/**
* 获取HarmonicResponseEnum实例
*/
public static DataProceessResponseEnum getDataProceessResponseEnumByMessage(@NotNull Object value) {
DataProceessResponseEnum harmonicResponseEnum;
try {
String message = value.toString();
if(message.indexOf(StrUtil.C_COMMA)>0){
value = message.substring(message.indexOf(StrUtil.C_COMMA)+1);
}
harmonicResponseEnum = EnumUtils.valueOf(DataProceessResponseEnum.class, value, DataProceessResponseEnum.class.getMethod(BusinessException.GET_MESSAGE_METHOD));
return Objects.isNull(harmonicResponseEnum) ? DataProceessResponseEnum.DATA_PROCESS_COMMON_ERROR : harmonicResponseEnum;
} catch (NoSuchMethodException e) {
throw new BusinessException(CommonResponseEnum.INTERNAL_ERROR);
}
}
public static Enum<?> getExceptionEnum(HttpResult<Object> result){
//如果返回错误,且为内部错误,则直接抛出异常
CommonResponseEnum commonResponseEnum = EnumUtils.getCommonResponseEnumByCode(result.getCode());
if (commonResponseEnum == CommonResponseEnum.DEVICE_RESPONSE_ENUM) {
return getDataProceessResponseEnumByMessage(result.getMessage());
}
return commonResponseEnum;
}
}

View File

@@ -7,9 +7,9 @@
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<artifactId>data-processing-data</artifactId> <artifactId>data-processing-boot</artifactId>
<name>data-processing-data</name> <name>data-processing-boot</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Some files were not shown because too many files have changed in this diff Show More