aggopenfeign

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/DataAggregatorFeignClient.java → epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java

@@ -1,17 +1,17 @@
-package com.epmet.feign;
+package com.epmet.dataaggre.feign;
 
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
-import com.epmet.feign.impl.DataAggregatorFeignClientClientFallBackFactory;
+import com.epmet.dataaggre.feign.impl.DataAggregatorOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallback = DataAggregatorFeignClientClientFallBackFactory.class)
+// @FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallbackFactory = DataAggregatorOpenFeignClientFallbackFactory.class)
-// @FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallback= DataAggregatorFeignClientClientFallBackFactory.class,url = "localhost:8114")
+@FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallbackFactory= DataAggregatorOpenFeignClientFallbackFactory.class,url = "localhost:8114")
-public interface DataAggregatorFeignClient {
+public interface DataAggregatorOpenFeignClient {
 
     /**
      * 定时任务导出网格活跃统计表

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallbackFactory.java

@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.feign.impl;
+
+import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class DataAggregatorOpenFeignClientFallbackFactory implements FallbackFactory<DataAggregatorOpenFeignClient> {
+    private DataAggregatorOpenFeignClientFallback fallback = new DataAggregatorOpenFeignClientFallback();
+
+    @Override
+    public DataAggregatorOpenFeignClient create(Throwable throwable) {
+        return null;
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -771,7 +771,7 @@ public class GovOrgServiceImpl implements GovOrgService {
 
             //小雷哥手机号：18660295251，
             OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
-            at.setAtMobiles(Arrays.asList("18660295251","15764229697"));
+            at.setAtMobiles(Arrays.asList("18660295251"));
             at.setIsAtAll(false);
             dingTalkTextMsg.setAt(at);
 
@@ -780,7 +780,7 @@ public class GovOrgServiceImpl implements GovOrgService {
             text.setContent("网格活跃度统计: \n" +
                     "起止时间: " + formDTO.getStartTime().concat(StrConstant.UNDER_LINE).concat(formDTO.getEndTime()) + "\n" +
                     "文件下载地址: " + uploadResult.getData().getUrl() + "\n"+
-                    "请查收@18660295251@15764229697");
+                    "请查收@18660295251");
             dingTalkTextMsg.setText(text);
             HttpClientManager.getInstance().sendDingMsg(JSON.toJSONString(dingTalkTextMsg), url, secret);
         }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java

@@ -12,7 +12,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
-import com.epmet.feign.DataAggregatorFeignClient;
+import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +32,7 @@ public class DemoController {
 	@Autowired
 	private DataStatisticalOpenFeignClient client;
 	@Autowired
-	private DataAggregatorFeignClient dataAggregatorFeignClient;
+	private DataAggregatorOpenFeignClient dataAggregatorFeignClient;
 
 	@GetMapping("testAlarm")
 	public void testAlarm() {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ExportGridLiveResTask.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
-import com.epmet.feign.DataAggregatorFeignClient;
+import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +12,9 @@ import org.springframework.stereotype.Component;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
 
 
 /**
@@ -23,7 +25,7 @@ import java.util.*;
 public class ExportGridLiveResTask implements ITask {
 
     @Autowired
-    private DataAggregatorFeignClient dataAggregatorFeignClient;
+    private DataAggregatorOpenFeignClient dataAggregatorFeignClient;
 
     @Override
     public void run(String params) {