Merge remote-tracking branch 'remotes/origin/dev'

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-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,16 @@
+package com.epmet.dto.result.issue;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class KcPartiTrendResultDTO {
+
+    private String monthId;
+    private Integer reportCount;
+
+    private List<String> xAxis = new ArrayList<>();
+    private List<Integer> reportCountDataList = new ArrayList<>();
+}

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/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/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/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-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java

@@ -3,15 +3,24 @@ 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.evaluationindex.screen.dto.result.HeartActcounttrendResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO;
+import com.epmet.dto.result.issue.IssueGridTotalRankDTO;
+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
  *
@@ -58,5 +67,157 @@ public class KcScreenController {
     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));
+    }
+
 
 }

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

@@ -19,6 +19,7 @@ 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;
 
@@ -36,5 +37,5 @@ public interface ScreenKcActTrendMonthlyDao {
      * @Description  按客户查询最近十二个月数据
      * @author sun
      */
-    List<ActTrendMonthlyResultDTO> selectActTrendMonthly(String customerId);
+    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/ScreenKcPlatformSummaryDailyDao.java

@@ -19,6 +19,7 @@ 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删除)
@@ -34,5 +35,5 @@ public interface ScreenKcPlatformSummaryDailyDao {
      * @Description  首页-平台各类总数
      * @author sun
      */
-    HomepageSummaryResultDTO selectSummaryDaily(String customerId);
+    HomepageSummaryResultDTO selectSummaryDaily(@Param("customerId") 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/ScreenKcVolunteerHeatRankGridDailyDao.java

@@ -17,9 +17,12 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
-import com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO;
+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删除)
  *
@@ -30,9 +33,10 @@ import org.apache.ibatis.annotations.Mapper;
 public interface ScreenKcVolunteerHeatRankGridDailyDao {
 
     /**
-     *  @param customerId
-     * @Description  公益互助-各类总数汇总
+     *  @param formDTO
+     * @Description  公益互助-个人（志愿者）公益时长排名
      * @author sun
      */
-    HeartSummaryResultDTO selectHeartSummary(String customerId);
+    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/KcScreenService.java

@@ -1,8 +1,14 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
-import com.epmet.evaluationindex.screen.dto.result.HeartActcounttrendResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO;
+import com.epmet.dto.result.issue.*;
+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;
 
 /**
@@ -33,4 +39,63 @@ public interface KcScreenService {
      * @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);
 }

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

@@ -2,19 +2,25 @@ 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.screenkc.ScreenKcActTrendMonthlyDao;
-import com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcPlatformSummaryDailyDao;
-import com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcVolunteerHeatRankGridDailyDao;
+import com.epmet.datareport.dao.evaluationindex.screenkc.*;
 import com.epmet.datareport.service.evaluationindex.screen.KcScreenService;
 import com.epmet.datareport.utils.DateUtils;
-import com.epmet.evaluationindex.screen.dto.result.ActTrendMonthlyResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.HeartActcounttrendResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO;
+import com.epmet.dto.result.issue.*;
+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.epmet.evaluationindex.screen.dto.form.HeartVolunteerrankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.NumberFormat;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -30,12 +36,32 @@ public class KcScreenServiceImpl implements KcScreenService {
 
     @Autowired
     private DateUtils dateUtils;
+
     @Autowired
     private ScreenKcPlatformSummaryDailyDao screenKcPlatformSummaryDailyDao;
     @Autowired
-    private ScreenKcVolunteerHeatRankGridDailyDao screenKcVolunteerHeatRankGridDailyDao;
+    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;
 
     /**
      * @param externalAppRequestParam
@@ -54,7 +80,7 @@ public class KcScreenServiceImpl implements KcScreenService {
      */
     @Override
     public HeartSummaryResultDTO heartSummary(ExternalAppRequestParam externalAppRequestParam) {
-        return screenKcVolunteerHeatRankGridDailyDao.selectHeartSummary(externalAppRequestParam.getCustomerId());
+        return screenKcActSummaryDailyDao.selectHeartSummary(externalAppRequestParam.getCustomerId());
     }
 
     /**
@@ -80,4 +106,182 @@ public class KcScreenServiceImpl implements KcScreenService {
         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;
+    }
+
 }

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/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,8 +4,7 @@
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcActTrendMonthlyDao">
 
 
-    <select id="selectActTrendMonthly"
-            resultType="com.epmet.evaluationindex.screen.dto.result.ActTrendMonthlyResultDTO">
+    <select id="selectActTrendMonthly" resultType="com.epmet.evaluationindex.screen.dto.result.ActTrendMonthlyResultDTO">
         SELECT
             month_id AS "monthId",
             act_count AS "actCount"
@@ -15,7 +14,7 @@
             del_flag = '0'
         AND customer_id = #{customerId}
         ORDER BY
-            month_id DESC
+            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,56 @@
 
 <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
+    </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
+    </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/ScreenKcPlatformSummaryDailyDao.xml

@@ -24,7 +24,7 @@
             del_flag = '0'
         AND customer_id = #{customerId}
         ORDER BY
-            date_id DESC
+            date_id DESC, created_time DESC
         LIMIT 1
     </select>
 

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

@@ -4,5 +4,27 @@
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcTopicTrendGridMonthlyDao">
 
 
-
+    <select id="selectActTrendMonthly" resultType="com.epmet.evaluationindex.screen.dto.result.KcTopicTrendGridMonthlyResultDTO">
+        SELECT DISTINCT
+            month_id AS "monthId",
+            (
+                select
+                    sum(topic_count)
+                from
+                    screen_kc_topic_trend_grid_monthly
+                where
+                    del_flag = '0'
+                and customer_id = #{customerId}
+                and month_id = monthId
+            )
+        FROM
+            screen_kc_topic_trend_grid_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/ScreenKcVolunteerHeatRankGridDailyDao.xml

@@ -3,22 +3,20 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcVolunteerHeatRankGridDailyDao">
 
-
-    <select id="selectHeartSummary" resultType="com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO">
+    <select id="selectHeartVolunteerrankList" resultType="com.epmet.evaluationindex.screen.dto.result.HeartVolunteerrankResultDTO">
         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"
+            grid_name AS "gridName",
+            user_id AS "userId",
+            user_name AS "userName",
+            heart_time AS "heartTime",
+            points AS "points"
         FROM
-            screen_kc_act_summary_daily
+            screen_kc_volunteer_heat_rank_grid_daily
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
         ORDER BY
-            date_id DESC
-        LIMIT 1
+            date_id DESC, created_time DESC
+        LIMIT #{pageNo}, #{pageSize}
     </select>
 </mapper>

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

@@ -3,5 +3,23 @@
 
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcVolunteerSummaryDailyDao">
 
-
+    <select id="selectVolunteerSummaryDaily" resultType="com.epmet.evaluationindex.screen.dto.result.AgeDistributionResultDTO">
+        SELECT
+            age_level_1 AS "ageLevel1",
+            age_level_2 AS "ageLevel2",
+            age_level_3 AS "ageLevel3",
+            age_level_4 AS "ageLevel4",
+            age_level_5 AS "ageLevel5",
+            age_level_6 AS "ageLevel6",
+            male_count AS "maleCount",
+            female_count AS "femaleCount"
+        FROM
+            screen_kc_volunteer_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-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java

@@ -15,11 +15,11 @@ public interface IndexCalConstant {
     /**
      * 批量删除 一次删除50
      */
-    Integer DELETE_SIZE=1000;
+    Integer DELETE_SIZE = 1000;
     /**
      * 分批计算，一次计算 10条
      */
-    Integer PAGE_SIZE = 1000;
+    Integer PAGE_SIZE = 800;
 
     String GRID_ID="GRID_ID";
 

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupDetailFormDTO.java

@@ -63,5 +63,6 @@ public class KcGroupDetailFormDTO implements Serializable {
     /**
      * 转为议题的话题数
      */
-    private Integer shifitIssueCount;
+    private Integer shiftIssueCount;
+
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSatisanalysisFormDTO.java

@@ -38,15 +38,15 @@ public class KcProjectSatisanalysisFormDTO implements Serializable {
     /**
      * 非常满意项目总数
      */
-    private Integer greatSatis;
+    private Integer greatSatisfaction;
 
     /**
      * 满意项目总数
      */
-    private Integer goodSatis;
+    private Integer goodSatisfaction;
 
     /**
      * 不满意的项目总数
      */
-    private Integer disSatis;
+    private Integer disSatisfaction;
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserSummaryFormDTO.java

@@ -48,7 +48,7 @@ public class KcUserSummaryFormDTO implements Serializable {
     /**
      * 党员用户
      */
-    private Integer partyUserCount;
+    private Integer partyCount;
 
     /**
      * 小于20岁的党员总人数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserHeatRankGridDailyDao.java

@@ -1,33 +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.dao.evaluationindex.screen;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.evaluationindex.screen.ScreenKcUserHeatRankGridDailyEntity;
-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 extends BaseDao<ScreenKcUserHeatRankGridDailyEntity> {
-
-}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java

@@ -84,7 +84,10 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
         List<CpcScoreEntity> list = null;
 
         Map<String, CpcScoreEntity> preLastCpcScoreTotalMap = new HashMap<>();
+        //当前最后一条记录
         CpcScoreEntity currentLastCpcScore = null;
+        //当前第一条记录
+        CpcScoreEntity currentFirstCpcScore = null;
         do {
             //获取数据
             list = cpcScoreDao.getPartScore(formDTO.getCustomerId(), formDTO.getMonthId(), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode(), (pageNo - NumConstant.ONE) * pageSize, pageSize);
@@ -94,8 +97,11 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
             } else {
                 //获取最后一条
                 currentLastCpcScore = list.get(list.size() - 1);
-                if (preLastCpcScoreTotalMap.containsKey(currentLastCpcScore.getUserId())) {
+                //获取第一条
+                currentFirstCpcScore = list.get(0);
+                if (preLastCpcScoreTotalMap.containsKey(currentFirstCpcScore.getUserId())) {
                     cpcScoreTotalMap.putAll(preLastCpcScoreTotalMap);
+                    preLastCpcScoreTotalMap.clear();
                     preLastCpcScoreTotalMap.put(currentLastCpcScore.getUserId(), null);
                 }
                 Map<String, List<CpcScoreEntity>> userGroupMap = list.stream().collect(Collectors.groupingBy(CpcScoreEntity::getUserId));

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

@@ -1,6 +1,8 @@
 package com.epmet.service.stats.impl;
 
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.DimYearDao;
 import com.epmet.entity.stats.DimYearEntity;
 import com.epmet.service.stats.DemoDataStatsService;
@@ -14,6 +16,7 @@ import java.util.Date;
  * 默认为统计数据源，不需要手动指定
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DemoDataStatsServiceImpl implements DemoDataStatsService {
 
     @Autowired

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

@@ -55,6 +55,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgencyEntity> implements DimAgencyService {
 
     @Autowired
@@ -210,7 +211,6 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
         return baseDao.selectTopAgency(customerId);
     }
 
-    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
 	@Override
 	public List<DimAgencyEntity> getAgencyListByCustomerId(String customerId) {
         if (StringUtils.isBlank(customerId)){

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

@@ -19,12 +19,14 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
 import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimCustomerDao;
@@ -52,6 +54,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
+@DataSource(DataSourceConstant.STATS)
 public class DimCustomerServiceImpl extends BaseServiceImpl<DimCustomerDao, DimCustomerEntity> implements DimCustomerService {
 
     @Autowired

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

@@ -19,17 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
-import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimDateDao;
 import com.epmet.dto.stats.DimDateDTO;
 import com.epmet.entity.stats.DimDateEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimDateService;
 import com.epmet.service.stats.LastExecRecordService;
 import com.epmet.util.DimIdGenerator;
@@ -39,7 +39,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 日期维度表
@@ -48,6 +51,7 @@ import java.util.*;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimDateServiceImpl extends BaseServiceImpl<DimDateDao, DimDateEntity> implements DimDateService {
 
     @Autowired

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

@@ -19,10 +19,12 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
 import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimDepartmentDao;
@@ -50,6 +52,7 @@ import java.util.Map;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimDepartmentServiceImpl extends BaseServiceImpl<DimDepartmentDao, DimDepartmentEntity> implements DimDepartmentService {
 
     @Autowired

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

@@ -19,12 +19,14 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimGridDao;
 import com.epmet.dao.stats.LastExecRecordDao;
@@ -33,9 +35,7 @@ import com.epmet.dto.group.result.AgencyGridInfoResultDTO;
 import com.epmet.dto.group.result.SubAgencyIdResultDTO;
 import com.epmet.dto.stats.DimGridDTO;
 import com.epmet.entity.stats.DimGridEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimGridService;
-import com.epmet.service.stats.LastExecRecordService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +53,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntity> implements DimGridService {
 
     @Autowired

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

@@ -19,23 +19,22 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
-import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimMonthDao;
 import com.epmet.dto.stats.DimMonthDTO;
 import com.epmet.entity.stats.DimMonthEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimMonthService;
 import com.epmet.service.stats.LastExecRecordService;
 import com.epmet.util.DimIdGenerator;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.LocalDate;
-import org.joda.time.LocalTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,6 +51,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimMonthServiceImpl extends BaseServiceImpl<DimMonthDao, DimMonthEntity> implements DimMonthService {
 
     @Autowired

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

@@ -19,21 +19,20 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
-import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimQuarterDao;
 import com.epmet.dto.stats.DimQuarterDTO;
 import com.epmet.entity.stats.DimQuarterEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimQuarterService;
 import com.epmet.service.stats.LastExecRecordService;
 import com.epmet.util.DimIdGenerator;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +40,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 季度维度表
@@ -50,6 +52,7 @@ import java.util.*;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimQuarterServiceImpl extends BaseServiceImpl<DimQuarterDao, DimQuarterEntity> implements DimQuarterService {
 
     private Logger logger = LoggerFactory.getLogger(getClass());

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

@@ -19,17 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
-import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimWeekDao;
 import com.epmet.dto.stats.DimWeekDTO;
 import com.epmet.entity.stats.DimWeekEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimWeekService;
 import com.epmet.service.stats.LastExecRecordService;
 import org.apache.commons.lang3.StringUtils;
@@ -50,6 +50,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimWeekServiceImpl extends BaseServiceImpl<DimWeekDao, DimWeekEntity> implements DimWeekService {
 
     @Autowired

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

@@ -19,17 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
-import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimYearDao;
 import com.epmet.dto.stats.DimYearDTO;
 import com.epmet.entity.stats.DimYearEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimYearService;
 import com.epmet.service.stats.LastExecRecordService;
 import org.apache.commons.lang3.StringUtils;
@@ -50,6 +50,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimYearServiceImpl extends BaseServiceImpl<DimYearDao, DimYearEntity> implements DimYearService {
 
     @Autowired

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

@@ -17,7 +17,9 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactAgencyProjectDailyDao;
 import com.epmet.dto.project.form.MonthProjectListFormDTO;
 import com.epmet.entity.stats.FactAgencyProjectDailyEntity;
@@ -33,6 +35,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactAgencyProjectDailyServiceImpl extends BaseServiceImpl<FactAgencyProjectDailyDao, FactAgencyProjectDailyEntity> implements FactAgencyProjectDailyService {
 
 

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

@@ -17,7 +17,9 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactAgencyProjectMonthlyDao;
 import com.epmet.entity.stats.FactAgencyProjectMonthlyEntity;
 import com.epmet.service.stats.FactAgencyProjectMonthlyService;
@@ -30,6 +32,7 @@ import org.springframework.stereotype.Service;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactAgencyProjectMonthlyServiceImpl extends BaseServiceImpl<FactAgencyProjectMonthlyDao, FactAgencyProjectMonthlyEntity> implements FactAgencyProjectMonthlyService {
 
     /**

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

@@ -18,7 +18,9 @@
 package com.epmet.service.stats.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactArticlePublishedAgencyDailyDao;
 import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
 import com.epmet.service.stats.FactArticlePublishedAgencyDailyService;
@@ -37,6 +39,7 @@ import java.util.Collection;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactArticlePublishedAgencyDailyServiceImpl extends BaseServiceImpl<FactArticlePublishedAgencyDailyDao, FactArticlePublishedAgencyDailyEntity> implements FactArticlePublishedAgencyDailyService {
 
 

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

@@ -17,7 +17,9 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactArticlePublishedDepartmentDailyDao;
 import com.epmet.entity.stats.FactArticlePublishedDepartmentDailyEntity;
 import com.epmet.service.stats.FactArticlePublishedDepartmentDailyService;
@@ -35,6 +37,7 @@ import java.util.Collection;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactArticlePublishedDepartmentDailyServiceImpl extends BaseServiceImpl<FactArticlePublishedDepartmentDailyDao, FactArticlePublishedDepartmentDailyEntity> implements FactArticlePublishedDepartmentDailyService {
 
 

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactArticlePublishedGridDailyDao;
 import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
 import com.epmet.entity.stats.FactArticlePublishedGridDailyEntity;
@@ -41,6 +43,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactArticlePublishedGridDailyServiceImpl extends BaseServiceImpl<FactArticlePublishedGridDailyDao, FactArticlePublishedGridDailyEntity> implements FactArticlePublishedGridDailyService {
 
 

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

@@ -17,7 +17,9 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactGridProjectDailyDao;
 import com.epmet.dto.project.form.MonthProjectListFormDTO;
 import com.epmet.entity.stats.FactAgencyProjectDailyEntity;
@@ -34,6 +36,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactGridProjectDailyServiceImpl extends BaseServiceImpl<FactGridProjectDailyDao, FactGridProjectDailyEntity> implements FactGridProjectDailyService {
 
     /**

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

@@ -17,7 +17,9 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactGridProjectMonthlyDao;
 import com.epmet.entity.stats.FactAgencyProjectMonthlyEntity;
 import com.epmet.entity.stats.FactGridProjectMonthlyEntity;
@@ -31,6 +33,7 @@ import org.springframework.stereotype.Service;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactGridProjectMonthlyServiceImpl extends BaseServiceImpl<FactGridProjectMonthlyDao, FactGridProjectMonthlyEntity> implements FactGridProjectMonthlyService {
 
     /**

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

@@ -19,11 +19,13 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactGroupAgencyDailyDao;
 import com.epmet.dto.group.form.AgencyMonthlyFormDTO;
 import com.epmet.dto.group.result.AgencyGroupDailyResultDTO;
@@ -32,7 +34,6 @@ import com.epmet.dto.stats.FactGroupAgencyDailyDTO;
 import com.epmet.entity.stats.FactGroupAgencyDailyEntity;
 import com.epmet.service.stats.FactGroupAgencyDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,6 +49,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactGroupAgencyDailyServiceImpl extends BaseServiceImpl<FactGroupAgencyDailyDao, FactGroupAgencyDailyEntity> implements FactGroupAgencyDailyService {
 
     @Override

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

@@ -19,11 +19,13 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactGroupAgencyMonthlyDao;
 import com.epmet.dto.group.form.AgencyMonthlyFormDTO;
 import com.epmet.dto.stats.FactGroupAgencyMonthlyDTO;
@@ -44,6 +46,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactGroupAgencyMonthlyServiceImpl extends BaseServiceImpl<FactGroupAgencyMonthlyDao, FactGroupAgencyMonthlyEntity> implements FactGroupAgencyMonthlyService {
 
     @Override

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

@@ -19,17 +19,18 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.group.result.GroupGridDailyResultDTO;
-import com.epmet.dto.stats.FactGroupGridDailyDTO;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactGroupGridDailyDao;
+import com.epmet.dto.group.result.GroupGridDailyResultDTO;
+import com.epmet.dto.stats.FactGroupGridDailyDTO;
 import com.epmet.entity.stats.FactGroupGridDailyEntity;
 import com.epmet.service.StatsGroupService;
-import com.epmet.service.group.GroupDataService;
 import com.epmet.service.stats.FactGroupGridDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactGroupGridDailyServiceImpl extends BaseServiceImpl<FactGroupGridDailyDao, FactGroupGridDailyEntity> implements FactGroupGridDailyService {
 
     @Autowired

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

@@ -19,16 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactIssueAgencyDailyDao;
 import com.epmet.dto.stats.FactIssueAgencyDailyDTO;
 import com.epmet.entity.stats.FactIssueAgencyDailyEntity;
 import com.epmet.service.stats.FactIssueAgencyDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +44,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-17
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactIssueAgencyDailyServiceImpl extends BaseServiceImpl<FactIssueAgencyDailyDao, FactIssueAgencyDailyEntity> implements FactIssueAgencyDailyService {
 
     @Override

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

@@ -19,16 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactIssueAgencyMonthlyDao;
 import com.epmet.dto.stats.FactIssueAgencyMonthlyDTO;
 import com.epmet.entity.stats.FactIssueAgencyMonthlyEntity;
 import com.epmet.service.stats.FactIssueAgencyMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +44,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-17
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactIssueAgencyMonthlyServiceImpl extends BaseServiceImpl<FactIssueAgencyMonthlyDao, FactIssueAgencyMonthlyEntity> implements FactIssueAgencyMonthlyService {
 
 

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

@@ -19,16 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactIssueGridDailyDao;
 import com.epmet.dto.stats.FactIssueGridDailyDTO;
 import com.epmet.entity.stats.FactIssueGridDailyEntity;
 import com.epmet.service.stats.FactIssueGridDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +44,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-17
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactIssueGridDailyServiceImpl extends BaseServiceImpl<FactIssueGridDailyDao, FactIssueGridDailyEntity> implements FactIssueGridDailyService {
 
     @Override

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

@@ -19,16 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactIssueGridMonthlyDao;
 import com.epmet.dto.stats.FactIssueGridMonthlyDTO;
 import com.epmet.entity.stats.FactIssueGridMonthlyEntity;
 import com.epmet.service.stats.FactIssueGridMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +44,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-17
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactIssueGridMonthlyServiceImpl extends BaseServiceImpl<FactIssueGridMonthlyDao, FactIssueGridMonthlyEntity> implements FactIssueGridMonthlyService {
 
     @Override

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

@@ -17,12 +17,13 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedAgencyDailyDao;
 import com.epmet.entity.stats.FactTagUsedAgencyDailyEntity;
-import com.epmet.entity.stats.FactTagUsedGridDailyEntity;
 import com.epmet.service.stats.FactTagUsedAgencyDailyService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -41,6 +42,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedAgencyDailyServiceImpl extends BaseServiceImpl<FactTagUsedAgencyDailyDao, FactTagUsedAgencyDailyEntity> implements FactTagUsedAgencyDailyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedAgencyMonthlyDao;
 import com.epmet.entity.stats.FactTagUsedAgencyMonthlyEntity;
 import com.epmet.service.stats.FactTagUsedAgencyMonthlyService;
@@ -39,6 +41,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedAgencyMonthlyServiceImpl extends BaseServiceImpl<FactTagUsedAgencyMonthlyDao, FactTagUsedAgencyMonthlyEntity> implements FactTagUsedAgencyMonthlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedAgencyQuarterlyDao;
 import com.epmet.entity.stats.FactTagUsedAgencyQuarterlyEntity;
 import com.epmet.service.stats.FactTagUsedAgencyQuarterlyService;
@@ -39,6 +41,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedAgencyQuarterlyServiceImpl extends BaseServiceImpl<FactTagUsedAgencyQuarterlyDao, FactTagUsedAgencyQuarterlyEntity> implements FactTagUsedAgencyQuarterlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedAgencyYearlyDao;
 import com.epmet.entity.stats.FactTagUsedAgencyYearlyEntity;
 import com.epmet.service.stats.FactTagUsedAgencyYearlyService;
@@ -39,6 +41,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedAgencyYearlyServiceImpl extends BaseServiceImpl<FactTagUsedAgencyYearlyDao, FactTagUsedAgencyYearlyEntity> implements FactTagUsedAgencyYearlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedDepartmentDailyDao;
 import com.epmet.entity.stats.FactTagUsedDepartmentDailyEntity;
 import com.epmet.service.stats.FactTagUsedDepartmentDailyService;
@@ -40,6 +42,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedDepartmentDailyServiceImpl extends BaseServiceImpl<FactTagUsedDepartmentDailyDao, FactTagUsedDepartmentDailyEntity> implements FactTagUsedDepartmentDailyService {
 
     @Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedDepartmentMonthlyDao;
 import com.epmet.entity.stats.FactTagUsedDepartmentMonthlyEntity;
 import com.epmet.service.stats.FactTagUsedDepartmentMonthlyService;
@@ -39,6 +41,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedDepartmentMonthlyServiceImpl extends BaseServiceImpl<FactTagUsedDepartmentMonthlyDao, FactTagUsedDepartmentMonthlyEntity> implements FactTagUsedDepartmentMonthlyService {
 
 

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedDepartmentQuarterlyDao;
 import com.epmet.entity.stats.FactTagUsedDepartmentQuarterlyEntity;
 import com.epmet.service.stats.FactTagUsedDepartmentQuarterlyService;
@@ -37,6 +39,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedDepartmentQuarterlyServiceImpl extends BaseServiceImpl<FactTagUsedDepartmentQuarterlyDao, FactTagUsedDepartmentQuarterlyEntity> implements FactTagUsedDepartmentQuarterlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedDepartmentYearlyDao;
 import com.epmet.entity.stats.FactTagUsedDepartmentYearlyEntity;
 import com.epmet.service.stats.FactTagUsedDepartmentYearlyService;
@@ -38,6 +40,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedDepartmentYearlyServiceImpl extends BaseServiceImpl<FactTagUsedDepartmentYearlyDao, FactTagUsedDepartmentYearlyEntity> implements FactTagUsedDepartmentYearlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedGridDailyDao;
 import com.epmet.entity.stats.FactTagUsedGridDailyEntity;
 import com.epmet.service.stats.FactTagUsedGridDailyService;
@@ -40,6 +42,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedGridDailyServiceImpl extends BaseServiceImpl<FactTagUsedGridDailyDao, FactTagUsedGridDailyEntity> implements FactTagUsedGridDailyService {
 
 

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedGridMonthlyDao;
 import com.epmet.entity.stats.FactTagUsedGridMonthlyEntity;
 import com.epmet.service.stats.FactTagUsedGridMonthlyService;
@@ -37,6 +39,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedGridMonthlyServiceImpl extends BaseServiceImpl<FactTagUsedGridMonthlyDao, FactTagUsedGridMonthlyEntity> implements FactTagUsedGridMonthlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedGridQuarterlyDao;
 import com.epmet.entity.stats.FactTagUsedGridQuarterlyEntity;
 import com.epmet.service.stats.FactTagUsedGridQuarterlyService;
@@ -37,6 +39,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedGridQuarterlyServiceImpl extends BaseServiceImpl<FactTagUsedGridQuarterlyDao, FactTagUsedGridQuarterlyEntity> implements FactTagUsedGridQuarterlyService {
 
 

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagUsedGridYearlyDao;
 import com.epmet.entity.stats.FactTagUsedGridYearlyEntity;
 import com.epmet.service.stats.FactTagUsedGridYearlyService;
@@ -37,6 +39,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagUsedGridYearlyServiceImpl extends BaseServiceImpl<FactTagUsedGridYearlyDao, FactTagUsedGridYearlyEntity> implements FactTagUsedGridYearlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedAgencyDailyDao;
 import com.epmet.entity.stats.FactTagViewedAgencyDailyEntity;
 import com.epmet.service.stats.FactTagViewedAgencyDailyService;
@@ -39,6 +41,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedAgencyDailyServiceImpl extends BaseServiceImpl<FactTagViewedAgencyDailyDao, FactTagViewedAgencyDailyEntity> implements FactTagViewedAgencyDailyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedAgencyMonthlyDao;
 import com.epmet.entity.stats.FactTagViewedAgencyMonthlyEntity;
 import com.epmet.service.stats.FactTagViewedAgencyMonthlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedAgencyMonthlyServiceImpl extends BaseServiceImpl<FactTagViewedAgencyMonthlyDao, FactTagViewedAgencyMonthlyEntity> implements FactTagViewedAgencyMonthlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedAgencyQuarterlyDao;
 import com.epmet.entity.stats.FactTagViewedAgencyQuarterlyEntity;
 import com.epmet.service.stats.FactTagViewedAgencyQuarterlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedAgencyQuarterlyServiceImpl extends BaseServiceImpl<FactTagViewedAgencyQuarterlyDao, FactTagViewedAgencyQuarterlyEntity> implements FactTagViewedAgencyQuarterlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedAgencyYearlyDao;
 import com.epmet.entity.stats.FactTagViewedAgencyYearlyEntity;
 import com.epmet.service.stats.FactTagViewedAgencyYearlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedAgencyYearlyServiceImpl extends BaseServiceImpl<FactTagViewedAgencyYearlyDao, FactTagViewedAgencyYearlyEntity> implements FactTagViewedAgencyYearlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedGridDailyDao;
 import com.epmet.entity.stats.FactTagViewedGridDailyEntity;
 import com.epmet.service.stats.FactTagViewedGridDailyService;
@@ -40,6 +42,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedGridDailyServiceImpl extends BaseServiceImpl<FactTagViewedGridDailyDao, FactTagViewedGridDailyEntity> implements FactTagViewedGridDailyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedGridMonthlyDao;
 import com.epmet.entity.stats.FactTagViewedGridMonthlyEntity;
 import com.epmet.service.stats.FactTagViewedGridMonthlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedGridMonthlyServiceImpl extends BaseServiceImpl<FactTagViewedGridMonthlyDao, FactTagViewedGridMonthlyEntity> implements FactTagViewedGridMonthlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedGridQuarterlyDao;
 import com.epmet.entity.stats.FactTagViewedGridQuarterlyEntity;
 import com.epmet.service.stats.FactTagViewedGridQuarterlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedGridQuarterlyServiceImpl extends BaseServiceImpl<FactTagViewedGridQuarterlyDao, FactTagViewedGridQuarterlyEntity> implements FactTagViewedGridQuarterlyService {
 
 	@Override

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

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedGridYearlyDao;
 import com.epmet.entity.stats.FactTagViewedGridYearlyEntity;
 import com.epmet.service.stats.FactTagViewedGridYearlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedGridYearlyServiceImpl extends BaseServiceImpl<FactTagViewedGridYearlyDao, FactTagViewedGridYearlyEntity> implements FactTagViewedGridYearlyService {
 
 	@Override

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

@@ -1,5 +1,7 @@
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
 import com.epmet.dao.stats.LastExecRecordDao;
 import com.epmet.entity.stats.LastExecRecordEntity;
@@ -7,13 +9,13 @@ import com.epmet.service.stats.LastExecRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class LastExecRecordServiceImpl implements LastExecRecordService {
     @Autowired
     private LastExecRecordDao lastExecRecordDao;
 
+    @Override
     public LastExecRecordEntity getLastExecRecord(String statsSubject) {
         return lastExecRecordDao.getLastExecRecord(statsSubject);
     }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcActSummaryDailyDao.xml

@@ -22,7 +22,7 @@
 
     <delete id="deleteActSummary">
         delete from screen_kc_act_summary_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>