From b318d284466887930b214cf0348b773a809bc47a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 20 May 2020 09:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=B7=BB=E5=8A=A0=E8=B0=83=E7=94=A8=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1feign=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/TickStaffFormDTO.java  |  2 +-
 .../gov-project/gov-project-server/pom.xml    |  6 ++++
 .../com/epmet/feign/MessageFeignClient.java   | 29 +++++++++++++++++++
 .../fallback/MessageFeignClientFallback.java  | 23 +++++++++++++++
 4 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/MessageFeignClient.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java
index 790d21914a..6fe9793020 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java
@@ -26,7 +26,7 @@ public class TickStaffFormDTO implements Serializable {
      */
     private String gridId="";
 
-    @NotBlank(message = "内部备注不能为空")
+    @NotBlank(message = "工作人员Id不能为空")
     private String staffId;
 }
 
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index 8112b6e5ea..665792d20a 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -84,6 +84,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-message-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/MessageFeignClient.java
new file mode 100644
index 0000000000..8ba3894440
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/MessageFeignClient.java
@@ -0,0 +1,29 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.feign.fallback.MessageFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+
+/**
+ * @Description 调用epmet-message服务
+ * @Author sun
+ * , url = "localhost:8085"
+ */
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class)
+public interface MessageFeignClient {
+
+    /**
+     * @param msgList
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 批量推送消息
+     **/
+    @PostMapping(value = "message/usermessage/saveusermessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result saveUserMessageList(List<UserMessageFormDTO> msgList);
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
new file mode 100644
index 0000000000..bb5491ea78
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
@@ -0,0 +1,23 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.feign.MessageFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description 调用epmet-message服务
+ * @Author sun
+ */
+@Component
+public class MessageFeignClientFallback implements MessageFeignClient {
+
+    @Override
+    public Result saveUserMessageList(List<UserMessageFormDTO> msgList) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessageList", msgList);
+    }
+}