Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -25,6 +25,7 @@ import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -341,4 +342,15 @@ public interface DataStatisticalOpenFeignClient {
      */
     @PostMapping("/data/stats/datareporting/eventinfo")
     Result<List<EventInfoResultDTO>> getEventInfo(@RequestBody EventInfoFormDTO formDTO);
+
+    /**
+     * wangxianzhang
+     *
+     * 计算客户下志愿者服务相关数据
+     *
+     * @param customerId 客户ID，可以为空，为空则计算所有客户
+     * @return
+     */
+    @PostMapping("/data/stats/demand/volunteer/daily")
+    Result statsVolunteerDemandServicesDaily(@RequestParam(value = "customer-id", required = false) String customerId);
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -334,4 +334,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result<List<EventInfoResultDTO>> getEventInfo(EventInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getEventInfo", formDTO);
     }
+
+    @Override
+    public Result statsVolunteerDemandServicesDaily(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "statsVolunteerDemandServicesDaily", customerId);
+    }
 }

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

@@ -0,0 +1,23 @@
+package com.epmet.task;
+
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description
+ * @Author wangxianzhang
+ * @Date 2021/12/13 9:40 上午
+ * @Version 1.0
+ */
+@Component("statsDemandTask")
+public class StatsDemandTask implements ITask {
+
+    @Autowired
+    private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+    
+    @Override
+    public void run(String params) {
+        dataStatisticalOpenFeignClient.statsVolunteerDemandServicesDaily(null);
+    }
+}