From f0d4f185dab98a02ac46db6c2a2456d566988694 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 29 Jun 2021 13:53:11 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/EpmetConstant.java | 71 ++++ .../form/ScreenBaseReportDataFormDTO.java | 15 + .../result/CommunityGroupTotalResultDTO.java | 75 ++++ .../result/CommunityHotTopicResultDTO.java | 75 ++++ .../result/CommunityIssueResultDTO.java | 185 +++++++++ .../result/CommunityProjectResultDTO.java | 130 ++++++ .../result/CommunityTopicIssueResultDTO.java | 68 ++++ .../result/CommunityTopicStatusResultDTO.java | 80 ++++ .../screen/result/CommunityUserResultDTO.java | 105 +++++ .../result/GridGridProjectResultDTO.java | 130 ++++++ .../result/GridGroupTotalResultDTO.java | 75 ++++ .../screen/result/GridHotTopicResultDTO.java | 75 ++++ .../dto/screen/result/GridIssueResultDTO.java | 185 +++++++++ .../result/GridTopicIssueResultDTO.java | 68 ++++ .../result/GridTopicStatusResultDTO.java | 80 ++++ .../dto/screen/result/GridUserResultDTO.java | 110 +++++ .../ScreenBaseReportDataController.java | 190 +++++++++ .../screen/dao/ScreenBaseReportDataDao.java | 154 +++++++ .../service/ScreenBaseReportDataService.java | 138 +++++++ .../impl/ScreenBaseReportDataServiceImpl.java | 146 +++++++ .../mapper/screen/ScreenBaseReportDataDao.xml | 380 ++++++++++++++++++ .../esua/epdc/feign/AnalysisFeignClient.java | 141 +++++++ .../fallback/AnalysisFeignClientFallback.java | 71 ++++ .../screen/ScreenBaseReportDataPushTask.java | 18 + .../ScreenBaseReportDataPushTaskImpl.java | 261 ++++++++++++ 25 files changed, 3026 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenBaseReportDataFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityHotTopicResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityIssueResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityUserResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridHotTopicResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridIssueResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridUserResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportDataController.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportDataService.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTask.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java index 31e1d361..f77a2ff3 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java @@ -318,4 +318,75 @@ public interface EpmetConstant { */ String EPMET_SCREEN_COLL_USER_TOTAL = "/data/stats/screencoll/usertotaldata"; + + /** + * 网格状态话题数据 + */ + String EPMET_SCREEN_BASE_REPORT_GRID_TOPIC_STATUS = "/data/stats/basereport/gridtopicstatus"; + + /** + * 组织状态话题数据 + */ + String EPMET_SCREEN_BASE_REPORT_AGENCY_TOPIC_STATUS = "/data/stats/basereport/agencytopicstatus"; + + /** + * 网格话题转议题数据 + */ + String EPMET_SCREEN_BASE_REPORT_GRID_TOPIC_ISSUE = "/data/stats/basereport/gridtopicissue"; + + /** + * 组织话题转议题数据 + */ + String EPMET_SCREEN_BASE_REPORT_AGNENCY_TOPIC_ISSUE = "/data/stats/basereport/agencytopicissue"; + + /** + * 网格项目数据 + */ + String EPMET_SCREEN_BASE_REPORT_GRID_PROJECT = "/data/stats/basereport/gridproject"; + + /** + * 组织项目数据 + */ + String EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT = "/data/stats/basereport/agencyproject"; + + /** + * 网格群组总数 + */ + String EPMET_SCREEN_BASE_REPORT_GRID_GROUP_TOTAL = "/data/stats/basereport/gridgrouptotal"; + + /** + * 组织群组总数 + */ + String EPMET_SCREEN_BASE_REPORT_AGENCY_GROUP_TOTAL = "/data/stats/basereport/agencygrouptotal"; + + /** + * 网格热议话题数据 + */ + String EPMET_SCREEN_BASE_REPORT_GRID_HOT_TOPIC = "/data/stats/basereport/gridhottopic"; + + /** + * 组织热议话题数据 + */ + String EPMET_SCREEN_BASE_REPORT_AGENCY_HOT_TOPIC = "/data/stats/basereport/agencyhottopic"; + + /** + * 网格议题数据 + */ + String EPMET_SCREEN_BASE_REPORT_GRID_ISSUE = "/data/stats/basereport/gridissue"; + + /** + * 组织议题数据 + */ + String EPMET_SCREEN_BASE_REPORT_AGENCY_ISSUE = "/data/stats/basereport/agencyissue"; + + /** + * 网格注册用户数据 + */ + String EPMET_SCREEN_BASE_REPORT_GRID_REGISTER_USER = "/data/stats/basereport/gridreguser"; + + /** + * 组织注册用户数据 + */ + String EPMET_SCREEN_BASE_REPORT_AGENCY_REGISTER_USER = "/data/stats/basereport/agencyreguser"; + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenBaseReportDataFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenBaseReportDataFormDTO.java new file mode 100644 index 00000000..e82a6d7e --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenBaseReportDataFormDTO.java @@ -0,0 +1,15 @@ +package com.elink.esua.epdc.dto.screen.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：syp + * @Date：2021/6/25 17:56 + */ +@Data +public class ScreenBaseReportDataFormDTO implements Serializable { + private static final long serialVersionUID = 8275259571095325022L; + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java new file mode 100644 index 00000000..052c9819 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java @@ -0,0 +1,75 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格群组总数 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class CommunityGroupTotalResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * + */ + private String pid; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 小组总数 + */ + private Integer groupTotal; + + /** + * 楼院小组总数 + */ + private Integer ordinaryTotal ; + + /** + * 支部小组总数 + */ + private Integer branchTotal ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityHotTopicResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityHotTopicResultDTO.java new file mode 100644 index 00000000..4292e2bb --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityHotTopicResultDTO.java @@ -0,0 +1,75 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 组织热议话题数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class CommunityHotTopicResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 父级机关ID + */ + private String pid; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 话题状态【热议中:hot_discuss】 + */ + private String status; + + /** + * 话题总数 + */ + private Integer topicTotal; + + /** + * 状态话题数量 + */ + private Integer topicCount; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityIssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityIssueResultDTO.java new file mode 100644 index 00000000..61b93f06 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityIssueResultDTO.java @@ -0,0 +1,185 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 社区议题数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class CommunityIssueResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 父ID + */ + private String pid; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 当日议题增量 + */ + private Integer issueIncr; + + /** + * 议题总数 + */ + private Integer issueTotal ; + + /** + * 当日已转项目的议题数增量 + */ + private Integer shiftProjectIncr ; + + /** + * 已转项目的议题总数 + */ + private Integer shiftProjectTotal ; + + /** + * 已转项目所占百分比 + */ + private Integer shiftProjectPercent ; + + /** + * 当日表决中议题数增量 + */ + private Integer votingIncr ; + + /** + * 表决中议题总数 + */ + private Integer votingTotal ; + + /** + * 表决中议题所占百分比 + */ + private Integer votingPercent ; + + /** + * 当日已关闭议题数增量 + */ + private Integer closedIncr ; + + /** + * 当日已关闭议题中已解决数量 + */ + private Integer closedResolvedIncr ; + + /** + * 当日已关闭议题中无需解决数量 + */ + private Integer closedUnresolvedIncr ; + + /** + * 已关闭议题总数 + */ + private Integer closedTotal ; + + /** + * 已关闭议题中已解决总数 + */ + private Integer closedResolvedTotal ; + + /** + * 已关闭议题中未解决总数 + */ + private Integer closedUnresolvedTotal ; + + /** + * 已关闭议题所占百分比 + */ + private Integer closedPercent ; + + /** + * 已关闭议题中已解决百分比 + */ + private Integer closedResolvedPercent ; + + /** + * 已关闭议题中未解决百分比 + */ + private Integer closedUnresolvedPercent ; + + /** + * 当日已结案议题数 + */ + private Integer closedCaseIncr ; + + /** + * 当日已结案议题中已解决数 + */ + private Integer closedCaseResolvedIncr ; + + /** + * 当日已结案议题中未解决数 + */ + private Integer closedCaseUnresolvedIncr ; + + /** + * 已结案议题总数 + */ + private Integer closedCaseTotal ; + + /** + * 已结案议题中已解决总数 + */ + private Integer closedCaseResolvedTotal ; + + /** + * 已结案议题中未解决总数 + */ + private Integer closedCaseUnresolvedTotal ; + + /** + * 已结案议题中已解决百分比 + */ + private Integer closedCaseResolvedPercent ; + + /** + * 已结案议题中已解决百分比 + */ + private Integer closedCaseUnresolvedPercent ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java new file mode 100644 index 00000000..4d6757e8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java @@ -0,0 +1,130 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 社区项目数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class CommunityProjectResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 上级组织ID + */ + private String parentId; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 截止当日网格下项目总数 【当前组织及下级项目总数】 + */ + private Integer projectTotal; + + /** + * 截止当日网格下处理中项目数 【当前组织及下级所有未结案项目总数】 + */ + private Integer pendingTotal ; + + /** + * 截止当日网格下处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】 + */ + private Integer pendingRatio ; + + /** + * 截止当日网格下已结案项目数 【当前组织及下级已结案项目总数】 + */ + private Integer closedTotal ; + + /** + * 截止当日网格下已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】 + */ + private Integer closedRatio ; + + /** + * 截止当日已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】 + */ + private Integer resolvedTotal ; + + /** + * 截止当日已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】 + */ + private Integer resolvedRatio ; + + /** + * 截止当日已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】 + */ + private Integer unresolvedTotal ; + + /** + * 截止当日已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】 + */ + private Integer unresolvedRatio ; + + /** + * 当日已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】 + */ + private Integer resolvedIncr ; + + /** + * 当日已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】 + */ + private Integer unresolvedIncr ; + + /** + * 当日网格下项目总数 【该网格下项目总数】 + */ + private Integer projectIncr ; + + /** + * 当日网格下处理中项目数 【该网格下未结案项目总数】 + */ + private Integer pendingIncr ; + + /** + * 当日网格下已结案项目数 【该网格下已结案项目总数】 + */ + private Integer closedIncr ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java new file mode 100644 index 00000000..9eb3473d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java @@ -0,0 +1,68 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 社区话题转议题数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class CommunityTopicIssueResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 父级机关ID + */ + private String pid; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + /** + * 当日新增转议题数 + */ + private Integer issueIncr; + /** + * 转议题总数 + */ + private Integer issueTotal ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java new file mode 100644 index 00000000..e3c055ad --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java @@ -0,0 +1,80 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 组织状态话题数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class CommunityTopicStatusResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 父级机关ID + */ + private String pid; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 话题状态ID [讨论中: discussi ;已屏蔽 : hidden ;已关闭:closed] + */ + private String topicStatusId; + + /** + * 话题数量 + */ + private Integer topicCount; + + /** + * 话题状态占比 指定状态话题数/话题总数 + */ + private String topicProportion; + + /** + * 话题增量 + */ + private Integer topicIncrement; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityUserResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityUserResultDTO.java new file mode 100644 index 00000000..39d5744d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityUserResultDTO.java @@ -0,0 +1,105 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 社区注册用户数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class CommunityUserResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 注册用户总数 + */ + private Integer regTotal; + + /** + * 居民总数【居民总数=注册用户数】 + */ + private Integer resiTotal ; + + /** + * 热心居民总数 + */ + private Integer warmHeartedTotal ; + + /** + * 党员总数 + */ + private Integer partymemberTotal ; + + /** + * 本日注册居民日增量 + */ + private Integer regIncr ; + + /** + * 本日热心居民日增量 + */ + private Integer warmIncr ; + + /** + * 本日党员认证日增量 + */ + private Integer partymemberIncr ; + + /** + * 居民总数占比【居民总数/居民总数】 + */ + private Integer resiProportion ; + + /** + * 党员总数占比【党员总数/居民总数】 + */ + private Integer partymemberProportion ; + + /** + * 热心居民占比【热心居民数/居民总数】 + */ + private Integer warmHeartedProportion ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java new file mode 100644 index 00000000..f27483fd --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java @@ -0,0 +1,130 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格项目数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class GridGridProjectResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 截止当日网格下项目总数 【当前组织及下级项目总数】 + */ + private Integer projectTotal; + + /** + * 截止当日网格下处理中项目数 【当前组织及下级所有未结案项目总数】 + */ + private Integer pendingTotal ; + + /** + * 截止当日网格下处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】 + */ + private Integer pendingRatio ; + + /** + * 截止当日网格下已结案项目数 【当前组织及下级已结案项目总数】 + */ + private Integer closedTotal ; + + /** + * 截止当日网格下已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】 + */ + private Integer closedRatio ; + + /** + * 截止当日已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】 + */ + private Integer resolvedTotal ; + + /** + * 截止当日已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】 + */ + private Integer resolvedRatio ; + + /** + * 截止当日已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】 + */ + private Integer unresolvedTotal ; + + /** + * 截止当日已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】 + */ + private Integer unresolvedRatio ; + + /** + * 当日已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】 + */ + private Integer resolvedIncr ; + + /** + * 当日已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】 + */ + private Integer unresolvedIncr ; + + /** + * 当日网格下项目总数 【该网格下项目总数】 + */ + private Integer projectIncr ; + + /** + * 当日网格下处理中项目数 【该网格下未结案项目总数】 + */ + private Integer pendingIncr ; + + /** + * 当日网格下已结案项目数 【该网格下已结案项目总数】 + */ + private Integer closedIncr ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java new file mode 100644 index 00000000..0927b415 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java @@ -0,0 +1,75 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格群组总数 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class GridGroupTotalResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 小组总数 + */ + private Integer groupTotal; + + /** + * 楼院小组总数 + */ + private Integer ordinaryTotal ; + + /** + * 支部小组总数 + */ + private Integer branchTotal ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridHotTopicResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridHotTopicResultDTO.java new file mode 100644 index 00000000..59287ddb --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridHotTopicResultDTO.java @@ -0,0 +1,75 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格热议话题数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class GridHotTopicResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 网格ID + */ + private String grid; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 话题状态【热议中:hot_discuss】 + */ + private String status; + + /** + * 话题总数 + */ + private Integer topicTotal; + + /** + * 状态话题数量 + */ + private Integer topicCount; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridIssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridIssueResultDTO.java new file mode 100644 index 00000000..256b0ba0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridIssueResultDTO.java @@ -0,0 +1,185 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格议题数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class GridIssueResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 当日议题增量 + */ + private Integer issueIncr; + + /** + * 议题总数 + */ + private Integer issueTotal ; + + /** + * 当日已转项目的议题数增量 + */ + private Integer shiftProjectIncr ; + + /** + * 已转项目的议题总数 + */ + private Integer shiftProjectTotal ; + + /** + * 已转项目所占百分比 + */ + private Integer shiftProjectPercent ; + + /** + * 当日表决中议题数增量 + */ + private Integer votingIncr ; + + /** + * 表决中议题总数 + */ + private Integer votingTotal ; + + /** + * 表决中议题所占百分比 + */ + private Integer votingPercent ; + + /** + * 当日已关闭议题数增量 + */ + private Integer closedIncr ; + + /** + * 当日已关闭议题中已解决数量 + */ + private Integer closedResolvedIncr ; + + /** + * 当日已关闭议题中无需解决数量 + */ + private Integer closedUnresolvedIncr ; + + /** + * 已关闭议题总数 + */ + private Integer closedTotal ; + + /** + * 已关闭议题中已解决总数 + */ + private Integer closedResolvedTotal ; + + /** + * 已关闭议题中未解决总数 + */ + private Integer closedUnresolvedTotal ; + + /** + * 已关闭议题所占百分比 + */ + private Integer closedPercent ; + + /** + * 已关闭议题中已解决百分比 + */ + private Integer closedResolvedPercent ; + + /** + * 已关闭议题中未解决百分比 + */ + private Integer closedUnresolvedPercent ; + + /** + * 当日已结案议题数 + */ + private Integer closedCaseIncr ; + + /** + * 当日已结案议题中已解决数 + */ + private Integer closedCaseResolvedIncr ; + + /** + * 当日已结案议题中未解决数 + */ + private Integer closedCaseUnresolvedIncr ; + + /** + * 已结案议题总数 + */ + private Integer closedCaseTotal ; + + /** + * 已结案议题中已解决总数 + */ + private Integer closedCaseResolvedTotal ; + + /** + * 已结案议题中未解决总数 + */ + private Integer closedCaseUnresolvedTotal ; + + /** + * 已结案议题中已解决百分比 + */ + private Integer closedCaseResolvedPercent ; + + /** + * 已结案议题中已解决百分比 + */ + private Integer 已结案议题中未解决百分比 ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java new file mode 100644 index 00000000..16ac8d19 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java @@ -0,0 +1,68 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格话题转议题数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class GridTopicIssueResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + /** + * 当日新增转议题数 + */ + private Integer issueIncr; + /** + * 转议题总数 + */ + private Integer issueTotal ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java new file mode 100644 index 00000000..dc99e72d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java @@ -0,0 +1,80 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格状态话题数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class GridTopicStatusResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 网格id + */ + private String gridId; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 话题状态ID [讨论中: discussi ;已屏蔽 : hidden ;已关闭:closed] + */ + private String topicStatusId; + + /** + * 话题数量 + */ + private Integer topicCount; + + /** + * 话题状态占比 指定状态话题数/话题总数 + */ + private String topicProportion; + + /** + * 话题增量 + */ + private Integer topicIncrement; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridUserResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridUserResultDTO.java new file mode 100644 index 00000000..b236e421 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridUserResultDTO.java @@ -0,0 +1,110 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格注册用户数据 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class GridUserResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 客户Id + */ + private String customId; + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + + /** + * 日期ID + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季度ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 注册用户总数 + */ + private Integer regTotal; + + /** + * 居民总数【居民总数=注册用户数】 + */ + private Integer resiTotal ; + + /** + * 热心居民总数 + */ + private Integer warmHeartedTotal ; + + /** + * 党员总数 + */ + private Integer partymemberTotal ; + + /** + * 本日注册居民日增量 + */ + private Integer regIncr ; + + /** + * 本日热心居民日增量 + */ + private Integer warmIncr ; + + /** + * 本日党员认证日增量 + */ + private Integer partymemberIncr ; + + /** + * 居民总数占比【居民总数/居民总数】 + */ + private Integer resiProportion ; + + /** + * 党员总数占比【党员总数/居民总数】 + */ + private Integer partymemberProportion ; + + /** + * 热心居民占比【热心居民数/居民总数】 + */ + private Integer warmHeartedProportion ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportDataController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportDataController.java new file mode 100644 index 00000000..2a399e95 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportDataController.java @@ -0,0 +1,190 @@ +package com.elink.esua.epdc.modules.screen.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.modules.screen.service.ScreenBaseReportDataService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author songyunpeng + * @Description 平阴-大屏基础信息上报 + * @create 2021-06-25 + */ + +@RestController +@RequestMapping("screenBaseReport") +public class ScreenBaseReportDataController { + + @Autowired + private ScreenBaseReportDataService screenBaseReportDataService; + + /** + * @Description 网格状态话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("gridtopicstatus") + Result gridTopicStatus(){ + return screenBaseReportDataService.gridTopicStatus(); + }; + + /** + * @Description 组织状态话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("agencytopicstatus") + Result agencyTopicStatus(){ + return screenBaseReportDataService.agencyTopicStatus(); + }; + + /** + * @Description 网格话题转议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("gridtopicissue") + Result gridTopicIssue(){ + return screenBaseReportDataService.gridTopicIssue(); + }; + + /** + * @Description 组织话题转议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("agencytopicissue") + Result agencyTopicIssue(){ + return screenBaseReportDataService.agencyTopicIssue(); + }; + + + + /** + * @Description 网格项目数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("gridproject") + Result selectGridProjectList(){ + return screenBaseReportDataService.selectGridProjectList(); + }; + + /** + * @Description 组织项目数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("agencyproject") + Result selectCommunityProjectList(){ + return screenBaseReportDataService.selectCommunityProjectList(); + }; + + + /** + * @Description 网格群组总数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("gridgrouptotal") + Result selectGridGroupTotalList(){ + return screenBaseReportDataService.selectGridGroupTotalList(); + }; + + + /** + * @Description 组织群组总数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("agencygrouptotal") + Result selectCommunityGroupTotalList(){ + return screenBaseReportDataService.selectCommunityGroupTotalList(); + }; + + + /** + * @Description 网格热议话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("gridhottopic") + Result selectGridHotTopic(){ + return screenBaseReportDataService.selectGridHotTopic(); + }; + + + /** + * @Description 组织热议话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("agencyhottopic") + Result selectAgencyHotTopic(){ + return screenBaseReportDataService.selectAgencyHotTopic(); + }; + + + /** + * @Description 网格议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("gridissue") + Result selectGridIssue(){ + return screenBaseReportDataService.selectGridIssue(); + }; + + + /** + * @Description 组织议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("agencyissue") + Result selectAgencyIssue(){ + return screenBaseReportDataService.selectAgencyIssue(); + }; + + + /** + * @Description 网格注册用户数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("gridreguser") + Result selectGridRegUser(){ + return screenBaseReportDataService.selectGridRegUser(); + }; + + + /** + * @Description 组织注册用户数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("agencyreguser") + Result selectAgencyRegUser(){ + return screenBaseReportDataService.selectAgencyRegUser(); + }; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java new file mode 100644 index 00000000..4feb09b6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java @@ -0,0 +1,154 @@ +package com.elink.esua.epdc.modules.screen.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.screen.form.ScreenBaseReportDataFormDTO; +import com.elink.esua.epdc.dto.screen.result.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description 平阴-大屏基础信息上报 + * @Author songyunpeng + * @Date 2021/6/25 + **/ +@Mapper +public interface ScreenBaseReportDataDao extends BaseDao { + /** + * @Description 网格状态话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectGridTopicStatusList(@Param("customId")String customId); + + /** + * @Description 社区状态话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectCommunityTopicStatusList(@Param("customId")String customId); + + /** + * @Description 网格话题转议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectGridTopicIssueList(@Param("customId")String customId); + + + /** + * @Description 社区话题转议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectCommunityTopicIssueList(@Param("customId")String customId); + + /** + * @Description 网格项目数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectGridProjectList(@Param("customId")String customId); + + /** + * @Description 组织项目数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectCommunityProjectList(@Param("customId")String customId); + + + /** + * @Description 网格群组总数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectGridGroupTotalList(@Param("customId")String customId); + + + /** + * @Description 组织群组总数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectCommunityGroupTotalList(@Param("customId")String customId); + + + /** + * @Description 网格热议话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectGridHotTopic(@Param("customId")String customId); + + + /** + * @Description 组织热议话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectAgencyHotTopic(@Param("customId")String customId); + + + /** + * @Description 网格议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectGridIssue(@Param("customId")String customId); + + + /** + * @Description 组织议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectAgencyIssue(@Param("customId")String customId); + + + /** + * @Description 网格注册用户数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectGridRegUser(@Param("customId")String customId); + + + /** + * @Description 组织注册用户数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectAgencyRegUser(@Param("customId")String customId); + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportDataService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportDataService.java new file mode 100644 index 00000000..b75682b3 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportDataService.java @@ -0,0 +1,138 @@ +package com.elink.esua.epdc.modules.screen.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; + +/** + * 平阴-大屏基础信息上报 + * + * @Author：syp + * @Date：2021/6/25 18:04 + */ +public interface ScreenBaseReportDataService { + /** + * @Description 网格状态话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result gridTopicStatus(); + + /** + * @Description 组织状态话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result agencyTopicStatus(); + + /** + * @Description 网格话题转议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result gridTopicIssue(); + + /** + * @Description 组织话题转议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result agencyTopicIssue(); + + /** + * @Description 网格项目数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + Result selectGridProjectList(); + + /** + * @Description 组织项目数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + Result selectCommunityProjectList(); + + + /** + * @Description 网格群组总数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + Result selectGridGroupTotalList(); + + + /** + * @Description 组织群组总数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + Result selectCommunityGroupTotalList(); + + + + + /** + * @Description 网格热议话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + Result selectGridHotTopic(); + + + /** + * @Description 组织热议话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + Result selectAgencyHotTopic(); + + + /** + * @Description 网格议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + Result selectGridIssue(); + + + /** + * @Description 组织议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + Result selectAgencyIssue(); + + + /** + * @Description 网格注册用户数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + Result selectGridRegUser(); + + + /** + * @Description 组织注册用户数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + Result selectAgencyRegUser(); + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java new file mode 100644 index 00000000..f13f9e62 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java @@ -0,0 +1,146 @@ +package com.elink.esua.epdc.modules.screen.service.impl; + +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.EpmetConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.ScreenBaseReportDataFormDTO; +import com.elink.esua.epdc.dto.screen.result.*; +import com.elink.esua.epdc.modules.screen.dao.ScreenBaseReportDataDao; +import com.elink.esua.epdc.modules.screen.service.ScreenBaseReportDataService; +import com.elink.esua.epdc.utils.EpmetUtils; +import com.elink.esua.epdc.utils.ScreenDataUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：liuchuang + * @Date：2020/9/9 18:05 + */ +@Service +public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl implements ScreenBaseReportDataService { + @Autowired + private EpmetUtils epmetUtils; + + @Value("epmet.config.customerId") + private String customerId; + + @Override + public Result gridTopicStatus() { + List gridTopicStatusResultDTOS = baseDao.selectGridTopicStatusList(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(gridTopicStatusResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_TOPIC_STATUS, dataJson); + return new Result(); + } + + @Override + public Result agencyTopicStatus() { + List communityTopicStatusResultDTOS = baseDao.selectCommunityTopicStatusList(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(communityTopicStatusResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_TOPIC_STATUS, dataJson); + return new Result(); } + + @Override + public Result gridTopicIssue() { + List gridTopicIssueResultDTOS = baseDao.selectGridTopicIssueList(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(gridTopicIssueResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_TOPIC_ISSUE, dataJson); + return new Result(); } + + @Override + public Result agencyTopicIssue() { + List communityTopicIssueResultDTOS = baseDao.selectCommunityTopicIssueList(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(communityTopicIssueResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGNENCY_TOPIC_ISSUE, dataJson); + return new Result(); } + + @Override + public Result selectGridProjectList() { + List gridGridProjectResultDTOS = baseDao.selectGridProjectList(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson); + return new Result(); + } + + @Override + public Result selectCommunityProjectList() { + List communityProjectResultDTOS = baseDao.selectCommunityProjectList(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson); + return new Result(); + } + + @Override + public Result selectGridGroupTotalList() { + List gridGroupTotalResultDTOS = baseDao.selectGridGroupTotalList(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(gridGroupTotalResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_GROUP_TOTAL, dataJson); + return new Result(); + } + + @Override + public Result selectCommunityGroupTotalList() { + List communityTopicIssueResultDTOS = baseDao.selectCommunityTopicIssueList(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(communityTopicIssueResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_GROUP_TOTAL, dataJson); + return new Result(); + } + + @Override + public Result selectGridHotTopic() { + List gridHotTopicResultDTOS = baseDao.selectGridHotTopic(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(gridHotTopicResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_HOT_TOPIC, dataJson); + return new Result(); } + + @Override + public Result selectAgencyHotTopic() { + List communityHotTopicResultDTOS = baseDao.selectAgencyHotTopic(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(communityHotTopicResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_HOT_TOPIC, dataJson); + return new Result(); } + + @Override + public Result selectGridIssue() { + List gridIssueResultDTOS = baseDao.selectGridIssue(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(gridIssueResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_ISSUE, dataJson); + return new Result(); } + + @Override + public Result selectAgencyIssue() { + List communityIssueResultDTOS = baseDao.selectAgencyIssue(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(communityIssueResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_ISSUE, dataJson); + return new Result(); } + + @Override + public Result selectGridRegUser() { + List gridUserResultDTOS = baseDao.selectGridRegUser(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(gridUserResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_REGISTER_USER, dataJson); + return new Result(); } + + @Override + public Result selectAgencyRegUser() { + List communityUserResultDTOS = baseDao.selectAgencyRegUser(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(communityUserResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_REGISTER_USER, dataJson); + return new Result(); } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml new file mode 100644 index 00000000..45b529a5 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml @@ -0,0 +1,380 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index c1ee468e..d2ad2abc 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -328,4 +328,145 @@ public interface AnalysisFeignClient { **/ @PostMapping("analysis/category/uploadCategoryCode") Result uploadCategoryCode(); + + + + /** + * @Description 网格状态话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("analysis/screenBaseReport/gridtopicstatus") + Result gridTopicStatus(); + /** + * @Description 组织状态话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("analysis/screenBaseReport/agencytopicstatus") + Result agencyTopicStatus(); + + /** + * @Description 网格话题转议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("analysis/screenBaseReport/gridtopicissue") + Result gridTopicIssue(); + + /** + * @Description 组织话题转议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("analysis/screenBaseReport/agencytopicissue") + Result agencyTopicIssue(); + + + /** + * @Description 网格项目数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("analysis/screenBaseReport/gridproject") + Result selectGridProjectList(); + + /** + * @Description 组织项目数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("analysis/screenBaseReport/agencyproject") + Result selectCommunityProjectList(); + + + /** + * @Description 网格群组总数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("analysis/screenBaseReport/gridgrouptotal") + Result selectGridGroupTotalList(); + + + /** + * @Description 组织群组总数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("analysis/screenBaseReport/agencygrouptotal") + Result selectCommunityGroupTotalList(); + + + + /** + * @Description 网格热议话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("analysis/screenBaseReport/gridhottopic") + Result selectGridHotTopic(); + + + /** + * @Description 组织热议话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("analysis/screenBaseReport/agencyhottopic") + Result selectAgencyHotTopic(); + + + /** + * @Description 网格议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("analysis/screenBaseReport/gridissue") + Result selectGridIssue(); + + + /** + * @Description 组织议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("analysis/screenBaseReport/agencyissue") + Result selectAgencyIssue(); + + + /** + * @Description 网格注册用户数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("analysis/screenBaseReport/gridreguser") + Result selectGridRegUser(); + + + /** + * @Description 组织注册用户数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + **/ + @PostMapping("analysis/screenBaseReport/agencyreguser") + Result selectAgencyRegUser(); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index e17331a6..04e2ec0c 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -159,6 +159,77 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result uploadCategoryCode() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "uploadCategoryCode"); } + + @Override + public Result gridTopicStatus() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridTopicStatus"); + } + + @Override + public Result agencyTopicStatus() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "agencyTopicStatus"); + } + + @Override + public Result gridTopicIssue() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridTopicIssue"); + } + + @Override + public Result agencyTopicIssue() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "agencyTopicIssue"); + } + + @Override + public Result selectGridProjectList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectGridProjectList"); + } + + @Override + public Result selectCommunityProjectList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectCommunityProjectList"); + } + + @Override + public Result selectGridGroupTotalList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectGridGroupTotalList"); + } + + @Override + public Result selectCommunityGroupTotalList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectCommunityGroupTotalList"); + } + + @Override + public Result selectGridHotTopic() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectGridHotTopic"); + } + + @Override + public Result selectAgencyHotTopic() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectAgencyHotTopic"); + } + + @Override + public Result selectGridIssue() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectGridIssue"); + } + + @Override + public Result selectAgencyIssue() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectAgencyIssue"); + } + + @Override + public Result selectGridRegUser() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectGridRegUser"); + } + + @Override + public Result selectAgencyRegUser() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectAgencyRegUser"); + } + @Override public Result getCategoryGridDaily(String date) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryGridDaily",date); diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTask.java new file mode 100644 index 00000000..c33c43ef --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTask.java @@ -0,0 +1,18 @@ +package com.elink.esua.epdc.task.screen; + +/** + * 大屏基础信息上报 + * + * @Author：songyunpeng + * @Date：2021/6/25 + */ +public interface ScreenBaseReportDataPushTask { + /** + * @Description 大屏基础信息上报 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [param] + * @return void + **/ + void run(String param); +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java new file mode 100644 index 00000000..7ee1debd --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java @@ -0,0 +1,261 @@ +package com.elink.esua.epdc.task.screen; + +import com.elink.esua.epdc.feign.AnalysisFeignClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 大屏指标信息统计上报 + * + * @Author：syp + * @Date：2021/6/25 15:19 + */ +@Component("screenIndexDataPushTask") +public class ScreenBaseReportDataPushTaskImpl implements ScreenIndexDataPushTask { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private AnalysisFeignClient analysisFeignClient; + + @Override + public void run(String param) { + + // 01、网格状态话题数据 + gridTopicStatus(); + // 02、组织状态话题数据 + agencyTopicStatus(); + // 03、网格话题转议题数据 + gridTopicIssue(); + // 04、组织话题转议题数据 + agencyTopicIssue(); + // 05、网格项目数据 + selectGridProjectList(); + // 组织项目数据 + selectCommunityProjectList(); + // 网格群组总数 + selectGridGroupTotalList(); + // 组织群组总数 + selectCommunityGroupTotalList(); + // 网格热议话题数据 + selectGridHotTopic(); + // 组织热议话题数据 + selectAgencyHotTopic(); + // 网格议题数据 + selectGridIssue(); + // 组织议题数据 + selectAgencyIssue(); + // 网格注册用户数据 + selectGridRegUser(); + // 组织注册用户数据 + selectAgencyRegUser(); + } + + /** + * @Description 网格状态话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void gridTopicStatus() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-网格状态话题数据>定时任务开始执行"); + analysisFeignClient.gridTopicStatus(); + logger.info("<" + methodName + "|大屏基础信息上报-网格状态话题数据>定时任务执行结束"); + } + /** + * @Description 组织状态话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void agencyTopicStatus() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-组织状态话题数据>定时任务开始执行"); + analysisFeignClient.agencyTopicStatus(); + logger.info("<" + methodName + "|大屏基础信息上报-组织状态话题数据>定时任务执行结束"); + } + /** + * @Description 网格话题转议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void gridTopicIssue() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-网格话题转议题数据>定时任务开始执行"); + analysisFeignClient.gridTopicIssue(); + logger.info("<" + methodName + "|大屏基础信息上报-网格话题转议题数据>定时任务执行结束"); + } + /** + * @Description 组织话题转议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void agencyTopicIssue() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-组织话题转议题数据>定时任务开始执行"); + analysisFeignClient.agencyTopicIssue(); + logger.info("<" + methodName + "|大屏基础信息上报-组织话题转议题数据>定时任务执行结束"); + } + /** + * @Description 网格项目数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void selectGridProjectList() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-网格项目数据>定时任务开始执行"); + analysisFeignClient.selectGridProjectList(); + logger.info("<" + methodName + "|大屏基础信息上报-网格项目数据>定时任务执行结束"); + } + /** + * @Description 组织项目数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void selectCommunityProjectList() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-组织项目数据>定时任务开始执行"); + analysisFeignClient.selectCommunityProjectList(); + logger.info("<" + methodName + "|大屏基础信息上报-组织项目数据>定时任务执行结束"); + } + /** + * @Description 网格群组总数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void selectGridGroupTotalList() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-网格群组总数>定时任务开始执行"); + analysisFeignClient.selectGridGroupTotalList(); + logger.info("<" + methodName + "|大屏基础信息上报-网格群组总数>定时任务执行结束"); + } + /** + * @Description 组织群组总数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void selectCommunityGroupTotalList() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-组织群组总数>定时任务开始执行"); + analysisFeignClient.selectCommunityGroupTotalList(); + logger.info("<" + methodName + "|大屏基础信息上报-组织群组总数>定时任务执行结束"); + } + + /** + * @Description 网格热议话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void selectGridHotTopic() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-网格热议话题数据>定时任务开始执行"); + analysisFeignClient.selectGridHotTopic(); + logger.info("<" + methodName + "|大屏基础信息上报-网格热议话题数据>定时任务执行结束"); + } + + /** + * @Description 组织热议话题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void selectAgencyHotTopic() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-组织热议话题数据>定时任务开始执行"); + analysisFeignClient.selectAgencyHotTopic(); + logger.info("<" + methodName + "|大屏基础信息上报-组织热议话题数据>定时任务执行结束"); + } + + /** + * @Description 网格议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void selectGridIssue() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-网格议题数据>定时任务开始执行"); + analysisFeignClient.selectGridIssue(); + logger.info("<" + methodName + "|大屏基础信息上报-网格议题数据>定时任务执行结束"); + } + + /** + * @Description 组织议题数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void selectAgencyIssue() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-组织议题数据>定时任务开始执行"); + analysisFeignClient.selectAgencyIssue(); + logger.info("<" + methodName + "|大屏基础信息上报-组织议题数据>定时任务执行结束"); + } + + /** + * @Description 网格注册用户数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void selectGridRegUser() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-网格注册用户数据>定时任务开始执行"); + analysisFeignClient.selectGridRegUser(); + logger.info("<" + methodName + "|大屏基础信息上报-网格注册用户数据>定时任务执行结束"); + } + + /** + * @Description 组织注册用户数据 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [] + * @return void + **/ + public void selectAgencyRegUser() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|大屏基础信息上报-组织注册用户数据>定时任务开始执行"); + analysisFeignClient.selectAgencyRegUser(); + logger.info("<" + methodName + "|大屏基础信息上报-组织注册用户数据>定时任务执行结束"); + } + + + +} From e1d4e2dbdc7b05e24ff22a1bfab8b0e42ce9ca73 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 30 Jun 2021 17:14:54 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/CommunityGroupTotalResultDTO.java | 2 +- .../result/CommunityHotTopicResultDTO.java | 4 +- .../result/CommunityIssueResultDTO.java | 2 +- .../result/CommunityProjectResultDTO.java | 2 +- .../result/CommunityTopicIssueResultDTO.java | 2 +- .../result/CommunityTopicStatusResultDTO.java | 2 +- .../screen/result/CommunityUserResultDTO.java | 2 +- .../result/GridGridProjectResultDTO.java | 2 +- .../result/GridGroupTotalResultDTO.java | 2 +- .../screen/result/GridHotTopicResultDTO.java | 4 +- .../dto/screen/result/GridIssueResultDTO.java | 2 +- .../result/GridTopicIssueResultDTO.java | 2 +- .../result/GridTopicStatusResultDTO.java | 2 +- .../dto/screen/result/GridUserResultDTO.java | 2 +- .../screen/result/UploadProjectInfoDTO.java | 7 + .../impl/ScreenBaseReportDataServiceImpl.java | 6 +- .../mapper/screen/ScreenBaseReportDataDao.xml | 1542 +++++++++++++++-- .../mapper/screen/ScreenProjectDataDao.xml | 8 +- .../ScreenBaseReportDataPushTaskImpl.java | 2 +- 19 files changed, 1442 insertions(+), 155 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java index 052c9819..5c9b12a6 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java @@ -19,7 +19,7 @@ public class CommunityGroupTotalResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityHotTopicResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityHotTopicResultDTO.java index 4292e2bb..acc19803 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityHotTopicResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityHotTopicResultDTO.java @@ -14,12 +14,10 @@ public class CommunityHotTopicResultDTO implements Serializable { private static final long serialVersionUID = 1L; - - /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityIssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityIssueResultDTO.java index 61b93f06..126b0ad3 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityIssueResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityIssueResultDTO.java @@ -19,7 +19,7 @@ public class CommunityIssueResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java index 4d6757e8..99f9a7a0 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java @@ -19,7 +19,7 @@ public class CommunityProjectResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java index 9eb3473d..c8fb13c3 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java @@ -19,7 +19,7 @@ public class CommunityTopicIssueResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java index e3c055ad..85555855 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java @@ -19,7 +19,7 @@ public class CommunityTopicStatusResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityUserResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityUserResultDTO.java index 39d5744d..5d611e40 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityUserResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityUserResultDTO.java @@ -19,7 +19,7 @@ public class CommunityUserResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java index f27483fd..61b290bb 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java @@ -19,7 +19,7 @@ public class GridGridProjectResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java index 0927b415..fc883b88 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java @@ -19,7 +19,7 @@ public class GridGroupTotalResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridHotTopicResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridHotTopicResultDTO.java index 59287ddb..3fb0ebe7 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridHotTopicResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridHotTopicResultDTO.java @@ -19,7 +19,7 @@ public class GridHotTopicResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id @@ -29,7 +29,7 @@ public class GridHotTopicResultDTO implements Serializable { /** * 网格ID */ - private String grid; + private String gridId; /** * 日期ID diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridIssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridIssueResultDTO.java index 256b0ba0..5863d8ef 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridIssueResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridIssueResultDTO.java @@ -19,7 +19,7 @@ public class GridIssueResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java index 16ac8d19..f82a6e1c 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java @@ -19,7 +19,7 @@ public class GridTopicIssueResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java index dc99e72d..ba6b81eb 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java @@ -19,7 +19,7 @@ public class GridTopicStatusResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridUserResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridUserResultDTO.java index b236e421..87384d1f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridUserResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridUserResultDTO.java @@ -19,7 +19,7 @@ public class GridUserResultDTO implements Serializable { /** * 客户Id */ - private String customId; + private String customerId; /** * 机关id:网格所属的组织id diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java index 8e43180b..f235c1fc 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java @@ -108,4 +108,11 @@ public class UploadProjectInfoDTO implements Serializable { */ private String projectLevel; + /** + * 满意度得分 + */ + private Integer satisfactionScore; + + + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java index f13f9e62..1266c1c0 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java @@ -24,7 +24,7 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl communityTopicIssueResultDTOS = baseDao.selectCommunityTopicIssueList(customerId); - String dataJson = ScreenDataUtils.getScreenDateJson(communityTopicIssueResultDTOS,true); + List communityGroupTotalResultDTOS = baseDao.selectCommunityGroupTotalList(customerId); + String dataJson = ScreenDataUtils.getScreenDateJson(communityGroupTotalResultDTOS,true); // 数据上报 epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_GROUP_TOTAL, dataJson); return new Result(); diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml index 45b529a5..c06566a7 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml @@ -6,9 +6,10 @@ - select - grid.id as gridId, - grid.pid as agencyId, - #{customId} as customerId, - DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') as dateId, - CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), - 'W', - WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId, - DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId, - CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), - 'Q', - QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), - '%Y-%m-%d'))) quarterId, - DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId, - count(eg.ID) as groupTotal, - count(eg.ID) as ordinaryTotal, - 0 as branchTotal - from esua_epdc_admin.sys_dept grid - left join esua_epdc_group.epdc_group eg on eg.GRID_ID = grid.id and eg.DEL_FLAG ='0' - where grid.del_flag = '0' - and grid.type_key = 'grid_party' - and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') - and DATE_FORMAT(eg.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') - group by grid.id + select grid.id as gridId, + grid.pid as agencyId, + '${customId}' as customerId, + DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId, + CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), + 'W', + WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId, + DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId, + CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), + 'Q', + QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), + '%Y-%m-%d'))) quarterId, + DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId, + ifnull(community.groupTotal,0) as groupTotal, + ifnull(community.ordinaryTotal,0) as ordinaryTotal, + ifnull(community.branchTotal,0) as branchTotal +from esua_epdc_admin.sys_dept grid + left join + + ( + select community.id as communityId, + count(eg.ID) as groupTotal, + count(eg.ID) as ordinaryTotal, + 0 as branchTotal + from esua_epdc_admin.sys_dept community + left join esua_epdc_party_group.epdc_party_group eg + on eg.`DEPT_ID` = community.id and eg.DEL_FLAG = '0' + where community.del_flag = '0' + and community.type_key = 'community_party' + and community.id not in + (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') + and DATE_FORMAT(eg.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') + group by community.id) community on community.communityId = grid.pid +where grid.del_flag = '0' and grid.type_key = 'grid_party' +and grid.id not in + (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') + - + - - - - + resultType="com.elink.esua.epdc.dto.screen.result.CommunityHotTopicResultDTO"> + SELECT + '${customId}' as customerId, + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y%m%d' + ) AS dateId, + CONCAT( + DATE_FORMAT( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y' + ), + '%Y' + ), + 'W', + WEEK ( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y-%m-%d' + ) + ) + ) weekId, + DATE_FORMAT( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y' + ), + '%Y' + ) AS yearId, + CONCAT( + DATE_FORMAT( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y' + ), + '%Y' + ), + 'Q', + QUARTER ( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y-%m-%d' + ) + ) + ) quarterId, + DATE_FORMAT( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y-%m' + ), + '%Y%m' + ) AS monthId, + sdp.id AS agencyId, + sdp.pid AS pid, + COUNT(0) AS topicTotal, + 'hot_discuss' AS STATUS, + SUM( + CASE + WHEN et.STATE = '0' THEN + 1 + ELSE + 0 + END + ) AS topicCount + FROM + esua_epdc_admin.sys_dept sd + LEFT JOIN esua_epdc_admin.sys_dept sdp ON sd.pid = sdp.id + LEFT JOIN esua_epdc_party_group.epdc_party_topic et ON sd.id = et.GRID_ID + WHERE + sd.del_flag = '0' + AND et.DEL_FLAG = '0' + AND sdp.del_flag = '0' + AND sd.id NOT IN ( + SELECT + t.dept_id + FROM + esua_epdc_admin.sys_dept_config t + WHERE + t.del_flag = '0' + ) + GROUP BY + sd.pid + UNION ALL + SELECT + '${customId}' as customerId, + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y%m%d' + ) AS dateId, + CONCAT( + DATE_FORMAT( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y' + ), + '%Y' + ), + 'W', + WEEK ( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y-%m-%d' + ) + ) + ) weekId, + DATE_FORMAT( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y' + ), + '%Y' + ) AS yearId, + CONCAT( + DATE_FORMAT( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y' + ), + '%Y' + ), + 'Q', + QUARTER ( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y-%m-%d' + ) + ) + ) quarterId, + DATE_FORMAT( + STR_TO_DATE( + DATE_FORMAT( + date_add(now(), INTERVAL - 1 DAY), + '%Y-%m-%d' + ), + '%Y-%m' + ), + '%Y%m' + ) AS monthId, + sdgp.id AS agencyId, + sdgp.pid AS pid, + COUNT(0) AS topicTotal, + 'hot_discuss' AS STATUS, + SUM( + CASE + WHEN et.STATE = '0' THEN + 1 + ELSE + 0 + END + ) AS topicCount + FROM + esua_epdc_admin.sys_dept sd + LEFT JOIN esua_epdc_admin.sys_dept sdp ON sd.pid = sdp.id + LEFT JOIN esua_epdc_admin.sys_dept sdgp ON sdp.pid = sdgp.id + LEFT JOIN esua_epdc_party_group.epdc_party_topic et ON sd.id = et.GRID_ID + WHERE + sd.del_flag = '0' + AND et.DEL_FLAG = '0' + AND sdp.del_flag = '0' + AND sdgp.del_flag = '0' + AND sd.id NOT IN ( + SELECT + t.dept_id + FROM + esua_epdc_admin.sys_dept_config t + WHERE + t.del_flag = '0' + ) + + + + + diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 4154cb47..a56228c1 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -49,8 +49,12 @@ when t1.ITEM_STATE = 10 then 3 when t1.ITEM_STATE = 0 and (select COUNT(1) from esua_epdc_events.epdc_item_handle_process where DEL_FLAG ='0' and ITEM_ID = t1.ID) = 1 then 1 when (t1.ITEM_STATE = 0 or t1.ITEM_STATE = 5) and (select COUNT(1) from esua_epdc_events.epdc_item_handle_process where DEL_FLAG ='0' and ITEM_ID = t1.ID) > 1 then 2 - else '' end as projectLevel - from (select * from(select * from esua_epdc_events.epdc_item where DEL_FLAG = '0' + else '' end as projectLevel, + case t1.EVALUATION_SCORE + when 0 then 60 + when 2 then 100 + else 80 end as satisfactionScore + from (select * from(select * from esua_epdc_events.epdc_item where DEL_FLAG = '0' and GRID_ID not in ( SELECT t.`dept_id` FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java index 7ee1debd..2df46ac3 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; * @Author：syp * @Date：2021/6/25 15:19 */ -@Component("screenIndexDataPushTask") +@Component("screenBaseReportDataPushTask") public class ScreenBaseReportDataPushTaskImpl implements ScreenIndexDataPushTask { private final Logger logger = LoggerFactory.getLogger(getClass()); From 1e91103d6b4fd7e00941035411d5f650420ffb26 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 1 Jul 2021 17:32:57 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/dao/ScreenBaseReportDataDao.java | 18 + .../impl/ScreenBaseReportDataServiceImpl.java | 18 + .../mapper/screen/ScreenBaseReportDataDao.xml | 1783 +++++------------ .../mapper/screen/ScreenProjectDataDao.xml | 1 + 4 files changed, 496 insertions(+), 1324 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java index 4feb09b6..438a02ec 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java @@ -120,6 +120,15 @@ public interface ScreenBaseReportDataDao extends BaseDao selectGridIssue(@Param("customId")String customId); +/** + * @Description 网格议题数据 - 当日新增议题转项目数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectGridIssueShiftProjectIncr(); + /** * @Description 组织议题数据 @@ -130,6 +139,15 @@ public interface ScreenBaseReportDataDao extends BaseDao selectAgencyIssue(@Param("customId")String customId); + /** + * @Description 组织议题数据 - 当日新增议题转项目数 + * @Author songyunpeng + * @Date 2021/6/25 + * @Param [customId] + * @return java.util.List + **/ + List selectAgencyIssueShiftProjectIncr(); + /** * @Description 网格注册用户数据 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java index 1266c1c0..5a7722e8 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java @@ -115,6 +115,15 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl gridIssueResultDTOS = baseDao.selectGridIssue(customerId); + //由于数据量大，字段单独处理 + List shiftProjectIncrs = baseDao.selectGridIssueShiftProjectIncr(); + for (GridIssueResultDTO gridIssueResultDTO : gridIssueResultDTOS) { + for (GridIssueResultDTO shiftProjectIncr : shiftProjectIncrs) { + if(gridIssueResultDTO.getGridId().equals(shiftProjectIncr.getGridId()) ){ + gridIssueResultDTO.setShiftProjectIncr(shiftProjectIncr.getShiftProjectIncr()); + } + } + } String dataJson = ScreenDataUtils.getScreenDateJson(gridIssueResultDTOS,true); // 数据上报 epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_ISSUE, dataJson); @@ -123,6 +132,15 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl communityIssueResultDTOS = baseDao.selectAgencyIssue(customerId); + //由于数据量大，字段单独处理 + List shiftProjectIncrs = baseDao.selectAgencyIssueShiftProjectIncr(); + for (CommunityIssueResultDTO gridIssueResultDTO : communityIssueResultDTOS) { + for (CommunityIssueResultDTO shiftProjectIncr : shiftProjectIncrs) { + if(gridIssueResultDTO.getAgencyId().equals(shiftProjectIncr.getAgencyId()) ){ + gridIssueResultDTO.setShiftProjectIncr(shiftProjectIncr.getShiftProjectIncr()); + } + } + } String dataJson = ScreenDataUtils.getScreenDateJson(communityIssueResultDTOS,true); // 数据上报 epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_ISSUE, dataJson); diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml index c06566a7..1ffc0a79 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml @@ -96,69 +96,56 @@ ( select - community.id as agencyId, - community.pid as pid, - 'discussi' as topicStatusId, - count(et.STATE = 0 or null) as topicCount, - ifnull(round(ifnull(count(et.STATE = 0 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, - ifnull(count(et.STATE = 0 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement - from esua_epdc_admin.sys_dept grid - left join esua_epdc_admin.sys_dept community on grid.pid = community.id - left join `esua_epdc_party_group`.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' - and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') - where grid.del_flag = '0' - and grid.type_key = 'grid_party' - and community.del_flag = '0' - and community.type_key = 'community_party' - and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') - and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') - group by community.id - + sd.id as agencyId, + sd.pid as pid, + 'discussi' as topicStatusId, + count(et.STATE = 0 or null) as topicCount, + ifnull(round(ifnull(count(et.STATE = 0 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, + ifnull(count(et.STATE = 0 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement + from esua_epdc_admin.sys_dept sd + left join `esua_epdc_party_group`.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0' + and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') + where sd.del_flag = '0' + and sd.type_key in( 'community_party','street_party') + and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') + group by sd.id union all select - community.id as agencyId, - community.pid as pid, - 'hidden' as topicStatusId, - count(et.SHIELD_FLAG = 1 or null) as topicCount, - ifnull(round(ifnull(count(et.SHIELD_FLAG = 1 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, - ifnull(count(et.SHIELD_FLAG = 1 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement - from esua_epdc_admin.sys_dept grid - left join esua_epdc_admin.sys_dept community on grid.pid = community.id - left join `esua_epdc_party_group`.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' - and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') - where grid.del_flag = '0' - and grid.type_key = 'grid_party' - and community.del_flag = '0' - and community.type_key = 'community_party' - and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') - and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') - group by community.id + sd.id as agencyId, + sd.pid as pid, + 'hidden' as topicStatusId, + count(et.SHIELD_FLAG = 1 or null) as topicCount, + ifnull(round(ifnull(count(et.SHIELD_FLAG = 1 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, + ifnull(count(et.SHIELD_FLAG = 1 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement + from esua_epdc_admin.sys_dept sd + left join `esua_epdc_party_group`.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0' + and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') + where sd.del_flag = '0' + and sd.type_key in( 'community_party','street_party') + and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') + group by sd.id union all select - community.id as agencyId, - community.pid as pid, - 'closed' as topicStatusId, - count(et.STATE = 20 or null) as topicCount, - ifnull(round(ifnull(count(et.STATE = 20 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, - ifnull(count(et.STATE = 20 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement - from esua_epdc_admin.sys_dept grid - left join esua_epdc_admin.sys_dept community on grid.pid = community.id - left join `esua_epdc_party_group`.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' - and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') - where grid.del_flag = '0' - and grid.type_key = 'grid_party' - and community.del_flag = '0' - and community.type_key = 'community_party' - and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') - and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') - group by community.id + sd.id as agencyId, + sd.pid as pid, + 'hidden' as topicStatusId, + count(et.STATE = 20 or null) as topicCount, + ifnull(round(ifnull(count(et.STATE = 20 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, + ifnull(count(et.STATE = 20 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement + from esua_epdc_admin.sys_dept sd + left join `esua_epdc_party_group`.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0' + and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') + where sd.del_flag = '0' + and sd.type_key in( 'community_party','street_party') + and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') + group by sd.id )t; @@ -192,7 +179,7 @@ -select - community.id as agencyId, - community.pid as pid, + select + sd.id as agencyId, + sd.pid as pid, '${customId}' as customerId, DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId, CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), @@ -376,1283 +356,438 @@ select count(eg.ID) as groupTotal, count(eg.ID) as ordinaryTotal, 0 as branchTotal - from esua_epdc_admin.sys_dept community - left join `esua_epdc_party_group`.`epdc_party_group` eg on eg.DEPT_ID = community.id and eg.DEL_FLAG ='0' + from esua_epdc_admin.sys_dept sd + left join `esua_epdc_party_group`.`epdc_party_group` eg on find_in_set(sd.id,eg.ALL_DEPT_IDS) and eg.DEL_FLAG ='0' where - community.del_flag = '0' - and community.type_key = 'community_party' - and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') + sd.del_flag = '0' + and sd.type_key in ( 'street_party', 'community_party' ) + and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') and DATE_FORMAT(eg.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') - group by community.id + group by sd.id; - t.*, ROUND( - t.shiftProjectIncr / t.shiftProjectTotal, - 6 - ) AS shiftProjectPercent, - t.closedIncr AS closedResolvedIncr, - 0 AS closedUnresolvedIncr, - t.closedTotal AS closedResolvedTotal, - 0 AS closedUnresolvedTotal, - 1 AS closedPercent, - 0 AS closedResolvedPercent, - 0 AS closedUnresolvedPercent, - 0 AS closedCaseIncr, - 0 AS closedCaseResolvedIncr, - 0 AS closedCaseUnresolvedIncr, - 0 AS closedCaseTotal, - 0 AS closedCaseResolvedTotal, - 0 AS closedCaseUnresolvedTotal, - 0 AS closedCaseResolvedPercent, - 0 AS closedCaseUnresolvedPercent - FROM - ( - SELECT - '${customId}' as customerId, - DATE_FORMAT( - date_add(now(), INTERVAL - 1 DAY), - '%Y%m%d' - ) AS dateId, - CONCAT( - DATE_FORMAT( - STR_TO_DATE( - DATE_FORMAT( - date_add(now(), INTERVAL - 1 DAY), - '%Y-%m-%d' - ), - '%Y' - ), - '%Y' - ), - 'W', - WEEK ( - STR_TO_DATE( - DATE_FORMAT( - date_add(now(), INTERVAL - 1 DAY), - '%Y-%m-%d' - ), - '%Y-%m-%d' - ) - ) - ) weekId, - DATE_FORMAT( - STR_TO_DATE( - DATE_FORMAT( - date_add(now(), INTERVAL - 1 DAY), - '%Y-%m-%d' - ), - '%Y' - ), - '%Y' - ) AS yearId, - CONCAT( - DATE_FORMAT( - STR_TO_DATE( - DATE_FORMAT( - date_add(now(), INTERVAL - 1 DAY), - '%Y-%m-%d' - ), - '%Y' - ), - '%Y' - ), - 'Q', - QUARTER ( - STR_TO_DATE( - DATE_FORMAT( - date_add(now(), INTERVAL - 1 DAY), - '%Y-%m-%d' - ), - '%Y-%m-%d' - ) - ) - ) quarterId, - DATE_FORMAT( - STR_TO_DATE( - DATE_FORMAT( - date_add(now(), INTERVAL - 1 DAY), - '%Y-%m-%d' - ), - '%Y-%m' - ), - '%Y%m' - ) AS monthId, - sd.id AS gridId, - sd.pid AS agencyId, - COUNT(0) AS issueTotal, - SUM( - CASE - WHEN DATE_FORMAT( - eis.CREATED_TIME, - '%Y-%m-%d' - ) = DATE_FORMAT( - date_add(now(), INTERVAL - 1 DAY), - '%Y-%m-%d' - ) THEN - 1 - ELSE - 0 - END - ) AS issueIncr, - SUM( - CASE - WHEN DATE_FORMAT( - eit.CREATED_TIME, - '%Y-%m-%d' - ) = DATE_FORMAT( - date_add(now(), INTERVAL - 1 DAY), - '%Y-%m-%d' - ) - AND eis.issue_state = '4' THEN - 1 - ELSE - 0 - END - ) AS shiftProjectIncr, - SUM( - CASE - WHEN eis.issue_state = '4' THEN - 1 - ELSE - 0 - END - ) AS shiftProjectTotal, - 0 AS votingIncr, - 0 AS votingTotal, - 0 AS votingPercent, - SUM( - CASE - WHEN DATE_FORMAT( - eis.UPDATED_TIME, - '%Y-%m-%d' - ) = DATE_FORMAT( - date_add(now(), INTERVAL - 1 DAY), - '%Y-%m-%d' - ) - AND eis.ISSUE_STATE = '2' THEN - 1 - ELSE - 0 - END - ) AS closedIncr, - SUM( - CASE - WHEN eis.issue_state = '2' THEN - 1 - ELSE - 0 - END - ) AS closedTotal - FROM - esua_epdc_admin.sys_dept sd - LEFT JOIN esua_epdc_events.epdc_issue eis ON sd.id = eis.GRID_ID - LEFT JOIN esua_epdc_events.epdc_item eit ON eit.ISSUE_ID = eis.ID - WHERE - sd.del_flag = '0' - AND eis.DEL_FLAG = '0' - AND sd.type_key = 'grid_party' - AND sd.id NOT IN ( - SELECT - t.dept_id - FROM - esua_epdc_admin.sys_dept_config t - WHERE - t.del_flag = '0' - ) - GROUP BY - sd.id - ) t + - + SELECT t.*, + '${customId}' as customerId, + IFNULL(ROUND(t.shiftProjectTotal / t.issueTotal, 6), 0) AS shiftProjectPercent, + IFNULL(t.closedIncr, 0) AS closedResolvedIncr, + 0 AS closedUnresolvedIncr, + IFNULL(t.closedTotal, 0) AS closedResolvedTotal, + 0 AS closedUnresolvedTotal, + 1 AS closedPercent, + 0 AS closedResolvedPercent, + 0 AS closedUnresolvedPercent, + 0 AS closedCaseIncr, + 0 AS closedCaseResolvedIncr, + 0 AS closedCaseUnresolvedIncr, + 0 AS closedCaseTotal, + 0 AS closedCaseResolvedTotal, + 0 AS closedCaseUnresolvedTotal, + 0 AS closedCaseResolvedPercent, + 0 AS closedCaseUnresolvedPercent + FROM( + SELECT DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y%m%d') AS dateId, CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y'), '%Y'), 'W', WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y-%m-%d'))) weekId, DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y'), '%Y') AS yearId, CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y'), '%Y'), 'Q', QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y-%m-%d'))) quarterId, DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId, sd.id AS agencyId, sd.pid AS pid, IFNULL(COUNT(eis.id), 0) AS issueTotal, IFNULL(SUM(CASE WHEN DATE_FORMAT(eis.CREATED_TIME, '%Y-%m-%d')= DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d') THEN 1 ELSE 0 END), 0) AS issueIncr, + IFNULL(SUM(CASE WHEN eis.issue_state= '4' THEN 1 ELSE 0 END), 0) AS shiftProjectTotal, 0 AS votingIncr, 0 AS votingTotal, 0 AS votingPercent, IFNULL(SUM(CASE WHEN DATE_FORMAT(eis.UPDATED_TIME, '%Y-%m-%d')= DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d') + AND eis.ISSUE_STATE= '2' THEN 1 ELSE 0 END), 0) AS closedIncr, IFNULL(SUM(CASE WHEN eis.issue_state= '2' THEN 1 ELSE 0 END), 0) AS closedTotal + FROM esua_epdc_admin.sys_dept sd + LEFT JOIN esua_epdc_events.epdc_issue eis ON find_in_set(sd.`id`, eis.`ALL_DEPT_IDS`) + AND eis.DEL_FLAG= '0' + AND DATE_FORMAT(eis.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d') + WHERE sd.del_flag= '0' + AND sd.type_key IN('community_party','street_party') + AND sd.id NOT IN( + SELECT t.dept_id + FROM esua_epdc_admin.sys_dept_config t + WHERE t.del_flag= '0') + GROUP BY sd.id) t + + diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index a56228c1..05036025 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -21,6 +21,7 @@ + From ca416fffef16b105c6dd338eb940186822590bc0 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 5 Jul 2021 15:30:05 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-analysis-server/src/main/resources/application.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml index a6a8c4d4..895cc646 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml @@ -62,12 +62,10 @@ mybatis-plus: map-underscore-to-camel-case: true cache-enabled: false call-setters-on-nulls: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - epmet: config: secret: @epmet.secret@ appId: @epmet.appId@ customerId: @epmet.customerId@ - url: @epmet.url@ \ No newline at end of file + url: @epmet.url@ From bae5589e37333eb981791f14fc2cdf05393c3120 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 8 Jul 2021 18:05:04 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E7=BE=A4=E4=BC=97bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/ScreenPublicDataDao.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index a344c10c..bf78bc08 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -1425,13 +1425,12 @@ select gr.id as orgId, st.name as orgName, st.pid as parentId, 'agency' as orgType, - (IFNULL(dg.createGroupTotal,0)) AS createGroupTotal, - (IFNULL(dg.groupUserTotal,0)) AS groupUserTotal, + (IFNULL(sum(dg.createGroupTotal),0)) AS createGroupTotal, + (IFNULL(sum(dg.groupUserTotal),0)) AS groupUserTotal, DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime, st.area_code AS areaCode from esua_epdc_admin.sys_dept st left join esua_epdc_admin.sys_dept co on st.id=co.pid - left join esua_epdc_admin.sys_dept gr on co.id=gr.pid left join (select eg.DEPT_ID as GRID_ID, count(eg.id) as createGroupTotal, @@ -1444,11 +1443,11 @@ select gr.id as orgId, group by PARTY_GROUP_ID)group_user on group_user.PARTY_GROUP_ID = eg.id where eg.DEL_FLAG=0 and eg.STATE=0 group by eg.DEPT_ID)dg on dg.GRID_ID=co.id - where gr.del_flag=0 - and co.del_flag=0 + where co.del_flag=0 and st.del_flag=0 and st.type_key='street_party' - group by st.id + GROUP BY st.ID + union all From 578ced15439440015b9a2c7f1dcb155af0339b43 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Fri, 9 Jul 2021 10:04:13 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=97=E5=8F=8B?= =?UTF-8?q?=E5=A4=9A=E5=A4=9A=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/VolunteerInfoDao.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index 7960e61a..ce922dff 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -221,16 +221,16 @@ + + From 47031815cc1b10b32676ce426b72da230164e849 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Fri, 9 Jul 2021 14:20:43 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8Eservi?= =?UTF-8?q?ce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ScreenPublicDataServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java index 23840c1e..0d0682a6 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java @@ -232,7 +232,20 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl list = baseDao.getUserjoin(yearMonth); + //获取平均参与度 + List joinList = baseDao.getUserJoinList(yearMonth); + for (UserjoinResultDTO userjoinResultDTO : joinList) { + for (UserjoinResultDTO resultDTO : list) { + if(resultDTO.getOrgId().equals(userjoinResultDTO.getOrgId())){ + resultDTO.setAvgJoin(userjoinResultDTO.getAvgJoin()); + resultDTO.setAvgJoinFz(userjoinResultDTO.getAvgJoinFz()); + resultDTO.setAvgJoinFm(userjoinResultDTO.getAvgJoinFm()); + } + } + } + // 将list转换为json格式 if(list != null && list.size()>0) { UserjoinDTO result = new UserjoinDTO(); From 5790421b58182715e0d20065e748c819cf3e232a Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Fri, 9 Jul 2021 16:58:00 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8Eservi?= =?UTF-8?q?ce=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/screen/result/UserjoinResultDTO.java | 4 ++-- .../main/resources/mapper/screen/ScreenPublicDataDao.xml | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java index b5002e84..add1cbb0 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java @@ -51,12 +51,12 @@ public class UserjoinResultDTO implements Serializable { /** * 平均参与度 */ - private Integer avgJoin; + private Double avgJoin; /** * 人均议题 */ - private Integer avgIssue; + private Double avgIssue; private String areaCode; private Integer avgIssueFz; private Integer avgIssueFm; diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index 52deb1be..38360d6d 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -1985,7 +1985,12 @@ select gr.id as orgId, shoudJoin.id as orgId, shoudJoin.name as orgName, shoudJoin.pid as parentId, - shoudJoin.type_key as orgType, + case shoudJoin.type_key + when 'grid_party' then 'grid' + when 'community_party' then 'agency' + when 'street_party' then 'agency' + else '' end + as orgType, shoudJoin.area_code as area_code, ifnull(round(ifnull(shoudJoin.issueNum,0)/ifnull(shoudJoin.userNum,0) ,2),0) as avgIssue, ifnull(shoudJoin.issueNum,0) as avgIssueFz, From 56b482d6db5d5891180f5b8d057c6a47b4749395 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 12 Jul 2021 09:06:58 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8Eservi?= =?UTF-8?q?ce=20=E4=B8=BAnullbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenPublicDataDao.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index 38360d6d..9b33a9a8 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -1997,7 +1997,11 @@ select gr.id as orgId, ifnull(shoudJoin.userNum,0) as avgIssueFm, (select (sum(APPROVE_NUM) + sum(OPPOSE_NUM) + sum(COMMENT_NUM) + sum(BROWSE_NUM))num from esua_epdc_events.epdc_events where DEL_FLAG = '0' and DATE_FORMAT(CREATED_TIME, '%Y%m')= #{yearMonth} - )joinTotal + )joinTotal, + + 0 as avgJoin, + 0 as avgJoinFz , + 0 as avgJoinFm from ( SELECT d.id, d.name,