活跃度导出上传oss发钉钉

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

@@ -761,15 +761,15 @@ public class GovOrgServiceImpl implements GovOrgService {
             log.warn("【网格活跃度统计】调用OSS上传结果描述文件失败");
         } else {
             //EPMETV3群机器人
-            // String secret = DingDingRobotConstant.V3_ROBOT_SECRET;
-            // String url = DingDingRobotConstant.V3_ROBOT_URL;
-            String secret = DingDingRobotConstant.YZM_TEST_SECRET;
-            String url = DingDingRobotConstant.YZM_TEST_URL;
+            String secret = DingDingRobotConstant.V3_ROBOT_SECRET;
+            String url = DingDingRobotConstant.V3_ROBOT_URL;
+            // String secret = DingDingRobotConstant.YZM_TEST_SECRET;
+            // String url = DingDingRobotConstant.YZM_TEST_URL;
 
             DingTextBriefNessFormDTO dingTalkTextMsg=new DingTextBriefNessFormDTO();
             dingTalkTextMsg.setMsgtype("text");
 
-            //小雷哥手机号：18660295251
+            //小雷哥手机号：18660295251，
             OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
             at.setAtMobiles(Arrays.asList("18660295251","15764229697"));
             at.setIsAtAll(false);

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -102,6 +102,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>data-aggregator-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -8,12 +8,16 @@
 
 package com.epmet.controller;
 
+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.feign.DataStatisticalOpenFeignClient;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 定时任务
@@ -27,6 +31,8 @@ public class DemoController {
 
 	@Autowired
 	private DataStatisticalOpenFeignClient client;
+	@Autowired
+	private DataAggregatorFeignClient dataAggregatorFeignClient;
 
 	@GetMapping("testAlarm")
 	public void testAlarm() {
@@ -35,4 +41,18 @@ public class DemoController {
 		//}
 		client.agencyGridIssueStats(null);
 	}
+
+
+	@PostMapping("exportGridLiveRes")
+	public Result exportGridLiveRes(@RequestParam("params") String params) {
+		if(StringUtils.isBlank(params)){
+			return new Result();
+		}
+		GridLivelyFormDTO formDTO = new GridLivelyFormDTO();
+		if (StringUtils.isNotBlank(params)) {
+			formDTO = JSON.parseObject(params, GridLivelyFormDTO.class);
+		}
+		ValidatorUtils.validateEntity(formDTO,GridLivelyFormDTO.Grid.class);
+		return dataAggregatorFeignClient.exportGridLiveRes(formDTO);
+	}
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/DataAggregatorFeignClient.java

@@ -0,0 +1,24 @@
+package com.epmet.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 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, fallback= DataAggregatorFeignClientClientFallBackFactory.class,url = "localhost:8114")
+public interface DataAggregatorFeignClient {
+
+    /**
+     * 定时任务导出网格活跃统计表
+     * @param form
+     * @return
+     */
+    @PostMapping(value = "data/aggregator/org/export-send-msg")
+    Result exportGridLiveRes(@RequestBody GridLivelyFormDTO form);
+
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/impl/DataAggregatorFeignClientClientFallBackFactory.java

@@ -0,0 +1,23 @@
+package com.epmet.feign.impl;
+
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
+import com.epmet.feign.DataAggregatorFeignClient;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DataAggregatorFeignClientClientFallBackFactory implements DataAggregatorFeignClient {
+
+    /**
+     * 定时任务导出网格活跃统计表
+     * @param form
+     * @return
+     */
+    @Override
+    public Result exportGridLiveRes(GridLivelyFormDTO form) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "pcworkRecordListExportSendMsg",form);
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.epmet.task;
+
+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 lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 每个星期一的凌晨5点执行，查询网格活跃度统计导出excel，上传oss, 发送钉钉@小雷哥
+ */
+@Slf4j
+@Component("exportGridLiveResTask")
+public class ExportGridLiveResTask implements ITask {
+
+    @Autowired
+    private DataAggregatorFeignClient dataAggregatorFeignClient;
+
+    @Override
+    public void run(String params) {
+        if(StringUtils.isBlank(params)){
+            return;
+        }
+        GridLivelyFormDTO formDTO = new GridLivelyFormDTO();
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, GridLivelyFormDTO.class);
+        }
+        ValidatorUtils.validateEntity(formDTO,GridLivelyFormDTO.Grid.class);
+        Result result = dataAggregatorFeignClient.exportGridLiveRes(formDTO);
+        if(!result.success()){
+            log.error(String.format("exportGridLiveResTask网格活跃度统计导出失败,入参：%s",params));
+        }
+    }
+}