From c6c1f05d8b1af3bc6f9e6cc1eea8f378cf8b5817 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Jun 2021 17:24:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?/data/stats/screencoll/usertotaldata?= =?UTF-8?q?=E6=96=B0=E5=A2=9EgridMemberTotal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java | 6 ++++++ .../evaluationindex/screen/ScreenUserTotalDataDao.xml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java index 3111d5136d..bc8a2b53b8 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java @@ -64,8 +64,14 @@ public class UserTotalDataFormDTO implements Serializable { */ private Integer projectTotal; + /** + * 06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数 + */ + private Integer gridMemberTotal; + /** * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) */ private String dataEndTime; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml index c3b3ef7de7..4e228f3fed 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml @@ -25,6 +25,7 @@ TOPIC_TOTAL, ISSUE_TOTAL, PROJECT_TOTAL, + GRID_MEMBER_TOTAL, DEL_FLAG, REVISION, CREATED_BY, @@ -47,6 +48,7 @@ #{item.topicTotal}, #{item.issueTotal}, #{item.projectTotal}, + #{item.gridMemberTotal}, 0, 0, 'APP_USER', From ec88b107f480d2836230fac92c4e1655707e014e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Jun 2021 14:51:56 +0800 Subject: [PATCH 2/8] =?UTF-8?q?streetdetail-py=20=E7=BA=A2=E9=BB=84?= =?UTF-8?q?=E7=BB=BF=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/screen/ColorProjectTotalFormDTO.java | 30 +++++++++++ .../form/screen/StreetDetailPYFormDTO.java | 27 ++++++++++ .../screen/ColorProjectTotalResultDTO.java | 48 +++++++++++++++++ .../screen/StreetDetailPYResultDTO.java | 50 ++++++++++++++++++ .../controller/screen/PyController.java | 38 ++++++++++++++ .../screen/ScreenProjectController.java | 23 ++++++--- .../screen/ScreenProjectDataDao.java | 17 +++++++ .../screen/ScreenUserTotalDataDao.java | 17 +++++++ .../evaluationindex/screen/PyService.java | 21 ++++++++ .../screen/ScreenProjectService.java | 10 ++++ .../screen/impl/PyServiceImpl.java | 51 +++++++++++++++++++ .../screen/impl/ScreenProjectServiceImpl.java | 30 +++++++++++ .../mapper/screen/ScreenProjectDataDao.xml | 37 ++++++++++++++ .../mapper/screen/ScreenUserTotalDataDao.xml | 28 ++++++++++ 14 files changed, 419 insertions(+), 8 deletions(-) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/StreetDetailPYFormDTO.java create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/ColorProjectTotalResultDTO.java create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/StreetDetailPYResultDTO.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PyController.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/PyService.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PyServiceImpl.java diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java new file mode 100644 index 0000000000..651808e10e --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dto.form.screen; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/6/1 3:11 下午 + * @DESC + */ +@Data +public class ColorProjectTotalFormDTO implements Serializable { + + private static final long serialVersionUID = -6991770717583778665L; + + public interface ColorProjectTotalForm{} + + /** + * 组织id + */ + @NotBlank(message = "组织ID不能为空",groups = ColorProjectTotalForm.class) + private String agencyId; + + /** + * 行政区域码【平阴必填】 + */ + private String areaCode; +} diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/StreetDetailPYFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/StreetDetailPYFormDTO.java new file mode 100644 index 0000000000..328510615b --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/StreetDetailPYFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form.screen; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/6/2 9:42 上午 + * @DESC + */ +@Data +public class StreetDetailPYFormDTO implements Serializable { + + private static final long serialVersionUID = -4821168326488796711L; + + public interface StreetDetailPYForm{} + + @NotBlank(message = "组织ID不能为空",groups = StreetDetailPYForm.class) + private String agencyId; + + /** + * 行政区域编码 平阴必填 + */ + private String areaCode; +} diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/ColorProjectTotalResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/ColorProjectTotalResultDTO.java new file mode 100644 index 0000000000..ed477cc951 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/ColorProjectTotalResultDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.result.screen; + +import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/6/1 3:15 下午 + * @DESC + */ +@Data +public class ColorProjectTotalResultDTO implements Serializable { + + private static final long serialVersionUID = -8211214262766797296L; + + /** + * 事件总数 + */ + private Integer projectTotal; + + /** + * 红灯事件总数 + */ + private Integer redTotal; + + /** + * 黄灯事件总数 + */ + private Integer yellowTotal; + + /** + * 绿灯事件总数 + */ + private Integer greenTotal; + + @JsonIgnore + private Integer projectLevel; + + public ColorProjectTotalResultDTO() { + this.projectTotal = NumConstant.ZERO; + this.redTotal = NumConstant.ZERO; + this.yellowTotal = NumConstant.ZERO; + this.greenTotal = NumConstant.ZERO; + } +} diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/StreetDetailPYResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/StreetDetailPYResultDTO.java new file mode 100644 index 0000000000..e81aabc23e --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/StreetDetailPYResultDTO.java @@ -0,0 +1,50 @@ +package com.epmet.dto.result.screen; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/6/2 9:43 上午 + * @DESC + */ +@Data +public class StreetDetailPYResultDTO implements Serializable { + + private static final long serialVersionUID = 663001974527694466L; + + /** + * 组织id + */ + private String agencyId; + + /** + * 组织名称 + */ + private String agencyName; + + /** + * 注册党员数 + */ + private Integer partyMemberTotal; + + /** + * 网格总数 + */ + private Integer gridTotal; + + /** + * 网格员数 + */ + private Integer gridMemberTotal; + + public StreetDetailPYResultDTO() { + this.partyMemberTotal = NumConstant.ZERO; + this.gridTotal = NumConstant.ZERO; + this.gridMemberTotal = NumConstant.ZERO; + this.agencyId = ""; + this.agencyName = ""; + } +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PyController.java new file mode 100644 index 0000000000..6835571eb2 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PyController.java @@ -0,0 +1,38 @@ +package com.epmet.datareport.controller.screen; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.datareport.service.evaluationindex.screen.PyService; +import com.epmet.dto.form.screen.StreetDetailPYFormDTO; +import com.epmet.dto.result.screen.StreetDetailPYResultDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author zxc + * @DateTime 2021/6/2 9:40 上午 + * @DESC + */ +@RestController +@RequestMapping("pyscreen") +public class PyController { + + @Autowired + private PyService pyService; + + /** + * @Description 街道：注册党员数、网格数、网格员数 + * @Param formDTO + * @author zxc + * @date 2021/6/2 10:07 上午 + */ + @PostMapping("streetdetail-py") + public Result streetDetail(@RequestBody StreetDetailPYFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, StreetDetailPYFormDTO.StreetDetailPYForm.class); + return new Result().ok(pyService.streetDetail(formDTO)); + } + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index e63eb501f8..c41380b282 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -5,14 +5,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectOrgDailyService; import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService; import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService; -import com.epmet.dto.form.screen.CategoryAnalysisFormDTO; -import com.epmet.dto.form.screen.EfficiencyAnalysisFormDTO; -import com.epmet.dto.form.screen.QueryQuantityMonthlyFormDTO; -import com.epmet.dto.form.screen.ScreenCommonFormDTO; -import com.epmet.dto.result.screen.CategoryAnalysisResultDTO; -import com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO; -import com.epmet.dto.result.screen.ProjectQuantityResultDTO; -import com.epmet.dto.result.screen.QueryQuantityMonthlyResultDTO; +import com.epmet.dto.form.screen.*; +import com.epmet.dto.result.screen.*; import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO; import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDetailFormDTO; import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDTO; @@ -132,4 +126,17 @@ public class ScreenProjectController { ValidatorUtils.validateEntity(formDTO, CategoryAnalysisFormDTO.CategoryAnalysis.class); return new Result>().ok(screenProjectService.categoryAnalysis(customerId, formDTO)); } + + /** + * @Description 红黄绿事件总数 + * @Param formDTO + * @author zxc + * @date 2021/6/1 3:20 下午 + */ + @PostMapping("colorprojectotal") + public Result colorProjectTotal(@RequestBody ColorProjectTotalFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ColorProjectTotalFormDTO.ColorProjectTotalForm.class); + return new Result().ok(screenProjectService.colorProjectTotal(formDTO)); + } + } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java index 061d0b81f1..43801dabda 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java @@ -1,5 +1,6 @@ package com.epmet.datareport.dao.evaluationindex.screen; +import com.epmet.dto.result.screen.ColorProjectTotalResultDTO; import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO; import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -28,4 +29,20 @@ public interface ScreenProjectDataDao { List selectProjectProcessAttachments(@Param("processId") String processId, @Param("projectId") String projectId, @Param("customerId") String customerId); + + /** + * @Description 根据agencyId查询事件 + * @Param agencyId + * @author zxc + * @date 2021/6/1 3:48 下午 + */ + List selectColorProjectByAgencyId(@Param("agencyId") String agencyId); + + /** + * @Description 根据areaCode查询事件 + * @Param agencyId + * @author zxc + * @date 2021/6/1 3:48 下午 + */ + List selectColorProjectByAreaCode(@Param("areaCode") String areaCode); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java index 8de5eaadfc..2e3436f807 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java @@ -17,6 +17,7 @@ package com.epmet.datareport.dao.evaluationindex.screen; +import com.epmet.dto.result.screen.StreetDetailPYResultDTO; import com.epmet.evaluationindex.screen.dto.result.PartymemberPercentResultDTO; import com.epmet.evaluationindex.screen.dto.result.TopProfileResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -60,4 +61,20 @@ public interface ScreenUserTotalDataDao { int selectAvgIssue(@Param("agencyId")String agencyId); PartymemberPercentResultDTO selectAgencyPartymemberPercentByIds(@Param("orgIds") List orgIds); + + /** + * @Description 根据组织ID查询街道详情 + * @Param agencyId + * @author zxc + * @date 2021/6/2 10:38 上午 + */ + StreetDetailPYResultDTO selectStreetDetailByAgencyId(@Param("agencyId")String agencyId); + + /** + * @Description 根据组织编码查询街道详情 + * @Param agencyId + * @author zxc + * @date 2021/6/2 10:38 上午 + */ + StreetDetailPYResultDTO selectStreetDetailByAreaCode(@Param("areaCode")String areaCode); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/PyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/PyService.java new file mode 100644 index 0000000000..65c54e13ca --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/PyService.java @@ -0,0 +1,21 @@ +package com.epmet.datareport.service.evaluationindex.screen; + +import com.epmet.dto.form.screen.StreetDetailPYFormDTO; +import com.epmet.dto.result.screen.StreetDetailPYResultDTO; + +/** + * @Author zxc + * @DateTime 2021/6/2 10:05 上午 + * @DESC + */ +public interface PyService { + + /** + * @Description 街道：注册党员数、网格数、网格员数 + * @Param formDTO + * @author zxc + * @date 2021/6/2 10:07 上午 + */ + StreetDetailPYResultDTO streetDetail(StreetDetailPYFormDTO formDTO); + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java index b4154a790a..7e708c3abe 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java @@ -2,7 +2,9 @@ package com.epmet.datareport.service.evaluationindex.screen; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.screen.CategoryAnalysisFormDTO; +import com.epmet.dto.form.screen.ColorProjectTotalFormDTO; import com.epmet.dto.result.screen.CategoryAnalysisResultDTO; +import com.epmet.dto.result.screen.ColorProjectTotalResultDTO; import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO; import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDetailFormDTO; import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDTO; @@ -40,4 +42,12 @@ public interface ScreenProjectService { List projectDistribution(ScreenProjectDistributionFormDTO formDTO); Result projectDistributionDetail(ScreenProjectDetailFormDTO formDTO); + + /** + * @Description 红黄绿事件总数 + * @Param formDTO + * @author zxc + * @date 2021/6/1 3:20 下午 + */ + ColorProjectTotalResultDTO colorProjectTotal(ColorProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PyServiceImpl.java new file mode 100644 index 0000000000..9b3bed927d --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PyServiceImpl.java @@ -0,0 +1,51 @@ +package com.epmet.datareport.service.evaluationindex.screen.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.constant.DataSourceConstant; +import com.epmet.datareport.dao.evaluationindex.screen.ScreenUserTotalDataDao; +import com.epmet.datareport.service.evaluationindex.screen.PyService; +import com.epmet.dto.form.screen.StreetDetailPYFormDTO; +import com.epmet.dto.result.screen.StreetDetailPYResultDTO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Author zxc + * @DateTime 2021/6/2 10:05 上午 + * @DESC + */ +@Slf4j +@Service +@DataSource(DataSourceConstant.EVALUATION_INDEX) +public class PyServiceImpl implements PyService { + + @Autowired + private ScreenUserTotalDataDao screenUserTotalDataDao; + + /** + * @Description 街道：注册党员数、网格数、网格员数 + * @Param formDTO + * @author zxc + * @date 2021/6/2 10:07 上午 + */ + @Override + public StreetDetailPYResultDTO streetDetail(StreetDetailPYFormDTO formDTO) { + StreetDetailPYResultDTO result = new StreetDetailPYResultDTO(); + if (StringUtils.isEmpty(formDTO.getAreaCode())){ + result = screenUserTotalDataDao.selectStreetDetailByAgencyId(formDTO.getAgencyId()); + }else { + StreetDetailPYResultDTO eightStreet = screenUserTotalDataDao.selectStreetDetailByAreaCode(formDTO.getAreaCode()); + result = screenUserTotalDataDao.selectStreetDetailByAgencyId(formDTO.getAgencyId()); + if (null == result){ + throw new RenException("组织ID【"+formDTO.getAgencyId()+"】不存在于screen_customer_agency"); + } + result.setGridMemberTotal(result.getGridMemberTotal() + eightStreet.getGridMemberTotal()); + result.setPartyMemberTotal(result.getPartyMemberTotal() + eightStreet.getPartyMemberTotal()); + result.setGridTotal(result.getGridTotal() + eightStreet.getGridTotal()); + } + return result; + } +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index c2728396d0..153db70313 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -11,7 +11,9 @@ import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectCategoryOrgD import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectDataDao; import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService; import com.epmet.dto.form.screen.CategoryAnalysisFormDTO; +import com.epmet.dto.form.screen.ColorProjectTotalFormDTO; import com.epmet.dto.result.screen.CategoryAnalysisResultDTO; +import com.epmet.dto.result.screen.ColorProjectTotalResultDTO; import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO; import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDetailFormDTO; import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDTO; @@ -28,6 +30,8 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 项目 @@ -149,4 +153,30 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { } return resultList; } + + /** + * @Description 红黄绿事件总数 + * @Param formDTO + * @author zxc + * @date 2021/6/1 3:20 下午 + */ + @Override + public ColorProjectTotalResultDTO colorProjectTotal(ColorProjectTotalFormDTO formDTO) { + ColorProjectTotalResultDTO result = new ColorProjectTotalResultDTO(); + List list = new ArrayList<>(); + if (StringUtils.isEmpty(formDTO.getAreaCode())){ + list = screenProjectDataDao.selectColorProjectByAgencyId(formDTO.getAgencyId()); + }else { + list = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode()); + } + // 事件级别 红色1级：已超期；黄色2级:即将超期；绿色3级：未超期 + if (!CollectionUtils.isEmpty(list)){ + Map> groupByLevel = list.stream().collect(Collectors.groupingBy(ColorProjectTotalResultDTO::getProjectLevel)); + result.setRedTotal(CollectionUtils.isEmpty(groupByLevel.get(NumConstant.ONE)) ? NumConstant.ZERO : groupByLevel.get(NumConstant.ONE).size()); + result.setYellowTotal(CollectionUtils.isEmpty(groupByLevel.get(NumConstant.TWO)) ? NumConstant.ZERO : groupByLevel.get(NumConstant.TWO).size()); + result.setGreenTotal(CollectionUtils.isEmpty(groupByLevel.get(NumConstant.THREE)) ? NumConstant.ZERO : groupByLevel.get(NumConstant.THREE).size()); + result.setProjectTotal(list.size()); + } + return result; + } } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 2f173078a0..aed4954ead 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -112,4 +112,41 @@ and CUSTOMER_ID= #{customerId} order by sort asc + + + + + + diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml index d2040d3e13..815f5ec755 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml @@ -82,4 +82,32 @@ ISSUE_TOTAL desc, PROJECT_TOTAL desc + + + + + + \ No newline at end of file From 96dd6b945f014fa84e3b478a9939a5b222b15c71 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Jun 2021 15:30:19 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=BA=A2=E9=BB=84=E7=BB=BF=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/screen/ColorProjectTotalFormDTO.java | 6 ++ .../screen/ScreenProjectDataDao.java | 4 +- .../screen/impl/ScreenProjectServiceImpl.java | 17 ++++- .../mapper/screen/ScreenProjectDataDao.xml | 68 ++++++++++++------- 4 files changed, 67 insertions(+), 28 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java index 651808e10e..e115815e44 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form.screen; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -27,4 +28,9 @@ public class ColorProjectTotalFormDTO implements Serializable { * 行政区域码【平阴必填】 */ private String areaCode; + + /** + * 绿灯事件查询几个月的数据 + */ + private Integer monthCount = NumConstant.ONE; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java index 43801dabda..2ee4a79202 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java @@ -36,7 +36,7 @@ public interface ScreenProjectDataDao { * @author zxc * @date 2021/6/1 3:48 下午 */ - List selectColorProjectByAgencyId(@Param("agencyId") String agencyId); + List selectColorProjectByAgencyId(@Param("agencyId") String agencyId,@Param("monthCount")Integer monthCount); /** * @Description 根据areaCode查询事件 @@ -44,5 +44,5 @@ public interface ScreenProjectDataDao { * @author zxc * @date 2021/6/1 3:48 下午 */ - List selectColorProjectByAreaCode(@Param("areaCode") String areaCode); + List selectColorProjectByAreaCode(@Param("areaCode") String areaCode,@Param("level")Integer level,@Param("monthCount")Integer monthCount); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 153db70313..2e1e8babcf 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -156,6 +156,8 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { /** * @Description 红黄绿事件总数 + * 绿色事件查询近30天，红色和黄色查询全部 + * 可以添加传参 monthCount，查询几个月的绿色事件 * @Param formDTO * @author zxc * @date 2021/6/1 3:20 下午 @@ -165,9 +167,20 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { ColorProjectTotalResultDTO result = new ColorProjectTotalResultDTO(); List list = new ArrayList<>(); if (StringUtils.isEmpty(formDTO.getAreaCode())){ - list = screenProjectDataDao.selectColorProjectByAgencyId(formDTO.getAgencyId()); + list = screenProjectDataDao.selectColorProjectByAgencyId(formDTO.getAgencyId(), formDTO.getMonthCount()); }else { - list = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode()); + List colorProjectTotal1 = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode(), NumConstant.ONE, formDTO.getMonthCount()); + if (!CollectionUtils.isEmpty(colorProjectTotal1)){ + list.addAll(colorProjectTotal1); + } + List colorProjectTotal2 = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode(), NumConstant.TWO, formDTO.getMonthCount()); + if (!CollectionUtils.isEmpty(colorProjectTotal2)){ + list.addAll(colorProjectTotal2); + } + List colorProjectTotal3 = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode(), NumConstant.THREE, formDTO.getMonthCount()); + if (!CollectionUtils.isEmpty(colorProjectTotal3)){ + list.addAll(colorProjectTotal3); + } } // 事件级别 红色1级：已超期；黄色2级:即将超期；绿色3级：未超期 if (!CollectionUtils.isEmpty(list)){ diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index aed4954ead..210d0a1b27 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -115,38 +115,58 @@ From 61942ef747db4d4262cfca28de31a527afb35b5c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Jun 2021 13:34:56 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=BA=A2=E9=BB=84=E7=BB=BF=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/ScreenProjectDataDao.java | 2 +- .../screen/impl/ScreenProjectServiceImpl.java | 16 +++------- .../mapper/screen/ScreenProjectDataDao.xml | 31 ++++++------------- 3 files changed, 14 insertions(+), 35 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java index 2ee4a79202..49797b9cb2 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java @@ -44,5 +44,5 @@ public interface ScreenProjectDataDao { * @author zxc * @date 2021/6/1 3:48 下午 */ - List selectColorProjectByAreaCode(@Param("areaCode") String areaCode,@Param("level")Integer level,@Param("monthCount")Integer monthCount); + List selectColorProjectByAreaCode(@Param("areaCode") String areaCode,@Param("monthCount")Integer monthCount); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 2e1e8babcf..91e8b227d8 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -156,7 +156,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { /** * @Description 红黄绿事件总数 - * 绿色事件查询近30天，红色和黄色查询全部 + * 红黄绿事件均查询1个月以内的 * 可以添加传参 monthCount，查询几个月的绿色事件 * @Param formDTO * @author zxc @@ -169,17 +169,9 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { if (StringUtils.isEmpty(formDTO.getAreaCode())){ list = screenProjectDataDao.selectColorProjectByAgencyId(formDTO.getAgencyId(), formDTO.getMonthCount()); }else { - List colorProjectTotal1 = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode(), NumConstant.ONE, formDTO.getMonthCount()); - if (!CollectionUtils.isEmpty(colorProjectTotal1)){ - list.addAll(colorProjectTotal1); - } - List colorProjectTotal2 = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode(), NumConstant.TWO, formDTO.getMonthCount()); - if (!CollectionUtils.isEmpty(colorProjectTotal2)){ - list.addAll(colorProjectTotal2); - } - List colorProjectTotal3 = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode(), NumConstant.THREE, formDTO.getMonthCount()); - if (!CollectionUtils.isEmpty(colorProjectTotal3)){ - list.addAll(colorProjectTotal3); + List colorProjectTotal = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode(), formDTO.getMonthCount()); + if (!CollectionUtils.isEmpty(colorProjectTotal)){ + list.addAll(colorProjectTotal); } } // 事件级别 红色1级：已超期；黄色2级:即将超期；绿色3级：未超期 diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 210d0a1b27..26578cec46 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -115,21 +115,13 @@ @@ -139,11 +131,9 @@ LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = pd.ORG_ID WHERE pd.DEL_FLAG = '0' AND pd.ORG_TYPE = 'agency' - AND pd.PROJECT_LEVEL = #{level} + AND pd.PROJECT_LEVEL != 0 AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%') - - AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) - + AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) ) UNION ALL (SELECT pd.PROJECT_LEVEL @@ -151,11 +141,9 @@ LEFT JOIN screen_customer_grid scg ON scg.GRID_ID = pd.ORG_ID WHERE pd.DEL_FLAG = '0' AND pd.ORG_TYPE = 'grid' - AND pd.PROJECT_LEVEL = #{level} + AND pd.PROJECT_LEVEL != 0 AND scg.AREA_CODE LIKE CONCAT(#{areaCode},'%') - - AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) - + AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) ) UNION ALL (SELECT pd.PROJECT_LEVEL @@ -163,10 +151,9 @@ LEFT JOIN screen_customer_dept scd ON scd.DEPT_ID = pd.ORG_ID WHERE pd.DEL_FLAG = '0' AND pd.ORG_TYPE = 'department' - AND pd.PROJECT_LEVEL = #{level} + AND pd.PROJECT_LEVEL != 0 AND scd.AREA_CODE LIKE CONCAT(#{areaCode},'%') - - AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) - ) + AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) + ) From e3e5fce2fbbb3fc9563ed1d1b4c4252e5af5d97c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Jun 2021 13:52:19 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=B8=AD=E5=A4=AE=E5=8C=BA=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=88=86=E6=9E=90-=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E5=B8=83=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/ScreenProjectServiceImpl.java | 1 + .../src/main/resources/mapper/screen/ScreenProjectDataDao.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 91e8b227d8..4bf518855a 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -77,6 +77,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { /** * @Description 中央区事件分析-项目分布 + * 【2021-06-03 修改查询红黄绿事件事件范围为一个月】 * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author liushaowen diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 26578cec46..3ed76af34c 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -17,6 +17,7 @@ screen_project_data WHERE del_flag = '0' + AND UNIX_TIMESTAMP(CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL 1 MONTH)) and project_level = #{level} From 54ae4f9ec72cf333949a3eee2a37a25fb4f3c20a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Jun 2021 14:02:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=A1=97=E9=81=93=EF=BC=9A=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E5=85=9A=E5=91=98=E6=95=B0=E3=80=81=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=95=B0=E3=80=81=E7=BD=91=E6=A0=BC=E5=91=98=E6=95=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenUserTotalDataDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml index 815f5ec755..af7f1bfc34 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml @@ -89,7 +89,7 @@ td.ORG_ID AS agencyId, td.ORG_NAME AS agencyName, IFNULL(td.PARTY_TOTAL,0) AS partyMemberTotal, - IFNULL(td.USER_TOTAL,0) AS gridMemberTotal, + IFNULL(td.grid_member_total,0) AS gridMemberTotal, (SELECT COUNT(ID) FROM screen_customer_grid WHERE DEL_FLAG = '0' AND PARENT_AGENCY_ID = #{agencyId}) AS gridTotal FROM screen_customer_agency sca LEFT JOIN screen_user_total_data td ON td.ORG_ID = sca.AGENCY_ID @@ -102,7 +102,7 @@ + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml index f30740e0ee..51db8980fc 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml @@ -532,4 +532,29 @@ user_id = #{project.linkName} + + +