diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java index 5ac58c8..c76dee8 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java @@ -43,9 +43,8 @@ import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; import com.elink.esua.epdc.modules.category.dao.CategoryDao; import com.elink.esua.epdc.modules.category.entity.CategoryEntity; -import com.elink.esua.epdc.modules.category.redis.CategoryRedis; import com.elink.esua.epdc.modules.category.service.CategoryService; -import com.elink.esua.epdc.modules.feign.AnalysisFeignClient; +import com.elink.esua.epdc.modules.feign.AnalysisPcFromEventFeignClient; import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; import com.elink.esua.epdc.modules.rocketmq.producer.CategoryModifyProducer; import com.google.common.collect.Lists; @@ -56,8 +55,6 @@ import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -76,8 +73,6 @@ import java.util.*; @Service public class CategoryServiceImpl extends BaseServiceImpl implements CategoryService { - @Autowired - private CategoryRedis categoryRedis; @Autowired private RedisUtils redisUtils; @@ -88,13 +83,11 @@ public class CategoryServiceImpl extends BaseServiceImpl list(Map params) { List entityList = baseDao.getList(params); diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisFeignClient.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisPcFromEventFeignClient.java similarity index 84% rename from epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisFeignClient.java rename to epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisPcFromEventFeignClient.java index c623dc1..928b29f 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisFeignClient.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisPcFromEventFeignClient.java @@ -3,7 +3,7 @@ package com.elink.esua.epdc.modules.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.analysis.pc.category.EpmetCategoryCodeOption; -import com.elink.esua.epdc.modules.feign.fallback.AnalysisFeignClientFallback; +import com.elink.esua.epdc.modules.feign.fallback.AnalysisPcFromEventFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.GetMapping; * @Author:liuchuang * @Date:2020/9/9 15:41 */ -@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class) -public interface AnalysisFeignClient { +@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisPcFromEventFallback.class) +public interface AnalysisPcFromEventFeignClient { /** * @Description 组织机构编码获取 diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisPcFromEventFallback.java similarity index 79% rename from epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisFeignClientFallback.java rename to epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisPcFromEventFallback.java index 9ea538b..4a6060d 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisFeignClientFallback.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisPcFromEventFallback.java @@ -4,7 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.analysis.pc.category.EpmetCategoryCodeOption; -import com.elink.esua.epdc.modules.feign.AnalysisFeignClient; +import com.elink.esua.epdc.modules.feign.AnalysisPcFromEventFeignClient; import org.springframework.stereotype.Component; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; * @Date:2020/9/9 15:42 */ @Component -public class AnalysisFeignClientFallback implements AnalysisFeignClient { +public class AnalysisPcFromEventFallback implements AnalysisPcFromEventFeignClient { @Override