Merge remote-tracking branch 'origin/dev'

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

@@ -101,7 +101,8 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
         executorService.submit(() -> {
             try {
                 long startCpc = System.currentTimeMillis();
-                calCpcIndexService.calCpcPartyAbility(customerId, monthId);
+                // calCpcIndexService.calCpcPartyAbility(customerId, monthId);
+                calCpcIndexService.calCpcPartyAbilityV2(customerId, monthId);
                 log.info("党员相关-党建能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startCpc, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【党员相关数据】发生异常,参数:" + JSON.toJSONString(param), e);

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.29__addindex_forcpcability.sql

@@ -0,0 +1,5 @@
+--  stat库执行
+alter table fact_origin_topic_main_daily add index `IDX_TOPIC_MAIN_GROUP_ID` (`GROUP_ID`);
+alter table fact_origin_project_main_daily add index  `IDX_P_MAIN_TOPIC_ID` (`TOPIC_ID`);
+alter table fact_origin_issue_main_daily add index   `IDX_ISSUE_MAIN_TOPIC_ID` (`TOPIC_ID`);
+alter table fact_origin_group_member_daily add index   `IDX_GM_GROUP_ID` (`GROUP_ID`);