From 5bef1d45df22d3385d7291c6bf965610dc8b9c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Thu, 26 Mar 2020 17:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/feign/UserFeignClint.java   | 17 ++++++++++++++++-
 .../feign/fallback/UserFeignClintFallback.java  |  5 +++++
 .../impl/ScheduleJobUserServiceImpl.java        |  5 +++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
index aa3393b8b..335871ed3 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
@@ -1,6 +1,9 @@
 package com.elink.esua.epdc.feign;
 
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.fallback.UserFeignClintFallback;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
 /**
@@ -8,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  *  @Date: 2020/3/25 10:20
  *  @Description: 用户数据分析
  */
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = UserFeignClintFallback.class)
 public interface UserFeignClint {
 
     /***
@@ -17,6 +21,17 @@ public interface UserFeignClint {
      * @author qushutong
      * @date 2020/3/25 10:19
      */
-    @GetMapping("analysis/user/tolead")
+    @GetMapping("analysis/metausergridopining/tolead")
     Result createUserAnalysisData();
+
+    /***
+     * 用户注册排行导入数据
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author qushutong
+     * @date 2020/3/26 17:45
+     */
+    @GetMapping("analysis/metauserregisterrank/toLeadUserRegisterRandData")
+    Result toLeadUserRegisterRandData();
+
 }
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
index 43636d315..0fc95fe4e 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
@@ -16,4 +16,9 @@ public class UserFeignClintFallback implements UserFeignClint {
     public Result createUserAnalysisData() {
         return  ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "createUserAnalysisData", "");
     }
+
+    @Override
+    public Result toLeadUserRegisterRandData() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "toLeadUserRegisterRandData", "");
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
index a19d0ef7e..115c30485 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
@@ -3,18 +3,23 @@ package com.elink.esua.epdc.service.impl;
 import com.elink.esua.epdc.feign.UserFeignClint;
 import com.elink.esua.epdc.service.ScheduleJobUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  *  @author: qushutong
  *  @Date: 2020/3/25 10:15
  *  @Description: 用户数据数据分析
  */
+@Service
 public class ScheduleJobUserServiceImpl implements ScheduleJobUserService {
     @Autowired
     private UserFeignClint userFeignClint;
 
     @Override
     public void createUserAnalysisData() {
+        // 网格开通
         userFeignClint.createUserAnalysisData();
+        // 用户注册
+        userFeignClint.toLeadUserRegisterRandData();
     }
 }