Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

epmet-cloud-generator/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     #MySQL配置
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.1.130:3306/epmet_gov_voice?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.1.130:3306/epmet_evaluation_index?useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: epmet_dba
     password: EpmEt-dbA-UsEr
     #oracle配置

epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/config/DynamicDataSource.java

@@ -24,7 +24,9 @@ public class DynamicDataSource extends AbstractRoutingDataSource {
 
     @Override
     protected Object determineCurrentLookupKey() {
-        return DynamicContextHolder.peek();
+        String ds = DynamicContextHolder.peek();
+        logger.info("动态数据源:{}" + ds);
+        return ds;
     }
 
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/CustomerApplicationRunner.java

@@ -41,7 +41,7 @@ public class CustomerApplicationRunner implements ApplicationRunner {
         //发送启动成功消息
         EnvEnum currentEnv = EnvEnum.getCurrentEnv();
         logger.info(currentEnv);
-        if (!EnvEnum.DEV.getCode().equals(currentEnv.getCode())) {
+        if (!EnvEnum.DEV.getCode().equals(currentEnv.getCode()) && !EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())) {
             InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
             String serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java

@@ -11,6 +11,7 @@ import org.springframework.core.env.Environment;
  * @date 2020-07-03 11:14
  **/
 public enum EnvEnum {
+	LOCAL("local", "本地环境"),
 	DEV("dev", "开发环境"),
 	TEST("test", "体验环境"),
 	PROD("prod", "生产环境"),

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -325,6 +325,14 @@ public class RedisKeys {
 	 * @return
 	 */
 	public static String getCustomerStatsCalFlag(String customerId) {
-		return String.format(rootPrefix + "stats:calflag:%s", customerId);
+		return getCustomerStatsCalKeyPrefix().concat(":").concat(customerId);
+	}
+
+	/**
+	 * 获取计算标记的key前缀
+	 * @return
+	 */
+	public static String getCustomerStatsCalKeyPrefix() {
+		return rootPrefix.concat("stats:calflag");
 	}
 }

epmet-gateway/src/main/resources/bootstrap.yml

@@ -442,6 +442,7 @@ epmet:
   urlWhiteList:
     - /data/report/test/test
     - /data/report/screen/**
+    - /data/report/kcscreen/**
     - /epmetuser/customerstaff/customerlist
 
   swaggerUrls:

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/PageFormDTO.java

@@ -0,0 +1,9 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+@Data
+public class PageFormDTO {
+    private Integer pageNo = 1;
+    private Integer pageSize = 10;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/issue/IssueAvgAuditTimeDTO.java

@@ -0,0 +1,15 @@
+package com.epmet.dto.result.issue;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class IssueAvgAuditTimeDTO {
+
+    private String gridName;
+    private Integer avgAuditTime;
+
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/issue/IssueEffectResultDTO.java

@@ -0,0 +1,11 @@
+package com.epmet.dto.result.issue;
+
+import lombok.Data;
+
+@Data
+public class IssueEffectResultDTO {
+
+    private Double reportEffectiveRatio;
+    private Double conversionRatio;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/issue/IssueGridTotalRankDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto.result.issue;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class IssueGridTotalRankDTO {
+
+    private String gridId;
+    private String gridName;
+    private Integer issueCount;
+
+    private List<String> gridNameDataList = new ArrayList<>();
+    private List<Integer> issueCountDataList = new ArrayList<>();
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/issue/KcIssueSummary.java

@@ -0,0 +1,18 @@
+package com.epmet.dto.result.issue;
+
+import lombok.Data;
+
+@Data
+public class KcIssueSummary {
+
+    private String dateId;
+    private Integer reportCount;
+    private Integer issueCount;
+    private Integer pendingCount;
+    private Integer rejectedCount;
+    private Integer processingCount;
+    private Integer closedCount;
+    private Integer issueViewCount;
+    private Integer voteCount;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/issue/KcPartiTrendResultDTO.java

@@ -0,0 +1,46 @@
+package com.epmet.dto.result.issue;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class KcPartiTrendResultDTO {
+
+    private String monthId;
+    private Integer reportCount;
+
+    private List<String> xAxis = new ArrayList<>();
+    private List<Integer> reportCountDataList = new ArrayList<>();
+
+    public String getMonthId() {
+        return monthId;
+    }
+
+    public void setMonthId(String monthId) {
+        this.monthId = monthId;
+    }
+
+    public Integer getReportCount() {
+        return reportCount;
+    }
+
+    public void setReportCount(Integer reportCount) {
+        this.reportCount = reportCount;
+    }
+
+    public List<String> getxAxis() {
+        return xAxis;
+    }
+
+    public void setxAxis(List<String> xAxis) {
+        this.xAxis = xAxis;
+    }
+
+    public List<Integer> getReportCountDataList() {
+        return reportCountDataList;
+    }
+
+    public void setReportCountDataList(List<Integer> reportCountDataList) {
+        this.reportCountDataList = reportCountDataList;
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/GridProjectCountRankResultDTO.java

@@ -0,0 +1,12 @@
+package com.epmet.dto.result.project;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class GridProjectCountRankResultDTO {
+    private List<String> gridNameDataList = new ArrayList<>();
+    private List<Integer> projectCountDataList = new ArrayList<>();
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/GridProjectCountResultDTO.java

@@ -0,0 +1,14 @@
+package com.epmet.dto.result.project;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GridProjectCountResultDTO {
+
+    private String gridId;
+    private String gridName;
+    private Integer projectCount;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/ProjectAvgClosedTimeResultDTO.java

@@ -0,0 +1,9 @@
+package com.epmet.dto.result.project;
+
+import lombok.Data;
+
+@Data
+public class ProjectAvgClosedTimeResultDTO {
+    private String gridName;
+    private Integer avgClosedCaseTime;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/ProjectCategoryAnalysisResultDTO.java

@@ -0,0 +1,10 @@
+package com.epmet.dto.result.project;
+
+import lombok.Data;
+
+@Data
+public class ProjectCategoryAnalysisResultDTO {
+    private String categoryId;
+    private String categoryName;
+    private Integer projectCount;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/ProjectSatisfactionResultDTO.java

@@ -0,0 +1,87 @@
+package com.epmet.dto.result.project;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * xAxis 被lombok生成后是XAxis，与nei不符，所以使用手动生成getter/setter方法
+ */
+public class ProjectSatisfactionResultDTO {
+
+    private List<String> xAxis = new ArrayList<>();
+    private List<Integer> greatSatisDataList = new ArrayList<>();
+    private List<Integer> goodSatisDataList = new ArrayList<>();
+    private List<Integer> disSatisDataList = new ArrayList<>();
+
+    private String monthId;
+    // 满意
+    private Integer goodSatis;
+    // 非常满意
+    private Integer greatSatis;
+    // 不满意
+    private Integer disSatis;
+
+    public List<String> getxAxis() {
+        return xAxis;
+    }
+
+    public void setxAxis(List<String> xAxis) {
+        this.xAxis = xAxis;
+    }
+
+    public List<Integer> getGreatSatisDataList() {
+        return greatSatisDataList;
+    }
+
+    public void setGreatSatisDataList(List<Integer> greatSatisDataList) {
+        this.greatSatisDataList = greatSatisDataList;
+    }
+
+    public List<Integer> getGoodSatisDataList() {
+        return goodSatisDataList;
+    }
+
+    public void setGoodSatisDataList(List<Integer> goodSatisDataList) {
+        this.goodSatisDataList = goodSatisDataList;
+    }
+
+    public List<Integer> getDisSatisDataList() {
+        return disSatisDataList;
+    }
+
+    public void setDisSatisDataList(List<Integer> disSatisDataList) {
+        this.disSatisDataList = disSatisDataList;
+    }
+
+    public String getMonthId() {
+        return monthId;
+    }
+
+    public void setMonthId(String monthId) {
+        this.monthId = monthId;
+    }
+
+    public Integer getGoodSatis() {
+        return goodSatis;
+    }
+
+    public void setGoodSatis(Integer goodSatis) {
+        this.goodSatis = goodSatis;
+    }
+
+    public Integer getGreatSatis() {
+        return greatSatis;
+    }
+
+    public void setGreatSatis(Integer greatSatis) {
+        this.greatSatis = greatSatis;
+    }
+
+    public Integer getDisSatis() {
+        return disSatis;
+    }
+
+    public void setDisSatis(Integer disSatis) {
+        this.disSatis = disSatis;
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/ProjectSummaryResultDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.dto.result.project;
+
+import lombok.Data;
+
+@Data
+public class ProjectSummaryResultDTO {
+
+    private String dateId;
+    private Integer projectCount;
+    private Integer processingCount;
+    private Integer closedCount;
+    private Integer moveCount;
+    private Integer closedCaseCount;
+    private Integer projectViewCount;
+    private Integer voteCount;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/UserSummaryResultDTO.java

@@ -0,0 +1,13 @@
+package com.epmet.dto.result.project;
+
+import lombok.Data;
+
+@Data
+public class UserSummaryResultDTO {
+
+    private String dateId;
+    private Integer vistorCount;
+    private Integer regUserCount;
+    private Integer partyUserCount;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/KcUserPointRankResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result.user;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class KcUserPointRankResultDTO {
+
+    private List<String> userNameDataList = new ArrayList<>();
+    private List<Integer> pointsDataList = new ArrayList<>();
+
+    @Data
+    public static class KcUserPoint {
+        private String userId;
+        private String userName;
+        private Integer pointTotal;
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/KcUserPortrayalResultDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.result.user;
+
+import lombok.Data;
+
+@Data
+public class KcUserPortrayalResultDTO {
+
+    // 年龄分布
+    private AgeDistribution ageDistribution;
+    // 性别分布
+    private GenderDistribution genderDistribution;
+
+    @Data
+    public static class AgeDistribution {
+        private Integer ageLevel1;
+        private Integer ageLevel2;
+        private Integer ageLevel3;
+        private Integer ageLevel4;
+        private Integer ageLevel5;
+        private Integer ageLevel6;
+    }
+
+    @Data
+    public static class GenderDistribution {
+        private Integer malePartyUserCount;
+        private Integer femalePartyUserCount;
+    }
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/KcUserRankResultDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.result.user;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class KcUserRankResultDTO {
+
+    // 网格名称
+    private String gridName;
+    // 浏览用户数
+    private Integer viewUserCount;
+
+    private List<String> gridNameDataList = new ArrayList<>();
+    private List<Integer> totalUserDataList = new ArrayList<>();
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/KcUserTrendResultDTO.java

@@ -0,0 +1,63 @@
+package com.epmet.dto.result.user;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class KcUserTrendResultDTO {
+
+    private String monthId;
+    private Integer regUserCount;
+    private Integer partyUserCount;
+
+    private List<String> xAxis = new ArrayList<>();
+    private List<Integer> userDataList = new ArrayList<>();
+    private List<Integer> partyUserDataList = new ArrayList<>();
+
+    public String getMonthId() {
+        return monthId;
+    }
+
+    public void setMonthId(String monthId) {
+        this.monthId = monthId;
+    }
+
+    public Integer getRegUserCount() {
+        return regUserCount;
+    }
+
+    public void setRegUserCount(Integer regUserCount) {
+        this.regUserCount = regUserCount;
+    }
+
+    public Integer getPartyUserCount() {
+        return partyUserCount;
+    }
+
+    public void setPartyUserCount(Integer partyUserCount) {
+        this.partyUserCount = partyUserCount;
+    }
+
+    public List<String> getxAxis() {
+        return xAxis;
+    }
+
+    public void setxAxis(List<String> xAxis) {
+        this.xAxis = xAxis;
+    }
+
+    public List<Integer> getUserDataList() {
+        return userDataList;
+    }
+
+    public void setUserDataList(List<Integer> userDataList) {
+        this.userDataList = userDataList;
+    }
+
+    public List<Integer> getPartyUserDataList() {
+        return partyUserDataList;
+    }
+
+    public void setPartyUserDataList(List<Integer> partyUserDataList) {
+        this.partyUserDataList = partyUserDataList;
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/ScreenKcCategoryNewsCountResultDTO.java

@@ -0,0 +1,12 @@
+package com.epmet.dto.result.user;
+
+import lombok.Data;
+
+@Data
+public class ScreenKcCategoryNewsCountResultDTO {
+
+    private String categoryName;
+    private Integer newsCount;
+    private Integer partiCount;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/ScreenKcCategoryNewsRankResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.result.user;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ScreenKcCategoryNewsRankResultDTO {
+
+    private List<String> xAxis = new ArrayList<>();
+    private List<Integer> partiCountDataList = new ArrayList<>();
+
+    public List<String> getxAxis() {
+        return xAxis;
+    }
+
+    public void setxAxis(List<String> xAxis) {
+        this.xAxis = xAxis;
+    }
+
+    public List<Integer> getPartiCountDataList() {
+        return partiCountDataList;
+    }
+
+    public void setPartiCountDataList(List<Integer> partiCountDataList) {
+        this.partiCountDataList = partiCountDataList;
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/ScreenKcNewsHotRankResultDTO.java

@@ -0,0 +1,12 @@
+package com.epmet.dto.result.user;
+
+import lombok.Data;
+
+@Data
+public class ScreenKcNewsHotRankResultDTO {
+
+    private String newsId;
+    private String newsTitle;
+    private Integer hotCount;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/ScreenKcNewsPartiTrendResultDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.dto.result.user;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ScreenKcNewsPartiTrendResultDTO {
+
+    private List<String> xAxis = new ArrayList<>();
+
+    private List<Integer> partiCountDataList = new ArrayList<>();
+
+    @Data
+    public static class ScreenKcNewsPartyCount {
+
+        private String monthId;
+        private Integer partiCount;
+
+    }
+
+    public List<String> getxAxis() {
+        return xAxis;
+    }
+
+    public void setxAxis(List<String> xAxis) {
+        this.xAxis = xAxis;
+    }
+
+    public List<Integer> getPartiCountDataList() {
+        return partiCountDataList;
+    }
+
+    public void setPartiCountDataList(List<Integer> partiCountDataList) {
+        this.partiCountDataList = partiCountDataList;
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/ScreenKcNewsSummaryResultDTO.java

@@ -0,0 +1,14 @@
+package com.epmet.dto.result.user;
+
+import lombok.Data;
+
+@Data
+public class ScreenKcNewsSummaryResultDTO {
+
+    private String dateId;
+    private Integer newsCount;
+    private Integer readCount;
+    private Integer likeCount;
+    private Integer commentCount;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/GroupTopicShiftIssueRatioRankFormDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.evaluationindex.screen.dto.form;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+/**
+ *  邻里党群-社群人数排名-接口入参
+ * @Author sun
+ */
+@Data
+public class GroupTopicShiftIssueRatioRankFormDTO implements Serializable {
+    private static final long serialVersionUID = -2880432640584616651L;
+    /**
+     * 页码，从1开始
+     */
+    @Min(value = 1, message = "页码必须大于0", groups = { AddUserInternalGroup.class })
+    private Integer pageNo;
+    /**
+     * 页容量，默认10页
+     */
+    @Min(value = 1, message = "每页条数必须大于0", groups = { AddUserInternalGroup.class })
+    private Integer pageSize;
+    /**
+     * 客户Id
+     */
+    private String customerId;
+    public interface AddUserInternalGroup {}
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/GroupUserCountRankFormDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.evaluationindex.screen.dto.form;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+/**
+ *  邻里党群-社群人数排名-接口入参
+ * @Author sun
+ */
+@Data
+public class GroupUserCountRankFormDTO implements Serializable {
+    private static final long serialVersionUID = -2880432640584616651L;
+    /**
+     * 页码，从1开始
+     */
+    @Min(value = 1, message = "页码必须大于0", groups = { AddUserInternalGroup.class })
+    private Integer pageNo;
+    /**
+     * 页容量，默认10页
+     */
+    @Min(value = 1, message = "每页条数必须大于0", groups = { AddUserInternalGroup.class })
+    private Integer pageSize;
+    /**
+     * 客户Id
+     */
+    private String customerId;
+    public interface AddUserInternalGroup {}
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/HeartVolunteerrankFormDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.evaluationindex.screen.dto.form;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+/**
+ *  公益互助-个人（志愿者）公益时长排名-接口入参
+ * @Author sun
+ */
+@Data
+public class HeartVolunteerrankFormDTO implements Serializable {
+    private static final long serialVersionUID = -2880432640584616651L;
+    public interface AddUserInternalGroup {}
+    /**
+     * 页码，从1开始
+     */
+    @Min(value = 1, message = "页码必须大于0", groups = { AddUserInternalGroup.class })
+    private Integer pageNo;
+    /**
+     * 页容量，默认10页
+     */
+    @Min(value = 1, message = "每页条数必须大于0", groups = { AddUserInternalGroup.class })
+    private Integer pageSize;
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+}

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

@@ -0,0 +1,26 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *   公益互助-公益活动次数
+ * @Author sun
+ */
+@Data
+public class ActTrendMonthlyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 月id :yyyyMM
+     */
+    private String monthId = "";
+
+    /**
+     * 活动数量（本月举行的活动）
+     */
+    private Integer actCount = 0;
+
+}

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

@@ -0,0 +1,53 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+/**
+ *  公益互助-志愿者画像
+ * @Author sun
+ */
+@Data
+public class AgeDistributionResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 小于20岁的志愿者总人数
+     */
+    private Integer ageLevel1 = 0;
+    /**
+     * 20-30岁的志愿者总人数
+     */
+    private Integer ageLevel2 = 0;
+    /**
+     * 31-40岁的志愿者总人数
+     */
+    private Integer ageLevel3 = 0;
+    /**
+     * 41-50岁的志愿者总人数
+     */
+    private Integer ageLevel4 = 0;
+    /**
+     * 51-60岁的志愿者总人数
+     */
+    private Integer ageLevel5 = 0;
+    /**
+     * 60+岁的志愿者总人数
+     */
+    private Integer ageLevel6 = 0;
+    /**
+     * 志愿者中男性总人数
+     */
+    @JsonIgnore
+    private Integer maleCount = 0;
+    /**
+     * 志愿者中女性总人数
+     */
+    @JsonIgnore
+    private Integer femaleCount = 0;
+
+}

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

@@ -0,0 +1,26 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+/**
+ *  公益互助-志愿者画像
+ * @Author sun
+ */
+@Data
+public class GenderDistributionResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 志愿者中男性总人数
+     */
+    private Integer maleCount = 0;
+    /**
+     * 志愿者中女性总人数
+     */
+    private Integer femaleCount = 0;
+
+}

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

@@ -0,0 +1,26 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *   邻里党群-社群数量排名
+ * @Author sun
+ */
+@Data
+public class GridNameGroupCountResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 网格名称
+     */
+    private String gridName = "";
+
+    /**
+     * 社群数量
+     */
+    private Integer groupCount = 0;
+
+}

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

@@ -0,0 +1,28 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+/**
+ *  邻里党群-社群数量排名
+ * @Author sun
+ */
+@Data
+public class GroupGridgroupcountrankResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 网格名称集合
+     */
+    private LinkedList<String> gridNameDataList;
+
+    /**
+     * 社群数量集合
+     */
+    private LinkedList<Integer> groupCountDataList;
+
+
+}

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

@@ -0,0 +1,28 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+/**
+ *  邻里党群-话题参与趋势
+ * @Author sun
+ */
+@Data
+public class GroupPartitopictrendResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 横坐标月份集合
+     */
+    private LinkedList<String> xAxis;
+
+    /**
+     * 话题数量 集合
+     */
+    private LinkedList<Integer> actCountDataList;
+
+
+}

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

@@ -0,0 +1,48 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  公益互助-各类总数汇总
+ * @Author sun
+ */
+@Data
+public class GroupSummaryResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 日期Id, 数据更新至：yyyyMMdd
+     */
+    private String dateId = "";
+
+    /**
+     * 社群总数
+     */
+    private Integer groupCount = 0;
+    /**
+     * 群员总数
+     */
+    private Integer memberCount = 0;
+    /**
+     * 话题数量
+     */
+    private Integer topicCount = 0;
+    /**
+     * 话题参与量
+     */
+    private Integer partiCount = 0;
+    /**
+     * 转化议题率，这个后端自己算
+     */
+    private String shiftIssueRatio = "";
+    /**
+     * 话题转议题总数
+     */
+    @JsonIgnore
+    private Integer shiftIssueCount = 0;
+
+}

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

@@ -0,0 +1,33 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  公益互助-个人（志愿者）公益时长排名
+ * @Author sun
+ */
+@Data
+public class GroupTopicShiftIssueRatioRankResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 小组id
+     */
+    private String groupId = "";
+    /**
+     * 小组名称
+     */
+    private String groupName = "";
+    /**
+     * 话题数量
+     */
+    private Integer topicCount = 0;
+    /**
+     * 群主名称
+     */
+    private String groupLeader = "";
+
+}

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

@@ -0,0 +1,33 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  公益互助-个人（志愿者）公益时长排名
+ * @Author sun
+ */
+@Data
+public class GroupUserCountRankResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 小组id
+     */
+    private String groupId = "";
+    /**
+     * 小组名称
+     */
+    private String groupName = "";
+    /**
+     * 群成员数
+     */
+    private Integer memberCount = 0;
+    /**
+     * 群主名称
+     */
+    private String groupLeader = "";
+
+}

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

@@ -0,0 +1,29 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+import rx.internal.util.LinkedArrayList;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+/**
+ *  公益互助-公益活动次数
+ * @Author sun
+ */
+@Data
+public class HeartActcounttrendResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 横坐标 月份集合
+     */
+    private LinkedList<String> xAxis;
+
+    /**
+     * 活动次数 集合
+     */
+    private LinkedList<String> actCountDataList;
+
+
+}

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

@@ -0,0 +1,43 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  公益互助-各类总数汇总
+ * @Author sun
+ */
+@Data
+public class HeartSummaryResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 日期Id, 数据更新至：yyyyMMdd
+     */
+    private String dateId = "";
+
+    /**
+     * 活动次数
+     */
+    private Integer actCount = 0;
+    /**
+     * 志愿者总数
+     */
+    private Integer volunteerCount = 0;
+    /**
+     * 参与人次
+     */
+    private Integer partiUserCount = 0;
+    /**
+     * 发放积分
+     */
+    private Integer rewardPointCount = 0;
+    /**
+     * 公益时长
+     */
+    private Integer heartTime = 0;
+
+
+}

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

@@ -0,0 +1,27 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+/**
+ *  公益互助-志愿者画像
+ * @Author sun
+ */
+@Data
+public class HeartVolunteerportrayalResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 个年龄段志愿者人数
+     */
+    private AgeDistributionResultDTO ageDistribution;
+
+    /**
+     * 男、女志愿者人员
+     */
+    private GenderDistributionResultDTO genderDistribution;
+
+}

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

@@ -0,0 +1,37 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  公益互助-个人（志愿者）公益时长排名
+ * @Author sun
+ */
+@Data
+public class HeartVolunteerrankResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 用户id
+     */
+    private String userId = "";
+    /**
+     * 用户名称
+     */
+    private String userName = "";
+    /**
+     * 公益时长分钟
+     */
+    private Integer heartTime = 0;
+    /**
+     * 积分
+     */
+    private Integer points = 0;
+    /**
+     * 所属网格名称
+     */
+    private String gridName = "";
+
+}

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

@@ -0,0 +1,71 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  首页-平台各类总数
+ * @Author sun
+ */
+@Data
+public class HomepageSummaryResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+    private String dateId = "";
+
+    /**
+     * 网格总数
+     */
+    private Integer gridCount = 0;
+    /**
+     * 已开通网格数
+     */
+    private Integer openedGridCount = 0;
+    /**
+     * 议题总数
+     */
+    private Integer issueCount = 0;
+    /**
+     * 项目总数
+     */
+    private Integer projectCount = 0;
+    /**
+     * 用户总数
+     */
+    private Integer userCount = 0;
+    /**
+     * 党员用户
+     */
+    private Integer partyUserCount = 0;
+    /**
+     * 社群总数
+     */
+    private Integer groupCount = 0;
+    /**
+     * 话题总数
+     */
+    private Integer topicCount = 0;
+    /**
+     * 新闻总数
+     */
+    private Integer newsCount = 0;
+    /**
+     * 阅读数量
+     */
+    private Integer readCount = 0;
+    /**
+     * 公益活动总数
+     */
+    private Integer actCount = 0;
+    /**
+     * 志愿者总数
+     */
+    private Integer volunteerCount = 0;
+
+
+}

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

@@ -0,0 +1,26 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *   邻里党群-话题参与趋势
+ * @Author sun
+ */
+@Data
+public class KcTopicTrendGridMonthlyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 月id :yyyyMM
+     */
+    private String monthId = "";
+
+    /**
+     * 话题数量(所在月新增话题数)
+     */
+    private Integer topicCount = 0;
+
+}

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

@@ -27,4 +27,9 @@ public class MonthPieChartResultDTO implements Serializable {
      * 治理能力
      */
     private Double governAbility = 0.0;
+
+    /**
+     * 月份Id
+     */
+    private String monthId;
 }

epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.36
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.37
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-report/data-report-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.36</version>
+    <version>0.3.37</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/test/TestController.java

@@ -1,19 +0,0 @@
-package com.epmet.controller.test;
-
-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
-import com.epmet.commons.tools.utils.Result;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("test")
-public class TestController {
-
-    @ExternalAppRequestAuth
-    @RequestMapping("/test")
-    public Result test(ExternalAppRequestParam externalAppRequestParam, String ext) {
-        return new Result().ok("调用成功,客户信息:"+externalAppRequestParam);
-    }
-
-}

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

@@ -67,8 +67,8 @@ public class IndexController {
     }
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:02 上午
      */

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

@@ -1,10 +1,28 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.KcScreenService;
+import com.epmet.dto.PageFormDTO;
+import com.epmet.dto.result.project.*;
+import com.epmet.dto.result.user.*;
+import com.epmet.evaluationindex.screen.dto.form.GroupTopicShiftIssueRatioRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.GroupUserCountRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.HeartVolunteerrankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
+import com.epmet.dto.result.issue.KcIssueSummary;
+import com.epmet.dto.result.issue.KcPartiTrendResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 孔村大屏api
  *
@@ -19,12 +37,376 @@ public class KcScreenController {
     private KcScreenService kcScreenService;
 
 
-//    @ExternalAppRequestAuth
-//    @PostMapping("homepage/summary")
-//    public Result<YearAverageIndexResultDTO> yearAverageIndex(){
-////        ValidatorUtils.validateEntity(yearAverageIndexFormDTO, YearAverageIndexFormDTO.YearAverageIndex.class);
-////        return new Result<YearAverageIndexResultDTO>().ok(indexService.yearAverageIndex(yearAverageIndexFormDTO));
-//    }
+    /**
+     *  @param externalAppRequestParam
+     * @Description  首页-平台各类总数
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("homepage/summary")
+    public Result<HomepageSummaryResultDTO> homepageSummary(ExternalAppRequestParam externalAppRequestParam){
+        return new Result<HomepageSummaryResultDTO>().ok(kcScreenService.homepageSummary(externalAppRequestParam));
+    }
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-各类总数汇总
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("heart/summary")
+    public Result<HeartSummaryResultDTO> heartSummary(ExternalAppRequestParam externalAppRequestParam){
+        return new Result<HeartSummaryResultDTO>().ok(kcScreenService.heartSummary(externalAppRequestParam));
+    }
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-公益活动次数
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("heart/actcounttrend")
+    public Result<HeartActcounttrendResultDTO> heartActcounttrend(ExternalAppRequestParam externalAppRequestParam){
+        return new Result<HeartActcounttrendResultDTO>().ok(kcScreenService.heartActcounttrend(externalAppRequestParam));
+    }
+    /**
+     * 议题分析-各类总数
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("issue/summary")
+    public Result getIssueSummary(ExternalAppRequestParam externalAppRequestParam) {
+        String customerId = externalAppRequestParam.getCustomerId();
+        //String customerId = "b09527201c4409e19d1dbc5e3c3429a1";
+        KcIssueSummary issueSummary = kcScreenService.getIssueSummary(customerId);
+        return new Result().ok(issueSummary);
+    }
+
+    /**
+     * 参与趋势
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("issue/partitrend")
+    public Result getIssuePartiTrend(ExternalAppRequestParam externalAppRequestParam) {
+        String customerId = externalAppRequestParam.getCustomerId();
+        //String customerId = "b09527201c4409e19d1dbc5e3c3429a1";
+        KcPartiTrendResultDTO trendResultDTO = kcScreenService.getIssuePartiTrend(customerId);
+        return new Result().ok(trendResultDTO);
+    }
+
+    /**
+     * 按照议题数量排名
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("issue/gridtotalrank")
+    public Result getIssueGridTotalRank(ExternalAppRequestParam externalAppRequestParam) {
+        String customerId = externalAppRequestParam.getCustomerId();
+        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
+        return new Result().ok(kcScreenService.getIssueGridTotalRank(customerId));
+    }
+
+    /**
+     * 议题分析-审核效率排名
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("issue/avgaudittimerank")
+    public Result getAvgAuditTimeRank(ExternalAppRequestParam externalAppRequestParam) {
+        String customerId = externalAppRequestParam.getCustomerId();
+        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
+        return new Result().ok(kcScreenService.getAvgAuditTimeRank(customerId));
+    }
+
+    /**
+     * 议题分析-议题效率
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("issue/effective")
+    public Result getIssueEffective(ExternalAppRequestParam externalAppRequestParam) {
+        String customerId = externalAppRequestParam.getCustomerId();
+        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
+        return new Result().ok(kcScreenService.getIssueEffective(customerId));
+    }
+
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-志愿者画像
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("heart/volunteerportrayal")
+    public Result<HeartVolunteerportrayalResultDTO> heartVolunteerportrayal(ExternalAppRequestParam externalAppRequestParam){
+        return new Result<HeartVolunteerportrayalResultDTO>().ok(kcScreenService.heartVolunteerportrayal(externalAppRequestParam));
+    }
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-个人（志愿者）公益时长排名
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("heart/volunteerrank")
+    public Result<List<HeartVolunteerrankResultDTO>> heartVolunteerrank(ExternalAppRequestParam externalAppRequestParam, @RequestBody HeartVolunteerrankFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, HeartVolunteerrankFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(externalAppRequestParam.getCustomerId());
+        return new Result<List<HeartVolunteerrankResultDTO>>().ok(kcScreenService.heartVolunteerrank(formDTO));
+    }
+
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  邻里党群-各类总数
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("group/summary")
+    public Result<GroupSummaryResultDTO> groupSummary(ExternalAppRequestParam externalAppRequestParam){
+        return new Result<GroupSummaryResultDTO>().ok(kcScreenService.groupSummary(externalAppRequestParam));
+    }
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  邻里党群-话题参与趋势
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("group/partitopictrend")
+    public Result<GroupPartitopictrendResultDTO> groupPartitopictrend(ExternalAppRequestParam externalAppRequestParam){
+        return new Result<GroupPartitopictrendResultDTO>().ok(kcScreenService.groupPartitopictrend(externalAppRequestParam));
+    }
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  邻里党群-社群数量排名
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("group/gridgroupcountrank")
+    public Result<GroupGridgroupcountrankResultDTO> groupGridgroupcountrank(ExternalAppRequestParam externalAppRequestParam){
+        return new Result<GroupGridgroupcountrankResultDTO>().ok(kcScreenService.groupGridgroupcountrank(externalAppRequestParam));
+    }
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  邻里党群-社群数量排名
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("group/usercountrank")
+    public Result<List<GroupUserCountRankResultDTO>> groupUserCountRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody GroupUserCountRankFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, GroupUserCountRankFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(externalAppRequestParam.getCustomerId());
+        return new Result<List<GroupUserCountRankResultDTO>>().ok(kcScreenService.groupUserCountRank(formDTO));
+    }
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  邻里党群-话题数量排名
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("group/topicshiftissueratiorank")
+    public Result<List<GroupTopicShiftIssueRatioRankResultDTO>> groupTopicShiftIssueRatioRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody GroupTopicShiftIssueRatioRankFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, GroupTopicShiftIssueRatioRankFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(externalAppRequestParam.getCustomerId());
+        return new Result<List<GroupTopicShiftIssueRatioRankResultDTO>>().ok(kcScreenService.groupTopicShiftIssueRatioRank(formDTO));
+    }
+
+    /**
+     * 项目各类总数汇总
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("project/summary")
+    public Result<ProjectSummaryResultDTO> getProjectSummary(ExternalAppRequestParam externalAppRequestParam){
+        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<ProjectSummaryResultDTO>().ok(kcScreenService.getProjectSummary(customerId));
+    }
+
+    /**
+     * 项目分析-网格下项目数量排名
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("project/gridcountrank")
+    public Result<GridProjectCountRankResultDTO> getProjectGridCountRank(ExternalAppRequestParam externalAppRequestParam){
+        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<GridProjectCountRankResultDTO>().ok(kcScreenService.getGridProjectCountRank(customerId));
+    }
+
+    /**
+     * 项目分析-项目类别
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("project/categoryanalysis")
+    public Result<List<ProjectCategoryAnalysisResultDTO>> getProjectCategoryAnalysis(ExternalAppRequestParam externalAppRequestParam){
+        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<List<ProjectCategoryAnalysisResultDTO>>().ok(kcScreenService.getProjectCategoryAnalysis(customerId));
+    }
+
+    /**
+     * 网格项目平均结案时间
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("project/avgclosedtimeanalysis")
+    public Result<List<ProjectAvgClosedTimeResultDTO>> getGridProjectAvgClosedTimeAnalysis(ExternalAppRequestParam externalAppRequestParam){
+        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<List<ProjectAvgClosedTimeResultDTO>>().ok(kcScreenService.getGridProjectAvgClosedTimeAnalysis(customerId));
+    }
+
+    /**
+     * 项目分析-居民满意度
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("project/statis")
+    public Result<ProjectSatisfactionResultDTO> getProjectSatisfactionAnalyze(ExternalAppRequestParam externalAppRequestParam){
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<ProjectSatisfactionResultDTO>().ok(kcScreenService.getProjectSatisfactionAnalyze(customerId));
+    }
+
+    /**
+     * 用户-summary
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("user/summary")
+    public Result<UserSummaryResultDTO> getUserSummary(ExternalAppRequestParam externalAppRequestParam){
+        String customerId = externalAppRequestParam.getCustomerId();
+        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
+        return new Result<UserSummaryResultDTO>().ok(kcScreenService.getUserSummary(customerId));
+    }
+
+    /**
+     * 用户量趋势
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("user/trend")
+    public Result<KcUserTrendResultDTO> getUserTrend(ExternalAppRequestParam externalAppRequestParam){
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<KcUserTrendResultDTO>().ok(kcScreenService.getUserTrend(customerId));
+    }
+
+    /**
+     * 网格用户数量排名
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("user/griduserrank")
+    public Result<KcUserRankResultDTO> getUserRank(ExternalAppRequestParam externalAppRequestParam){
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<KcUserRankResultDTO>().ok(kcScreenService.getUserRank(customerId));
+    }
+
+    /**
+     * 用户画像
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("user/userportrayal")
+    public Result<KcUserPortrayalResultDTO> getUserPortrayal(ExternalAppRequestParam externalAppRequestParam){
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<KcUserPortrayalResultDTO>().ok(kcScreenService.getUserPortrayal(customerId));
+    }
+
+    /**
+     * 用户积分排名
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("user/pointsrank")
+    public Result<KcUserPointRankResultDTO> getUserPointsRank(ExternalAppRequestParam externalAppRequestParam,
+                                                              @RequestBody PageFormDTO form) {
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<KcUserPointRankResultDTO>().ok(kcScreenService.getUserPointsRank(customerId, form.getPageNo(), form.getPageSize()));
+    }
+
+    /**
+     * 党建声音-各类总数
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("news/summary")
+    public Result<ScreenKcNewsSummaryResultDTO> getNewsSummary(ExternalAppRequestParam externalAppRequestParam){
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<ScreenKcNewsSummaryResultDTO>().ok(kcScreenService.getNewsSummary(customerId));
+    }
+
+    /**
+     * 新闻阅读参与趋势
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("news/partitrend")
+    public Result<ScreenKcNewsPartiTrendResultDTO> getNewsPartiTrend(ExternalAppRequestParam externalAppRequestParam){
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<ScreenKcNewsPartiTrendResultDTO>().ok(kcScreenService.getNewsPartiTrend(customerId));
+    }
+
+    /**
+     * 党建声音-分类的news数量
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("news/category")
+    public Result<List<ScreenKcCategoryNewsCountResultDTO>> getNewsCountGroupByCategory(ExternalAppRequestParam externalAppRequestParam){
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<List<ScreenKcCategoryNewsCountResultDTO>>().ok(kcScreenService.getNewsCountOfCategory(customerId));
+    }
+
+    /**
+     * 党建声音-分类的用户参与数排行
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("news/userparticategoryrank")
+    public Result<ScreenKcCategoryNewsRankResultDTO> getNewsPartiCategoryRank(ExternalAppRequestParam externalAppRequestParam){
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<ScreenKcCategoryNewsRankResultDTO>().ok(kcScreenService.getNewsPartiCategoryRank(customerId));
+    }
+
+    /**
+     * 党建声音-热点新闻排行
+     * @param externalAppRequestParam
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("news/hotrank")
+    public Result<List<ScreenKcNewsHotRankResultDTO>> listNewsHotRank(ExternalAppRequestParam externalAppRequestParam,
+                                                                      @RequestBody PageFormDTO form){
+        String customerId = externalAppRequestParam.getCustomerId();
+        return new Result<List<ScreenKcNewsHotRankResultDTO>>().ok(kcScreenService.getNewsHotRank(customerId, form.getPageNo(), form.getPageSize()));
+    }
+
 
-    // @RequestBody
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java

@@ -54,8 +54,8 @@ public interface ScreenIndexDataMonthlyDao{
     List<MonthBarchartResult> selectMonthBarchart(@Param("agencyId")String agencyId);
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java

@@ -17,6 +17,7 @@
 
 package com.epmet.datareport.dao.evaluationindex.screen;
 
+import com.epmet.dto.result.user.KcUserPointRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.PartyUserPointResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.UserPointResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -51,4 +52,5 @@ public interface ScreenPartyUserRankDataDao{
     **/
     List<PartyUserPointResultDTO> selectPartymemberPointOrder(@Param("agencyId")String agencyId);
 
+    List<KcUserPointRankResultDTO.KcUserPoint> listUserPoints(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcActSummaryDailyDao.java

@@ -17,7 +17,9 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * KC-活动各类总数(先根据customerId+dateId删除)
@@ -28,4 +30,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcActSummaryDailyDao {
 
+    /**
+     *  @param customerId
+     * @Description  公益互助-各类总数汇总
+     * @author sun
+     */
+    HeartSummaryResultDTO selectHeartSummary(@Param("customerId") String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcActTrendMonthlyDao.java

@@ -17,7 +17,11 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.evaluationindex.screen.dto.result.ActTrendMonthlyResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * KC-活动(次数+时长)趋势(先根据customerId+monthId删除)
@@ -28,4 +32,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcActTrendMonthlyDao {
 
+    /**
+     *  @param customerId
+     * @Description  按客户查询最近十二个月数据
+     * @author sun
+     */
+    List<ActTrendMonthlyResultDTO> selectActTrendMonthly(@Param("customerId") String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupDetailGridDailyDao.java

@@ -17,8 +17,14 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.evaluationindex.screen.dto.form.GroupTopicShiftIssueRatioRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.GroupUserCountRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.GroupTopicShiftIssueRatioRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.GroupUserCountRankResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-小组详情(先根据customerId+dateId删除)
  *
@@ -28,4 +34,17 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcGroupDetailGridDailyDao {
 
+    /**
+     *  @param formDTO
+     * @Description 按客户查询最近一天所有网格数据 再按社群总数降序排列
+     * @author sun
+     */
+    List<GroupUserCountRankResultDTO> selectGroupUserCountRankList(GroupUserCountRankFormDTO formDTO);
+
+    /**
+     *  @param formDTO
+     * @Description 按客户查询最近一天所有网格数据 再按话题总数降序排列
+     * @author sun
+     */
+    List<GroupTopicShiftIssueRatioRankResultDTO> selectGroupTopicShiftIssueRatioRankList(GroupTopicShiftIssueRatioRankFormDTO formDTO);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupSummaryGridDailyDao.java

@@ -17,7 +17,12 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.evaluationindex.screen.dto.result.GridNameGroupCountResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.GroupSummaryResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.LinkedList;
 
 /**
  * KC-小组分析各类总数(先根据customerId+dateId删除)
@@ -28,4 +33,17 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcGroupSummaryGridDailyDao {
 
+    /**
+     * @param customerId
+     * @Description  邻里党群-各类总数
+     * @author sun
+     */
+    GroupSummaryResultDTO selectGroupSummaryDaily(@Param("customerId") String customerId);
+
+    /**
+     * @param customerId
+     * @Description 按日期降序，查询客户最近一天所有网格数据，按每个网格的社区总数降序排列
+     * @author sun
+     */
+    LinkedList<GridNameGroupCountResultDTO> selectGridDailyList(@Param("customerId") String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcIssueSummaryGridDailyDao.java

@@ -17,7 +17,14 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.issue.IssueAvgAuditTimeDTO;
+import com.epmet.dto.result.issue.IssueEffectResultDTO;
+import com.epmet.dto.result.issue.IssueGridTotalRankDTO;
+import com.epmet.dto.result.issue.KcIssueSummary;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * KC-议题分析(各类总数)
@@ -28,4 +35,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcIssueSummaryGridDailyDao {
 
+    KcIssueSummary getIssueSummary(@Param("customerId") String customerId);
+
+    List<IssueGridTotalRankDTO> getIssueGridTotalRank(@Param("customerId") String customerId);
+
+    List<IssueAvgAuditTimeDTO> getAvgAuditTimeRank(@Param("customerId") String customerId);
+
+    IssueEffectResultDTO getIssueEffective(@Param("customerId") String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcIssueTrendGridMonthlyDao.java

@@ -17,7 +17,11 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.issue.KcPartiTrendResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * KC-议题参与趋势(每天上报当前月)customerId+monthId先删后增
@@ -28,4 +32,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcIssueTrendGridMonthlyDao {
 
+    List<KcPartiTrendResultDTO> getIssuePartiTrend(@Param("customerId") String customerId);
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsCategoryAnalysisDao.java

@@ -17,8 +17,11 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.user.ScreenKcCategoryNewsCountResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-新闻-按类别统计(先根据customerId+dateId删除)
  *
@@ -28,4 +31,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcNewsCategoryAnalysisDao {
 
+    List<ScreenKcCategoryNewsCountResultDTO> getNewsCountOfCategory(String customerId);
+
+    List<ScreenKcCategoryNewsCountResultDTO> listNewsPartiCategoryRank(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsRankDao.java

@@ -17,8 +17,11 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.user.ScreenKcNewsHotRankResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-热点新闻排行-(先根据customerId删除)
  *
@@ -28,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcNewsRankDao {
 
+    List<ScreenKcNewsHotRankResultDTO> getNewsHotRank(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsSummaryDailyDao.java

@@ -17,6 +17,7 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.user.ScreenKcNewsSummaryResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -28,4 +29,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcNewsSummaryDailyDao {
 
+    ScreenKcNewsSummaryResultDTO getNewsSummary(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsTrendMonthlyDao.java

@@ -17,8 +17,11 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.user.ScreenKcNewsPartiTrendResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-新闻参与趋势-(先根据customerId+monthId删除)
  *
@@ -28,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcNewsTrendMonthlyDao {
 
+    List<ScreenKcNewsPartiTrendResultDTO.ScreenKcNewsPartyCount> getNewsPartiTrend(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcPlatformSummaryDailyDao.java

@@ -17,7 +17,9 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * KC-平台各汇总值(先根据customerId+dateId删除)
@@ -28,4 +30,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcPlatformSummaryDailyDao {
 
+    /**
+     *  @param customerId
+     * @Description  首页-平台各类总数
+     * @author sun
+     */
+    HomepageSummaryResultDTO selectSummaryDaily(@Param("customerId") String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectCategoryGridDailyDao.java

@@ -17,8 +17,11 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.project.ProjectCategoryAnalysisResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-项目按分类统计上报总数(先根据customerId+dateId删除)
  *
@@ -28,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcProjectCategoryGridDailyDao {
 
+    List<ProjectCategoryAnalysisResultDTO> listProjectCountGroupByCategory(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectSatisGridMonthlyDao.java

@@ -17,8 +17,11 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.project.ProjectSatisfactionResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-项目满意度分析(customerId+monthId先删除记录，再插入)
  *
@@ -28,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcProjectSatisGridMonthlyDao {
 
+    List<ProjectSatisfactionResultDTO> getProjectSatisfactionAnalyze(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectSummaryGridDailyDao.java

@@ -17,8 +17,13 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.project.GridProjectCountResultDTO;
+import com.epmet.dto.result.project.ProjectAvgClosedTimeResultDTO;
+import com.epmet.dto.result.project.ProjectSummaryResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-项目分析(各类总数先根据customerId+dateId删除，后插入)
  *
@@ -28,4 +33,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcProjectSummaryGridDailyDao {
 
+    List<GridProjectCountResultDTO> getGridProjectCountRank(String customerId);
+
+    ProjectSummaryResultDTO getProjectSummary(String customerId);
+
+    List<ProjectAvgClosedTimeResultDTO> getGridProjectAvgClosedTimeAnalysis(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcTopicTrendGridMonthlyDao.java

@@ -17,7 +17,11 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.evaluationindex.screen.dto.result.KcTopicTrendGridMonthlyResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * KC-话题参与趋势(先根据customerId+monthId删除)
@@ -28,4 +32,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcTopicTrendGridMonthlyDao {
 
+    /**
+     *  @param customerId
+     * @Description  按客户查询最近十二个月所有网格汇总数据
+     * @author sun
+     */
+    List<KcTopicTrendGridMonthlyResultDTO> selectActTrendMonthly(@Param("customerId") String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserHeatRankGridDailyDao.java

@@ -1,31 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.epmet.datareport.dao.evaluationindex.screenkc;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * KC-用户公益时长排名(先根据customerId删除)
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-09-09
- */
-@Mapper
-public interface ScreenKcUserHeatRankGridDailyDao {
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserSummaryDailyDao.java

@@ -17,8 +17,13 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.project.UserSummaryResultDTO;
+import com.epmet.dto.result.user.KcUserPortrayalResultDTO;
+import com.epmet.dto.result.user.KcUserRankResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-用户分析(先根据customerId+dateId删除，后插入)
  *
@@ -28,4 +33,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcUserSummaryDailyDao {
 
+    UserSummaryResultDTO getUserSummary(String customerId);
+
+    List<KcUserRankResultDTO> getUserRank(String customerId);
+
+    KcUserPortrayalResultDTO.AgeDistribution getAgeDistribution(String customerId);
+
+    KcUserPortrayalResultDTO.GenderDistribution getGenderDistribution(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserTrendGridMonthlyDao.java

@@ -17,8 +17,11 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.dto.result.user.KcUserTrendResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-用户趋势分析(根据monthId+customerId先删后增)
  *
@@ -28,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcUserTrendGridMonthlyDao {
 
+    List<KcUserTrendResultDTO> getUserTrend(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcVolunteerHeatRankGridDailyDao.java

@@ -17,8 +17,12 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.evaluationindex.screen.dto.form.HeartVolunteerrankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.HeartVolunteerrankResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-志愿者公益时长排名(先根据customerId删除)
  *
@@ -28,4 +32,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcVolunteerHeatRankGridDailyDao {
 
+    /**
+     *  @param formDTO
+     * @Description  公益互助-个人（志愿者）公益时长排名
+     * @author sun
+     */
+    List<HeartVolunteerrankResultDTO> selectHeartVolunteerrankList(HeartVolunteerrankFormDTO formDTO);
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcVolunteerSummaryDailyDao.java

@@ -17,7 +17,9 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.evaluationindex.screen.dto.result.AgeDistributionResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * KC-志愿者汇总(先根据customerId+dateId删除)
@@ -28,4 +30,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcVolunteerSummaryDailyDao {
 
+    /**
+     *  @param customerId
+     * @Description  根据客户Id查询最近日期志愿者统计数据
+     * @author sun
+     */
+    AgeDistributionResultDTO selectVolunteerSummaryDaily(@Param("customerId") String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/ScreenKcIssueSummaryGridDailyDTO.java

@@ -0,0 +1,156 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.issue;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * KC-议题分析(各类总数)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-14
+ */
+@Data
+public class ScreenKcIssueSummaryGridDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID 主键（先根据customerId+dateId删除，后插入）
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 上报总数
+     */
+	private Integer reportCount;
+
+    /**
+     * 议题总数
+     */
+	private Integer issueCount;
+
+    /**
+     * 待审核数
+     */
+	private Integer pendingCount;
+
+    /**
+     * 已驳回数
+     */
+	private Integer rejectedCount;
+
+    /**
+     * 处理中数
+     */
+	private Integer processingCount;
+
+    /**
+     * 已关闭数
+     */
+	private Integer closedCount;
+
+    /**
+     * 议题浏览数
+     */
+	private Integer issueViewCount;
+
+    /**
+     * 表态数
+     */
+	private Integer voteCount;
+
+    /**
+     * 审核通过数 ？为了算议题效率
+     */
+	private Integer passedCount;
+
+    /**
+     * 转化成项目数 ？为了算议题效率
+     */
+	private Integer shiftToProjectCount;
+
+    /**
+     * 平均审核时间单位分钟  ？
+     */
+	private Integer avgAuditTime;
+
+    /**
+     * 删除标识 0未删除；1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserHeatRankGridDailyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/ScreenKcIssueTrendGridMonthlyDTO.java

@@ -15,28 +15,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity.evaluationindex.screen;
+package com.epmet.datareport.dao.issue;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import java.io.Serializable;
+import java.util.Date;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
-import java.util.Date;
 
 /**
- * KC-用户公益时长排名(先根据customerId删除)
+ * KC-议题参与趋势(每天上报当前月)customerId+monthId先删后增
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-09-09
+ * @since v1.0.0 2020-09-14
  */
 @Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("screen_kc_user_heat_rank_grid_daily")
-public class ScreenKcUserHeatRankGridDailyEntity extends BaseEpmetEntity {
+public class ScreenKcIssueTrendGridMonthlyDTO implements Serializable {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID 主键(每天上报当前月),按照customerId+monthId先删除记录，再插入
+     */
+	private String id;
 
     /**
      * 客户Id
@@ -44,9 +44,9 @@ public class ScreenKcUserHeatRankGridDailyEntity extends BaseEpmetEntity {
 	private String customerId;
 
     /**
-     * 数据更新至：yyyyMMdd
+     * 月id :yyyyMM
      */
-	private String dateId;
+	private String monthId;
 
     /**
      * 网格id
@@ -59,7 +59,7 @@ public class ScreenKcUserHeatRankGridDailyEntity extends BaseEpmetEntity {
 	private String gridName;
 
     /**
-     * 网格所属组织id
+     * 网格所属的组织id
      */
 	private String parentAgencyId;
 
@@ -69,28 +69,38 @@ public class ScreenKcUserHeatRankGridDailyEntity extends BaseEpmetEntity {
 	private String allParentIds;
 
     /**
-     * 用户id
+     * 议题上报数（本月内上报的议题数量）
+     */
+	private Integer reportCount;
+
+    /**
+     * 删除标识 0未删除；1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
      */
-	private String userId;
+	private Integer revision;
 
     /**
-     * 用户姓名
+     * 创建人
      */
-	private String userName;
+	private String createdBy;
 
     /**
-     * 1志愿者 0不是志愿者
+     * 创建时间
      */
-	private Integer volunteerFlag;
+	private Date createdTime;
 
     /**
-     * 爱心时长 单位分钟
+     * 更新人
      */
-	private Integer heartTime;
+	private String updatedBy;
 
     /**
-     * 积分
+     * 更新时间
      */
-	private Integer points;
+	private Date updatedTime;
 
-}
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java

@@ -38,8 +38,8 @@ public interface IndexService {
     MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO);
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java

@@ -1,5 +1,18 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
+import com.epmet.dto.result.issue.*;
+import com.epmet.dto.result.project.*;
+import com.epmet.dto.result.user.*;
+import com.epmet.evaluationindex.screen.dto.form.GroupTopicShiftIssueRatioRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.GroupUserCountRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.HeartVolunteerrankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
+
+import java.util.List;
+
+import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
+
 /**
  * 孔村大屏api
  *
@@ -8,5 +21,117 @@ package com.epmet.datareport.service.evaluationindex.screen;
  */
 public interface KcScreenService {
 
+    /**
+     *  @param externalAppRequestParam
+     * @Description  首页-平台各类总数
+     * @author sun
+     */
+    HomepageSummaryResultDTO homepageSummary(ExternalAppRequestParam externalAppRequestParam);
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-各类总数汇总
+     * @author sun
+     */
+    HeartSummaryResultDTO heartSummary(ExternalAppRequestParam externalAppRequestParam);
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-公益活动次数
+     * @author sun
+     */
+    HeartActcounttrendResultDTO heartActcounttrend(ExternalAppRequestParam externalAppRequestParam);
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-志愿者画像
+     * @author sun
+     */
+    HeartVolunteerportrayalResultDTO heartVolunteerportrayal(ExternalAppRequestParam externalAppRequestParam);
+
+    /**
+     *  @param formDTO
+     * @Description  公益互助-个人（志愿者）公益时长排名
+     * @author sun
+     */
+    List<HeartVolunteerrankResultDTO> heartVolunteerrank(HeartVolunteerrankFormDTO formDTO);
+    KcIssueSummary getIssueSummary(String customerId);
+
+    KcPartiTrendResultDTO getIssuePartiTrend(String customerId);
+
+    IssueGridTotalRankDTO getIssueGridTotalRank(String customerId);
+
+    List<IssueAvgAuditTimeDTO> getAvgAuditTimeRank(String customerId);
+
+    IssueEffectResultDTO getIssueEffective(String customerId);
+
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  邻里党群-各类总数
+     * @author sun
+     */
+    GroupSummaryResultDTO groupSummary(ExternalAppRequestParam externalAppRequestParam);
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  邻里党群-话题参与趋势
+     * @author sun
+     */
+    GroupPartitopictrendResultDTO groupPartitopictrend(ExternalAppRequestParam externalAppRequestParam);
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  邻里党群-社群数量排名
+     * @author sun
+     */
+    GroupGridgroupcountrankResultDTO groupGridgroupcountrank(ExternalAppRequestParam externalAppRequestParam);
+
+    /**
+     *  @param formDTO
+     * @Description  邻里党群-社群数量排名
+     * @author sun
+     */
+    List<GroupUserCountRankResultDTO> groupUserCountRank(GroupUserCountRankFormDTO formDTO);
+
+    /**
+     *  @param formDTO
+     * @Description  邻里党群-话题数量排名
+     * @author sun
+     */
+    List<GroupTopicShiftIssueRatioRankResultDTO> groupTopicShiftIssueRatioRank(GroupTopicShiftIssueRatioRankFormDTO formDTO);
+    /**
+     * 项目各类总数
+     * @param customerId
+     * @return
+     */
+    ProjectSummaryResultDTO getProjectSummary(String customerId);
+
+    GridProjectCountRankResultDTO getGridProjectCountRank(String customerId);
+
+    List<ProjectCategoryAnalysisResultDTO> getProjectCategoryAnalysis(String customerId);
+
+    List<ProjectAvgClosedTimeResultDTO> getGridProjectAvgClosedTimeAnalysis(String customerId);
+
+    ProjectSatisfactionResultDTO getProjectSatisfactionAnalyze(String customerId);
+
+    UserSummaryResultDTO getUserSummary(String customerId);
+
+    KcUserTrendResultDTO getUserTrend(String customerId);
+
+    KcUserRankResultDTO getUserRank(String customerId);
+
+    KcUserPortrayalResultDTO getUserPortrayal(String customerId);
+
+    KcUserPointRankResultDTO getUserPointsRank(String customerId, Integer pageNo, Integer pageSize);
+
+    ScreenKcNewsSummaryResultDTO getNewsSummary(String customerId);
+
+    ScreenKcNewsPartiTrendResultDTO getNewsPartiTrend(String customerId);
+
+    List<ScreenKcCategoryNewsCountResultDTO> getNewsCountOfCategory(String customerId);
+
+    ScreenKcCategoryNewsRankResultDTO getNewsPartiCategoryRank(String customerId);
 
+    List<ScreenKcNewsHotRankResultDTO> getNewsHotRank(String customerId, Integer pageNo, Integer pageSize);
 }

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

@@ -86,7 +86,11 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public PartymemberAgeDistributionResultDTO partymemberAgeDistribution(ParymemberFormDTO param) {
-       return screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
+        PartymemberAgeDistributionResultDTO ageInfo = screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
+        if(null == ageInfo){
+            ageInfo = new PartymemberAgeDistributionResultDTO();
+        }
+        return ageInfo;
     }
 
     /**

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

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -53,6 +54,10 @@ public class IndexServiceImpl implements IndexService {
         if (null == yearAverageIndexResultDTO){
             return new YearAverageIndexResultDTO();
         }
+        yearAverageIndexResultDTO.setPartyDevAbility(getRound(yearAverageIndexResultDTO.getPartyDevAbility()));
+        yearAverageIndexResultDTO.setGovernAbility(getRound(yearAverageIndexResultDTO.getGovernAbility()));
+        yearAverageIndexResultDTO.setServiceAbility(getRound(yearAverageIndexResultDTO.getServiceAbility()));
+        yearAverageIndexResultDTO.setYearAverageIndex(getRound(yearAverageIndexResultDTO.getPartyDevAbility() + yearAverageIndexResultDTO.getGovernAbility() + yearAverageIndexResultDTO.getServiceAbility()));
         return yearAverageIndexResultDTO;
     }
 
@@ -66,19 +71,23 @@ public class IndexServiceImpl implements IndexService {
     @Override
     public MonthPieChartResultDTO monthPieChart(MonthPieChartFormDTO monthPieChartFormDTO) {
 
-        MonthPieChartResultDTO monthPieChartResultDTO = screenIndexDataMonthlyDao.selectMonthPieChart(monthPieChartFormDTO.getAgencyId(),null);
+        MonthPieChartResultDTO pieChartDTO = screenIndexDataMonthlyDao.selectMonthPieChart(monthPieChartFormDTO.getAgencyId(), null);
         String monthId = dateUtils.getCurrentMonthId();
         int time = NumConstant.TWELVE;
         //保证获取月度指数数据的最大可能性
-        while(null == monthPieChartResultDTO && time > NumConstant.ONE){
+        while ((null == pieChartDTO || StringUtils.isBlank(pieChartDTO.getMonthId())) && time > NumConstant.ONE) {
             time--;
-            monthId = dateUtils.getPreviousMonthIdByDest(null,monthId);
-            monthPieChartResultDTO = screenIndexDataMonthlyDao.selectMonthPieChart(monthPieChartFormDTO.getAgencyId(),monthId);
+            monthId = dateUtils.getPreviousMonthIdByDest(null, monthId);
+            pieChartDTO = screenIndexDataMonthlyDao.selectMonthPieChart(monthPieChartFormDTO.getAgencyId(), monthId);
         }
-        if (null == monthPieChartResultDTO){
+        if (null == pieChartDTO) {
             return new MonthPieChartResultDTO();
         }
-        return monthPieChartResultDTO;
+        // 处理小数四舍五入
+        pieChartDTO.setPartyDevAbility(getRound(pieChartDTO.getPartyDevAbility()));
+        pieChartDTO.setGovernAbility(getRound(pieChartDTO.getGovernAbility()));
+        pieChartDTO.setServiceAbility(getRound(pieChartDTO.getServiceAbility()));
+        return pieChartDTO;
     }
 
     /**
@@ -112,6 +121,13 @@ public class IndexServiceImpl implements IndexService {
             result.setTotalIndexData(totalIndexData);
             return result;
         }
+        // 处理小数四舍五入
+        monthBarchartResults.forEach(barchart -> {
+            barchart.setPartyDevAbility(getRound(barchart.getPartyDevAbility()));
+            barchart.setGovernAbility(getRound(barchart.getGovernAbility()));
+            barchart.setServiceAbility(getRound(barchart.getServiceAbility()));
+            barchart.setIndexTotal(getRound(barchart.getPartyDevAbility() + barchart.getGovernAbility() + barchart.getServiceAbility()));
+        });
         List<MonthBarchartResult> collect = monthBarchartResults.stream().sorted(Comparator.comparing(MonthBarchartResult::getMonthId)).collect(Collectors.toList());
         //升序 当前月份在队尾
         List<String> _ymList = dateUtils.getXpro().keySet().stream().collect(Collectors.toList());
@@ -163,8 +179,8 @@ public class IndexServiceImpl implements IndexService {
     }
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */
@@ -178,6 +194,13 @@ public class IndexServiceImpl implements IndexService {
         if (CollectionUtils.isEmpty(subAgencyIndexRankResultDTOS)){
             return new ArrayList<>();
         }
+        // 小数四舍五入
+        subAgencyIndexRankResultDTOS.forEach(indexRank -> {
+            indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility()));
+            indexRank.setGovernAbility(getRound(indexRank.getGovernAbility()));
+            indexRank.setServiceAbility(getRound(indexRank.getServiceAbility()));
+            indexRank.setTotalIndex(getRound(indexRank.getPartyDevAbility() + indexRank.getGovernAbility() + indexRank.getServiceAbility()));
+        });
         return subAgencyIndexRankResultDTOS;
     }
 
@@ -191,7 +214,25 @@ public class IndexServiceImpl implements IndexService {
         } else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())){
             // 月(上一个月) 指数排行
             subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectAnNingSubAgencyIndexMonthlyRank(formDTO);
+            subAgencyIndexRankResultDTOS.forEach(rank -> {
+                rank.setPartyDevAbility(getRound(rank.getPartyDevAbility()));
+                rank.setGovernAbility(getRound(rank.getGovernAbility()));
+                rank.setServiceAbility(getRound(rank.getServiceAbility()));
+                rank.setTotalIndex(getRound(rank.getPartyDevAbility() + rank.getGovernAbility() + rank.getServiceAbility()));
+            });
         }
         return subAgencyIndexRankResultDTOS;
     }
+
+    /**
+     * @Description  小数四舍五入
+     * @param d
+     * @author zxc
+     * @date 2020/9/14 2:01 下午
+     */
+    public Double getRound(Double d){
+        BigDecimal bigDecimal = new BigDecimal(d);
+        BigDecimal b = bigDecimal.setScale(NumConstant.ONE, BigDecimal.ROUND_HALF_UP);
+        return Double.valueOf(b.toString());
+    }
 }

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

@@ -1,12 +1,31 @@
 package com.epmet.datareport.service.evaluationindex.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.evaluationindex.screen.ScreenPartyUserRankDataDao;
+import com.epmet.datareport.dao.evaluationindex.screenkc.*;
 import com.epmet.datareport.service.evaluationindex.screen.KcScreenService;
 import com.epmet.datareport.utils.DateUtils;
+import com.epmet.dto.result.issue.*;
+import com.epmet.dto.result.project.*;
+import com.epmet.dto.result.user.*;
+import com.epmet.evaluationindex.screen.dto.form.GroupTopicShiftIssueRatioRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.GroupUserCountRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.HeartVolunteerrankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
+import com.epmet.dto.result.issue.KcIssueSummary;
+import com.epmet.dto.result.issue.KcPartiTrendResultDTO;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.NumberFormat;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * 孔村大屏api
  *
@@ -20,5 +39,426 @@ public class KcScreenServiceImpl implements KcScreenService {
     @Autowired
     private DateUtils dateUtils;
 
+    @Autowired
+    private ScreenKcPlatformSummaryDailyDao screenKcPlatformSummaryDailyDao;
+    @Autowired
+    private ScreenKcActSummaryDailyDao screenKcActSummaryDailyDao;
+    @Autowired
+    private ScreenKcActTrendMonthlyDao screenKcActTrendMonthlyDao;
+    @Autowired
+    private ScreenKcVolunteerSummaryDailyDao screenKcVolunteerSummaryDailyDao;
+    @Autowired
+    private ScreenKcVolunteerHeatRankGridDailyDao screenKcVolunteerHeatRankGridDailyDao;
+
+    @Autowired
+    private ScreenKcIssueSummaryGridDailyDao screenKcIssueSummaryGridDailyDao;
+
+    @Autowired
+    private ScreenKcIssueTrendGridMonthlyDao trendGridMonthlyDao;
+
+    @Autowired
+    private ScreenKcGroupSummaryGridDailyDao screenKcGroupSummaryGridDailyDao;
+
+    @Autowired
+    private ScreenKcTopicTrendGridMonthlyDao screenKcTopicTrendGridMonthlyDao;
+
+    @Autowired
+    private ScreenKcGroupDetailGridDailyDao screenKcGroupDetailGridDailyDao;
+
+    @Autowired
+    private ScreenKcProjectSummaryGridDailyDao screenKcProjectSummaryGridDailyDao;
+
+    @Autowired
+    private ScreenKcProjectCategoryGridDailyDao screenKcProjectCategoryGridDailyDao;
+
+    @Autowired
+    private ScreenKcProjectSummaryGridDailyDao projectSummaryGridDailyDao;
+
+    @Autowired
+    private ScreenKcProjectSatisGridMonthlyDao projectSatisGridMonthlyDao;
+
+    @Autowired
+    private ScreenKcUserSummaryDailyDao kcUserSummaryDailyDao;
+
+    @Autowired
+    private ScreenKcUserTrendGridMonthlyDao userTrendGridMonthlyDao;
+
+    @Autowired
+    private ScreenPartyUserRankDataDao partyUserRankDataDao;
+
+    @Autowired
+    private ScreenKcNewsSummaryDailyDao screenKcNewsSummaryDailyDao;
+
+    @Autowired
+    private ScreenKcNewsTrendMonthlyDao screenKcNewsTrendMonthlyDao;
+
+    @Autowired
+    private ScreenKcNewsCategoryAnalysisDao screenKcNewsCategoryAnalysisDao;
+
+    @Autowired
+    private ScreenKcNewsRankDao screenKcNewsRankDao;
+
+    /**
+     * @param externalAppRequestParam
+     * @Description 首页-平台各类总数
+     * @author sun
+     */
+    @Override
+    public HomepageSummaryResultDTO homepageSummary(ExternalAppRequestParam externalAppRequestParam) {
+        return screenKcPlatformSummaryDailyDao.selectSummaryDaily(externalAppRequestParam.getCustomerId());
+    }
+
+    /**
+     * @param externalAppRequestParam
+     * @Description 公益互助-各类总数汇总
+     * @author sun
+     */
+    @Override
+    public HeartSummaryResultDTO heartSummary(ExternalAppRequestParam externalAppRequestParam) {
+        return screenKcActSummaryDailyDao.selectHeartSummary(externalAppRequestParam.getCustomerId());
+    }
+
+    /**
+     * @param externalAppRequestParam
+     * @Description 公益互助-公益活动次数
+     * @author sun
+     */
+    @Override
+    public HeartActcounttrendResultDTO heartActcounttrend(ExternalAppRequestParam externalAppRequestParam) {
+        HeartActcounttrendResultDTO resultDTO = new HeartActcounttrendResultDTO();
+        LinkedList<String> xAxis = new LinkedList<>();
+        LinkedList<String> actCountDataList = new LinkedList<>();
+        //1.按客户查询最近十二个月数据
+        List<ActTrendMonthlyResultDTO> list = screenKcActTrendMonthlyDao.selectActTrendMonthly(externalAppRequestParam.getCustomerId());
+        //2.倒序遍历封装数据
+        for (int i = list.size() - 1; i >= 0; i--) {
+            xAxis.add(list.get(i).getMonthId());
+            actCountDataList.add(list.get(i).getActCount().toString());
+        }
+        //3.封装数据并返回
+        resultDTO.setXAxis(xAxis);
+        resultDTO.setActCountDataList(actCountDataList);
+        return resultDTO;
+    }
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-志愿者画像
+     * @author sun
+     */
+    @Override
+    public HeartVolunteerportrayalResultDTO heartVolunteerportrayal(ExternalAppRequestParam externalAppRequestParam) {
+        HeartVolunteerportrayalResultDTO resultDTO = new HeartVolunteerportrayalResultDTO();
+        GenderDistributionResultDTO genderDistribution = new GenderDistributionResultDTO();
+        //1.根据客户Id查询最近日期志愿者统计数据
+        AgeDistributionResultDTO ageDistribution = screenKcVolunteerSummaryDailyDao.selectVolunteerSummaryDaily(externalAppRequestParam.getCustomerId());
+        //2.封装数据并返回
+        if (null == ageDistribution) {
+            resultDTO.setAgeDistribution(new AgeDistributionResultDTO());
+            resultDTO.setGenderDistribution(genderDistribution);
+        } else {
+            resultDTO.setAgeDistribution(ageDistribution);
+            genderDistribution.setMaleCount(ageDistribution.getMaleCount());
+            genderDistribution.setFemaleCount(ageDistribution.getFemaleCount());
+            resultDTO.setGenderDistribution(genderDistribution);
+        }
+        return resultDTO;
+    }
+
+    /**
+     *  @param formDTO
+     * @Description  公益互助-个人（志愿者）公益时长排名
+     * @author sun
+     */
+    @Override
+    public List<HeartVolunteerrankResultDTO> heartVolunteerrank(HeartVolunteerrankFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        List<HeartVolunteerrankResultDTO> list = screenKcVolunteerHeatRankGridDailyDao.selectHeartVolunteerrankList(formDTO);
+        return list;
+    }
+
+    @Override
+    public KcIssueSummary getIssueSummary(String customerId) {
+        return screenKcIssueSummaryGridDailyDao.getIssueSummary(customerId);
+    }
+
+    @Override
+    public KcPartiTrendResultDTO getIssuePartiTrend(String customerId) {
+        List<KcPartiTrendResultDTO> trend = trendGridMonthlyDao.getIssuePartiTrend(customerId);
+        KcPartiTrendResultDTO result = new KcPartiTrendResultDTO();
+        trend.stream().forEach(t -> {
+            String month = t.getMonthId().substring(4);
+            result.getxAxis().add(new Integer(month).toString().concat("月"));
+            result.getReportCountDataList().add(t.getReportCount());
+        });
+        return result;
+    }
+
+    @Override
+    public IssueGridTotalRankDTO getIssueGridTotalRank(String customerId) {
+        List<IssueGridTotalRankDTO> issueGridTotals = screenKcIssueSummaryGridDailyDao.getIssueGridTotalRank(customerId);
+
+        IssueGridTotalRankDTO resultDTO = new IssueGridTotalRankDTO();
+        issueGridTotals.stream().forEach(igt -> {
+            resultDTO.getGridNameDataList().add(igt.getGridName());
+            resultDTO.getIssueCountDataList().add(igt.getIssueCount());
+        });
+
+        return resultDTO;
+    }
+
+    @Override
+    public List<IssueAvgAuditTimeDTO> getAvgAuditTimeRank(String customerId) {
+        return screenKcIssueSummaryGridDailyDao.getAvgAuditTimeRank(customerId);
+    }
+
+    @Override
+    public IssueEffectResultDTO getIssueEffective(String customerId) {
+        return screenKcIssueSummaryGridDailyDao.getIssueEffective(customerId);
+    }
+
+    /**
+     * @param externalAppRequestParam
+     * @Description 邻里党群-各类总数
+     * @author sun
+     */
+    @Override
+    public GroupSummaryResultDTO groupSummary(ExternalAppRequestParam externalAppRequestParam) {
+        //1.按客户查询最近一天各网格各项数据的汇总值
+        GroupSummaryResultDTO resultDTO = screenKcGroupSummaryGridDailyDao.selectGroupSummaryDaily(externalAppRequestParam.getCustomerId());
+        if (null == resultDTO) {
+            return new GroupSummaryResultDTO();
+        }
+
+        //2.计算转化议题率,保留两位小数
+        if (resultDTO.getTopicCount() < NumConstant.ONE || resultDTO.getShiftIssueCount() < NumConstant.ONE) {
+            resultDTO.setShiftIssueRatio("0%");
+        } else {
+            NumberFormat numberFormat = NumberFormat.getInstance();
+            //设置精确到小数点后2位
+            numberFormat.setMaximumFractionDigits(2);
+            String ratio = numberFormat.format((float) resultDTO.getShiftIssueCount() / (float) resultDTO.getTopicCount() * 100);
+            resultDTO.setShiftIssueRatio(ratio + "%");
+        }
+
+        return resultDTO;
+    }
+
+    /**
+     * @param externalAppRequestParam
+     * @Description 邻里党群-话题参与趋势
+     * @author sun
+     */
+    @Override
+    public GroupPartitopictrendResultDTO groupPartitopictrend(ExternalAppRequestParam externalAppRequestParam) {
+        GroupPartitopictrendResultDTO resultDTO = new GroupPartitopictrendResultDTO();
+        LinkedList<String> xAxis = new LinkedList<>();
+        LinkedList<Integer> actCountDataList = new LinkedList<>();
+        //1.按客户查询最近十二个月所有网格汇总数据
+        List<KcTopicTrendGridMonthlyResultDTO> list = screenKcTopicTrendGridMonthlyDao.selectActTrendMonthly(externalAppRequestParam.getCustomerId());
+        //2.倒序遍历封装数据
+        for (int i = list.size() - 1; i >= 0; i--) {
+            xAxis.add(list.get(i).getMonthId());
+            actCountDataList.add(list.get(i).getTopicCount());
+        }
+        //3.封装数据并返回
+        resultDTO.setXAxis(xAxis);
+        resultDTO.setActCountDataList(actCountDataList);
+        return resultDTO;
+    }
+
+    /**
+     * @param externalAppRequestParam
+     * @Description 邻里党群-社群数量排名
+     * @author sun
+     */
+    @Override
+    public GroupGridgroupcountrankResultDTO groupGridgroupcountrank(ExternalAppRequestParam externalAppRequestParam) {
+        GroupGridgroupcountrankResultDTO resultDTO = new GroupGridgroupcountrankResultDTO();
+        LinkedList<String> gridNameDataList = new LinkedList<>();
+        LinkedList<Integer> groupCountDataList = new LinkedList<>();
+        //1.按日期降序，查询客户最近一天所有网格数据，按每个网格的社区总数降序排列
+        LinkedList<GridNameGroupCountResultDTO> list = screenKcGroupSummaryGridDailyDao.selectGridDailyList(externalAppRequestParam.getCustomerId());
+        //2.封装数据
+        list.forEach(l -> {
+            gridNameDataList.add(l.getGridName());
+            groupCountDataList.add(l.getGroupCount());
+        });
+        resultDTO.setGridNameDataList(gridNameDataList);
+        resultDTO.setGroupCountDataList(groupCountDataList);
+
+        return resultDTO;
+    }
+
+    /**
+     *  @param formDTO
+     * @Description  邻里党群-社群数量排名
+     * @author sun
+     */
+    @Override
+    public List<GroupUserCountRankResultDTO> groupUserCountRank(GroupUserCountRankFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        //按客户查询最近一天所有网格数据 再按社群总数降序排列
+        List<GroupUserCountRankResultDTO> list = screenKcGroupDetailGridDailyDao.selectGroupUserCountRankList(formDTO);
+        return list;
+    }
+
+    /**
+     *  @param formDTO
+     * @Description  邻里党群-话题数量排名
+     * @author sun
+     */
+    @Override
+    public List<GroupTopicShiftIssueRatioRankResultDTO> groupTopicShiftIssueRatioRank(GroupTopicShiftIssueRatioRankFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        //按客户查询最近一天所有网格数据 再按话题总数降序排列
+        List<GroupTopicShiftIssueRatioRankResultDTO> list = screenKcGroupDetailGridDailyDao.selectGroupTopicShiftIssueRatioRankList(formDTO);
+        return list;
+    }
+
+    @Override
+    public ProjectSummaryResultDTO getProjectSummary(String customerId) {
+        return projectSummaryGridDailyDao.getProjectSummary(customerId);
+    }
+
+    @Override
+    public GridProjectCountRankResultDTO getGridProjectCountRank(String customerId) {
+        List<GridProjectCountResultDTO> gridCounts = screenKcProjectSummaryGridDailyDao.getGridProjectCountRank(customerId);
+        GridProjectCountRankResultDTO rankResult = new GridProjectCountRankResultDTO();
+        gridCounts.stream().forEach(gc -> {
+            rankResult.getGridNameDataList().add(gc.getGridName());
+            rankResult.getProjectCountDataList().add(gc.getProjectCount());
+        });
+        return rankResult;
+    }
+
+    @Override
+    public List<ProjectCategoryAnalysisResultDTO> getProjectCategoryAnalysis(String customerId) {
+        return screenKcProjectCategoryGridDailyDao.listProjectCountGroupByCategory(customerId);
+    }
+
+    @Override
+    public List<ProjectAvgClosedTimeResultDTO> getGridProjectAvgClosedTimeAnalysis(String customerId) {
+        return screenKcProjectSummaryGridDailyDao.getGridProjectAvgClosedTimeAnalysis(customerId);
+    }
+
+    @Override
+    public ProjectSatisfactionResultDTO getProjectSatisfactionAnalyze(String customerId) {
+        List<ProjectSatisfactionResultDTO> pss = projectSatisGridMonthlyDao.getProjectSatisfactionAnalyze(customerId);
+
+        ProjectSatisfactionResultDTO resultDTO = new ProjectSatisfactionResultDTO();
+        pss.stream().forEach(ps -> {
+            String monthNo = ps.getMonthId().substring(4);
+            resultDTO.getxAxis().add(new Integer(monthNo).toString().concat("月"));
+            resultDTO.getGreatSatisDataList().add(ps.getGreatSatis());
+            resultDTO.getGoodSatisDataList().add(ps.getGoodSatis());
+            resultDTO.getDisSatisDataList().add(ps.getDisSatis());
+        });
+        return resultDTO;
+    }
+
+    @Override
+    public UserSummaryResultDTO getUserSummary(String customerId) {
+        return kcUserSummaryDailyDao.getUserSummary(customerId);
+    }
+
+    @Override
+    public KcUserTrendResultDTO getUserTrend(String customerId) {
+        List<KcUserTrendResultDTO> userSomeNums = userTrendGridMonthlyDao.getUserTrend(customerId);
+        KcUserTrendResultDTO trend = new KcUserTrendResultDTO();
+        userSomeNums.stream().forEach(usm -> {
+            String monthStr = usm.getMonthId().substring(4);
+            trend.getxAxis().add(new Integer(monthStr).toString().concat("月"));
+            trend.getUserDataList().add(usm.getRegUserCount());
+            trend.getPartyUserDataList().add(usm.getPartyUserCount());
+        });
+
+        return trend;
+    }
+
+    @Override
+    public KcUserRankResultDTO getUserRank(String customerId) {
+        List<KcUserRankResultDTO> list = kcUserSummaryDailyDao.getUserRank(customerId);
+
+        KcUserRankResultDTO rank = new KcUserRankResultDTO();
+        list.stream().forEach(i -> {
+            rank.getGridNameDataList().add(i.getGridName());
+            rank.getTotalUserDataList().add(i.getViewUserCount());
+        });
+
+        return rank;
+    }
+
+    @Override
+    public KcUserPortrayalResultDTO getUserPortrayal(String customerId) {
+        KcUserPortrayalResultDTO.AgeDistribution ageDistribution = kcUserSummaryDailyDao.getAgeDistribution(customerId);
+        KcUserPortrayalResultDTO.GenderDistribution genderDistribution = kcUserSummaryDailyDao.getGenderDistribution(customerId);
+
+        KcUserPortrayalResultDTO portrayal = new KcUserPortrayalResultDTO();
+        portrayal.setAgeDistribution(ageDistribution);
+        portrayal.setGenderDistribution(genderDistribution);
+
+        return portrayal;
+    }
+
+    @Override
+    public KcUserPointRankResultDTO getUserPointsRank(String customerId, Integer pageNo, Integer pageSize) {
+        if (pageNo != null && pageSize != null) {
+            PageHelper.startPage(pageNo, pageSize);
+        }
+        List<KcUserPointRankResultDTO.KcUserPoint> userPoints = partyUserRankDataDao.listUserPoints(customerId);
+        KcUserPointRankResultDTO rank = new KcUserPointRankResultDTO();
+        userPoints.stream().forEach(p -> {
+            rank.getUserNameDataList().add(p.getUserName());
+            rank.getPointsDataList().add(p.getPointTotal());
+        });
+        return rank;
+    }
+
+    @Override
+    public ScreenKcNewsSummaryResultDTO getNewsSummary(String customerId) {
+        return screenKcNewsSummaryDailyDao.getNewsSummary(customerId);
+    }
+
+    @Override
+    public ScreenKcNewsPartiTrendResultDTO getNewsPartiTrend(String customerId) {
+        List<ScreenKcNewsPartiTrendResultDTO.ScreenKcNewsPartyCount> partyCounts =
+                screenKcNewsTrendMonthlyDao.getNewsPartiTrend(customerId);
+
+        ScreenKcNewsPartiTrendResultDTO trend = new ScreenKcNewsPartiTrendResultDTO();
+        partyCounts.stream().forEach(pc -> {
+            String monthId = pc.getMonthId();
+            trend.getxAxis().add(new Integer(monthId.substring(4)).toString().concat("月"));
+            trend.getPartiCountDataList().add(pc.getPartiCount());
+        });
+
+        return trend;
+    }
+
+    @Override
+    public List<ScreenKcCategoryNewsCountResultDTO> getNewsCountOfCategory(String customerId) {
+        return screenKcNewsCategoryAnalysisDao.getNewsCountOfCategory(customerId);
+    }
+
+    @Override
+    public ScreenKcCategoryNewsRankResultDTO getNewsPartiCategoryRank(String customerId) {
+        List<ScreenKcCategoryNewsCountResultDTO> partiCounts = screenKcNewsCategoryAnalysisDao.listNewsPartiCategoryRank(customerId);
+        ScreenKcCategoryNewsRankResultDTO rank = new ScreenKcCategoryNewsRankResultDTO();
+        partiCounts.stream().forEach(pc -> {
+            rank.getxAxis().add(pc.getCategoryName());
+            rank.getPartiCountDataList().add(pc.getPartiCount());
+        });
+        return rank;
+    }
 
+    @Override
+    public List<ScreenKcNewsHotRankResultDTO> getNewsHotRank(String customerId, Integer pageNo, Integer pageSize) {
+        if (pageNo != null && pageSize != null) {
+            PageHelper.startPage(pageNo, pageSize);
+        }
+        return screenKcNewsRankDao.getNewsHotRank(customerId);
+    }
 }

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

@@ -139,7 +139,7 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="dev,test,local">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.datareport.dao.group" level="DEBUG"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcUserHeatRankGridDailyDao.xml → epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/ScreenKcIssueSummaryGridDailyDao.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcUserHeatRankGridDailyDao">
+<mapper namespace="com.epmet.datareport.dao.issue.ScreenKcIssueSummaryGridDailyDTO">
 
 
-</mapper>
+
+</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/ScreenKcIssueTrendGridMonthlyDao.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.issue.ScreenKcIssueTrendGridMonthlyDTO">
+
+
+
+</mapper>

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

@@ -6,9 +6,10 @@
     <!-- 2、月度指数分析-饼状图 -->
     <select id="selectMonthPieChart" resultType="com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO">
         SELECT
-            ROUND(service_ablity,1) AS serviceAbility,
-            ROUND(party_dev_ablity,1) AS partyDevAbility,
-            ROUND(govern_ablity,1) AS governAbility
+            service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility,
+            party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility,
+            govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility,
+            MONTH_ID
         FROM
             screen_index_data_monthly
         WHERE
@@ -30,10 +31,9 @@
     <select id="selectMonthBarchart" resultType="com.epmet.evaluationindex.screen.dto.result.MonthBarchartResult">
         SELECT
 	        month_id AS monthId,
-            ROUND(service_ablity,1) AS serviceAbility,
-            ROUND(party_dev_ablity,1) AS partyDevAbility,
-            ROUND(govern_ablity,1) AS governAbility,
-            ROUND(index_total,1) AS indexTotal
+            service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility,
+            party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility,
+            govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility
         FROM
             screen_index_data_monthly
         WHERE
@@ -43,20 +43,20 @@
             LIMIT 12
     </select>
 
-    <!-- 下级部门指数排行 -->
+    <!-- 下级组织/部门指数排行 (不包含部门的数据) -->
     <select id="selectSubAgencyIndexRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
         SELECT
             org_name AS NAME,
-            ROUND(index_total,1) AS totalIndex,
-            ROUND(govern_ablity,1) AS governAbility,
-            ROUND(party_dev_ablity,1) AS partyDevAbility,
-            ROUND(service_ablity,1) AS serviceAbility
+            govern_ablity AS governAbility,
+            party_dev_ablity AS partyDevAbility,
+            service_ablity AS serviceAbility
         FROM
             screen_index_data_yearly
         WHERE
             del_flag = '0'
             AND parent_id = #{agencyId}
             AND year_id = #{yearId}
+            AND ORG_TYPE != 'department'
         ORDER BY index_total DESC
             LIMIT #{topNum}
     </select>
@@ -66,10 +66,9 @@
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         org_name AS `NAME`,
-        ROUND(index_total, 1) AS totalIndex,
-        ROUND(govern_ablity, 1) AS governAbility,
-        ROUND(party_dev_ablity, 1) AS partyDevAbility,
-        ROUND(service_ablity, 1) AS serviceAbility,
+        service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility,
+        party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility,
+        govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility,
         ORG_ID orgId
         FROM
         screen_index_data_monthly

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

@@ -6,10 +6,9 @@
     <!-- 1、年度平均指数 -->
     <select id="selectYearAverageIndex" resultType="com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO">
         SELECT
-            ROUND(index_total,1) AS yearAverageIndex,
-            ROUND(service_ablity,1) AS serviceAbility,
-            ROUND(party_dev_ablity,1) AS partyDevAbility,
-            ROUND(govern_ablity,1) AS governAbility
+            service_ablity AS serviceAbility,
+            party_dev_ablity AS partyDevAbility,
+            govern_ablity AS governAbility
         FROM
             screen_index_data_yearly
         WHERE
@@ -24,10 +23,9 @@
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         org_name AS `NAME`,
-        ROUND(index_total, 1) AS totalIndex,
-        ROUND(govern_ablity, 1) AS governAbility,
-        ROUND(party_dev_ablity, 1) AS partyDevAbility,
-        ROUND(service_ablity, 1) AS serviceAbility,
+        govern_ablity AS governAbility,
+        party_dev_ablity AS partyDevAbility,
+        service_ablity AS serviceAbility,
         ORG_ID orgId
         FROM
         screen_index_data_yearly

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

@@ -35,4 +35,13 @@
         ORDER BY
             POINT_TOTAL DESC
     </select>
+
+    <select id="listUserPoints" resultType="com.epmet.dto.result.user.KcUserPointRankResultDTO$KcUserPoint">
+        select ur.USER_NAME userName,
+               ur.POINT_TOTAL pointTotal
+        from screen_party_user_rank_data ur
+        where ur.DEL_FLAG = 0
+          and ur.CUSTOMER_ID = #{customerId}
+        order by ur.POINT_TOTAL desc
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcActSummaryDailyDao.xml

@@ -3,5 +3,22 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcActSummaryDailyDao">
 
+    <select id="selectHeartSummary" resultType="com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO">
+        SELECT
+            date_id AS "dateId",
+            act_count AS "actCount",
+            volunteer_count AS "volunteerCount",
+            parti_user_count AS "partiUserCount",
+            reward_point_count AS "rewardPointCount",
+            heart_time AS "heartTime"
+        FROM
+            screen_kc_act_summary_daily
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        ORDER BY
+            date_id DESC, created_time DESC
+        LIMIT 1
+    </select>
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcActTrendMonthlyDao.xml

@@ -4,5 +4,17 @@
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcActTrendMonthlyDao">
 
 
-
+    <select id="selectActTrendMonthly" resultType="com.epmet.evaluationindex.screen.dto.result.ActTrendMonthlyResultDTO">
+        SELECT
+            month_id AS "monthId",
+            act_count AS "actCount"
+        FROM
+            screen_kc_act_trend_monthly
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        ORDER BY
+            month_id DESC, created_time DESC
+        LIMIT 12
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupDetailGridDailyDao.xml

@@ -3,5 +3,62 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcGroupDetailGridDailyDao">
 
+    <select id="selectGroupUserCountRankList" resultType="com.epmet.evaluationindex.screen.dto.result.GroupUserCountRankResultDTO">
+        SELECT
+            grid_id AS "groupId",
+            grid_name AS "groupName",
+            member_count AS "memberCount",
+            group_leader AS "groupLeader"
+        FROM
+            screen_kc_group_detail_grid_daily
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND date_id = (
+            select
+                date_id
+            from
+                screen_kc_group_detail_grid_daily
+            where
+                del_flag = '0'
+            and customer_id = #{customerId}
+            order by
+                date_id desc,
+                created_time desc
+            limit 1
+        )
+        ORDER BY
+            member_count DESC
+        LIMIT #{pageNo}, #{pageSize}
+    </select>
+
+    <select id="selectGroupTopicShiftIssueRatioRankList" resultType="com.epmet.evaluationindex.screen.dto.result.GroupTopicShiftIssueRatioRankResultDTO">
+SELECT
+            grid_id AS "groupId",
+            grid_name AS "groupName",
+            topic_count AS "topicCount",
+            group_leader AS "groupLeader"
+        FROM
+            screen_kc_group_detail_grid_daily
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND date_id = (
+            select
+                date_id
+            from
+                screen_kc_group_detail_grid_daily
+            where
+                del_flag = '0'
+            and customer_id = #{customerId}
+            order by
+                date_id desc,
+                created_time desc
+            limit 1
+        )
+        ORDER BY
+            member_count DESC
+        LIMIT #{pageNo}, #{pageSize}
+    </select>
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupSummaryGridDailyDao.xml

@@ -3,5 +3,58 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcGroupSummaryGridDailyDao">
 
+    <select id="selectGroupSummaryDaily" resultType="com.epmet.evaluationindex.screen.dto.result.GroupSummaryResultDTO">
+        SELECT
+            date_id,
+            sum(group_count) "groupCount",
+            sum(member_count) "memberCount",
+            sum(topic_count) "topicCount",
+            sum(parti_count) "partiCount",
+            sum(shift_issue_count) "shiftIssueCount"
+        FROM
+            screen_kc_group_summary_grid_daily
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND date_id = (
+            select
+                date_id
+            from
+                screen_kc_group_summary_grid_daily
+            where
+                del_flag = '0'
+            and customer_id = #{customerId}
+            order by
+                date_id desc,
+                created_time desc
+            limit 1
+        )
+    </select>
+
+    <select id="selectGridDailyList" resultType="com.epmet.evaluationindex.screen.dto.result.GridNameGroupCountResultDTO">
+        SELECT
+            grid_name AS "gridName",
+            group_count AS "groupCount"
+        FROM
+            screen_kc_group_summary_grid_daily
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND date_id = (
+            select
+                date_id
+            from
+                screen_kc_group_summary_grid_daily
+            where
+                del_flag = '0'
+            and customer_id = #{customerId}
+            order by
+                date_id desc,
+                created_time desc
+            limit 1
+        )
+        ORDER BY
+            group_count DESC
+    </select>
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcIssueSummaryGridDailyDao.xml

@@ -3,5 +3,58 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcIssueSummaryGridDailyDao">
 
+    <select id="getIssueSummary" resultType="com.epmet.dto.result.issue.KcIssueSummary">
+        select t1.DATE_ID dateId,
+               sum(REPORT_COUNT)     reportCount,
+               sum(ISSUE_COUNT)      issueCount,
+               sum(PENDING_COUNT)    pendingCount,
+               sum(REJECTED_COUNT)   rejectedCount,
+               sum(PROCESSING_COUNT) processingCount,
+               sum(CLOSED_COUNT)     closedCount,
+               sum(ISSUE_VIEW_COUNT) issueViewCount,
+               sum(VOTE_COUNT)       voteCount
+        from screen_kc_issue_summary_grid_daily t1
+                 inner join (
+            select t21.CUSTOMER_ID as customerId, max(t21.DATE_ID) max_date_id from screen_kc_issue_summary_grid_daily t21  where t21.CUSTOMER_ID=#{customerId}) t2
+                            on (t1.CUSTOMER_ID = t2.customerId and t1.DATE_ID = t2.max_date_id)
+    </select>
 
+    <select id="getIssueGridTotalRank" resultType="com.epmet.dto.result.issue.IssueGridTotalRankDTO">
+        select
+            GRID_ID gridId,
+            GRID_NAME gridName,
+            ISSUE_COUNT issueCount
+        from screen_kc_issue_summary_grid_daily isd
+                 inner join (
+            select t21.CUSTOMER_ID as customerId, max(t21.DATE_ID) max_date_id
+            from screen_kc_issue_summary_grid_daily t21
+            where t21.CUSTOMER_ID = #{customerId}) latest
+                            on (isd.CUSTOMER_ID = latest.customerId and isd.DATE_ID = latest.max_date_id)
+        order by isd.ISSUE_COUNT desc
+        limit 7
+    </select>
+
+    <select id="getAvgAuditTimeRank" resultType="com.epmet.dto.result.issue.IssueAvgAuditTimeDTO">
+        select isd.GRID_ID gridId, isd.GRID_NAME gridName, isd.AVG_AUDIT_TIME avgAuditTime
+        from screen_kc_issue_summary_grid_daily isd
+                 inner join (
+            select t21.CUSTOMER_ID as customerId, max(t21.DATE_ID) max_date_id
+            from screen_kc_issue_summary_grid_daily t21
+            where t21.CUSTOMER_ID = #{customerId}) latest
+                            on (isd.CUSTOMER_ID = latest.customerId and isd.DATE_ID = latest.max_date_id)
+        order by isd.AVG_AUDIT_TIME desc
+        limit 7
+    </select>
+
+    <select id="getIssueEffective" resultType="com.epmet.dto.result.issue.IssueEffectResultDTO">
+        select (sum(isd.PASSED_COUNT) / sum(REPORT_COUNT)) * 100           reportEffectiveRatio,
+                (sum(isd.SHIFT_TO_PROJECT_COUNT) / sum(REPORT_COUNT)) * 100 conversionRatio
+        from screen_kc_issue_summary_grid_daily isd
+                 inner join (
+            select t21.CUSTOMER_ID as customerId, max(t21.DATE_ID) max_date_id
+            from screen_kc_issue_summary_grid_daily t21
+            where t21.CUSTOMER_ID = #{customerId}) latest
+                            on (isd.CUSTOMER_ID = latest.customerId and isd.CUSTOMER_ID = latest.customerId and
+                                isd.DATE_ID = latest.max_date_id)
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcIssueTrendGridMonthlyDao.xml

@@ -3,6 +3,12 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcIssueTrendGridMonthlyDao">
 
-
-
+    <select id="getIssuePartiTrend" resultType="com.epmet.dto.result.issue.KcPartiTrendResultDTO">
+        select MONTH_ID                monthId,
+               sum(trend.REPORT_COUNT) reportCount
+        from screen_kc_issue_trend_grid_monthly trend
+        where CUSTOMER_ID = #{customerId}
+        group by MONTH_ID
+        order by MONTH_ID asc
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsCategoryAnalysisDao.xml

@@ -3,4 +3,34 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcNewsCategoryAnalysisDao">
 
+    <select id="getNewsCountOfCategory"
+            resultType="com.epmet.dto.result.user.ScreenKcCategoryNewsCountResultDTO">
+        select pcd.CATEGORY_ID categoryId,
+               pcd.CATEGORY_NAME categoryName,
+               pcd.NEWS_COUNT newsCount
+        from screen_kc_news_category_analysis pcd
+                 inner join (
+            select CUSTOMER_ID, max(DATE_ID) MAX_DATE_ID
+            from screen_kc_news_category_analysis
+            where CUSTOMER_ID = #{customerId}
+              and DEL_FLAG = 0
+        ) latest on (pcd.CUSTOMER_ID = latest.CUSTOMER_ID and pcd.DATE_ID = latest.MAX_DATE_ID)
+        where pcd.DEL_FLAG = 0
+        order by pcd.NEWS_COUNT asc
+    </select>
+
+    <select id="listNewsPartiCategoryRank"
+            resultType="com.epmet.dto.result.user.ScreenKcCategoryNewsCountResultDTO">
+        select pcd.CATEGORY_NAME                                      categoryName,
+               (pcd.READ_COUNT + pcd.LIKE_COUNT + pcd.DIS_LIKE_COUNT) partiCount
+        from screen_kc_news_category_analysis pcd
+                 inner join (
+            select CUSTOMER_ID, max(DATE_ID) MAX_DATE_ID
+            from screen_kc_news_category_analysis
+            where CUSTOMER_ID = #{customerId}
+              and DEL_FLAG = 0
+        ) latest on (pcd.CUSTOMER_ID = latest.CUSTOMER_ID and pcd.DATE_ID = latest.MAX_DATE_ID)
+        where pcd.DEL_FLAG = 0
+        order by partiCount desc
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsRankDao.xml

@@ -3,6 +3,18 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcNewsRankDao">
 
-
-
+    <select id="getNewsHotRank" resultType="com.epmet.dto.result.user.ScreenKcNewsHotRankResultDTO">
+        select pcd.NEWS_ID    newsId,
+               pcd.NEWS_TITLE newsTitle,
+               pcd.HOT_COUNT  hotCount
+        from screen_kc_news_rank pcd
+                 inner join (
+            select CUSTOMER_ID, max(DATE_ID) MAX_DATE_ID
+            from screen_kc_news_rank
+            where CUSTOMER_ID = #{customerId}
+              and DEL_FLAG = 0
+        ) latest on (pcd.CUSTOMER_ID = latest.CUSTOMER_ID and pcd.DATE_ID = latest.MAX_DATE_ID)
+        where pcd.DEL_FLAG = 0
+        order by pcd.HOT_COUNT desc
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsSummaryDailyDao.xml

@@ -3,6 +3,20 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcNewsSummaryDailyDao">
 
-
-
+    <select id="getNewsSummary" resultType="com.epmet.dto.result.user.ScreenKcNewsSummaryResultDTO">
+        select ns.DATE_ID       dateId,
+               ns.NEWS_COUNT    newsCount,
+               ns.READ_COUNT    readCount,
+               ns.COMMENT_COUNT commentCount,
+               ns.LIKE_COUNT    likeCount
+        from screen_kc_news_summary_daily ns
+                 inner join (
+            select CUSTOMER_ID,
+                   max(DATE_ID) MAX_DATE_ID
+            from screen_kc_news_summary_daily
+            where DEL_FLAG = 0
+              and CUSTOMER_ID = #{customerId}
+        ) latest on (ns.CUSTOMER_ID = latest.CUSTOMER_ID and ns.DATE_ID = latest.MAX_DATE_ID)
+        where ns.DEL_FLAG = 0
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsTrendMonthlyDao.xml

@@ -3,6 +3,13 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcNewsTrendMonthlyDao">
 
-
-
+    <select id="getNewsPartiTrend"
+            resultType="com.epmet.dto.result.user.ScreenKcNewsPartiTrendResultDTO$ScreenKcNewsPartyCount">
+        select ntm.MONTH_ID, ntm.PARTI_COUNT
+        from screen_kc_news_trend_monthly ntm
+        where ntm.CUSTOMER_ID = #{customerId}
+          and ntm.DEL_FLAG = 0
+        order by MONTH_ID asc
+        limit 12
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcPlatformSummaryDailyDao.xml

@@ -3,5 +3,29 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcPlatformSummaryDailyDao">
 
+    <select id="selectSummaryDaily" resultType="com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO">
+        SELECT
+            date_id AS "dateId",
+            grid_count AS "gridCount",
+            opened_grid_count AS "openedGridCount",
+            issue_count AS "issueCount",
+            project_count AS "projectCount",
+            user_count AS "userCount",
+            party_user_count AS "partyUserCount",
+            group_count AS "groupCount",
+            topic_count AS "topicCount",
+            news_count AS "newsCount",
+            read_count AS "readCount",
+            act_count AS "actCount",
+            volunteer_count AS "volunteerCount"
+        FROM
+            screen_kc_platform_summary_daily
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        ORDER BY
+            date_id DESC, created_time DESC
+        LIMIT 1
+    </select>
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectCategoryGridDailyDao.xml

@@ -4,4 +4,19 @@
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcProjectCategoryGridDailyDao">
 
 
+    <select id="listProjectCountGroupByCategory"
+            resultType="com.epmet.dto.result.project.ProjectCategoryAnalysisResultDTO">
+        select CATEGORY_ID            categoryId,
+               CATEGORY_NAME          categoryName,
+               sum(pcd.PROJECT_COUNT) projectCount
+        from screen_kc_project_category_grid_daily pcd
+                 inner join (
+            select t.CUSTOMER_ID, max(DATE_ID) MAX_DATE_ID
+            from screen_kc_project_category_grid_daily t
+            where CUSTOMER_ID = #{customerId}
+        ) latest on (pcd.CUSTOMER_ID = latest.CUSTOMER_ID and pcd.DATE_ID = latest.MAX_DATE_ID)
+        where pcd.DEL_FLAG = 0
+        group by CATEGORY_ID
+        order by projectCount desc;
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectSatisGridMonthlyDao.xml

@@ -3,6 +3,19 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcProjectSatisGridMonthlyDao">
 
-
-
+    <select id="getProjectSatisfactionAnalyze" resultType="com.epmet.dto.result.project.ProjectSatisfactionResultDTO">
+        select t.monthId, greatSatis, goodSatis, disSatis
+        from (
+                 select psm.MONTH_ID         monthId,
+                        sum(psm.GREAT_SATIS) greatSatis,
+                        sum(psm.GOOD_SATIS)  goodSatis,
+                        sum(psm.DIS_SATIS)   disSatis
+                 from screen_kc_project_satis_grid_monthly psm
+                 where psm.DEL_FLAG = 0
+                   and psm.CUSTOMER_ID = #{customerId}
+                 group by psm.MONTH_ID
+             ) t
+        order by t.monthId asc
+        limit 12
+    </select>
 </mapper>