From 3ca13400fb0cb75d382bd6286ecd447918559d10 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Thu, 11 Nov 2021 09:46:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=86=E7=B1=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=88=96=E6=96=B0=E5=A2=9E=E6=97=B6=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=8E=BF=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-commons-yushan                             |  2 +-
 .../category/service/impl/CategoryServiceImpl.java    |  2 ++
 .../modules/feign/AnalysisPcFromEventFeignClient.java | 11 +++++++++++
 .../feign/fallback/AnalysisPcFromEventFallback.java   |  5 +++++
 epdc-cloud-parent-yushan                              |  2 +-
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 235f56d..128c6a4 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 235f56d5ea756317efe54c5e0d4be0ac45e09155
+Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a
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 c76dee8..32bac12 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
@@ -133,6 +133,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
 		}
 		insert(entity);
 		this.packageCategoryOption();
+		analysisFeignClient.uploadCategoryCode();
 	}
 
 	/**
@@ -228,6 +229,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
 		sendMqMessage(dto);
 		updateById(entity);
 		this.packageCategoryOption();
+		analysisFeignClient.uploadCategoryCode();
 	}
 
 	@Override
diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisPcFromEventFeignClient.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisPcFromEventFeignClient.java
index 928b29f..49ca997 100644
--- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisPcFromEventFeignClient.java
+++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisPcFromEventFeignClient.java
@@ -7,6 +7,7 @@ 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;
+import org.springframework.web.bind.annotation.PostMapping;
 
 /**
  * 数据分析模块调用
@@ -27,4 +28,14 @@ public interface AnalysisPcFromEventFeignClient {
     @GetMapping(value = "analysis/category/getCategoryCode", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<EpmetCategoryCodeOption> getCategoryCode();
 
+    /**
+     * 事件分类修改或新增时同步上报县平台
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author lc
+     * @since 2021/11/11 9:39
+     */
+    @PostMapping("analysis/category/uploadCategoryCode")
+    Result uploadCategoryCode();
+
 }
diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisPcFromEventFallback.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisPcFromEventFallback.java
index 4a6060d..4d5511c 100644
--- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisPcFromEventFallback.java
+++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisPcFromEventFallback.java
@@ -19,4 +19,9 @@ public class AnalysisPcFromEventFallback implements AnalysisPcFromEventFeignClie
     public Result<EpmetCategoryCodeOption> getCategoryCode() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryCode");
     }
+
+    @Override
+    public Result uploadCategoryCode() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "uploadCategoryCode");
+    }
 }
diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan
index db92131..6c53fd9 160000
--- a/epdc-cloud-parent-yushan
+++ b/epdc-cloud-parent-yushan
@@ -1 +1 @@
-Subproject commit db9213163f8005cba05ad21334bebb72484174b7
+Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d