公众参与联调

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridGroupUserCountResultDTO.java

@@ -20,7 +20,7 @@ public class GridGroupUserCountResultDTO implements Serializable {
      */
     private String customerId;
 
-    private String gridId;
+    private String orgId;
 
     private Integer memberCount;
     /**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridUserCountResultDTO.java

@@ -28,4 +28,9 @@ public class GridUserCountResultDTO implements Serializable {
      * 网格ID
      */
     private String gridId;
+
+    /**
+     * 用户总数
+     */
+    private Integer regTotal;
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueVoteUserCountResultDTO.java

@@ -15,8 +15,7 @@ public class IssueVoteUserCountResultDTO implements Serializable {
 
 
     private static final long serialVersionUID = -4729061928990808187L;
-    private String gridId;
+    private String orgId;
-    private String issueId;
     private Integer voteCount;
     private Integer issueCount;
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -62,4 +62,6 @@ public interface ProjectConstant {
      * 下级
      */
     String XIA_JI = "xiaji";
+    String GRID_ID = "GRID_ID";
+    String AGENCY_ID = "AGENCY_ID";
 }

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

@@ -32,4 +32,16 @@ public class ScreenExtractDailyController {
         return new Result();
     }
 
+    /**
+     * @param extractOriginFormDTO
+     * @Description 抽取数据到大屏【月】
+     * @author zxc
+     * @date 2020/9/24 10:15 上午
+     */
+    @PostMapping("extractmonthlyyall")
+    public Result screenExtractMonthly(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) {
+        screenExtractService.extractDailyAll(extractOriginFormDTO);
+        return new Result();
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java

@@ -153,9 +153,10 @@ public interface FactOriginGroupMainDailyDao extends BaseDao<FactOriginGroupMain
      * desc: 获取所有网格的组中成员人数 去重
      *
      * @param customerId
+     * @param groupField
      * @return java.util.List<com.epmet.dto.extract.result.GridGroupUserCountResultDTO>
      * @author LiuJanJun
      * @date 2020/9/27 2:31 下午
      */
-    List<GridGroupUserCountResultDTO> selectDistinctGroupMemberCount(@Param("customerId") String customerId);
+    List<GridGroupUserCountResultDTO> selectDistinctGroupMemberCount(@Param("customerId") String customerId, @Param("groupField") String groupField);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueLogDailyDao.java

@@ -85,11 +85,11 @@ public interface FactOriginIssueLogDailyDao extends BaseDao<FactOriginIssueLogDa
      * @description 党员参与议事：支持或者反对的次数
      * @Date 2020/9/26 18:05
      **/
-    int calPartyPartiIssueTotal(@Param("customerId")String customerId,
+    int calPartyPartiIssueTotal(@Param("customerId") String customerId,
-                                @Param("gridId")String gridId,
+                                @Param("gridId") String gridId,
-                                @Param("communityId")String communityId,
+                                @Param("communityId") String communityId,
-                                @Param("agencyPath")String agencyPath,
+                                @Param("agencyPath") String agencyPath,
-                                @Param("isParty")String isParty);
+                                @Param("isParty") String isParty);
 
     /**
      * @param gridId 网格id
@@ -108,9 +108,11 @@ public interface FactOriginIssueLogDailyDao extends BaseDao<FactOriginIssueLogDa
      *
      * @param customerId
      * @param monthId
+     * @param pids
+     * @param groupField
      * @return java.util.List<com.epmet.dto.extract.IssueVoteUserCountResultDTO>
      * @author LiuJanJun
      * @date 2020/9/27 1:58 下午
      */
-    List<IssueVoteUserCountResultDTO> getVoteCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
+    List<IssueVoteUserCountResultDTO> getVoteCount(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("groupField") String groupField);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueAgencyMonthlyDao.java

@@ -42,14 +42,26 @@ public interface FactIssueAgencyMonthlyDao extends BaseDao<FactIssueAgencyMonthl
 	 * @return java.util.List<com.epmet.dto.stats.FactIssueAgencyMonthlyDTO>
 	 */
 	List<FactIssueAgencyMonthlyDTO> selectAgencyMonthlyInc(@Param("customerId") String customerId, @Param("monthId") String monthId);
-	/**
-	 * 删除
-	 * @author zhaoqifeng
-	 * @date 2020/6/23 14:02
-	 * @param customerId
-	 * @param monthId
-	 * @return void
-	 */
-	void deleteByCustomerId(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
+    /**
+     * 删除
+     *
+     * @param customerId
+     * @param monthId
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/6/23 14:02
+     */
+    void deleteByCustomerId(@Param("customerId") String customerId, @Param("monthId") String monthId);
+
+    /**
+     * desc: 获取各机关某月议题增量和议题总数
+     *
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.entity.stats.FactIssueAgencyMonthlyEntity>
+     * @author LiuJanJun
+     * @date 2020/9/27 3:33 下午
+     */
+    List<FactIssueAgencyMonthlyEntity> getIssueIncCountAndTotalByMonthId(String customerId, String monthId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactRegUserAgencyMonthlyDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao.stats.user;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.extract.result.GridUserCountResultDTO;
 import com.epmet.dto.stats.user.FactRegUserAgencyMonthlyDTO;
 import com.epmet.entity.stats.user.FactRegUserAgencyMonthlyEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -36,5 +37,7 @@ public interface FactRegUserAgencyMonthlyDao extends BaseDao<FactRegUserAgencyMo
 
     void insertBatch(@Param("list") List<FactRegUserAgencyMonthlyDTO> list);
 
-    void deleteByParams(@Param("monthId")String monthId,@Param("customerId")String customerId);
+    void deleteByParams(@Param("monthId") String monthId, @Param("customerId") String customerId);
+
+    List<GridUserCountResultDTO> selectAgencyUserCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java

@@ -78,9 +78,10 @@ public interface FactOriginGroupMainDailyService extends BaseService<FactOriginG
      * desc: 获取客户下每个网格小组内的 去重人数
      *
      * @param customerId
+     * @param groupField
      * @return java.util.List<com.epmet.entity.evaluationindex.extract.GridGroupUserCountResultDTO>
      * @author LiuJanJun
      * @date 2020/9/27 2:24 下午
      */
-    List<GridGroupUserCountResultDTO> selectDistinctGroupMemberCount(String customerId);
+    List<GridGroupUserCountResultDTO> selectDistinctGroupMemberCount(String customerId, String groupField);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueLogDailyService.java

@@ -59,9 +59,10 @@ public interface FactOriginIssueLogDailyService extends BaseService<FactOriginIs
      *
      * @param customerId
      * @param monthId
+     * @param groupField
      * @return java.util.List<com.epmet.dto.extract.FactOriginIssueLogDailyEntity>
      * @author LiuJanJun
      * @date 2020/9/27 1:58 下午
      */
-    List<IssueVoteUserCountResultDTO> getVoteCount(String customerId, String monthId);
+    List<IssueVoteUserCountResultDTO> getVoteCount(String customerId, String monthId, String groupField);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java

@@ -116,8 +116,8 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
     }
 
     @Override
-    public List<GridGroupUserCountResultDTO> selectDistinctGroupMemberCount(String customerId) {
+    public List<GridGroupUserCountResultDTO> selectDistinctGroupMemberCount(String customerId, String groupField) {
-        return baseDao.selectDistinctGroupMemberCount(customerId);
+        return baseDao.selectDistinctGroupMemberCount(customerId, groupField);
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueLogDailyServiceImpl.java

@@ -97,7 +97,7 @@ public class FactOriginIssueLogDailyServiceImpl extends BaseServiceImpl<FactOrig
 
 
     @Override
-    public List<IssueVoteUserCountResultDTO> getVoteCount(String customerId, String monthId) {
+    public List<IssueVoteUserCountResultDTO> getVoteCount(String customerId, String monthId, String groupField) {
-        return baseDao.getVoteCount(customerId, monthId);
+        return baseDao.getVoteCount(customerId, monthId, groupField);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/ScreenExtractService.java

@@ -16,4 +16,12 @@ public interface ScreenExtractService {
      */
     void extractDailyAll(ExtractOriginFormDTO extractOriginFormDTO);
 
+    /**
+     * @param extractOriginFormDTO
+     * @Description 抽取数据到大屏【月】
+     * @author zxc
+     * @date 2020/9/24 10:15 上午
+     */
+    void extractMonthlyAll(ExtractOriginFormDTO extractOriginFormDTO);
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.OrgTypeConstant;
+import com.epmet.constant.ProjectConstant;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.extract.result.GridGroupUserCountResultDTO;
 import com.epmet.dto.extract.result.GridUserCountResultDTO;
@@ -13,25 +14,28 @@ import com.epmet.dto.extract.result.IssueVoteUserCountResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenUserJoinEntity;
 import com.epmet.entity.stats.DimAgencyEntity;
 import com.epmet.entity.stats.DimGridEntity;
+import com.epmet.entity.stats.FactIssueAgencyMonthlyEntity;
 import com.epmet.entity.stats.FactIssueGridMonthlyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginGroupMainDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueLogDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.PublicPartExtractService;
+import com.epmet.service.evaluationindex.screen.ScreenUserJoinService;
 import com.epmet.service.stats.DimAgencyService;
 import com.epmet.service.stats.DimGridService;
+import com.epmet.service.stats.FactIssueAgencyMonthlyService;
 import com.epmet.service.stats.FactIssueGridMonthlyService;
+import com.epmet.service.stats.user.FactRegUserAgencyMonthlyService;
 import com.epmet.service.stats.user.FactRegUserGridMonthlyService;
 import com.epmet.util.DimIdGenerator;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -53,9 +57,15 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
     @Autowired
     private FactRegUserGridMonthlyService factRegUserGridMonthlyService;
     @Autowired
+    private FactIssueAgencyMonthlyService factIssueAgencyMonthlyService;
+    @Autowired
+    private FactRegUserAgencyMonthlyService factRegUserAgencyMonthlyService;
+    @Autowired
     private FactOriginIssueLogDailyService factOriginIssueLogDailyService;
     @Autowired
     private FactOriginGroupMainDailyService factOriginGroupMainDailyService;
+    @Autowired
+    private ScreenUserJoinService screenUserJoinService;
 
 
     /**
@@ -64,9 +74,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
      * 总参与：统计周期内议题表决(虽然可以评价 但是只有表决的人可以评价 所以按表决人数算)的人数
      * 百人人均议题：统计周期内总的议题数/（注册用户数/100）
      * 百人平均参与度：每个议题的实际参与数/应参与数 的平均值：（每个议题的实际参与数/应参与数）的和）/被表决的议题数  来源 获取issue_vote_statistical_daily中 monthId的数据
-     * <p>
+     *
-     * <p>
-     * <p>
      * 不考虑市北：人均议题：统计周期内议题总数/发过议题的人数 参与度：各个行为(表决)的总数/发生行为的人数
      *
      * @return java.lang.Boolean
@@ -94,7 +102,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         Map<String, ScreenUserJoinEntity> insertMap = new HashMap<>();
         orgList.forEach(org -> buildUserJoinEntity(formDTO, org, insertMap));
         //获取议题月份增量
-        List<FactIssueGridMonthlyEntity> issueTotal = factIssueGridMonthlyService.getIssueCount(formDTO.getCustomerId(), formDTO.getMonthId());
+        List<FactIssueGridMonthlyEntity> issueTotal = factIssueGridMonthlyService.getIssueIncCountAndTotalByMonthId(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(issueTotal)) {
             log.error("抽取【公众参与-人均议题】，获取议题增量为空");
             return;
@@ -111,28 +119,28 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
             entity.setJoinTotal(issue.getIssueIncr());
             GridUserCountResultDTO user = userCountMap.get(gridId);
             //百人人均议题：统计周期内总的议题数/（注册用户数/100）
-            BigDecimal avgIssueCount = new BigDecimal(issue.getIssueIncr()).divide(new BigDecimal(user.getUserCount()).divide(new BigDecimal(NumConstant.ONE_HUNDRED)));
+            BigDecimal avgIssueCount = new BigDecimal(issue.getIssueIncr()).divide(new BigDecimal(user.getRegTotal()).divide(new BigDecimal(NumConstant.ONE_HUNDRED)));
             entity.setAvgIssue(avgIssueCount);
         });
 
 
         //获取该月 表决的人数
-        List<IssueVoteUserCountResultDTO> voteCountList = factOriginIssueLogDailyService.getVoteCount(formDTO.getCustomerId(), formDTO.getMonthId());
+        List<IssueVoteUserCountResultDTO> voteCountList = factOriginIssueLogDailyService.getVoteCount(formDTO.getCustomerId(), formDTO.getMonthId(), ProjectConstant.GRID_ID);
         Map<String, Integer> gridMemberCount = new HashMap<>();
         if (!CollectionUtils.isEmpty(issueTotal)) {
             //获取每个网格的应表决人数
-            List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId());
+            List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
             if (CollectionUtils.isEmpty(memberCountList)) {
                 log.error("抽取【公众参与-人均议题】，获取应表决人数为空");
                 return;
             }
-            gridMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getGridId, o -> o.getMemberCount()));
+            gridMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount()));
         }
 
         //百人平均参与度：每个议题的实际参与数/应参与数 的平均值：（每个议题的实际参与数/应参与数）的和）/被表决的议题数
 
         //遍历实际参与人数
-        Map<String, List<IssueVoteUserCountResultDTO>> voteMap = voteCountList.stream().collect(Collectors.groupingBy(IssueVoteUserCountResultDTO::getGridId));
+        Map<String, List<IssueVoteUserCountResultDTO>> voteMap = voteCountList.stream().collect(Collectors.groupingBy(IssueVoteUserCountResultDTO::getOrgId));
         for (Map.Entry<String, List<IssueVoteUserCountResultDTO>> entry : voteMap.entrySet()) {
             String gridId = entry.getKey();
             ScreenUserJoinEntity entity = insertMap.get(gridId);
@@ -148,6 +156,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
             }
             entity.setAvgJoin(bigDecimal.divide(votedByIssueCount).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)));
         }
+        screenUserJoinService.deleteAndInsertBatch(formDTO, new ArrayList<>(insertMap.values()));
     }
 
     private void extractAgencyUserJoin(ExtractScreenFormDTO formDTO) {
@@ -158,10 +167,63 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         }
         //构建组织数据
         Map<String, ScreenUserJoinEntity> insertMap = new HashMap<>();
-        orgList.forEach(org -> {
+        orgList.forEach(org -> buildUserJoinEntity(formDTO, org, insertMap));
-            buildUserJoinEntity(formDTO, org, insertMap);
+        List<FactIssueAgencyMonthlyEntity> issueTotal = factIssueAgencyMonthlyService.getIssueIncCountAndTotalByMonthId(formDTO.getCustomerId(), formDTO.getMonthId());
+
+        List<GridUserCountResultDTO> userCountList = factRegUserAgencyMonthlyService.selectAgencyUserCount(formDTO.getCustomerId(), formDTO.getMonthId());
+        if (CollectionUtils.isEmpty(issueTotal)) {
+            log.error("抽取【公众参与-人均议题】，获取注册用户数为空");
+            return;
+        }
+        Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getGridId, o -> o));
+        Set<String> agencyIdSet = new HashSet<>();
+        issueTotal.forEach(issue -> {
+            String agencyId = issue.getAgencyId();
+            agencyIdSet.add(agencyId);
+            ScreenUserJoinEntity entity = insertMap.get(agencyId);
+            entity.setJoinTotal(issue.getIssueIncr());
+            GridUserCountResultDTO user = userCountMap.get(agencyId);
+            //百人人均议题：统计周期内总的议题数/（注册用户数/100）
+            BigDecimal avgIssueCount = new BigDecimal(issue.getIssueIncr()).divide(new BigDecimal(user.getRegTotal()).divide(new BigDecimal(NumConstant.ONE_HUNDRED)));
+            entity.setAvgIssue(avgIssueCount);
+        });
+
+        List<List<String>> partition = ListUtils.partition(new ArrayList<>(agencyIdSet), NumConstant.THIRTY);
+        partition.forEach(list -> {
+            //获取该月 表决的人数
+            List<IssueVoteUserCountResultDTO> voteCountList = factOriginIssueLogDailyService.getVoteCount(formDTO.getCustomerId(), formDTO.getMonthId(), ProjectConstant.AGENCY_ID);
+            Map<String, Integer> orgMemberCount = new HashMap<>();
+            if (!CollectionUtils.isEmpty(issueTotal)) {
+                //获取每个网格的应表决人数
+                List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
+                if (CollectionUtils.isEmpty(memberCountList)) {
+                    log.error("抽取【公众参与-人均议题】，获取应表决人数为空");
+                    return;
+                }
+                orgMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount()));
+            }
+
+            //百人平均参与度：每个议题的实际参与数/应参与数 的平均值：（每个议题的实际参与数/应参与数）的和）/被表决的议题数
+
+            //遍历实际参与人数
+            Map<String, List<IssueVoteUserCountResultDTO>> voteMap = voteCountList.stream().collect(Collectors.groupingBy(IssueVoteUserCountResultDTO::getOrgId));
+            for (Map.Entry<String, List<IssueVoteUserCountResultDTO>> entry : voteMap.entrySet()) {
+                String orgId = entry.getKey();
+                ScreenUserJoinEntity entity = insertMap.get(orgId);
+                List<IssueVoteUserCountResultDTO> issueList = entry.getValue();
+                BigDecimal bigDecimal = new BigDecimal(0);
+                BigDecimal votedByIssueCount = new BigDecimal(issueList.get(0).getIssueCount());
+                for (IssueVoteUserCountResultDTO vote : issueList) {
+                    Integer memberCount = orgMemberCount.get(orgId);
+                    if (memberCount == null) {
+                        memberCount = 0;
+                    }
+                    bigDecimal = bigDecimal.add(new BigDecimal(vote.getVoteCount() / memberCount));
+                }
+                entity.setAvgJoin(bigDecimal.divide(votedByIssueCount).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)));
+            }
         });
-        List<FactIssueGridMonthlyEntity> issueTotal = factIssueGridMonthlyService.getIssueCount(formDTO.getCustomerId(), formDTO.getMonthId());
+        screenUserJoinService.deleteAndInsertBatch(formDTO, new ArrayList<>(insertMap.values()));
     }
 
     private void buildUserJoinEntity(ExtractScreenFormDTO formDTO, Object org, Map<String, ScreenUserJoinEntity> result) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -3,8 +3,10 @@ package com.epmet.service.evaluationindex.extract.toscreen.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.service.evaluationindex.extract.toscreen.PartyBaseInfoService;
 import com.epmet.service.evaluationindex.extract.toscreen.PioneerDataExtractService;
+import com.epmet.service.evaluationindex.extract.toscreen.PublicPartExtractService;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService;
 import com.epmet.service.stats.DimCustomerService;
 import lombok.extern.slf4j.Slf4j;
@@ -31,6 +33,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     private PartyBaseInfoService partyBaseInfoService;
     @Autowired
     private PioneerDataExtractService pioneerDataExtractService;
+    @Autowired
+    private PublicPartExtractService publicPartExtractService;
 
     /**
      * @param extractOriginFormDTO
@@ -66,17 +70,59 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
 
     }
 
+    @Override
+    public void extractMonthlyAll(ExtractOriginFormDTO formDTO) {
+
+        List<String> customerIds = new ArrayList<>();
+        if (StringUtils.isNotBlank(formDTO.getCustomerId())) {
+            customerIds.add(formDTO.getCustomerId());
+        } else {
+            int pageNo = NumConstant.ONE;
+            int pageSize = NumConstant.ONE_HUNDRED;
+            customerIds = dimCustomerService.selectCustomerIdPage(pageNo, pageSize);
+        }
+        if (!CollectionUtils.isEmpty(customerIds)) {
+            customerIds.forEach(customerId -> {
+                if (StringUtils.isNotBlank(formDTO.getStartDate()) && StringUtils.isNotBlank(formDTO.getEndDate())) {
+                    List<String> daysBetween = DateUtils.getDaysBetween(formDTO.getStartDate(), formDTO.getEndDate());
+                    daysBetween.forEach(dateId -> {
+                        extractMonthly(customerId, dateId);
+                    });
+                } else if (StringUtils.isNotBlank(formDTO.getDateId())) {
+                    extractMonthly(customerId, formDTO.getDateId());
+                } else {
+                    String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", "");
+                    extractMonthly(customerId, dateId);
+                }
+            });
+        }
+
+    }
+
     /**
-     * @Description  按天计算
      * @param customerId
      * @param dateId
+     * @Description 按天计算
      * @author zxc
      * @date 2020/9/24 10:16 上午
      */
-    public void extractDaily(String customerId,String dateId){
+    public void extractDaily(String customerId, String dateId) {
 //        partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId,dateId);
-        pioneerDataExtractService.extractGridPioneerData(customerId,dateId);
+        pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
-        pioneerDataExtractService.extractCommunityPioneerData(customerId,dateId);
+        pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
-        pioneerDataExtractService.extractExceptCommunityPioneerData(customerId,dateId);
+        pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
+    }
+
+    /**
+     * @Description 按月计算
+     * @author zxc
+     * @date 2020/9/24 10:16 上午
+     */
+    public void extractMonthly(String customerId, String monthId) {
+        ExtractScreenFormDTO formDTO = new ExtractScreenFormDTO();
+        formDTO.setCustomerId(customerId);
+        formDTO.setMonthId(monthId);
+
+        publicPartExtractService.extractTotalDataMonthly(formDTO);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenUserJoinService.java

@@ -19,8 +19,11 @@ package com.epmet.service.evaluationindex.screen;
 
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenUserJoinEntity;
 
+import java.util.List;
+
 /**
  * 基层治理-公众参与
  *
@@ -28,4 +31,14 @@ import com.epmet.entity.evaluationindex.screen.ScreenUserJoinEntity;
  * @since v1.0.0 2020-09-22
  */
 public interface ScreenUserJoinService extends BaseService<ScreenUserJoinEntity> {
+    /**
+     * desc: 删除并插入某月的数据
+     *
+     * @param formDTO
+     * @param list
+     * @return java.lang.Boolean
+     * @author LiuJanJun
+     * @date 2020/9/27 4:40 下午
+     */
+    Boolean deleteAndInsertBatch(ExtractScreenFormDTO formDTO, List<ScreenUserJoinEntity> list);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java

@@ -18,11 +18,27 @@
 package com.epmet.service.evaluationindex.screen.impl;
 
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.CompareConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenUserJoinDao;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenUserJoinEntity;
 import com.epmet.service.evaluationindex.screen.ScreenUserJoinService;
+import com.epmet.util.DimIdGenerator;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 基层治理-公众参与
@@ -30,8 +46,149 @@ import org.springframework.stereotype.Service;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-22
  */
+@Slf4j
 @Service
 public class ScreenUserJoinServiceImpl extends BaseServiceImpl<ScreenUserJoinDao, ScreenUserJoinEntity> implements ScreenUserJoinService {
 
 
+    @Override
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteAndInsertBatch(ExtractScreenFormDTO formDTO, List<ScreenUserJoinEntity> list) {
+        if (formDTO == null || StringUtils.isBlank(formDTO.getCustomerId()) || StringUtils.isBlank(formDTO.getMonthId()) || CollectionUtils.isEmpty(list)) {
+            log.error("deleteAndInsertBatch param is error");
+            return false;
+        }
+        int deleteNum;
+        do {
+            deleteNum = baseDao.deleteUserJoin(formDTO.getCustomerId(), formDTO.getMonthId());
+        } while (deleteNum != NumConstant.ZERO);
+
+
+        String[] orgIds = new String[list.size()];
+        for (int i = NumConstant.ZERO; i < list.size(); i++) {
+            orgIds[i] = list.get(i).getOrgId();
+        }
+        DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(DateUtils.addDateMonths(DateUtils.stringToDate(formDTO.getMonthId(), DateUtils.DATE_PATTERN_YYYYMM), -1));
+        // 获取上个月的基本数据
+        List<ScreenUserJoinEntity> lastMonthJoinList = baseDao.selectLastMonthScreenUserJoinList(formDTO.getCustomerId(),
+                dimIdBean.getYearId(),
+                dimIdBean.getMonthId(),
+                orgIds);
+
+        // 定义本月待添加数据的集合
+        List<ScreenUserJoinEntity> curMonthJoinEntityList = new ArrayList<>();
+        // 增加率计算
+        if (null != lastMonthJoinList && lastMonthJoinList.size() > NumConstant.ZERO) {
+            // 存在上个月的数据 （本月-上月）/上月  *100
+            for (int i = NumConstant.ZERO; i < list.size(); i++) {
+                for (int j = NumConstant.ZERO; j < lastMonthJoinList.size(); j++) {
+                    if (list.get(i).getOrgId().equals(lastMonthJoinList.get(j).getOrgId())) {
+                        ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(list.get(i), ScreenUserJoinEntity.class);
+                        entity.setJoinTotalUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getJoinTotal(), list.get(j).getJoinTotal()));
+                        entity.setJoinTotalUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getJoinTotal(), list.get(j).getJoinTotal()));
+                        entity.setAvgIssueUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getAvgIssue(), list.get(j).getAvgIssue()));
+                        entity.setAvgIssueUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getAvgIssue(), list.get(j).getAvgIssue()));
+                        entity.setAgvgJoinUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getAvgJoin(), list.get(j).getAvgJoin()));
+                        entity.setAgvgJoinUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getAvgJoin(), list.get(j).getAvgJoin()));
+                        curMonthJoinEntityList.add(entity);
+                    }
+                }
+            }
+        } else {
+            // 计算增长率后的 待新增数据
+            BigDecimal zero = new BigDecimal(NumConstant.ZERO);
+            // 不存在上个月的数据
+            for (int i = NumConstant.ZERO; i < list.size(); i++) {
+                ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(list.get(i), ScreenUserJoinEntity.class);
+                entity.setJoinTotalUpRate(zero);
+                entity.setJoinTotalUpFlag("");
+                entity.setAvgIssueUpRate(zero);
+                entity.setAvgIssueUpFlag("");
+                entity.setAgvgJoinUpRate(zero);
+                entity.setAgvgJoinUpFlag("");
+                curMonthJoinEntityList.add(entity);
+            }
+        }
+
+        this.insertBatch(list, NumConstant.ONE_HUNDRED);
+        return true;
+    }
+
+
+    /**
+     * 计算 本月数值 相较于 上月数值，的增长率
+     *
+     * @param old 上月数值
+     * @param now 本月数值
+     * @return java.math.BigDecimal
+     * @Author zhangyong
+     * @Date 15:38 2020-08-21
+     **/
+    private BigDecimal calculateGrowthRateNumber(Integer old, Integer now) {
+        if (NumConstant.ZERO == old) {
+            return new BigDecimal(now * NumConstant.ONE_HUNDRED);
+        }
+        BigDecimal bignum1 = new BigDecimal((now - old) * NumConstant.ONE_HUNDRED);
+        BigDecimal bignum2 = bignum1.divide(new BigDecimal(old), 2, BigDecimal.ROUND_HALF_UP);
+        return bignum2;
+    }
+
+    /**
+     * 计算 本月数值 相较于 上月数值，的增长率
+     *
+     * @param old 上月数值
+     * @param now 本月数值
+     * @return java.math.BigDecimal
+     * @Author zhangyong
+     * @Date 15:38 2020-08-21
+     **/
+    private BigDecimal calculateGrowthRateNumber(BigDecimal old, BigDecimal now) {
+        BigDecimal oneHundred = new BigDecimal(NumConstant.ONE_HUNDRED);
+        if (old.compareTo(new BigDecimal(NumConstant.ZERO)) == NumConstant.ZERO) {
+            return now.multiply(oneHundred);
+        }
+        BigDecimal bignum1 = now.subtract(old).multiply(oneHundred);
+        BigDecimal bignum2 = bignum1.divide(old, 2, BigDecimal.ROUND_HALF_UP);
+        return bignum2;
+    }
+
+
+    /**
+     * 计算 本月数值 相较于 上月数值，的增长率， 得出标识
+     *
+     * @param old 上月数值
+     * @param now 本月数值
+     * @return java.util.String
+     * @Author zhangyong
+     * @Date 15:38 2020-08-21
+     **/
+    private String calculateGrowthRateFlag(Integer old, Integer now) {
+        if (old > now) {
+            return CompareConstant.DECR_STR;
+        } else if (old < now) {
+            return CompareConstant.INCR_STR;
+        } else {
+            return CompareConstant.EQ_STR;
+        }
+    }
+
+    /**
+     * 计算 本月数值 相较于 上月数值，的增长率， 得出标识
+     *
+     * @param old 上月数值
+     * @param now 本月数值
+     * @return java.util.String
+     * @Author zhangyong
+     * @Date 15:38 2020-08-21
+     **/
+    private String calculateGrowthRateFlag(BigDecimal old, BigDecimal now) {
+        if (old.compareTo(now) == 1) {
+            return CompareConstant.DECR_STR;
+        } else if (old.compareTo(now) == -1) {
+            return CompareConstant.INCR_STR;
+        } else {
+            return CompareConstant.EQ_STR;
+        }
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueAgencyMonthlyService.java

@@ -115,10 +115,22 @@ public interface FactIssueAgencyMonthlyService extends BaseService<FactIssueAgen
 
     /**
      * 批量保存
-     * @author zhaoqifeng
+     *
-     * @date 2020/6/23 14:07
      * @param list
      * @return void
+     * @author zhaoqifeng
+     * @date 2020/6/23 14:07
      */
     void saveList(List<FactIssueAgencyMonthlyEntity> list);
+
+    /**
+     * desc: 获取某月议题总数
+     *
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.entity.stats.FactIssueGridMonthlyEntity>
+     * @author LiuJanJun
+     * @date 2020/9/27 3:30 下午
+     */
+    List<FactIssueAgencyMonthlyEntity> getIssueIncCountAndTotalByMonthId(String customerId, String monthId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueGridMonthlyService.java

@@ -79,5 +79,5 @@ public interface FactIssueGridMonthlyService extends BaseService<FactIssueGridMo
      * @author LiuJanJun
      * @date 2020/9/25 5:00 下午
      */
-    List<FactIssueGridMonthlyEntity> getIssueCount(String customerId, String monthId);
+    List<FactIssueGridMonthlyEntity> getIssueIncCountAndTotalByMonthId(String customerId, String monthId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyMonthlyServiceImpl.java

@@ -117,4 +117,9 @@ public class FactIssueAgencyMonthlyServiceImpl extends BaseServiceImpl<FactIssue
         insertBatch(list);
     }
 
+    @Override
+    public List<FactIssueAgencyMonthlyEntity> getIssueIncCountAndTotalByMonthId(String customerId, String monthId) {
+        return baseDao.getIssueIncCountAndTotalByMonthId(customerId, monthId);
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridMonthlyServiceImpl.java

@@ -74,7 +74,7 @@ public class FactIssueGridMonthlyServiceImpl extends BaseServiceImpl<FactIssueGr
      * @date 2020/9/25 5:00 下午
      */
     @Override
-    public List<FactIssueGridMonthlyEntity> getIssueCount(String customerId, String monthId) {
+    public List<FactIssueGridMonthlyEntity> getIssueIncCountAndTotalByMonthId(String customerId, String monthId) {
         return baseDao.getIssueCount(customerId, monthId);
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserAgencyMonthlyService.java

@@ -19,10 +19,10 @@ package com.epmet.service.stats.user;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.extract.result.GridUserCountResultDTO;
 import com.epmet.dto.stats.user.FactRegUserAgencyMonthlyDTO;
 import com.epmet.entity.stats.user.FactRegUserAgencyMonthlyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +93,15 @@ public interface FactRegUserAgencyMonthlyService extends BaseService<FactRegUser
      * @date 2020-06-17
      */
     void delete(String[] ids);
+
+    /**
+     * desc: 获取用户注册用户数 某月增量
+     *
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.extract.result.GridUserCountResultDTO>
+     * @author LiuJanJun
+     * @date 2020/9/27 3:45 下午
+     */
+    List<GridUserCountResultDTO> selectAgencyUserCount(String customerId, String monthId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserAgencyMonthlyServiceImpl.java

@@ -20,15 +20,15 @@ package com.epmet.service.stats.user.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.user.FactRegUserAgencyMonthlyDao;
+import com.epmet.dto.extract.result.GridUserCountResultDTO;
 import com.epmet.dto.stats.user.FactRegUserAgencyMonthlyDTO;
 import com.epmet.entity.stats.user.FactRegUserAgencyMonthlyEntity;
 import com.epmet.service.stats.user.FactRegUserAgencyMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -99,4 +99,9 @@ public class FactRegUserAgencyMonthlyServiceImpl extends BaseServiceImpl<FactReg
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<GridUserCountResultDTO> selectAgencyUserCount(String customerId, String monthId) {
+        return baseDao.selectAgencyUserCount(customerId, monthId);
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml

@@ -268,8 +268,8 @@
     <select id="selectDistinctGroupMemberCount" resultType="com.epmet.dto.extract.result.GridGroupUserCountResultDTO">
         SELECT
                 COUNT(DISTINCT MEMBER_ID) AS memberCount,
-                GRID_ID,
+                ${groupField}  AS orgId,
-               CUSTOMER_ID,
+                CUSTOMER_ID,
                 PIDS,
                 AGENCY_ID
         FROM
@@ -277,6 +277,6 @@
         WHERE
                 DEL_FLAG = '0'
           AND CUSTOMER_ID = #{customerId}
-          GROUP by  GRID_ID
+          GROUP by  ${groupField,jdbcType=VARCHAR}
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueLogDailyDao.xml

@@ -95,6 +95,23 @@
     </select>
 
     <!--  党员参与议事：支持或者反对的次数  -->
+    <select id="getVoteCount" resultType="com.epmet.dto.extract.result.IssueVoteUserCountResultDTO">
+        SELECT
+            ${groupField} AS orgId,
+            COUNT(1) AS voteCount,
+            COUNT( DISTINCT ISSUE_ID) issueCount
+        FROM
+            fact_origin_issue_log_daily
+        WHERE
+            DEL_FLAG = '0'
+            and CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+            and MONTH_ID = #{monthId,jdbcType=VARCHAR}
+            AND ACTION_CODE LIKE 'vote_%'
+        group by ${groupField,jdbcType=VARCHAR}
+    </select>
+
+
+    <!--  参与人数:  议题的表决行为的用户数去重的累计值  -->
     <select id="calPartyPartiIssueTotal" parameterType="map" resultType="int">
         SELECT
             COUNT(1)AS  TOTAL
@@ -120,8 +137,6 @@
         </if>
     </select>
 
-
-    <!--  参与人数:  议题的表决行为的用户数去重的累计值  -->
     <select id="selectCountJoinUserTotal" parameterType="map" resultType="int">
         SELECT
             count( DISTINCT m.OPERATION_USER_ID ) as total
@@ -138,20 +153,4 @@
             and m.PIDS LIKE CONCAT(#{pids},'%')
         </if>
     </select>
-
-    <select id="getVoteCount" resultType="com.epmet.dto.extract.result.IssueVoteUserCountResultDTO">
-        SELECT
-                GRID_ID,
-                ISSUE_ID,
-                COUNT(1) AS voteCount,
-                COUNT( DISTINCT ISSUE_ID) issueCount
-        FROM
-                fact_origin_issue_log_daily
-        WHERE
-                DEL_FLAG = '0'
-          and CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
-          and MONTH_ID = #{monthId,jdbcType=VARCHAR}
-          AND ACTION_CODE LIKE 'vote_%'
-        group by GRID_ID
-    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueAgencyMonthlyDao.xml

@@ -71,4 +71,13 @@
             da.ID
     </select>
 
+    <select id="getIssueIncCountAndTotalByMonthId" resultType="com.epmet.entity.stats.FactIssueAgencyMonthlyEntity">
+        select
+                AGENCY_ID,PID,MONTH_ID,ISSUE_INCR,ISSUE_TOTAL
+        from fact_issue_agency_monthly
+        where
+                CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+          and DEL_FLAG = '0'
+          AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserAgencyMonthlyDao.xml

@@ -102,4 +102,17 @@
         </if>
     </delete>
 
+    <select id="selectAgencyUserCount" resultType="com.epmet.dto.extract.result.GridUserCountResultDTO">
+        SELECT
+                REG_INCR,
+                PARTYMEMBER_INCR,
+                AGENCY_ID,
+                REG_TOTAL
+        FROM
+                fact_reg_user_grid_monthly
+        WHERE
+                DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId}
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml

@@ -111,7 +111,8 @@
         SELECT
             REG_INCR,
             PARTYMEMBER_INCR,
-            GRID_ID
+            GRID_ID,
+            REG_TOTAL
         FROM
             fact_reg_user_grid_monthly
         WHERE