From 15dd331cb8e94ef46b41af17f6159512aaf88670 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Dec 2021 10:00:03 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=88=86=E6=9E=90=E3=80=91=E4=BA=8B=E4=BB=B6=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/DateUtils.java | 27 +++++++++++ .../result/FactAgencyProjectResultDTO.java | 35 ++++++++++++++ .../govproject/form/ProjectTotalFormDTO.java | 5 ++ .../result/ProjectTotalResultDTO.java | 14 +++--- .../dataaggre/dao/datastats/DataStatsDao.java | 7 +++ .../service/datastats/DataStatsService.java | 6 +++ .../datastats/impl/DataStatsServiceImpl.java | 12 ++++- .../impl/GovProjectServiceImpl.java | 37 +++++++++++++- .../mapper/datastats/DatsStatsDao.xml | 48 +++++++++++++++++++ 9 files changed, 182 insertions(+), 9 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index cfca4dec6f..72ef2b483d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -890,4 +890,31 @@ public class DateUtils { format = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD); System.out.println(format); } + + /** + * @Author sun + * @Description 获取dateId对应的num天的dateId活monthId + * dateId yyyymmdd + * type[date;month] + * num[1;-1] + * 20211201 date 1 -> 20211202 + * 20211201 month -1 -> 202111 + **/ + public static String dateOrmonthId(String dateId, String type, int num){ + Calendar cal=Calendar.getInstance(); + if (StringUtils.isNotBlank(dateId)){ + cal.setTime(DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD)); + } + if("date".equals(type)){ + cal.add(Calendar.DATE, num); + }else if("month".equals(type)){ + cal.add(Calendar.MONTH, num); + } + Date time=cal.getTime(); + if("month".equals(type)){ + return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMM).format(time); + } + return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(time); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java new file mode 100644 index 0000000000..4418c02cb3 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description 项目总数-接口返参 + * @Auth sun + */ +@Data +public class FactAgencyProjectResultDTO implements Serializable { + private static final long serialVersionUID = 466974582608407121L; + @JsonIgnore + BigDecimal bi = new BigDecimal(0); + //组织Id + private String agencyId; + //组织名称 + private String dateId; + //问题解决总数 + private String monthId; + //党群自治占比 + private Integer projectTotal = 0; + //网格自治占比 + private Integer pendingTotal = 0; + //社区解决占比 + private String pendingRatio = "0%"; + //区直部门解决占比 + private Integer closedTotal = 0; + //街道解决占比 + private String closedRatio = "0%"; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java index 975e22596b..bf02cf40f2 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java @@ -32,4 +32,9 @@ public class ProjectTotalFormDTO implements Serializable { public interface Statuslist extends CustomerClientShowGroup { } + //较昨日的dateId值 + private String yeDateId; + //较dateId上月的monthId值 + private String monthId; + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java index 541a742582..9afb3cb712 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java @@ -17,18 +17,18 @@ public class ProjectTotalResultDTO implements Serializable { //日期yyyymmdd private String dateId; //项目总数 - private Integer projectTotal; + private Integer projectTotal = 0; //较昨日数 - private Integer dateIncr; + private Integer dateIncr = 0; //较上月数 - private Integer monthIncr; + private Integer monthIncr = 0; //未结案项目数 - private Integer pendingTotal; + private Integer pendingTotal = 0; //为结案项目占比 xx% - private String pendingRatio; + private String pendingRatio = "0%"; //已结案项目数 - private Integer closedTotal; + private Integer closedTotal = 0; //已结案项目占比 - private String closedRatio; + private String closedRatio = "0%"; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index 8696fa47a3..b41d0cd9b1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -24,6 +24,7 @@ import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO; import com.epmet.dataaggre.dto.datastats.result.*; import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; @@ -335,4 +336,10 @@ public interface DataStatsDao { * @author sun */ List projectList(CustomerDataManageFormDTO formDTO); + + /** + * @Description 分别查询组织下dateId、较昨日、较上月项目统计数据 + * @author sun + */ + List getProjectTotal(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 36fa24c7b2..80aa4defb5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -6,6 +6,7 @@ import com.epmet.dataaggre.dto.datastats.result.*; import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; @@ -247,4 +248,9 @@ public interface DataStatsService { */ CustomerDataManageResultDTO operateExport(CustomerDataManageFormDTO formDTO) throws ParseException; + /** + * @Description 分别查询组织下dateId、较昨日、较上月项目统计数据 + * @author sun + */ + List getProjectTotal(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index e2156dbadb..88ff22c7db 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -23,7 +23,8 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; -import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; + import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; + import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity; @@ -2114,5 +2115,14 @@ public class DataStatsServiceImpl implements DataStatsService { return resultDTO; } + /** + * @Description 分别查询组织下dateId、较昨日、较上月项目统计数据 + * @author sun + */ + @Override + public List getProjectTotal(ProjectTotalFormDTO formDTO) { + return dataStatsDao.getProjectTotal(formDTO); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index a0401eb9b8..16e8dd97d0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -5,10 +5,12 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.ProjectConstant; import com.epmet.dataaggre.dao.govproject.ProjectDao; +import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; @@ -17,6 +19,7 @@ import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; +import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.govissue.GovIssueService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; @@ -52,6 +55,8 @@ public class GovProjectServiceImpl implements GovProjectService { private GovIssueService govIssueService; @Autowired private ResiGroupService resiGroupService; + @Autowired + private DataStatsService dataStatsService; /** * @Description 查询项目信息 @@ -251,7 +256,37 @@ public class GovProjectServiceImpl implements GovProjectService { */ @Override public ProjectTotalResultDTO projectTotal(ProjectTotalFormDTO formDTO) { - return null; + ProjectTotalResultDTO result = new ProjectTotalResultDTO(); + result.setAgencyId(formDTO.getAgencyId()); + result.setDateId(formDTO.getDateId()); + //较昨日dateId值 + formDTO.setYeDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", -1)); + //较上月monthId值 + formDTO.setMonthId(DateUtils.dateOrmonthId(formDTO.getDateId(), "month", -1)); + + //1.分别查询组织下dateId、较昨日、较上月项目统计数据 + List list = dataStatsService.getProjectTotal(formDTO); + if (CollectionUtils.isEmpty(list) || !formDTO.getDateId().equals(list.get(0).getDateId())) { + return result; + } + + //2.封装数据 + list.forEach(l -> { + if (formDTO.getDateId().equals(l.getDateId())) { + s result.setProjectTotal(l.getProjectTotal()); + result.setPendingTotal(l.getPendingTotal()); + result.setPendingRatio(l.getPendingRatio()); + result.setClosedTotal(l.getClosedTotal()); + result.setClosedRatio(l.getClosedRatio()); + } + if (formDTO.getYeDateId().equals(l.getDateId())) { + result.setDateIncr(result.getProjectTotal() - l.getProjectTotal()); + } else if (formDTO.getMonthId().equals(l.getMonthId())) { + result.setMonthIncr(result.getProjectTotal() - l.getProjectTotal()); + } + }); + + return result; } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index 3332f525f3..2c39797518 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -1035,4 +1035,52 @@ GROUP BY t.orgId + + From b60d3304bea00dad0496161bc7342cd2534e2f7e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Dec 2021 10:00:34 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=88=86=E6=9E=90=E3=80=91=E4=BA=8B=E4=BB=B6=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/govproject/impl/GovProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 16e8dd97d0..d6af5cfe8b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -273,7 +273,7 @@ public class GovProjectServiceImpl implements GovProjectService { //2.封装数据 list.forEach(l -> { if (formDTO.getDateId().equals(l.getDateId())) { - s result.setProjectTotal(l.getProjectTotal()); + result.setProjectTotal(l.getProjectTotal()); result.setPendingTotal(l.getPendingTotal()); result.setPendingRatio(l.getPendingRatio()); result.setClosedTotal(l.getClosedTotal()); From 2a859c90ad3d2cae88a21ec8d86b32aa9f61e79e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Dec 2021 10:23:36 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E5=8F=B3=E9=A5=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDistributionAnalysisFormDTO.java | 4 ++ .../ProjectDistributionAnalysisRightDTO.java | 38 +++++++++++++++++++ ...ectDistributionAnalysisRightResultDTO.java | 33 ++++++++++++++++ .../epmet/controller/ProjectController.java | 13 +++++++ .../com/epmet/service/ProjectService.java | 9 +++++ .../service/impl/ProjectServiceImpl.java | 12 ++++++ 6 files changed, 109 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java index 745febe364..6cf6eaa2d4 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java @@ -20,4 +20,8 @@ public class ProjectDistributionAnalysisFormDTO implements Serializable { @NotBlank(message = "date不能为空",groups = ProjectDistributionAnalysisForm.class) private String date; + private String orgId; + + private String orgType; + } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java new file mode 100644 index 0000000000..da965870b5 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/12/8 10:14 上午 + * @DESC + */ +@Data +public class ProjectDistributionAnalysisRightDTO implements Serializable { + + private static final long serialVersionUID = 7233782006110358477L; + + /** + * 组织ID + */ + private String orgId; + + /** + * 组织类型，组织：agency，网格：grid + */ + private String orgType; + + /** + * 热力值 + */ + private Integer count; + + public ProjectDistributionAnalysisRightDTO() { + this.orgId = ""; + this.orgType = ""; + this.count = NumConstant.ZERO; + } +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java new file mode 100644 index 0000000000..1801d1c1d7 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/12/8 10:11 上午 + * @DESC + */ +@Data +public class ProjectDistributionAnalysisRightResultDTO implements Serializable { + + private static final long serialVersionUID = 8359144215262197796L; + + /** + * ..以上 + */ + private String under; + + /** + * 中间区间 + */ + private String middle; + /** + * ..以下 + */ + private String above; + + private List list; +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 085cc4c333..edaaa2bc28 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -287,4 +287,17 @@ public class ProjectController { return new Result>().ok(projectService.projectDistributionAnalysisLeft(formDTO,tokenDto)); } + /** + * @Description 【社区治理】项目分布分析-右边 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/8 10:21 上午 + */ + @PostMapping("projectdistributionanalysisright") + public Result projectDistributionAnalysisRight(@RequestBody ProjectDistributionAnalysisFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, ProjectDistributionAnalysisFormDTO.ProjectDistributionAnalysisForm.class); + return new Result().ok(projectService.projectDistributionAnalysisRight(formDTO,tokenDto)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 7a780592e1..7be2c6d71f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -342,4 +342,13 @@ public interface ProjectService extends BaseService { */ List projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto); + /** + * @Description 【社区治理】项目分布分析-右边 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/8 10:21 上午 + */ + ProjectDistributionAnalysisRightResultDTO projectDistributionAnalysisRight(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index d393cad3a7..adeb5eae2a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2819,6 +2819,18 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Wed, 8 Dec 2021 11:07:32 +0800 Subject: [PATCH 04/19] LinkedList --- .../epmet/commons/tools/utils/DateUtils.java | 28 +++++++++++++++++++ .../FactAgencyProjectMonthResultDTO.java | 21 ++++++++++++++ .../result/FactAgencyProjectResultDTO.java | 12 ++++---- .../govproject/form/ProjectTotalFormDTO.java | 4 +++ .../result/ProjectMonthIncrResultDTO.java | 4 +-- .../controller/GovProjectController.java | 5 ++-- .../dataaggre/dao/datastats/DataStatsDao.java | 7 +++++ .../service/datastats/DataStatsService.java | 7 +++++ .../datastats/impl/DataStatsServiceImpl.java | 10 +++++++ .../service/govproject/GovProjectService.java | 3 +- .../impl/GovProjectServiceImpl.java | 27 ++++++++++++++++-- .../mapper/datastats/DatsStatsDao.xml | 14 ++++++++++ 12 files changed, 129 insertions(+), 13 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 72ef2b483d..db6abec6aa 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -11,6 +11,7 @@ package com.epmet.commons.tools.utils; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.TimeListResultDTO; +import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; import org.joda.time.LocalDate; @@ -917,4 +918,31 @@ public class DateUtils { return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(time); } + /** + * @Author sun + * @Description 获取dateId对应上一个月过去12个月的monthId + * dateId yyyymmdd + * 20211201 -> 202012-202111的值 + **/ + public static LinkedHashMap getXproSub(String dateId){ + java.time.format.DateTimeFormatter fmt = java.time.format.DateTimeFormatter.ofPattern("yyyyMM"); + LinkedHashMap xAxis = new LinkedHashMap<>(); + Calendar cal=Calendar.getInstance(); + cal.setTime(DateUtils.parseDate(dateId, DateUtils.DATE_PATTERN_YYYYMMDD)); + TimeZone tz = cal.getTimeZone(); + ZoneId zid = tz == null ? ZoneId.systemDefault() : tz.toZoneId(); + java.time.LocalDate today = java.time.LocalDateTime.ofInstant(cal.toInstant(), zid).toLocalDate(); + //java.time.LocalDate today = java.time.LocalDate.now(); + + for(int i = NumConstant.TWELVE;i > NumConstant.ZERO; i--){ + java.time.LocalDate localDate = today.minusMonths(i); + String s = localDate.getMonth().getValue() + "月"; + xAxis.put(localDate.format(fmt),s); + } + LinkedHashMap result = Maps.newLinkedHashMap(); + xAxis.entrySet().stream().sorted(Map.Entry.comparingByKey()) + .forEachOrdered((e -> result.put(e.getKey(),e.getValue()))); + return result; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java new file mode 100644 index 0000000000..8138219216 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 项目月数据-接口返参 + * @Auth sun + */ +@Data +public class FactAgencyProjectMonthResultDTO implements Serializable { + private static final long serialVersionUID = 466974582608407121L; + //组织Id + private String agencyId; + //月维度Id + private String monthId; + //当月项目总数 【当前组织及下级前一月新增项目数】 + private Integer projectIncr = 0; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java index 4418c02cb3..13bc60fa06 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java @@ -19,17 +19,17 @@ public class FactAgencyProjectResultDTO implements Serializable { private String agencyId; //组织名称 private String dateId; - //问题解决总数 + //月维度Id private String monthId; - //党群自治占比 + //项目总数 private Integer projectTotal = 0; - //网格自治占比 + //处理中项目数 private Integer pendingTotal = 0; - //社区解决占比 + //处理中项目占比 private String pendingRatio = "0%"; - //区直部门解决占比 + //已结案中项目数 private Integer closedTotal = 0; - //街道解决占比 + //已结案中项目占比 private String closedRatio = "0%"; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java index bf02cf40f2..ff60c5eb79 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java @@ -36,5 +36,9 @@ public class ProjectTotalFormDTO implements Serializable { private String yeDateId; //较dateId上月的monthId值 private String monthId; + //查询数据起始月份Id + private String startMonth; + //查询数据结束月份Id + private String endMonth; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java index 8947eb971b..ade71720ed 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java @@ -13,8 +13,8 @@ public class ProjectMonthIncrResultDTO implements Serializable { private static final long serialVersionUID = 6188316867855643263L; //横坐标值 - private String value; + private Integer value; //横坐标 - private Integer type; + private String type; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 503caedfb4..42d4633398 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -17,6 +17,7 @@ import com.epmet.dataaggre.service.govproject.GovProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.LinkedList; import java.util.List; /** @@ -75,9 +76,9 @@ public class GovProjectController { * @author sun */ @PostMapping("projectmonthincr") - public Result> projectMonthIncr(@RequestBody ProjectTotalFormDTO formDTO) { + public Result> projectMonthIncr(@RequestBody ProjectTotalFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Monthincr.class); - return new Result>().ok(govProjectService.projectMonthIncr(formDTO)); + return new Result>().ok(govProjectService.projectMonthIncr(formDTO)); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index b41d0cd9b1..237432f5c2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -25,6 +25,7 @@ import com.epmet.dataaggre.dto.datastats.result.*; import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; @@ -342,4 +343,10 @@ public interface DataStatsDao { * @author sun */ List getProjectTotal(ProjectTotalFormDTO formDTO); + + /** + * @Description 查询dateId的上一月过去12个月份组织项目数据 + * @author sun + */ + List getProjectMonthIncr(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 80aa4defb5..de584839e2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -7,6 +7,7 @@ import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; @@ -253,4 +254,10 @@ public interface DataStatsService { * @author sun */ List getProjectTotal(ProjectTotalFormDTO formDTO); + + /** + * @Description 查询dateId的上一月过去12个月份组织项目数据 + * @author sun + */ + List getProjectMonthIncr(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 88ff22c7db..31cf2174d6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; + import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; @@ -2124,5 +2125,14 @@ public class DataStatsServiceImpl implements DataStatsService { return dataStatsDao.getProjectTotal(formDTO); } + /** + * @Description 查询dateId的上一月过去12个月份组织项目数据 + * @author sun + */ + @Override + public List getProjectMonthIncr(ProjectTotalFormDTO formDTO) { + return dataStatsDao.getProjectMonthIncr(formDTO); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index a09c9257db..1cf1c73f18 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -7,6 +7,7 @@ import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.*; +import java.util.LinkedList; import java.util.List; /** @@ -61,7 +62,7 @@ public interface GovProjectService { * @Description 赋能平台【项目处理分析】进12月新增项目折线图 * @author sun */ - List projectMonthIncr(ProjectTotalFormDTO formDTO); + LinkedList projectMonthIncr(ProjectTotalFormDTO formDTO); /** * @Description 赋能平台【项目处理分析】按状态查询项目列表 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index d6af5cfe8b..b3da96257b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.ProjectConstant; import com.epmet.dataaggre.dao.govproject.ProjectDao; +import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; @@ -294,8 +295,30 @@ public class GovProjectServiceImpl implements GovProjectService { * @author sun */ @Override - public List projectMonthIncr(ProjectTotalFormDTO formDTO) { - return null; + public LinkedList projectMonthIncr(ProjectTotalFormDTO formDTO) { + LinkedList resultList = new LinkedList<>(); + //1.获取起始终止月份值 + LinkedHashMap map = DateUtils.getXproSub(formDTO.getDateId()); + List monthIdList = map.keySet().stream().collect(Collectors.toList()); + formDTO.setStartMonth(monthIdList.get(NumConstant.ZERO)); + formDTO.setEndMonth(monthIdList.get(NumConstant.ELEVEN)); + + //2.查询dateId的上一月过去12个月份数据【2021-12-08 数据是202012到202111的数据】 + List list = dataStatsService.getProjectMonthIncr(formDTO); + + //3.封装数据并返回 + map.forEach((k, v) -> { + ProjectMonthIncrResultDTO dto = new ProjectMonthIncrResultDTO(); + dto.setType(v); + list.forEach(l -> { + if (k.equals(l.getMonthId())) { + dto.setValue(l.getProjectIncr()); + } + }); + resultList.add(dto); + }); + + return resultList; } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index 2c39797518..4943a96776 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -1083,4 +1083,18 @@ ORDER BY a.date_id DESC + + From 87fbaa7ab344fe572a59bf38d701d354ccd1993d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Dec 2021 11:12:38 +0800 Subject: [PATCH 05/19] emm --- .../service/impl/ProjectServiceImpl.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index adeb5eae2a..6614b7002a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2847,9 +2847,9 @@ public class ProjectServiceImpl extends BaseServiceImpl { AtomicReference count = new AtomicReference<>(cate.getCount()); groupByCode.forEach((k,v) -> { @@ -2862,17 +2862,27 @@ public class ProjectServiceImpl extends BaseServiceImpl { AtomicReference count = new AtomicReference<>(cate.getCount()); groupByCode.forEach((k,v) -> { if (cate.getCategoryCode().equals(k)){ v.forEach(l -> { - if (l.getCreatedTime().getTime() < end && l.getCreatedTime().getTime() >= start){ + if (l.getCreatedTime().getTime() < finalEnd && l.getCreatedTime().getTime() >= start){ cate.setCount(count.getAndSet(count.get() + NumConstant.ONE)); } }); @@ -2912,8 +2922,6 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Wed, 8 Dec 2021 12:14:13 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E5=8F=82epmetUserIdList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/UserPointActionLogServiceImpl.java | 2 +- .../src/main/resources/mapper/UserPointActionLogDao.xml | 4 +++- .../java/com/epmet/dto/form/PageUserReportEventFormDTO.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index c27498a82b..45bbb65790 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -571,7 +571,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl pageUserPoint(IcResiPointPageFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getEpmetUserId())){ + if(org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){ return new PageData(new ArrayList<>(),NumConstant.ZERO); } PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index 8996007d8a..c6136f2202 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -52,7 +52,9 @@ USER_POINT_ACTION_LOG WHERE DEL_FLAG = '0' - AND USER_ID = #{epmetUserId} + + USER_ID = #{epmetUserId} + ORDER BY CREATED_TIME DESC diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java index 8d18c2a7ea..f4821b54b7 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; @Data @@ -11,7 +12,7 @@ public class PageUserReportEventFormDTO implements Serializable { public interface AddUserInternalGroup { } //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class) - private String epmetUserId; + private List epmetUserIdList; @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) private Integer pageNo; @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) From f14ebb24c09157a24067df9c556c9a920f70e191 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 13:06:17 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E5=8F=82epmetUserIdList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java index d4a8fb1f89..727bf1f558 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java @@ -4,13 +4,13 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; @Data public class IcResiPointPageFormDTO implements Serializable { public interface AddUserInternalGroup { } - //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class) - private String epmetUserId; + private List epmetUserIdList; @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) private Integer pageNo; @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) From d1965876e74c565e3394a5652d2c3f62d0716129 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 13:31:36 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/PageUserReportEventFormDTO.java | 4 ++- .../dto/result/PageUserReportEventResDTO.java | 26 +++++++++++++++++++ .../epmet/controller/ResiEventController.java | 2 +- .../main/java/com/epmet/dao/ResiEventDao.java | 15 ++++++++--- .../com/epmet/service/ResiEventService.java | 7 +++++ .../service/impl/ResiEventServiceImpl.java | 15 +++++++++-- .../main/resources/mapper/ResiEventDao.xml | 16 ++++++++++++ 7 files changed, 77 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java index f4821b54b7..0a7b966a62 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java @@ -6,7 +6,9 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; - +/** + * 数据分析-个人档案-上报事件列表入参 + */ @Data public class PageUserReportEventFormDTO implements Serializable { public interface AddUserInternalGroup { diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java index 2f86cdef7d..d562132e12 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java @@ -1,9 +1,35 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; +/** + * 数据分析-个人档案-上报事件列表入参 + */ @Data public class PageUserReportEventResDTO implements Serializable { + private String resiEventId; + /** + * 事件内容 + */ + private String eventContent; + + /** + * 事件上报事件 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date reportTime; + + /** + * true 已转项目；false:未转项目 + */ + private Boolean shiftProject; + + /** + * 项目id + */ + private String projectId; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index 09dcb021f8..c868dbff0d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -217,7 +217,7 @@ public class ResiEventController { /** * 数据分析-个人档案-上报事件列表 - * + * 根据epmetUserIdList查询 * @param formDTO * @return com.epmet.commons.tools.utils.Result> * @author yinzuomei diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java index 6275a0d821..a39c72aa76 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java @@ -18,10 +18,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.result.EventDetailResultDTO; -import com.epmet.dto.result.EventListResultDTO; -import com.epmet.dto.result.MyReportedResultDTO; -import com.epmet.dto.result.NewEventsResultDTO; +import com.epmet.dto.form.PageUserReportEventFormDTO; +import com.epmet.dto.result.*; import com.epmet.entity.ResiEventEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -88,4 +86,13 @@ public interface ResiEventDao extends BaseDao { * @date 2021/8/5 10:42 上午 */ List newEvents(@Param("orgIds")List orgIds); + + /** + * 数据分析-个人档案-上报事件列表 + * 根据epmetUserIdList查询 + * + * @param formDTO + * @return + */ + List selectUserReported(PageUserReportEventFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index cabf11aeb7..f9712c498b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -131,5 +131,12 @@ public interface ResiEventService extends BaseService { */ ResiEventManageRedDotRes queryResiEventManageRedDot(String agencyId); + /** + * 数据分析-个人档案-上报事件列表 + * 根据epmetUserIdList查询 + * + * @param formDTO + * @return + */ PageData pageUserReported(PageUserReportEventFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 1a8ae98cde..cbd5ff6b3c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -640,10 +640,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl pageUserReported(PageUserReportEventFormDTO formDTO) { - //todo - return null; + if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { + return new PageData(new ArrayList<>(), NumConstant.ZERO); + } + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO)); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 3284be99e6..d88575dbab 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -201,4 +201,20 @@ ) ORDER BY ro.CREATED_TIME DESC + + \ No newline at end of file From 5a94f7a20a51f6c727bcb96bb245c0f329d1937d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Dec 2021 13:56:45 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=88=86=E6=9E=90=E3=80=91=E6=8C=89=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govproject/form/ProjectTotalFormDTO.java | 2 ++ .../controller/GovProjectController.java | 9 +++------ .../dataaggre/dao/govproject/ProjectDao.java | 9 +++++++++ .../service/govproject/GovProjectService.java | 2 +- .../impl/GovProjectServiceImpl.java | 8 ++++++-- .../mapper/govproject/ProjectDao.xml | 19 +++++++++++++++++++ 6 files changed, 40 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java index ff60c5eb79..b277be17c9 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java @@ -40,5 +40,7 @@ public class ProjectTotalFormDTO implements Serializable { private String startMonth; //查询数据结束月份Id private String endMonth; + //明天的dateId值 + private String toDateId; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 42d4633398..1d448806b4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -9,10 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; -import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO; +import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.service.govproject.GovProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -86,9 +83,9 @@ public class GovProjectController { * @author sun */ @PostMapping("projectstatuslist") - public Result> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) { + public Result> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Statuslist.class); - return new Result>().ok(govProjectService.projectStatusList(formDTO)); + return new Result>().ok(govProjectService.projectStatusList(formDTO)); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 4697a0f267..0fb0c154dc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -21,8 +21,11 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectStatusListResultDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO; import com.epmet.dataaggre.entity.govproject.ProjectEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -70,4 +73,10 @@ public interface ProjectDao extends BaseDao { List selectList(@Param("customerId") String customerId,@Param("list")List issueIds); int countRedDot(String userId); + + /** + * @Description 查询组织下截止到dateId的某个状态的项目列表 + * @author sun + */ + List getProjectStatusList(ProjectTotalFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 1cf1c73f18..0265b0312f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -68,5 +68,5 @@ public interface GovProjectService { * @Description 赋能平台【项目处理分析】按状态查询项目列表 * @author sun */ - List projectStatusList(ProjectTotalFormDTO formDTO); + List projectStatusList(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index b3da96257b..058b0cce9a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -326,8 +326,12 @@ public class GovProjectServiceImpl implements GovProjectService { * @author sun */ @Override - public List projectStatusList(ProjectTotalFormDTO formDTO) { - return null; + public List projectStatusList(ProjectTotalFormDTO formDTO) { + //所选日期后一天的dateId值 + formDTO.setYeDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", 1)); + //1.查询组织下截止到dateId的某个状态的项目列表 + List resultList = projectDao.getProjectStatusList(formDTO); + return resultList; } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 1e144e3420..6b88005261 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -155,4 +155,23 @@ AND rem.RED_DOT = '1' AND rem.USER_ID = #{userId} + + + \ No newline at end of file From af133e21680a9328d7845e6022e3e725b6520a77 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Dec 2021 14:02:33 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/ProjectConstant.java | 2 ++ .../main/java/com/epmet/dao/ProjectDao.java | 8 ++++--- .../service/impl/ProjectServiceImpl.java | 21 ++++++++++++++++++- .../src/main/resources/mapper/ProjectDao.xml | 3 +++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java index b5acf5b2e7..205d91bc3d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java @@ -195,4 +195,6 @@ public interface ProjectConstant { String SORT_ASC = "asc"; String SORT_DESC = "desc"; + String ORG_TYPE_GRID = "grid"; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index 4f65e09ab8..c070c7e8ac 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -219,12 +219,14 @@ public interface ProjectDao extends BaseDao { List selectByOriginId(String originId); /** - * @Description 根据日期查询项目分类 + * @Description 根据日期查询项目分类 * @param date * @param orgId + * @param codeLength 1级分类编码长度 + * @param originGrid 是否来源网格 * @author zxc - * @date 2021/12/7 2:43 下午 + * @date 2021/12/8 1:37 下午 */ - List selectProjectCategoryByDate(@Param("date")String date,@Param("orgId")String orgId,@Param("codeLength")Integer codeLength); + List selectProjectCategoryByDate(@Param("date")String date,@Param("orgId")String orgId,@Param("codeLength")Integer codeLength,@Param("originGrid")Boolean originGrid); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 6614b7002a..b83310b93c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2812,7 +2812,12 @@ public class ProjectServiceImpl extends BaseServiceImpl projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength()); + List projectCategoryByDateDTOS = new ArrayList<>(); + if (formDTO.getOrgType().equals(ProjectConstant.ORG_TYPE_GRID)){ + projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength(),true); + }else { + projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength(),false); + } if (CollectionUtils.isEmpty(projectCategoryByDateDTOS)){ return new ArrayList<>(); } @@ -2821,6 +2826,20 @@ public class ProjectServiceImpl extends BaseServiceImpl + p.ORIGIN = 'issue' + ORDER BY projectId \ No newline at end of file From e18ea027e2ab8efaa857dd4e8f3f971cdf53e50b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 14:07:28 +0800 Subject: [PATCH 11/19] =?UTF-8?q?/heart/userdemand/mydemand=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E6=94=B9=E4=B8=BAicResiUserId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java | 4 ++-- .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java index f29e088293..4589bbd9ed 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java @@ -16,8 +16,8 @@ public class IcResiUserDemandFromDTO implements Serializable { /** * 居民信息录入的居民的id */ - @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) - private String userId; + @NotBlank(message = "icResiUserId不能为空", groups = AddUserInternalGroup.class) + private String icResiUserId; /** * icresiuser/persondata接口返参中有此值 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 3a0f278b10..9f37c99a6a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -476,7 +476,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userIds=new ArrayList<>(); - userIds.add(formDTO.getUserId()); + userIds.add(formDTO.getIcResiUserId()); if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){ userIds.addAll(formDTO.getEpmetUserIdList()); } From 8fcb8cf1cf3aec6d8ea4c5534a02bd569734cfa5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Dec 2021 14:35:23 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=88=86=E6=9E=90=E3=80=91=E6=96=B9=E6=B3=95=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/CategoryProjectFormDTO.java | 40 +++++++++++++++ .../form/ProjectAnalysisFormDTO.java | 34 +++++++++++++ .../form/ProjectCategoryTotalFormDTO.java | 30 +++++++++++ .../govproject/form/ProjectTotalFormDTO.java | 2 +- .../result/CategoryProjectResultDTO.java | 51 +++++++++++++++++++ .../result/ProjectAnalysisResultDTO.java | 34 +++++++++++++ .../result/ProjectCategoryTotalResultDTO.java | 24 +++++++++ .../controller/GovProjectController.java | 34 +++++++++++-- .../service/govproject/GovProjectService.java | 22 ++++++-- .../impl/GovProjectServiceImpl.java | 31 +++++++++-- 10 files changed, 292 insertions(+), 10 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java new file mode 100644 index 0000000000..726d01dbce --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java @@ -0,0 +1,40 @@ +package com.epmet.dataaggre.dto.govproject.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 赋能平台【项目分类分析】-接口入参 + * @Auth sun + */ +@NoArgsConstructor +@Data +public class CategoryProjectFormDTO implements Serializable { + private static final long serialVersionUID = -8515172319313536407L; + //组织Id + @NotBlank(message = "组织ID不能为空", groups = {Category.class}) + private String agencyId; + //日期yyyymmdd + @NotBlank(message = "组织ID不能为空", groups = {Category.class}) + private String dateId; + //一级分类Id + @NotBlank(message = "分类Id不能为空", groups = {Category.class}) + private String categoryId; + //页码 + @Min(1) + private Integer pageNo = 1; + //每页多少条 + private Integer pageSize = 20; + //是否分页(是:true 否:false) + private Boolean isPage = true; + + public interface Category extends CustomerClientShowGroup { + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java new file mode 100644 index 0000000000..9689899cc4 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dataaggre.dto.govproject.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 赋能平台【项目分类分析】-接口入参 + * @Auth sun + */ +@NoArgsConstructor +@Data +public class ProjectAnalysisFormDTO implements Serializable { + private static final long serialVersionUID = -8515172319313536407L; + //日期yyyymmdd + @NotBlank(message = "日维度ID不能为空", groups = {Analysis.class}) + private String dateId; + //小程序话题或事件发起人Id + @NotBlank(message = "话题或事件发起人Id不能为空", groups = {Analysis.class}) + private String userId; + //一级分类Id集合 + @NotNull(message = "分类Id集合不能为空", groups = {Analysis.class}) + private List categoryIdList; + + public interface Analysis extends CustomerClientShowGroup { + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java new file mode 100644 index 0000000000..eddd513d1c --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dataaggre.dto.govproject.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 赋能平台【项目分类分析】-接口入参 + * @Auth sun + */ +@NoArgsConstructor +@Data +public class ProjectCategoryTotalFormDTO implements Serializable { + private static final long serialVersionUID = -8515172319313536407L; + //组织Id + @NotBlank(message = "组织ID不能为空", groups = {Project.class}) + private String agencyId; + //日期yyyymmdd + @NotBlank(message = "日维度ID不能为空", groups = {Project.class}) + private String dateId; + + public interface Project extends CustomerClientShowGroup { + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java index b277be17c9..22c0e731b6 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java @@ -19,7 +19,7 @@ public class ProjectTotalFormDTO implements Serializable { @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class}) private String agencyId; //日期yyyymmdd - @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class}) + @NotBlank(message = "日维度ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class}) private String dateId; //状态:待处理 pending，结案closed @NotBlank(message = "项目状态不能为空", groups = {Statuslist.class}) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java new file mode 100644 index 0000000000..6f24967aba --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java @@ -0,0 +1,51 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 赋能平台【项目处理分析】分类下项目列表-接口返参 + * @Auth sun + */ +@Data +public class CategoryProjectResultDTO implements Serializable { + private static final long serialVersionUID = 6188316867855643263L; + + //总条数 + private Integer total = 0; + + private List list; + + @Data + public static class Project { + //项目所属组织Id + private String agencyId; + //项目Id + private String projectId; + //项目编码[目前没这个功能 默认为空] + private String projectCode = ""; + //一级分类Id集合 + private List categoryIds; + //一级分类名称集合 + private List categoryNames; + //来源：议题issue 项目立项:agency 事件:resi_event【控制电机查看时里边三个按钮的显示】 + private String origin; + //网格Id[立项项目此值为空] + private String gridId; + //网格名[立项项目此值为空] + private String gridName; + //状态:待处理 pending，已结案closed + private String status; + //标题 + private String title; + //转项目时间 + private String time; + //当前人员是否处理：未处理unhandled，已处理handle + private String isHandle; + //小程序居民端话题或事件创建人【立项项目此值为空】 + private String userId; + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java new file mode 100644 index 0000000000..62a949a3d2 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 赋能平台【项目处理分析】研判分析-接口返参 + * @Auth sun + */ +@Data +public class ProjectAnalysisResultDTO implements Serializable { + private static final long serialVersionUID = 6188316867855643263L; + + //组织Id + private String agencyId; + //日期yyyymmdd + private String dateId; + //项目总数 + private Integer projectTotal = 0; + //较昨日数 + private Integer dateIncr = 0; + //较上月数 + private Integer monthIncr = 0; + //未结案项目数 + private Integer pendingTotal = 0; + //为结案项目占比 xx% + private String pendingRatio = "0%"; + //已结案项目数 + private Integer closedTotal = 0; + //已结案项目占比 + private String closedRatio = "0%"; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java new file mode 100644 index 0000000000..1d95b68175 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 赋能平台【项目分类分析】各分类项目数图表-接口返参 + * @Auth sun + */ +@Data +public class ProjectCategoryTotalResultDTO implements Serializable { + private static final long serialVersionUID = 6188316867855643263L; + + //组织Id + private String agencyId; + //一级分类Id + private String categoryId; + //一级分类名称 + private String categoryName; + //分类下项目总数 + private Integer total = 0; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 1d448806b4..396f14543d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -6,9 +6,7 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.service.govproject.GovProjectService; import org.springframework.beans.factory.annotation.Autowired; @@ -88,4 +86,34 @@ public class GovProjectController { return new Result>().ok(govProjectService.projectStatusList(formDTO)); } + /** + * @Description 赋能平台【项目分类分析】各分类项目数图表 + * @author sun + */ + @PostMapping("projectcategorylist") + public Result projectCategoryList(@RequestBody ProjectCategoryTotalFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ProjectCategoryTotalFormDTO.Project.class); + return new Result().ok(govProjectService.projectCategoryList(formDTO)); + } + + /** + * @Description 赋能平台【项目处理分析】分类下项目列表 + * @author sun + */ + @PostMapping("categoryprojectlist") + public Result categoryProjectList(@RequestBody CategoryProjectFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, CategoryProjectFormDTO.Category.class); + return new Result().ok(govProjectService.categoryProjectList(formDTO)); + } + + /** + * @Description 赋能平台【项目处理分析】研判分析 + * @author sun + */ + @PostMapping("projectanalysis") + public Result projectAnalysis(@RequestBody ProjectAnalysisFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ProjectAnalysisFormDTO.Analysis.class); + return new Result().ok(govProjectService.projectAnalysis(formDTO)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 0265b0312f..035e9d5400 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -2,9 +2,7 @@ package com.epmet.dataaggre.service.govproject; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; -import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import java.util.LinkedList; @@ -69,4 +67,22 @@ public interface GovProjectService { * @author sun */ List projectStatusList(ProjectTotalFormDTO formDTO); + + /** + * @Description 赋能平台【项目分类分析】各分类项目数图表 + * @author sun + */ + ProjectCategoryTotalResultDTO projectCategoryList(ProjectCategoryTotalFormDTO formDTO); + + /** + * @Description 赋能平台【项目处理分析】分类下项目列表 + * @author sun + */ + CategoryProjectResultDTO categoryProjectList(CategoryProjectFormDTO formDTO); + + /** + * @Description 赋能平台【项目处理分析】研判分析 + * @author sun + */ + ProjectAnalysisResultDTO projectAnalysis(ProjectAnalysisFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 058b0cce9a..9f594e6b70 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -15,9 +15,7 @@ import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; -import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.service.datastats.DataStatsService; @@ -334,4 +332,31 @@ public class GovProjectServiceImpl implements GovProjectService { return resultList; } + /** + * @Description 赋能平台【项目分类分析】各分类项目数图表 + * @author sun + */ + @Override + public ProjectCategoryTotalResultDTO projectCategoryList(ProjectCategoryTotalFormDTO formDTO) { + return null; + } + + /** + * @Description 赋能平台【项目处理分析】分类下项目列表 + * @author sun + */ + @Override + public CategoryProjectResultDTO categoryProjectList(CategoryProjectFormDTO formDTO) { + return null; + } + + /** + * @Description 赋能平台【项目处理分析】研判分析 + * @author sun + */ + @Override + public ProjectAnalysisResultDTO projectAnalysis(ProjectAnalysisFormDTO formDTO) { + return null; + } + } From b18f1a4558b43f158122a1e4f3ae5a785fb622f7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 14:52:57 +0800 Subject: [PATCH 13/19] =?UTF-8?q?/heart/userdemand/mydemand=E8=BF=94?= =?UTF-8?q?=E5=8F=82=E5=A2=9E=E5=8A=A0=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/demand/IcResiUserReportDemandRes.java | 3 +++ .../epmet/service/impl/IcUserDemandRecServiceImpl.java | 1 + .../src/main/resources/mapper/IcUserDemandRecDao.xml | 9 +++------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java index e4792920b3..869f1b01e9 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java @@ -30,4 +30,7 @@ public class IcResiUserReportDemandRes implements Serializable { private String status; private String statusName; + + private String firstCategoryCode; + private String firstCategoryName; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 9f37c99a6a..b3b746eff1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -498,6 +498,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 33d491e2b4..e4ac17efca 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -129,7 +129,8 @@ r.PARENT_CODE as parentCode, r.CONTENT, r.`STATUS`, - r.WANT_SERVICE_TIME as wantServiceTime + r.WANT_SERVICE_TIME as wantServiceTime, + left(r.CATEGORY_CODE,4) as firstCategoryCode FROM ic_user_demand_rec r WHERE @@ -181,11 +182,7 @@ IFNULL(s.FINISH_DESC,'') as finishDesc, '' AS serviceShowName, s.id as serviceId, - ( - case when r.PARENT_CODE !='0' then r.PARENT_CODE - ELSE R.CATEGORY_CODE - END - ) as firstCategoryCode + left(r.CATEGORY_CODE,4) as firstCategoryCode FROM ic_user_demand_rec r left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' ) From 98e9a1cf4aa27b2fae4ac31bd215d444e3d94172 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Dec 2021 15:12:05 +0800 Subject: [PATCH 14/19] emm --- .../com/epmet/controller/IssueController.java | 2 ++ .../mapper/IssueProjectCategoryDictDao.xml | 2 +- .../ProjectDistributionAnalysisFormDTO.java | 7 +++++-- .../main/java/com/epmet/dao/ProjectDao.java | 9 +++++---- .../epmet/service/impl/ProjectServiceImpl.java | 18 ++++++++---------- .../src/main/resources/mapper/ProjectDao.xml | 8 +++----- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index cec85e03e5..3378abc1b4 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -284,5 +284,7 @@ public class IssueController { return new Result>().ok(issueService.getUnResolvedList(formDTO)); } +// @PostMapping("resibuzz") + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index 0030bb0a27..6c5d46eedd 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -256,7 +256,7 @@ AND CUSTOMER_ID = #{customerId} AND CATEGORY_TYPE = 1 AND IS_DISABLE = 'enable' - ORDER BY CATEGORY_CODE + ORDER BY SORT diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java index 6cf6eaa2d4..d4413eb75f 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java @@ -17,8 +17,11 @@ public class ProjectDistributionAnalysisFormDTO implements Serializable { public interface ProjectDistributionAnalysisForm{} - @NotBlank(message = "date不能为空",groups = ProjectDistributionAnalysisForm.class) - private String date; + @NotBlank(message = "startDate不能为空",groups = ProjectDistributionAnalysisForm.class) + private String startDate; + + @NotBlank(message = "endDate不能为空",groups = ProjectDistributionAnalysisForm.class) + private String endDate; private String orgId; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index c070c7e8ac..df0dc1ad95 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -220,13 +220,14 @@ public interface ProjectDao extends BaseDao { /** * @Description 根据日期查询项目分类 - * @param date - * @param orgId + * @param startDate + * @param endDate * @param codeLength 1级分类编码长度 - * @param originGrid 是否来源网格 + * @param orgId * @author zxc * @date 2021/12/8 1:37 下午 */ - List selectProjectCategoryByDate(@Param("date")String date,@Param("orgId")String orgId,@Param("codeLength")Integer codeLength,@Param("originGrid")Boolean originGrid); + List selectProjectCategoryByDate(@Param("startDate")String startDate,@Param("endDate")String endDate, + @Param("orgId")String orgId,@Param("codeLength")Integer codeLength); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index b83310b93c..3588aeefb1 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2804,24 +2804,22 @@ public class ProjectServiceImpl extends BaseServiceImpl projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); - if (null == staffInfo){ - throw new EpmetException("未查询到此工作人员的所属组织信息..."); + if (StringUtils.isBlank(formDTO.getOrgId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询到此工作人员的所属组织信息..."); + } + formDTO.setOrgId(staffInfo.getAgencyId()); } Result> listResult = govIssueOpenFeignClient.selectCategoryOneLevelListByCustomerId(tokenDto); if (!listResult.success()){ throw new EpmetException("查询1级分类列表失败..."); } - List projectCategoryByDateDTOS = new ArrayList<>(); - if (formDTO.getOrgType().equals(ProjectConstant.ORG_TYPE_GRID)){ - projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength(),true); - }else { - projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength(),false); - } + List projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getStartDate(),formDTO.getEndDate(), formDTO.getOrgId(), listResult.getData().get(NumConstant.ZERO).getCodeLength()); if (CollectionUtils.isEmpty(projectCategoryByDateDTOS)){ return new ArrayList<>(); } - return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getDate(), listResult.getData()); + return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getStartDate(), listResult.getData()); } /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 6eec0fe694..179a83ce1b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -402,16 +402,14 @@ \ No newline at end of file From d23401c039dfabb566fbca7ff37b5bdb68700698 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Dec 2021 16:08:56 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=88=86=E6=9E=90=E3=80=91=E5=90=84=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govissue/IssueProjectCategoryDictDTO.java | 93 +++++++++++++++++++ .../form/CategoryProjectFormDTO.java | 4 +- .../form/ProjectAnalysisFormDTO.java | 4 +- .../form/ProjectCategoryTotalFormDTO.java | 2 + .../result/CategoryProjectResultDTO.java | 2 +- .../result/ProjectCategoryTotalResultDTO.java | 4 +- .../controller/GovProjectController.java | 5 +- .../evaluationindex/EvaluationIndexDao.java | 8 ++ .../dataaggre/dao/govissue/IssueDao.java | 7 ++ .../EvaluationIndexService.java | 7 ++ .../impl/EvaluationIndexServiceImpl.java | 11 +++ .../service/govissue/GovIssueService.java | 7 ++ .../govissue/impl/GovIssueServiceImpl.java | 10 ++ .../service/govproject/GovProjectService.java | 2 +- .../impl/GovProjectServiceImpl.java | 31 ++++++- .../evaluationindex/EvaluationIndexDao.xml | 13 +++ .../resources/mapper/govissue/IssueDao.xml | 12 +++ 17 files changed, 209 insertions(+), 13 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java new file mode 100644 index 0000000000..4555a86cd2 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java @@ -0,0 +1,93 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.dto.govissue; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 议题项目分类字典 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-12-08 + */ +@Data +public class IssueProjectCategoryDictDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id, 产品默认default + */ + private String customerId; + + /** + * 上级分类ID 顶级此列存储0 + */ + private String pid; + + /** + * 所有上级分类ID，用逗号分开 + */ + private String pids; + + /** + * 上级分类编码 + */ + private String parentCategoryCode; + + /** + * 分类编码，分类编码+customer_id唯一 + */ + private String categoryCode; + + /** + * 分类名称 + */ + private String categoryName; + + /** + * 分类类别1,2,3,4.... + */ + private String categoryType; + + /** + * 排序 + */ + private Integer sort; + + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + + /** + * 颜色 + */ + private String colour; + + +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java index 726d01dbce..38335e8223 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java @@ -24,8 +24,8 @@ public class CategoryProjectFormDTO implements Serializable { @NotBlank(message = "组织ID不能为空", groups = {Category.class}) private String dateId; //一级分类Id - @NotBlank(message = "分类Id不能为空", groups = {Category.class}) - private String categoryId; + @NotBlank(message = "分类Code不能为空", groups = {Category.class}) + private String categoryCode; //页码 @Min(1) private Integer pageNo = 1; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java index 9689899cc4..1cf8e85373 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java @@ -25,8 +25,8 @@ public class ProjectAnalysisFormDTO implements Serializable { @NotBlank(message = "话题或事件发起人Id不能为空", groups = {Analysis.class}) private String userId; //一级分类Id集合 - @NotNull(message = "分类Id集合不能为空", groups = {Analysis.class}) - private List categoryIdList; + @NotNull(message = "分类Code集合不能为空", groups = {Analysis.class}) + private List categoryCodeList; public interface Analysis extends CustomerClientShowGroup { } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java index eddd513d1c..66d4e983b8 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java @@ -24,6 +24,8 @@ public class ProjectCategoryTotalFormDTO implements Serializable { @NotBlank(message = "日维度ID不能为空", groups = {Project.class}) private String dateId; + private String customerId; + public interface Project extends CustomerClientShowGroup { } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java index 6f24967aba..b6cd54a88c 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java @@ -27,7 +27,7 @@ public class CategoryProjectResultDTO implements Serializable { //项目编码[目前没这个功能 默认为空] private String projectCode = ""; //一级分类Id集合 - private List categoryIds; + private List categoryCodes; //一级分类名称集合 private List categoryNames; //来源：议题issue 项目立项:agency 事件:resi_event【控制电机查看时里边三个按钮的显示】 diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java index 1d95b68175..fabbad4ddf 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java @@ -14,8 +14,8 @@ public class ProjectCategoryTotalResultDTO implements Serializable { //组织Id private String agencyId; - //一级分类Id - private String categoryId; + //一级分类Code + private String categoryCode; //一级分类名称 private String categoryName; //分类下项目总数 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 396f14543d..3039785f12 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -91,9 +91,10 @@ public class GovProjectController { * @author sun */ @PostMapping("projectcategorylist") - public Result projectCategoryList(@RequestBody ProjectCategoryTotalFormDTO formDTO) { + public Result> projectCategoryList(@LoginUser TokenDto tokenDto, @RequestBody ProjectCategoryTotalFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ProjectCategoryTotalFormDTO.Project.class); - return new Result().ok(govProjectService.projectCategoryList(formDTO)); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(govProjectService.projectCategoryList(formDTO)); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java index 138ff3d449..5afe394900 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java @@ -21,6 +21,8 @@ import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -103,4 +105,10 @@ public interface EvaluationIndexDao { */ String selectAgencyNameByAgencyId(@Param("agencyId")String agencyId); + /** + * @Description 按dateId查询组织下一级分类项目总数统计 + * @author sun + */ + List projectCategoryList(ProjectCategoryTotalFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java index 1e85e06366..6727a2d2d4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java @@ -18,6 +18,7 @@ package com.epmet.dataaggre.dao.govissue; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.form.ClosedIssueListFormDTO; import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO; import com.epmet.dataaggre.dto.govissue.form.VotingIssueListFormDTO; @@ -74,4 +75,10 @@ public interface IssueDao extends BaseDao { Integer selectIssueCount(@Param("gridIds") List gridIds,@Param("issueType")String issueType); List selectShiftProjectIssueList(@Param("customerId") String customerId, @Param("gridId") String gridId); + + /** + * @Description 查询客户下分类信息 + * @author sun + **/ + List getCategoryList(@Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java index 67468e32de..bd5cfd6886 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java @@ -6,6 +6,8 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO; import java.util.List; @@ -86,4 +88,9 @@ public interface EvaluationIndexService { */ ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String agencyId); + /** + * @Description 按dateId查询组织下一级分类项目总数统计 + * @author sun + */ + List projectCategoryList(ProjectCategoryTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java index abb0f137f5..e3f1b246af 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java @@ -11,6 +11,8 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.opercrm.CustomerRelation; import lombok.extern.slf4j.Slf4j; @@ -206,4 +208,13 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService { return resultDTO; } + /** + * @Description 按dateId查询组织下一级分类项目总数统计 + * @author sun + */ + @Override + public List projectCategoryList(ProjectCategoryTotalFormDTO formDTO) { + return evaluationIndexDao.projectCategoryList(formDTO); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java index 5159bda48f..65e768ccf5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service.govissue; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.form.AllIssueFormDTO; import com.epmet.dataaggre.dto.govissue.form.ClosedIssueListFormDTO; import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO; @@ -45,4 +46,10 @@ public interface GovIssueService { List closedIssueList(ClosedIssueListFormDTO fromDTO); List selectShiftProjectIssueList(String customerId,String gridId,Integer pageNo,Integer pageSize); + + /** + * @Description 查询客户下一级分类信息 + * @author sun + **/ + List categoryList(String customerId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java index 7b68d96332..db987e0b5c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.IssueConstant; import com.epmet.dataaggre.dao.govissue.IssueApplicationDao; import com.epmet.dataaggre.dao.govissue.IssueDao; +import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.form.AllIssueFormDTO; import com.epmet.dataaggre.dto.govissue.form.ClosedIssueListFormDTO; import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO; @@ -323,4 +324,13 @@ public class GovIssueServiceImpl implements GovIssueService { return issueDao.selectShiftProjectIssueList(customerId, gridId); } + /** + * @Description 查询客户下一级分类信息 + * @author sun + **/ + @Override + public List categoryList(String customerId) { + return issueDao.getCategoryList(customerId); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 035e9d5400..41d6b64379 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -72,7 +72,7 @@ public interface GovProjectService { * @Description 赋能平台【项目分类分析】各分类项目数图表 * @author sun */ - ProjectCategoryTotalResultDTO projectCategoryList(ProjectCategoryTotalFormDTO formDTO); + List projectCategoryList(ProjectCategoryTotalFormDTO formDTO); /** * @Description 赋能平台【项目处理分析】分类下项目列表 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 9f594e6b70..ff484007b3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -12,6 +12,7 @@ import com.epmet.dataaggre.constant.ProjectConstant; import com.epmet.dataaggre.dao.govproject.ProjectDao; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; +import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; @@ -19,6 +20,7 @@ import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.service.datastats.DataStatsService; +import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.govissue.GovIssueService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; @@ -56,6 +58,8 @@ public class GovProjectServiceImpl implements GovProjectService { private ResiGroupService resiGroupService; @Autowired private DataStatsService dataStatsService; + @Autowired + private EvaluationIndexService evaluationIndexService; /** * @Description 查询项目信息 @@ -334,11 +338,32 @@ public class GovProjectServiceImpl implements GovProjectService { /** * @Description 赋能平台【项目分类分析】各分类项目数图表 - * @author sun +, * @author sun */ @Override - public ProjectCategoryTotalResultDTO projectCategoryList(ProjectCategoryTotalFormDTO formDTO) { - return null; + public List projectCategoryList(ProjectCategoryTotalFormDTO formDTO) { + List resultList = new ArrayList<>(); + //1.查询客户下一级分类信息 + List categoryList = govIssueService.categoryList(formDTO.getCustomerId()); + + //2.按dateId查询组织下一级分类项目总数 + List list = evaluationIndexService.projectCategoryList(formDTO); + + //3.封装数据并返回 + categoryList.forEach(ca -> { + ProjectCategoryTotalResultDTO dto = new ProjectCategoryTotalResultDTO(); + dto.setAgencyId(formDTO.getAgencyId()); + dto.setCategoryCode(ca.getCategoryCode()); + dto.setCategoryName(ca.getCategoryName()); + list.forEach(l -> { + if (ca.getCategoryCode().equals(l.getCategoryCode())) { + dto.setTotal(l.getTotal()); + } + }); + resultList.add(dto); + }); + + return resultList; } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml index afa7e56c2d..117e6c537b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml @@ -182,4 +182,17 @@ AND DEL_FLAG = 0 + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml index 185816c9bb..239e846aa9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml @@ -124,4 +124,16 @@ order by i.SHIFTED_TIME desc + + + \ No newline at end of file From b7b67c889ae5bcbdaab3161391d111c2bbfba83a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 20:58:11 +0800 Subject: [PATCH 16/19] /resievent/eventdetail-icdata --- .../dto/form/ResiEventDetailFormDTO.java | 18 +++++++++++ .../dto/result/EventDetailResultDTO.java | 6 ++-- .../epmet/controller/ResiEventController.java | 12 +++++++ .../com/epmet/service/ResiEventService.java | 8 +++++ .../service/impl/ResiEventServiceImpl.java | 31 ++++++++++++++----- 5 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java new file mode 100644 index 0000000000..37049a3ef8 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 数字赋能平台-个人档案-上报事件-事件详情 + */ +@Data +public class ResiEventDetailFormDTO implements Serializable { + private static final long serialVersionUID = 4449275163195979994L; + public interface AddUserInternalGroup { + } + @NotBlank(message = "resiEventId不能为空",groups =AddUserInternalGroup.class ) + private String resiEventId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java index 18295391c5..0b6bb8ccb2 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java @@ -11,7 +11,7 @@ import java.util.List; /** * @Author zxc * @DateTime 2021/8/3 1:30 下午 - * @DESC + * @DESC 两端通用时间详情接口+个人档案-数据分析-事件详情 */ @Data public class EventDetailResultDTO implements Serializable { @@ -87,10 +87,10 @@ public class EventDetailResultDTO implements Serializable { @JsonIgnore private List orgNameList; - @JsonIgnore + //@JsonIgnore private String projectId; - @JsonIgnore + //@JsonIgnore private Boolean isProject; public EventDetailResultDTO() { diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index c868dbff0d..b3dd410a81 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -57,6 +57,18 @@ public class ResiEventController { return new Result().ok(resiEventService.eventDetail(formDTO, tokenDto)); } + /** + * 数字赋能平台-个人档案-事件详情 + * + * @param formDTO + * @return + */ + @PostMapping("eventdetail-icdata") + public Result eventDetailForIcData(@RequestBody ResiEventDetailFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO,ResiEventDetailFormDTO.AddUserInternalGroup.class); + return new Result().ok(resiEventService.eventDetailForIcData(formDTO)); + } + /** * 我要报事-提交（尹） * diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index f9712c498b..b73e1f7908 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -41,6 +41,14 @@ public interface ResiEventService extends BaseService { */ EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO, TokenDto tokenDto); + /** + * 数字赋能平台-个人档案-事件详情 + * + * @param formDTO + * @return + */ + EventDetailResultDTO eventDetailForIcData(ResiEventDetailFormDTO formDTO); + /** * 我要报事-提交（尹） * diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index cbd5ff6b3c..01b0377ad3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -163,7 +163,20 @@ public class ResiEventServiceImpl extends BaseServiceImpl data = orgResult.getData(); dto.setEventOrg(data); - // 更改已读状态 报事人的红点：resi_event,艾特人的：resi_event_mention,所代表的组织的：resi_event_report_org - if (tokenDto.getApp().equals(EventConstant.TYPE_RESI)){ - baseDao.updateResiEvent(tokenDto.getUserId(),formDTO.getEventId()); - baseDao.updateEventMention(tokenDto.getUserId(),formDTO.getEventId()); - }else if (tokenDto.getApp().equals(EventConstant.TYPE_GOV)){ - resiEventReportOrgDao.updateEventOrg(formDTO.getEventId(), formDTO.getOrgId()); - } return dto; } + /** + * 数字赋能平台-个人档案-事件详情 + * + * @param formDTO + * @return + */ + public EventDetailResultDTO eventDetailForIcData(ResiEventDetailFormDTO formDTO){ + return getEventDetailResultDTO(formDTO.getResiEventId()); + } /** * 我要报事-提交（尹） From 504f293f6ef0a239d8e1d3b888d0906b5f33bcf8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 22:54:45 +0800 Subject: [PATCH 17/19] zancun --- .../result/IssueProjectCategory.java | 19 +++++++ .../resigroup/form/UserTopicPageFormDTO.java | 19 +++++++ .../dto/resigroup/result/UserTopicResDTO.java | 26 ++++++++++ .../controller/ResiGroupController.java | 12 +++++ .../dataaggre/dao/govproject/ProjectDao.java | 4 +- .../dataaggre/dao/resigroup/ResiTopicDao.java | 10 ++++ .../service/govproject/GovProjectService.java | 9 ++++ .../impl/GovProjectServiceImpl.java | 33 ++++++++++++ .../service/resigroup/ResiGroupService.java | 4 ++ .../resigroup/impl/ResiGroupServiceImpl.java | 50 +++++++++++++++++-- .../mapper/govproject/ProjectDao.xml | 21 ++++++++ .../mapper/resigroup/ResiTopicDao.xml | 18 +++++++ 12 files changed, 220 insertions(+), 5 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java new file mode 100644 index 0000000000..e0a028ee3d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java @@ -0,0 +1,19 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Set; + +@Data +public class IssueProjectCategory implements Serializable { + private static final long serialVersionUID = -2226298165882293959L; + private String issueId; + private String projectId; + private Set categoryPidsList; + + /** + * 这个项目对应的所有一级项目分类编码 + */ + private Set firstCategoryCodeList; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java new file mode 100644 index 0000000000..cfedd6e6d9 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dataaggre.dto.resigroup.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +@Data +public class UserTopicPageFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class) + private List epmetUserIdList; + @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) + private Integer pageNo; + @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) + private Integer pageSize; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java new file mode 100644 index 0000000000..98bf53a3e6 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dataaggre.dto.resigroup.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +/** + * 个人分析，发布话题分页列表 + */ +@Data +public class UserTopicResDTO implements Serializable { + private String topicId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date releaseTime; + private String topicContent; + private Boolean shiftIssue; + private String issueId; + private Boolean shiftProject=false; + private String projectId=""; + //不返给前端了。 + private Set projectFirstCategoryCodeList=new HashSet<>(); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java index 259b22cff0..8dc1a34527 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java @@ -1,12 +1,15 @@ package com.epmet.dataaggre.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO; import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO; +import com.epmet.dataaggre.dto.resigroup.result.UserTopicResDTO; import com.epmet.dataaggre.service.resigroup.ResiGroupService; +import com.epmet.dto.form.PageUserReportEventFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -39,4 +42,13 @@ public class ResiGroupController { return new Result>().ok(resiGroupService.candidateList(formDTO)); } + /** + * 数字赋能平台-个人分析，发布话题分页列表 + * @return + */ + @PostMapping("pageusertopic") + public Result> pageUserTopic(@RequestBody PageUserReportEventFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, PageUserReportEventFormDTO.AddUserInternalGroup.class); + return new Result>().ok(resiGroupService.pageUserTopic(formDTO)); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 0fb0c154dc..2a433d58d7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -18,6 +18,7 @@ package com.epmet.dataaggre.dao.govproject; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; @@ -25,7 +26,6 @@ import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectStatusListResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO; import com.epmet.dataaggre.entity.govproject.ProjectEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -79,4 +79,6 @@ public interface ProjectDao extends BaseDao { * @author sun */ List getProjectStatusList(ProjectTotalFormDTO formDTO); + + List selectProjectIssueCategory(@Param("issueIds") List issueIds); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java index cd57936e2f..c41c85d0de 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java @@ -19,7 +19,9 @@ package com.epmet.dataaggre.dao.resigroup; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; +import com.epmet.dataaggre.dto.resigroup.result.UserTopicResDTO; import com.epmet.dataaggre.entity.resigroup.ResiTopicEntity; +import com.epmet.dto.form.PageUserReportEventFormDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -35,4 +37,12 @@ import java.util.List; public interface ResiTopicDao extends BaseDao { List selectTopicInfoByIds(@Param("list") List topicIds); + + /** + * 数据分析-个人档案-发布话题列表 + * + * @param formDTO + * @return + */ + List selectListTopic(PageUserReportEventFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 41d6b64379..d118a05746 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service.govproject; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; @@ -85,4 +86,12 @@ public interface GovProjectService { * @author sun */ ProjectAnalysisResultDTO projectAnalysis(ProjectAnalysisFormDTO formDTO); + + /** + * 找出这些议题中对应的项目id,以及项目对应的一级分类编码 + * + * @param issueIds + * @return + */ + List getIssueProjectFirstCategory(List issueIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index ff484007b3..de145afac2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.dataaggre.service.govproject.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -12,6 +13,7 @@ import com.epmet.dataaggre.constant.ProjectConstant; import com.epmet.dataaggre.dao.govproject.ProjectDao; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; +import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; @@ -384,4 +386,35 @@ public class GovProjectServiceImpl implements GovProjectService { return null; } + /** + * 找出这些议题中对应的项目id,以及项目对应的一级分类编码 + * + * @param issueIds + * @return + */ + @Override + public List getIssueProjectFirstCategory(List issueIds) { + List list=projectDao.selectProjectIssueCategory(issueIds); + if(CollectionUtils.isNotEmpty(list)){ + for(IssueProjectCategory projectCategory:list){ + Set firt=new HashSet<>(); + for(String pids:projectCategory.getCategoryPidsList()){ + if(pids.contains(StrConstant.COLON)){ + String[] pidAtt=pids.split(StrConstant.COLON); + firt.add(pidAtt[0]); + break; + } + if(pids.contains(StrConstant.COMMA)){ + String[] pidAtt=pids.split(StrConstant.COMMA); + firt.add(pidAtt[0]); + break; + } + firt.add(pids); + } + projectCategory.setFirstCategoryCodeList(firt); + } + } + return list; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java index 68f4afb4ee..4aaaa113e7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java @@ -1,9 +1,11 @@ package com.epmet.dataaggre.service.resigroup; +import com.epmet.commons.tools.page.PageData; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.dto.resigroup.form.*; import com.epmet.dataaggre.dto.resigroup.result.*; +import com.epmet.dto.form.PageUserReportEventFormDTO; import java.util.List; @@ -61,4 +63,6 @@ public interface ResiGroupService { * @return com.epmet.dataaggre.dto.resigroup.result.GroupActRankResultDTO */ List querySubRankList(GroupActRankFormDTO formDTO); + + PageData pageUserTopic(PageUserReportEventFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java index 374db9eedf..f81c5d9a39 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java @@ -3,12 +3,15 @@ package com.epmet.dataaggre.service.resigroup.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.resigroup.ResiGroupDao; import com.epmet.dataaggre.dao.resigroup.ResiTopicDao; import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO; import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO; +import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.dto.resigroup.form.*; @@ -18,7 +21,9 @@ import com.epmet.dataaggre.redis.ResiGroupRedis; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.govorg.GovOrgService; +import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.resigroup.ResiGroupService; +import com.epmet.dto.form.PageUserReportEventFormDTO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -27,10 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -53,6 +55,8 @@ public class ResiGroupServiceImpl implements ResiGroupService { private DataStatsService dataStatsService; @Autowired private GovOrgService govOrgService; + @Autowired + private GovProjectService govProjectService; @Override public List selectTopicInfoByIds(List topicIds) { @@ -358,4 +362,42 @@ public class ResiGroupServiceImpl implements ResiGroupService { } return resultDTOList; } + + /** + * 数据分析-个人档案-发布话题列表 + * + * @param formDTO + * @return + */ + @Override + public PageData pageUserTopic(PageUserReportEventFormDTO formDTO) { + if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { + return new PageData(new ArrayList<>(), NumConstant.ZERO); + } + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> resiTopicDao.selectListTopic(formDTO)); + List list =pageInfo.getList(); + //根据议题id查询出每个议题对应的项目id，以及项目分类编码 + List issueIds=list.stream().filter(dto -> StringUtils.isNotBlank(dto.getIssueId())).map(UserTopicResDTO::getIssueId).collect(Collectors.toList()); + if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(issueIds)){ + List categoryList= govProjectService.getIssueProjectFirstCategory(issueIds); + for(UserTopicResDTO topicResDTO :pageInfo.getList()){ + topicResDTO.setShiftProject(false); + topicResDTO.setProjectId(StrConstant.EPMETY_STR); + + topicResDTO.setProjectFirstCategoryCodeList(new HashSet<>()); + for(IssueProjectCategory category:categoryList){ + if(StringUtils.isNotBlank(category.getProjectId())){ + topicResDTO.setShiftProject(true); + topicResDTO.setProjectId(category.getProjectId()); + + topicResDTO.setProjectFirstCategoryCodeList(category.getFirstCategoryCodeList()); + break; + } + } + + } + } + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 6b88005261..1d23d8562d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -174,4 +174,25 @@ ORDER BY created_time DESC + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml index bd46639c94..763dcd98df 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml @@ -22,4 +22,22 @@ #{topicId} + + + \ No newline at end of file From 356180a0132f14ea1abe03d8e00b11bebe6fea20 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 22:58:44 +0800 Subject: [PATCH 18/19] zancun --- .../result/IssueProjectCategory.java | 7 ------ .../dto/resigroup/result/UserTopicResDTO.java | 4 ---- .../impl/GovProjectServiceImpl.java | 24 +------------------ .../resigroup/impl/ResiGroupServiceImpl.java | 5 +--- .../mapper/govproject/ProjectDao.xml | 13 ++-------- 5 files changed, 4 insertions(+), 49 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java index e0a028ee3d..1e50bd7c19 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java @@ -3,17 +3,10 @@ package com.epmet.dataaggre.dto.govproject.result; import lombok.Data; import java.io.Serializable; -import java.util.Set; @Data public class IssueProjectCategory implements Serializable { private static final long serialVersionUID = -2226298165882293959L; private String issueId; private String projectId; - private Set categoryPidsList; - - /** - * 这个项目对应的所有一级项目分类编码 - */ - private Set firstCategoryCodeList; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java index 98bf53a3e6..4d5fd23ca2 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java @@ -5,8 +5,6 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -import java.util.HashSet; -import java.util.Set; /** * 个人分析，发布话题分页列表 @@ -21,6 +19,4 @@ public class UserTopicResDTO implements Serializable { private String issueId; private Boolean shiftProject=false; private String projectId=""; - //不返给前端了。 - private Set projectFirstCategoryCodeList=new HashSet<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index de145afac2..1b665e2888 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -2,7 +2,6 @@ package com.epmet.dataaggre.service.govproject.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -13,7 +12,6 @@ import com.epmet.dataaggre.constant.ProjectConstant; import com.epmet.dataaggre.dao.govproject.ProjectDao; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; -import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; @@ -394,27 +392,7 @@ public class GovProjectServiceImpl implements GovProjectService { */ @Override public List getIssueProjectFirstCategory(List issueIds) { - List list=projectDao.selectProjectIssueCategory(issueIds); - if(CollectionUtils.isNotEmpty(list)){ - for(IssueProjectCategory projectCategory:list){ - Set firt=new HashSet<>(); - for(String pids:projectCategory.getCategoryPidsList()){ - if(pids.contains(StrConstant.COLON)){ - String[] pidAtt=pids.split(StrConstant.COLON); - firt.add(pidAtt[0]); - break; - } - if(pids.contains(StrConstant.COMMA)){ - String[] pidAtt=pids.split(StrConstant.COMMA); - firt.add(pidAtt[0]); - break; - } - firt.add(pids); - } - projectCategory.setFirstCategoryCodeList(firt); - } - } - return list; + return projectDao.selectProjectIssueCategory(issueIds); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java index f81c5d9a39..d0cd285b19 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java @@ -385,13 +385,10 @@ public class ResiGroupServiceImpl implements ResiGroupService { topicResDTO.setShiftProject(false); topicResDTO.setProjectId(StrConstant.EPMETY_STR); - topicResDTO.setProjectFirstCategoryCodeList(new HashSet<>()); for(IssueProjectCategory category:categoryList){ - if(StringUtils.isNotBlank(category.getProjectId())){ + if(topicResDTO.getIssueId().equals(category.getIssueId())&&StringUtils.isNotBlank(category.getProjectId())){ topicResDTO.setShiftProject(true); topicResDTO.setProjectId(category.getProjectId()); - - topicResDTO.setProjectFirstCategoryCodeList(category.getFirstCategoryCodeList()); break; } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 1d23d8562d..fd2b6e44e1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -174,21 +174,12 @@ ORDER BY created_time DESC - - - - - - - SELECT p.ORIGIN_ID AS issueId, - p.id AS projectId, - pc.CATEGORY_PIDS + p.id AS projectId FROM project p - inner join project_category pc - on(p.id=pc.PROJECT_ID and pc.DEL_FLAG='0') WHERE p.DEL_FLAG = '0' From aca9b6ce5c6c453ca57028ab1b110ea2256a78c4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 23:00:12 +0800 Subject: [PATCH 19/19] zancun --- .../epmet/dataaggre/service/resigroup/ResiGroupService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java index 4aaaa113e7..2a353b0cc6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java @@ -64,5 +64,10 @@ public interface ResiGroupService { */ List querySubRankList(GroupActRankFormDTO formDTO); + /** + * 分页查询我发布的话题 + * @param formDTO + * @return + */ PageData pageUserTopic(PageUserReportEventFormDTO formDTO); }