diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/api/MessAnalysisFeignClient.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/api/MessAnalysisFeignClient.java index 4205a4d..5feec13 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/api/MessAnalysisFeignClient.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/api/MessAnalysisFeignClient.java @@ -1,5 +1,6 @@ package com.njcn.stat.api; +import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.message.messagedto.MessageDataDTO; @@ -18,7 +19,7 @@ import java.util.List; * @version V1.0.0 */ @FeignClient( - value = "front-analysis-boot", + value = ServerInfo.PLATFORM_STAT_BOOT, path = "/messageAnalysis", fallbackFactory = MessAnalysisFeignClientFallbackFactory.class, contextId = "analysis") diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlickerFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlickerFeignClient.java index 2e389fa..d0315f6 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlickerFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlickerFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlucFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlucFeignClient.java index c6dfa69..bfdab97 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlucFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlucFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicIFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicIFeignClient.java index d4f1ac7..4d95ba3 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicIFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicIFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicVFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicVFeignClient.java index b747ebe..23c2a9d 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicVFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicVFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerPFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerPFeignClient.java index b570659..7762b1a 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerPFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerPFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerQFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerQFeignClient.java index cdab996..3db0a3d 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerQFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerQFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerSFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerSFeignClient.java index dee8008..2695da4 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerSFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerSFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java index 1798ffe..61137a3 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmIFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmIFeignClient.java index c7e4a90..5359178 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmIFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmIFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmVFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmVFeignClient.java index 832b313..21ecf13 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmVFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmVFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataPltFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataPltFeignClient.java index a1551b4..d384a9d 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataPltFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataPltFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataVFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataVFeignClient.java index 4633a88..679d18d 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataVFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataVFeignClient.java @@ -18,7 +18,7 @@ import java.util.List; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/LnDataDealFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/LnDataDealFeignClient.java index 6b796c7..4c2058c 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/LnDataDealFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/LnDataDealFeignClient.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/RmpEventDetailFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/RmpEventDetailFeignClient.java index dd79e46..659e8e2 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/RmpEventDetailFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/RmpEventDetailFeignClient.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @version 1.0.0 * @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 { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlickerFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlickerFeignClientFallbackFactory.java index bc115da..55bc280 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlickerFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlickerFeignClientFallbackFactory.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataFlickerFeignClient; import com.njcn.dataProcess.dto.DataFlickerDTO; -import com.njcn.system.utils.SystemEnumUtil; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -33,7 +33,7 @@ public class DataFlickerFeignClientFallbackFactory implements FallbackFactory exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataFlickerFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlucFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlucFeignClientFallbackFactory.java index 8f0df4a..8ff63b5 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlucFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlucFeignClientFallbackFactory.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataFlucFeignClient; import com.njcn.dataProcess.dto.DataFlucDTO; -import com.njcn.system.utils.SystemEnumUtil; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -33,7 +33,7 @@ public class DataFlucFeignClientFallbackFactory implements FallbackFactory exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataFlucFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicIFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicIFeignClientFallbackFactory.java index e1299e1..3a78d60 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicIFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicIFeignClientFallbackFactory.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataHarmphasicIFeignClient; import com.njcn.dataProcess.dto.DataHarmphasicIDTO; -import com.njcn.system.utils.SystemEnumUtil; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -33,7 +33,7 @@ public class DataHarmphasicIFeignClientFallbackFactory implements FallbackFactor Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataHarmphasicIFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerPFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerPFeignClientFallbackFactory.java index fef891a..b42c8cd 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerPFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerPFeignClientFallbackFactory.java @@ -5,7 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataHarmpowerPFeignClient; import com.njcn.dataProcess.dto.DataHarmpowerPDTO; -import com.njcn.system.utils.SystemEnumUtil; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -32,7 +32,7 @@ public class DataHarmpowerPFeignClientFallbackFactory implements FallbackFactory Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataHarmpowerPFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerQFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerQFeignClientFallbackFactory.java index c83c132..a55aba4 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerQFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerQFeignClientFallbackFactory.java @@ -4,9 +4,8 @@ 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.dataProcess.api.DataHarmpowerQFeignClient; -import com.njcn.dataProcess.api.DataHarmpowerQFeignClient; import com.njcn.dataProcess.dto.DataHarmpowerQDTO; -import com.njcn.system.utils.SystemEnumUtil; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -33,7 +32,7 @@ public class DataHarmpowerQFeignClientFallbackFactory implements FallbackFactory Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataHarmpowerQFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerSFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerSFeignClientFallbackFactory.java index f6df46b..06133d2 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerSFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerSFeignClientFallbackFactory.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataHarmpowerSFeignClient; import com.njcn.dataProcess.dto.DataHarmpowerSDTO; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -32,7 +33,7 @@ public class DataHarmpowerSFeignClientFallbackFactory implements FallbackFactory Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataHarmpowerSFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataIFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataIFeignClientFallbackFactory.java index 1bbb532..95f456e 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataIFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataIFeignClientFallbackFactory.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataIFeignClient; import com.njcn.dataProcess.dto.DataIDTO; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -32,7 +33,7 @@ public class DataIFeignClientFallbackFactory implements FallbackFactory exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataIFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmIFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmIFeignClientFallbackFactory.java index 593cb41..c9dd021 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmIFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmIFeignClientFallbackFactory.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataInharmIFeignClient; import com.njcn.dataProcess.dto.DataInharmIDTO; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -32,7 +33,7 @@ public class DataInharmIFeignClientFallbackFactory implements FallbackFactory exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataInharmIFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmVFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmVFeignClientFallbackFactory.java index a67b9be..9473246 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmVFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmVFeignClientFallbackFactory.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataInharmVFeignClient; import com.njcn.dataProcess.dto.DataInharmVDTO; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -32,7 +33,7 @@ public class DataInharmVFeignClientFallbackFactory implements FallbackFactory exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataInharmVFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataPltFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataPltFeignClientFallbackFactory.java index a54cc94..3c20782 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataPltFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataPltFeignClientFallbackFactory.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataPltFeignClient; import com.njcn.dataProcess.dto.DataPltDTO; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -32,7 +33,7 @@ public class DataPltFeignClientFallbackFactory implements FallbackFactory exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataPltFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataVFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataVFeignClientFallbackFactory.java index e6ee6f5..5f3d30a 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataVFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataVFeignClientFallbackFactory.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataVFeignClient; import com.njcn.dataProcess.dto.DataVDTO; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -33,7 +34,7 @@ public class DataVFeignClientFallbackFactory implements FallbackFactory exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new DataVFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/LnDataDealFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/LnDataDealFeignClientFallbackFactory.java index e7d1e66..d9acf8f 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/LnDataDealFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/LnDataDealFeignClientFallbackFactory.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.LnDataDealFeignClient; import com.njcn.dataProcess.dto.LnDataDTO; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -31,7 +32,7 @@ public class LnDataDealFeignClientFallbackFactory implements FallbackFactory exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new LnDataDealFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/RmpEventFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/RmpEventFeignClientFallbackFactory.java index 6d92433..116e5ae 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/RmpEventFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/RmpEventFeignClientFallbackFactory.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.RmpEventDetailFeignClient; import com.njcn.dataProcess.dto.RmpEventDetailDTO; +import com.njcn.dataProcess.util.DataProcessingEnumUtil; import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -30,7 +31,7 @@ public class RmpEventFeignClientFallbackFactory implements FallbackFactory exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if(cause.getCause() instanceof BusinessException){ BusinessException businessException = (BusinessException) cause.getCause(); - exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; return new RmpEventDetailFeignClient() { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/enums/DataProceessResponseEnum.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/enums/DataProceessResponseEnum.java new file mode 100644 index 0000000..c2e2f7c --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/enums/DataProceessResponseEnum.java @@ -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; + } +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/util/DataProcessingEnumUtil.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/util/DataProcessingEnumUtil.java new file mode 100644 index 0000000..47a0a2b --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/util/DataProcessingEnumUtil.java @@ -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 result){ + //如果返回错误,且为内部错误,则直接抛出异常 + CommonResponseEnum commonResponseEnum = EnumUtils.getCommonResponseEnumByCode(result.getCode()); + if (commonResponseEnum == CommonResponseEnum.DEVICE_RESPONSE_ENUM) { + return getDataProceessResponseEnumByMessage(result.getMessage()); + } + return commonResponseEnum; + } + + +} diff --git a/data-processing/data-processing-data/pom.xml b/data-processing/data-processing-boot/pom.xml similarity index 98% rename from data-processing/data-processing-data/pom.xml rename to data-processing/data-processing-boot/pom.xml index 1fcca41..5758142 100644 --- a/data-processing/data-processing-data/pom.xml +++ b/data-processing/data-processing-boot/pom.xml @@ -7,9 +7,9 @@ 1.0.0 - data-processing-data + data-processing-boot - data-processing-data + data-processing-boot UTF-8 diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/DataProcessBootApplication.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/DataProcessBootApplication.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/DataProcessBootApplication.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/DataProcessBootApplication.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/annotation/InsertBean.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/annotation/InsertBean.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/annotation/InsertBean.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/annotation/InsertBean.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/annotation/QueryBean.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/annotation/QueryBean.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/annotation/QueryBean.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/annotation/QueryBean.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/bean/DynamicBeanProcessor.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/bean/DynamicBeanProcessor.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/bean/DynamicBeanProcessor.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/bean/DynamicBeanProcessor.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataFlickerController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlickerController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataFlickerController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlickerController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataFlucController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlucController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataFlucController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlucController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicIController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicIController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicIController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicIController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicVController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicVController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicVController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicVController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerPController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerPController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerPController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerPController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerQController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerQController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerQController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerQController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerSController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerSController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerSController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerSController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataIController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataIController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataIController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataIController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataInharmIController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmIController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataInharmIController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmIController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataInharmVController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmVController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataInharmVController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmVController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataPltController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataPltController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataPltController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataPltController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataVController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/DataVController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/LnDataDealController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/LnDataDealController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/LnDataDealController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/LnDataDealController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/RmpEventDetailController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/RmpEventDetailController.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/controller/RmpEventDetailController.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/RmpEventDetailController.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataFlickerMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataFlickerMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataFlickerMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataFlickerMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataFlucMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataFlucMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataFlucMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataFlucMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmphasicIMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmphasicIMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmphasicIMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmphasicIMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmphasicVMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmphasicVMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmphasicVMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmphasicVMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerPMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerPMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerPMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerPMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerQMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerQMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerQMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerQMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerSMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerSMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerSMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmpowerSMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataIMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataIMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataIMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataIMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataInharmIMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataInharmIMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataInharmIMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataInharmIMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataInharmVMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataInharmVMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataInharmVMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataInharmVMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataPltMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataPltMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataPltMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataPltMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataVMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataVMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/imapper/DataVMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataVMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlickerRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlickerRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlickerRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlickerRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlickerRelationMapper.xml b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlickerRelationMapper.xml similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlickerRelationMapper.xml rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlickerRelationMapper.xml diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlucRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlucRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlucRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataFlucRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicIRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicIRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicIRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicIRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicIRelationMapper.xml b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicIRelationMapper.xml similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicIRelationMapper.xml rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicIRelationMapper.xml diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicVRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicVRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicVRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmphasicVRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerPRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerPRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerPRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerPRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerQRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerQRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerQRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerQRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerSRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerSRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerSRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmpowerSRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmrateIRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmrateIRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmrateIRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmrateIRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmrateVRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmrateVRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmrateVRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataHarmrateVRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataIRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataIRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataIRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataIRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataInharmIRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataInharmIRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataInharmIRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataInharmIRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataPltRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataPltRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataPltRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataPltRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataVInharmVRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataVInharmVRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataVInharmVRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataVInharmVRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataVRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataVRelationMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataVRelationMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/DataVRelationMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RmpEventDetailMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RmpEventDetailMapper.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RmpEventDetailMapper.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RmpEventDetailMapper.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataFlicker.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFlicker.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataFlicker.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFlicker.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataFluc.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFluc.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataFluc.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFluc.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicI.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicI.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicI.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicI.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicV.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicV.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicV.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicV.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerP.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerP.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerP.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerP.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerQ.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerQ.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerQ.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerQ.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerS.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerS.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerS.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerS.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataI.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataI.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataI.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataI.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataInharmI.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmI.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataInharmI.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmI.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataInharmV.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmV.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataInharmV.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmV.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataPlt.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataPlt.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataPlt.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataPlt.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataV.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataV.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IDataV.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataV.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IRmpEventDetail.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IRmpEventDetail.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/IRmpEventDetail.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IRmpEventDetail.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/LnDataDealService.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/LnDataDealService.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/LnDataDealService.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/LnDataDealService.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/LnDataDealServiceImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/LnDataDealServiceImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/LnDataDealServiceImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/LnDataDealServiceImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlucImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlucImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlucImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlucImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataPltImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataPltImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataPltImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataPltImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbRmpEventDetailImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbRmpEventDetailImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbRmpEventDetailImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbRmpEventDetailImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlickerImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlickerImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlickerImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlickerImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlucImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlucImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlucImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlucImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicIImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicIImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicIImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicVImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicVImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicVImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerPImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerPImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerPImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerPImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerQImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerQImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerQImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerQImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerSImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerSImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerSImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerSImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmIImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmIImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmIImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmVImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmVImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmVImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java diff --git a/data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationRmpEventDetailImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationRmpEventDetailImpl.java similarity index 100% rename from data-processing/data-processing-data/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationRmpEventDetailImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationRmpEventDetailImpl.java diff --git a/data-processing/data-processing-data/src/main/resources/bootstrap.yml b/data-processing/data-processing-boot/src/main/resources/bootstrap.yml similarity index 100% rename from data-processing/data-processing-data/src/main/resources/bootstrap.yml rename to data-processing/data-processing-boot/src/main/resources/bootstrap.yml diff --git a/data-processing/data-processing-data/src/test/java/com/njcn/dataProcess/AppTest.java b/data-processing/data-processing-boot/src/test/java/com/njcn/dataProcess/AppTest.java similarity index 100% rename from data-processing/data-processing-data/src/test/java/com/njcn/dataProcess/AppTest.java rename to data-processing/data-processing-boot/src/test/java/com/njcn/dataProcess/AppTest.java diff --git a/data-processing/pom.xml b/data-processing/pom.xml index 9e624d3..3c0f69e 100644 --- a/data-processing/pom.xml +++ b/data-processing/pom.xml @@ -15,7 +15,7 @@ data-processing-api - data-processing-data + data-processing-boot diff --git a/message/message-api/src/main/java/com/njcn/message/api/ProduceFeignClient.java b/message/message-api/src/main/java/com/njcn/message/api/ProduceFeignClient.java index 63d1606..4f98728 100644 --- a/message/message-api/src/main/java/com/njcn/message/api/ProduceFeignClient.java +++ b/message/message-api/src/main/java/com/njcn/message/api/ProduceFeignClient.java @@ -1,5 +1,6 @@ package com.njcn.message.api; +import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.message.api.fallback.ProduceFeignClientFallbackFactory; @@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @version V1.0.0 */ @FeignClient( - value = "message-boot", + value = ServerInfo.PLATFORM_MESSAGE_BOOT, path = "/produce", fallbackFactory = ProduceFeignClientFallbackFactory.class, contextId = "message")