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

epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/enums/DataSourceEnum.java

@@ -11,8 +11,11 @@ public enum DataSourceEnum {
 	DATA_REPORT_FAKE("data-report-server", "fake", "statsDisplay"),
 	;
 
+	// 服务名
 	private String serviceName;
+	// 数据源标记
 	private String flag;
+	// 数据源，跟yml中的数据源名称保持一致
 	private String dataSourceName;
 
 	DataSourceEnum(String serviceName, String flag, String dataSourceName) {

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityResultDTO.java

@@ -3,6 +3,7 @@ package com.epmet.screen.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @Description 治理能力查询结果dto
@@ -22,20 +23,20 @@ public class GovernCapacityResultDTO implements Serializable {
     /**
      * 响应率
      * */
-    private Integer responseRatio;
+    private BigDecimal responseRatio;
 
     /**
      * 解决率
      * */
-    private Integer resolvedRatio;
+    private BigDecimal resolvedRatio;
 
     /**
      * 自治率
      * */
-    private Integer governRatio;
+    private BigDecimal governRatio;
 
     /**
      * 满意率
      * */
-    private Integer satisfactionRatio;
+    private BigDecimal satisfactionRatio;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java

@@ -3,7 +3,6 @@ package com.epmet.datareport.controller.screen;
 import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
 import com.epmet.datareport.service.screen.GrassrootsPartyDevService;
 import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
 import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java

@@ -1,7 +1,9 @@
 package com.epmet.datareport.service.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
 import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
 import com.epmet.screen.dto.form.CompartmentFormDTO;
@@ -35,6 +37,7 @@ public class AgencyServiceImpl implements AgencyService {
      * @author zxc
      * @date 2020/8/18 2:04 下午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public TreeResultDTO tree(ExternalAppRequestParam externalAppRequestParam) {
         // 1. 查询客户根组织ID
@@ -71,6 +74,7 @@ public class AgencyServiceImpl implements AgencyService {
      * @author zxc
      * @date 2020/8/18 2:33 下午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public CompartmentResultDTO compartment(CompartmentFormDTO compartmentFormDTO) {
         CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(compartmentFormDTO.getAgencyId());

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java

@@ -1,6 +1,8 @@
 package com.epmet.datareport.service.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
 import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
 import com.epmet.datareport.dao.screen.ScreenEventDataDao;
@@ -40,6 +42,7 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/8/18 10:59 上午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public List<BranchResultDTO> branch(BranchFormDTO formDTO) {
         List<BranchResultDTO> branchResultDTOS = screenCustomerGridDao.selectBranch(formDTO.getAgencyId());
@@ -52,6 +55,7 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/8/18 11:10 上午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public UserResultDTO user(UserFormDTO userFormDTO) {
         UserResultDTO userResult = new UserResultDTO();
@@ -76,6 +80,7 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/8/18 11:20 上午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO) {
         ParymemberResultDTO parymemberResult = new ParymemberResultDTO();
@@ -100,6 +105,7 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/8/19 1:29 下午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public List<ProjectResultDTO> project(ProjectFormDTO projectFormDTO) {
         List<ProjectResultDTO> projectResultDTOS = screenEventDataDao.selectEvent(projectFormDTO.getAgencyId());
@@ -115,6 +121,7 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/8/19 1:52 下午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public TopProfileResultDTO topProfile(TopProfileFormDTO topProfileFormDTO) {
         TopProfileResultDTO topProfileResultDTO = screenUserTotalDataDao.selectTopProfile(topProfileFormDTO.getAgencyId());

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java

@@ -1,7 +1,9 @@
 package com.epmet.datareport.service.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.screen.*;
 import com.epmet.datareport.service.screen.GrassRootsGovernService;
 import com.epmet.datareport.utils.DateUtils;
@@ -50,6 +52,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
      * @author wangc
      * @date 2020.08.20 11:16
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public UserPointRankResultDTO userPointRank(AgencyAndNumFormDTO param) {
         //默认5
@@ -73,6 +76,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
      * @author wangc
      * @date 2020.08.20 13:55
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public List<DifficultProjectResultDTO> difficultProject(AgencyNumTypeParamFormDTO param) {
         if(null == param.getTopNum()){
@@ -93,6 +97,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
      * @author wangc
      * @date 2020.08.20 14:37
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public PublicPartiProfileResultDTO publicPartiProfile(AgencyFormDTO param) {
 
@@ -114,6 +119,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
      * @author wangc
      * @date 2020.08.20 15:32
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public List<PublicPartiRankResultDTO> publicPartiRank(AgencyAndNumFormDTO param) {
         if(null == param.getTopNum()) param.setTopNum(NumConstant.TWO);
@@ -132,6 +138,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
      * @author wangc
      * @date 2020.08.20 17:46
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public List<GovernCapacityRankResultDTO> governCapacityRank(AgencyAndNumFormDTO param) {
         if(null == param.getTopNum()) param.setTopNum(NumConstant.FIVE);
@@ -144,10 +151,10 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         orderList.forEach(o -> {
             GovernCapacityRankResultDTO rank = new GovernCapacityRankResultDTO();
             rank.setAgencyName(o.getAgencyName());
-            rank.setGovernRatio(convertPercentStr(new BigDecimal(o.getGovernRatio())));
-            rank.setResolvedRatio(convertPercentStr(new BigDecimal(o.getResolvedRatio())));
-            rank.setResponseRatio(convertPercentStr(new BigDecimal(o.getResponseRatio())));
-            rank.setSatisfactionRatio(convertPercentStr(new BigDecimal(o.getSatisfactionRatio())));
+            rank.setGovernRatio(convertPercentStr(o.getGovernRatio(),NumConstant.ONE));
+            rank.setResolvedRatio(convertPercentStr(o.getResolvedRatio(),NumConstant.ONE));
+            rank.setResponseRatio(convertPercentStr(o.getResponseRatio(),NumConstant.ONE));
+            rank.setSatisfactionRatio(convertPercentStr(o.getSatisfactionRatio(),NumConstant.ONE));
             result.add(rank);
         });
         return result;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java

@@ -1,6 +1,8 @@
 package com.epmet.datareport.service.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao;
 import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao;
 import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
@@ -50,6 +52,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
      * @author wangc
      * @date 2020.08.18 14:58
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param) {
 
@@ -63,7 +66,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
         if(null == result.getPlatFormTotal() || NumConstant.ZERO == result.getPlatFormTotal()){
             result.setPercentInPlatForm(convertPercentStr(BigDecimal.ZERO));
         }else{
-            result.setPercentInPlatForm(convertPercentStr(new BigDecimal(result.getPartyMemberTotal()/result.getPlatFormTotal())));
+            result.setPercentInPlatForm(convertPercentStr(new BigDecimal((result.getPartyMemberTotal().doubleValue()/result.getPlatFormTotal().doubleValue()))));
         }
         return result;
     }
@@ -76,6 +79,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
      * @author wangc
      * @date 2020.08.18 17:54
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public PartymemberAgeDistributionResultDTO partymemberAgeDistribution(ParymemberFormDTO param) {
        return screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
@@ -89,6 +93,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
      * @author wangc
      * @date 2020.08.19 11:02
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public BranchBuildTrendResultDTO branchBuildTrend(BranchBuildTrendFormDTO param) {
         if(StringUtils.equals(ModuleConstant.PARAM_BRANCH_CATEGORY_UNION,param.getCategory())){
@@ -124,7 +129,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
                 List<Integer> numArray = new LinkedList<>();
                 BranchTrendSeriesDataResultDTO data = new BranchTrendSeriesDataResultDTO();
                 data.setName(issue);
-                if(null != issueYearlyDataList && issueYearlyDataList.isEmpty()){
+                if(null != issueYearlyDataList && !issueYearlyDataList.isEmpty()){
                     monthMap.keySet().forEach( monthId ->{
                         Optional<BranchIssueDataResultDTO> optional
                                 = issueYearlyDataList.stream().filter(yearly -> StringUtils.equals(monthId,yearly.getMonthId())).findAny();
@@ -139,6 +144,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
                         numArray.add(NumConstant.ZERO);
                     }
                 }
+                data.setData(numArray);
                 dataArray.add(data);
             });
         }
@@ -157,6 +163,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
      * @author wangc
      * @date 2020.08.19 15:25
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public BranchBuildRankResultDTO branchBuildRank(BranchBuildRankFormDTO param) {
         if(StringUtils.equals(ModuleConstant.PARAM_BRANCH_CATEGORY_UNION,param.getCategory())){
@@ -237,51 +244,6 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
     }
 
 
-    public static void main(String[] args) {
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMM");
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date()); // 设置为当前时间
-        calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月
-        String currentMonth = format.format(calendar.getTime());
-        Integer monthCounter = Integer.parseInt(currentMonth);
-        Map<String,String> monthMap = new HashMap<>();
-        int i = NumConstant.ONE;
-        while(i <= NumConstant.TWELVE){
-
-            if(monthCounter.toString().endsWith("00")){
-                monthCounter -= NumConstant.EIGHTY_EIGHT;
-            }
-
-            String abscissa = monthCounter.toString().substring(monthCounter.toString().length() - NumConstant.TWO);
-            if(abscissa.startsWith("0")) {
-                abscissa = abscissa.replace("0","").concat("月");
-            }else{
-                abscissa = abscissa.concat("月");
-            }
-            monthMap.put(monthCounter.toString(),abscissa);
-            monthCounter-- ;
-            i++;
-        }
-
-        Map<String, String> result = Maps.newLinkedHashMap();
-        monthMap.entrySet().stream().sorted(Map.Entry.comparingByKey())
-                .forEachOrdered((e -> result.put(e.getKey(),e.getValue())));
-
-        result.forEach((k,v) -> {
-            System.out.print(k);
-            System.out.print(" -> ");
-            System.out.print(v);
-            System.out.println();
-        });
-
-        List<String> xLine = result.values().stream().collect(Collectors.toList());
-        xLine.forEach(x -> {
-            System.out.println(x);
-        });
-
-        result.keySet().forEach(key -> System.out.println(key));
-    }
-
     /**
      * @Description 得到上个月的monthId
      * @param

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java

@@ -1,7 +1,9 @@
 package com.epmet.datareport.service.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.screen.ScreenIndexDataMonthlyDao;
 import com.epmet.datareport.dao.screen.ScreenIndexDataYearlyDao;
 import com.epmet.datareport.service.screen.IndexService;
@@ -17,7 +19,6 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -42,6 +43,7 @@ public class IndexServiceImpl implements IndexService {
      * @author zxc
      * @date 2020/8/19 2:53 下午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public YearAverageIndexResultDTO yearAverageIndex(YearAverageIndexFormDTO yearAverageIndexFormDTO) {
         YearAverageIndexResultDTO yearAverageIndexResultDTO = screenIndexDataYearlyDao.selectYearAverageIndex(yearAverageIndexFormDTO.getAgencyId());
@@ -57,6 +59,7 @@ public class IndexServiceImpl implements IndexService {
      * @author zxc
      * @date 2020/8/19 3:17 下午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public MonthPieChartResultDTO monthPieChart(MonthPieChartFormDTO monthPieChartFormDTO) {
         MonthPieChartResultDTO monthPieChartResultDTO = screenIndexDataMonthlyDao.selectMonthPieChart(monthPieChartFormDTO.getAgencyId());
@@ -72,6 +75,7 @@ public class IndexServiceImpl implements IndexService {
      * @author zxc
      * @date 2020/8/19 5:27 下午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO, ExternalAppRequestParam externalAppRequestParam) {
         String customerId = externalAppRequestParam.getCustomerId();
@@ -117,6 +121,7 @@ public class IndexServiceImpl implements IndexService {
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public List<SubAgencyIndexRankResultDTO> subAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO) {
         LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java

@@ -1,7 +1,9 @@
 package com.epmet.datareport.service.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.screen.ScreenOrgRankDataDao;
 import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao;
 import com.epmet.datareport.dao.screen.ScreenPartyLinkMassesDataDao;
@@ -22,11 +24,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -58,6 +55,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author zxc
      * @date 2020/8/20 1:56 下午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public FineExampleResultDTO fineExample(FineExampleFormDTO fineExampleFormDTO) {
         FineExampleResultDTO fineExampleResultDTO = screenPioneerDataDao.selectFineExample(fineExampleFormDTO.getAgencyId());
@@ -89,6 +87,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author zxc
      * @date 2020/8/20 2:35 下午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO) {
         ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO();
@@ -119,6 +118,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author zxc
      * @date 2020/8/20 3:19 下午
      */
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public VolunteerServiceResultDTO volunteerService(VolunteerServiceFormDTO volunteerServiceFormDTO) {
         VolunteerServiceResultDTO result = new VolunteerServiceResultDTO();
@@ -174,6 +174,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author wangc
      * @date 2020.08.21 11:05
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public List<AdvanceBranchRankResultDTO> advancedBranchRank(AgencyAndNumFormDTO param) {
         if(null == param.getTopNum()){
@@ -204,6 +205,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author wangc
      * @date 2020.08.21 14:22
      **/
+    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
     @Override
     public List<PartyUserPointResultDTO> advancedPartymemberRank(AgencyAndNumFormDTO param) {
         if(null == param.getTopNum()) param.setTopNum(NumConstant.TEN);

epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml

@@ -144,6 +144,7 @@
         <logger name="com.epmet.datareport.dao.topic" level="DEBUG"/>
         <logger name="com.epmet.datareport.dao.user" level="DEBUG"/>
         <logger name="com.epmet.datareport.dao.voice" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao.screen" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml

@@ -22,12 +22,13 @@
             AND eve.DEL_FLAG = '0'
         WHERE
             diff.DEL_FLAG = '0'
-            AND diff.ORG_TYPE = 'agencyId'
+            AND diff.ORG_TYPE = 'agency'
             AND diff.ORG_ID = #{agencyId}
          ORDER BY
-         CASE #{type}  WHEN 'timelongest' THEN diff.EVENT_COST_TIME DESC
-                       WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT DESC
-                       ELSE diss.EVENT_RE_ORG DESC END
+         CASE #{type}  WHEN 'timelongest' THEN diff.EVENT_COST_TIME
+                       WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT
+                       ELSE diff.EVENT_RE_ORG  END
+         DESC
     </select>
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml

@@ -6,7 +6,7 @@
     <!-- 根据agencyTd、type(数据类别 party:支部建设;union:联合建设)查出共有多少议题主题 -->
     <select id="selectIssueGroup" resultType="java.lang.String">
         SELECT DISTINCT
-            ISSUE_CATEGORY_NAME
+            MEET_CATEGORY_NAME
         FROM
             screen_party_branch_data
         WHERE
@@ -20,7 +20,7 @@
     <select id="selectBranchDataByTypeAndTimeZone" resultType="com.epmet.screen.dto.result.BranchIssueDataResultDTO">
         SELECT
             MONTH_ID,
-            ISSUE_CATEGORY_NAME AS issue,
+            MEET_CATEGORY_NAME AS issue,
             CASE #{type} WHEN 'organize' THEN ORGANIZE_COUNT
                              WHEN 'joinuser' THEN JOIN_USER_COUNT
                              WHEN 'averagejoinuser' THEN AVERAGE_JOIN_USER_COUNT
@@ -35,7 +35,7 @@
             AND MONTH_ID <![CDATA[ >= ]]> #{bottomMonthId}
         ORDER BY
             MONTH_ID DESC ,
-            ISSUE_CATEGORY_NAME
+            MEET_CATEGORY_NAME
     </select>
 
     <!-- 查找指定组织的下级组织的党建联建数据排序 -->
@@ -50,7 +50,7 @@
         <where>
             DEL_FLAG = '0'
             AND ORG_TYPE = 'agency'
-            AND ORG_ID = #{agencyId}
+            AND PARENT_ID = #{agencyId}
             AND TYPE = #{category}
                 <!-- 指定月的排行 -->
                 <if test='null != monthId and "" != monthId'>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@@ -6,7 +6,7 @@
     <!-- 查询指定机关所属网格的用户积分排名 -->
     <select id="selectUserPointOrder" resultType="com.epmet.screen.dto.result.UserPointResultDTO">
         SELECT
-            user_name AS name,
+            concat( surname, CASE char_length( NAME ) WHEN 1 THEN '*' WHEN 2 THEN '**' ELSE '***' END )  AS name,
             point_total AS point
         FROM
             screen_party_user_rank_data
@@ -24,7 +24,7 @@
     <select id="selectPartymemberPointOrder" resultType="com.epmet.screen.dto.result.PartyUserPointResultDTO">
         SELECT
             USER_ID,
-            concat( SURNAME, '*' ) AS NAME,
+            concat( surname, CASE char_length( NAME ) WHEN 1 THEN '*' WHEN 2 THEN '**' ELSE '***' END )  AS name,
             POINT_TOTAL AS point
         FROM
             screen_party_user_rank_data

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml

@@ -7,7 +7,7 @@
     <select id="selectUserJoinData" resultType="com.epmet.screen.dto.result.UserJoinIndicatorGrowthRateResultDTO">
         SELECT
             JOIN_TOTAL AS total,
-            AVG_JOIN_USER AS averageJoin,
+            AVG_JOIN AS averageJoin,
             JOIN_TOTAL_UP_RATE AS monthIncr,
             JOIN_TOTAL_UP_FLAG AS monthTrend,
             AVG_ISSUE AS averageIssue,

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml

@@ -67,6 +67,6 @@
             JOIN_USER_TOTAL desc,
             TOPIC_TOTAL desc,
             ISSUE_TOTAL desc,
-            PROJECT_TOTAL desc,
+            PROJECT_TOTAL desc
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java

@@ -1,6 +1,8 @@
 package com.epmet.service.indexcollect.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.indexcoll.*;
 import com.epmet.dto.indexcollect.form.*;
 import com.epmet.service.indexcollect.FactIndexCollectService;
@@ -34,6 +36,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     @Autowired
     private FactIndexGovrnAblityDeptMonthlyDao factIndexGovrnAblityDeptMonthlyDao;
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridPartyMemberData(List<GridPartyMemberDataFormDTO> formDTO, String customerId) {
@@ -47,6 +50,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridPartyAbility(List<GridPartyAbilityFormDTO> formDTO, String customerId) {
@@ -60,6 +64,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertOrgPartyAbility(List<OrgPartyAbilityFormDTO> formDTO, String customerId) {
@@ -77,6 +82,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridServiceAbility(List<GridServiceAbilityFormDTO> formDTO, String customerId) {
@@ -90,6 +96,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertOrgServiceAbility(List<OrgServiceAbilityFormDTO> formDTO, String customerId) {
@@ -107,6 +114,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridGovrnAbility(List<GridGovrnAbilityFormDTO> formDTO, String customerId) {
@@ -120,6 +128,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertOrgGovrnAbility(List<OrgGovrnAbilityFormDTO> formDTO, String customerId) {
@@ -137,6 +146,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertDeptGovrnAbility(List<DeptGovrnAbilityFormDTO> formDTO, String customerId) {

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

@@ -17,10 +17,12 @@
 
 package com.epmet.service.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CompareConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.screen.*;
 import com.epmet.dto.screencoll.form.*;
 import com.epmet.entity.screen.ScreenEventImgDataEntity;
@@ -78,6 +80,8 @@ public class ScreenCollServiceImpl implements ScreenCollService {
     private ScreenPioneerDataDao screenPioneerDataDao;
     @Autowired
     private ScreenIndexDataYearlyDao screenIndexDataYearlyDao;
+
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO,String customerId) {
@@ -92,6 +96,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO, String customerId) {
@@ -106,6 +111,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO, String customerId) {
@@ -123,6 +129,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertOrgRankData(List<OrgRankDataFormDTO> formDTO, String customerId) {
@@ -140,6 +147,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGovernRankData(List<GovernRankDataFormDTO> formDTO, String customerId) {
@@ -157,6 +165,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertEventData(List<EventDataFormDTO> formDTO, String customerId) {
@@ -184,6 +193,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertDifficultyData(List<DifficultyDataFormDTO> formDTO, String customerId) {
@@ -196,6 +206,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO, String customerId) {
@@ -210,6 +221,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertIndexDataMonthly(List<IndexDataMonthlyFormDTO> formDTO, String customerId) {
@@ -227,6 +239,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertIndexDataYearly(List<IndexDataYearlyFormDTO> formDTO, String customerId) {
@@ -243,6 +256,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertCustomerDept(List<CustomerDeptFormDTO> formDTO, String customerId) {
@@ -257,6 +271,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertCustomerGrid(List<CustomerGridFormDTO> formDTO, String customerId) {
@@ -271,6 +286,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO, String customerId) {
@@ -285,6 +301,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertUserTotalData(List<UserTotalDataFormDTO> formDTO, String customerId) {
@@ -299,6 +316,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertUserJoin(List<UserJoinFormDTO> formDTO, String customerId) {
@@ -413,6 +431,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
     }
 
+    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertPioneerData(List<PioneerDataFormDTO> formDTO, String customerId) {

epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.3__extApp.sql

@@ -0,0 +1,56 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+CREATE TABLE `external_app` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `APP_NAME` varchar(64) NOT NULL COMMENT 'APP名字',
+  `CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '客户ID',
+  `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除',
+  `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id',
+  `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id',
+  `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='外部应用列表';
+
+CREATE TABLE `external_app_secret` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `APP_ID` varchar(64) NOT NULL COMMENT 'APP ID',
+  `SECRET` varchar(255) NOT NULL COMMENT '秘钥',
+  `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除',
+  `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id',
+  `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id',
+  `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='外部应用秘钥列表';
+
+CREATE TABLE `external_customer` (
+  `ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `CUSTOMER_NAME` varchar(255) NOT NULL COMMENT '客户名称',
+  `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除',
+  `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id',
+  `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id',
+  `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+BEGIN;
+INSERT INTO `external_app` VALUES ('227fb75ae4baa820755aaf43bf7f0a69', '便捷通行', '7e07311f4c4a56c65fa1dd5d16e0b743', 0, 0, 'wxz', '2020-08-18 13:39:32', 'wxz', '2020-08-18 13:39:37');
+INSERT INTO `external_app` VALUES ('acc4ad66c82a7b46e741364b4c62dce2', '市北大屏', 'b09527201c4409e19d1dbc5e3c3429a1', 0, 0, 'wxz', '2020-08-18 13:39:32', 'wxz', '2020-08-18 13:39:37');
+INSERT INTO `external_app` VALUES ('dbfad3110c124c89948d16e8b06a8888', '数据采集', 'b09527201c4409e19d1dbc5e3c3429a1', 0, 0, 'wxz', '2020-08-18 13:39:32', 'wxz', '2020-08-18 13:39:37');
+
+INSERT INTO `external_app_secret` VALUES ('44ed58fd256ae51b473b6ff8555c7131', '227fb75ae4baa820755aaf43bf7f0a69', 'a44a4fc41eb513cd93a0f957db3ef764e189e6aebb2369471396a8c3b32f61ed', 0, 0, 'wxz', '2020-08-18 13:40:03', 'xz', '2020-08-18 13:40:07');
+INSERT INTO `external_app_secret` VALUES ('95d16f5fe76d1139023107476871a077', 'dbfad3110c124c89948d16e8b06a8888', '0f7e983b017ac180b0da1877abe11bab22ab6288580e64d39b5e415dbb0fcc8f', 0, 0, 'wxz', '2020-08-18 13:40:03', 'xz', '2020-08-18 13:40:07');
+INSERT INTO `external_app_secret` VALUES ('9ca67b7b02dc2e80e9ba6ba4793aea54', 'acc4ad66c82a7b46e741364b4c62dce2', '612d304095c50369c3ef06e490f05779eeb8f19ff16566c73aeafafc5fa01970', 0, 0, 'wxz', '2020-08-18 13:40:03', 'xz', '2020-08-18 13:40:07');
+
+INSERT INTO `external_customer` VALUES ('7e07311f4c4a56c65fa1dd5d16e0b743', '外挂功能', 0, 0, 'wxz', '2020-08-19 14:21:52', 'APP_USER', '2020-08-21 15:23:35');
+INSERT INTO `external_customer` VALUES ('b09527201c4409e19d1dbc5e3c3429a1', '市北党建', 0, 0, 'wxz', '2020-08-19 14:21:52', 'wxz', '2020-08-19 14:21:58');
+
+COMMIT;
+
+SET FOREIGN_KEY_CHECKS = 1;