diff --git a/epdc-cloud-events/pom.xml b/epdc-cloud-events/pom.xml index 3d27f11..cecf4e9 100644 --- a/epdc-cloud-events/pom.xml +++ b/epdc-cloud-events/pom.xml @@ -100,6 +100,12 @@ epdc-commons-points-tools 1.0.0 + + com.esua.epdc.yushan + epdc-cloud-analysis-pc-client + 1.0.0 + compile + @@ -181,10 +187,10 @@ epdc!redis@master1405 - + - epdcyushan - elink833066 + yushan_epdc_test + elink-epdc@yushan false 47.104.224.45:8848 diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java index a3d0e2e..04373e1 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java @@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.category.CategoryOption; +import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption; import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; import com.elink.esua.epdc.modules.category.excel.CategoryExcel; @@ -144,4 +145,17 @@ public class CategoryController { List data = categoryService.listCategoryInfo(formDTO); return new Result>().ok(data); } + + /** + * @Description 获取分类编码树 + * @Author songyunpeng + * @Date 2021/1/7 + * @Param [] + * @return com.elink.esua.epdc.getdeptinfocommons.tools.utils.Result + **/ + @GetMapping("getCategoryCode") + public Result getCategoryCode(){ + return categoryService.getCategoryCode(); + } + } diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java index f936feb..a9bade8 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java @@ -109,4 +109,8 @@ public class CategoryEntity extends BaseEntity { */ private String enableFlag; + private String epmetCategoryCode; + + private String epmetCategoryName; + } diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java index 9165fdb..3488916 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.category.CategoryOption; +import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption; import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; import com.elink.esua.epdc.modules.category.entity.CategoryEntity; @@ -131,4 +132,13 @@ public interface CategoryService extends BaseService { * @Date 2019/12/4 9:43 **/ List listCategoryInfo(CategoryInfoFormDTO formDTO); + + /** + * @Description 获取分类编码树 + * @Author songyunpeng + * @Date 2021/3/23 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result getCategoryCode(); } 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 e504721..6eb760c 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 @@ -37,12 +37,14 @@ import com.elink.esua.epdc.commons.tools.utils.TreeUtils; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.category.CategoryOption; import com.elink.esua.epdc.dto.category.CategoryTreeDTO; +import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption; 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.rocketmq.dto.CategoryModifyDTO; import com.elink.esua.epdc.modules.rocketmq.producer.CategoryModifyProducer; import com.google.common.collect.Lists; @@ -85,6 +87,9 @@ public class CategoryServiceImpl extends BaseServiceImpl getCategoryCode() { + return analysisFeignClient.getCategoryCode(); + } + /** * @param * @return void 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/AnalysisFeignClient.java new file mode 100644 index 0000000..832eb7c --- /dev/null +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisFeignClient.java @@ -0,0 +1,30 @@ +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.category.EpmetCategoryCodeOption; +import com.elink.esua.epdc.modules.feign.fallback.AnalysisFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * 数据分析模块调用 + * + * @Author：liuchuang + * @Date：2020/9/9 15:41 + */ +@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class,url = "http://localhost:9077") +public interface AnalysisFeignClient { + + /** + * @Description 组织机构编码获取 + * @Author songyunpeng + * @Date 2021/1/7 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping(value = "analysis/category/getCategoryCode", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getCategoryCode(); + +} 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/AnalysisFeignClientFallback.java new file mode 100644 index 0000000..94b71d7 --- /dev/null +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisFeignClientFallback.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.modules.feign.fallback; + +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.category.EpmetCategoryCodeOption; +import com.elink.esua.epdc.modules.feign.AnalysisFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Author：songyunpeg + * @Date：2020/9/9 15:42 + */ +@Component +public class AnalysisFeignClientFallback implements AnalysisFeignClient { + + + @Override + public Result getCategoryCode() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryCode"); + } +}