小组成员添加是否党员身份

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

@@ -236,4 +236,24 @@ public interface DataStatisticalOpenFeignClient {
     @PostMapping(value = "/data/stats/indexdict/initCustomerIndex")
     Result<Boolean> initCustomerIndex(@RequestBody InitCustomerIndexForm formDTO);
 
+    /**
+     * 党员先锋统计-机关
+     * @author zhaoqifeng
+     * @date 2021/5/18 9:26
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("/data/stats/vanguard/agencyvanguardstats")
+    Result agencyVanguardStats(StatsFormDTO formDTO);
+
+    /**
+     * 党员先锋统计-网格
+     * @author zhaoqifeng
+     * @date 2021/5/18 9:27
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("/data/stats/vanguard/gridvanguardstats")
+    Result gridVanguardStats(StatsFormDTO formDTO);
+
 }

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

@@ -230,4 +230,30 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result<Boolean> initCustomerIndex(InitCustomerIndexForm formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "initCustomerIndex", formDTO);
     }
+
+    /**
+     * 党员先锋统计-机关
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author zhaoqifeng
+     * @date 2021/5/18 9:26
+     */
+    @Override
+    public Result agencyVanguardStats(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "agencyVanguardStats", formDTO);
+    }
+
+    /**
+     * 党员先锋统计-网格
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author zhaoqifeng
+     * @date 2021/5/18 9:27
+     */
+    @Override
+    public Result gridVanguardStats(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "gridVanguardStats", formDTO);
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPartyMemberVanguardController.java

@@ -0,0 +1,49 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
+import com.epmet.service.StatsPartyMemberVanguardService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 9:23
+ */
+@RequestMapping("vanguard")
+@RestController
+public class StatsPartyMemberVanguardController {
+	@Resource
+	private StatsPartyMemberVanguardService statsPartyMemberVanguardService;
+
+	/**
+	 * 党员先锋统计-机关
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:26
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("agencyvanguardstats")
+	public Result agencyVanguardStats(StatsFormDTO formDTO) {
+		statsPartyMemberVanguardService.agencyStats(formDTO);
+		return new Result();
+	}
+
+	/**
+	 * 党员先锋统计-网格
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:27
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("gridvanguardstats")
+	public Result gridVanguardStats(StatsFormDTO formDTO) {
+		statsPartyMemberVanguardService.gridStats(formDTO);
+		return new Result();
+	}
+
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java

@@ -0,0 +1,29 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 9:56
+ */
+public interface StatsPartyMemberVanguardService {
+	/**
+	 * 党员先锋统计-机关
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:58
+	 * @param params
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	Result agencyVanguardStats(StatsFormDTO params);
+
+	/**
+	 * 党员先锋统计-网格
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:58
+	 * @param params
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	Result gridVanguardStats(StatsFormDTO params);
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java

@@ -0,0 +1,47 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.service.StatsPartyMemberVanguardService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 9:56
+ */
+@Service
+public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVanguardService {
+	@Resource
+	private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+
+
+	/**
+	 * 党员先锋统计-机关
+	 *
+	 * @param params
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:58
+	 */
+	@Override
+	public Result agencyVanguardStats(StatsFormDTO params) {
+		return dataStatisticalOpenFeignClient.agencyVanguardStats(params);
+	}
+
+	/**
+	 * 党员先锋统计-网格
+	 *
+	 * @param params
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:58
+	 */
+	@Override
+	public Result gridVanguardStats(StatsFormDTO params) {
+		return dataStatisticalOpenFeignClient.gridVanguardStats(params);
+	}
+}

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

@@ -0,0 +1,46 @@
+package com.epmet.task;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
+import com.epmet.service.StatsPartyMemberVanguardService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 9:55
+ */
+@Component("statsVanguardTask")
+@Slf4j
+public class StatsPartyMemberVanguardTask implements ITask {
+
+	@Resource
+	private StatsPartyMemberVanguardService statsPartyMemberVanguardService;
+
+	@Override
+	public void run(String params) {
+		log.info("statsVanguardTask定时任务正在执行，参数为：{}", params);
+		StatsFormDTO statsFormDTO = new StatsFormDTO();
+		if (StringUtils.isNotBlank(params)) {
+			statsFormDTO = JSON.parseObject(params, StatsFormDTO.class);
+		}
+		Result result = statsPartyMemberVanguardService.agencyVanguardStats(statsFormDTO);
+		if (result.success()) {
+			log.info("statsVanguardTask组织级别定时任务执行成功");
+		} else {
+			log.error("statsVanguardTask组织级别定时任务执行失败:" + result.getMsg());
+		}
+
+		result = statsPartyMemberVanguardService.gridVanguardStats(statsFormDTO);
+		if (result.success()) {
+			log.info("statsVanguardTask网格级别定时任务执行成功");
+		} else {
+			log.error("statsVanguardTask网格级别定时任务执行失败:" + result.getMsg());
+		}
+	}
+}