From d37948235e14bb681651c00bee8a69418aa42e0f Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 12 Sep 2019 13:53:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiItemController.java | 15 ++++++++- .../esua/epdc/feign/ItemFeignClient.java | 12 +++++++ .../elink/esua/epdc/service/ItemService.java | 10 ++++++ .../epdc/service/impl/ItemServiceImpl.java | 10 ++++++ .../form/IssueCategoryStatisticsFormDTO.java | 3 +- .../IssueCategoryStatisticsResultDTO.java | 2 +- .../form/ItemCategoryStatisticsFormDTO.java | 28 ++++++++++++++++ .../ItemCategoryStatisticsResultDTO.java | 32 +++++++++++++++++++ .../modules/events/dao/EpdcEventsDao.java | 11 ------- .../events/service/EpdcEventsService.java | 11 ------- .../service/impl/EpdcEventsServiceImpl.java | 7 ---- .../esua/epdc/modules/issue/dao/IssueDao.java | 9 ++++++ .../issue/service/impl/IssueServiceImpl.java | 4 +-- .../controller/EpdcAppItemController.java | 15 ++++++++- .../esua/epdc/modules/item/dao/ItemDao.java | 11 +++++++ .../modules/item/service/ItemService.java | 11 +++++++ .../item/service/impl/ItemServiceImpl.java | 8 +++++ .../resources/mapper/events/EpdcEventsDao.xml | 19 ----------- .../main/resources/mapper/issue/IssueDao.xml | 23 +++++++++++-- .../main/resources/mapper/item/ItemDao.xml | 22 +++++++++++-- 20 files changed, 204 insertions(+), 59 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemCategoryStatisticsResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java index abef7555d..12c2b3dfb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java @@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.service.ItemService; @@ -33,7 +34,7 @@ public class ApiItemController { * @Date: 2019/9/9 16:34 */ @GetMapping("list") - public Result> listItems(@LoginUser TokenDto userDetail, ItemFormDTO formDto) { + public Result> listItems(@LoginUser TokenDto userDetail, @RequestBody ItemFormDTO formDto) { return itemService.listItems(userDetail, formDto); } @@ -54,4 +55,16 @@ public class ApiItemController { public Result evaluation(@LoginUser TokenDto userDetail, EvaluationFormDTO evaluationFormDTO) { return itemService.evaluation(userDetail,evaluationFormDTO); } + + /** + * 项目分类统计 + * @Params: [userDetail, categoryId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/12 13:26 + */ + @GetMapping("statistics/{categoryId}") + public Result issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryId) { + return itemService.getItemCategoryStatistics(userDetail, categoryId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java index 37bae85cc..9ffae4a6d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java @@ -2,9 +2,11 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.feign.fallback.ItemFeignClientFallback; @@ -46,4 +48,14 @@ public interface ItemFeignClient { @PostMapping(value = "events/epdc-app/item/evaluation", consumes = MediaType.APPLICATION_JSON_VALUE) Result evaluation(EvaluationFormDTO evaluationFormDTO); + + /** + * 项目分类统计 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/12 13:29 + */ + @GetMapping(value = "events/epdc-app/item/statistics", consumes = MediaType.APPLICATION_JSON_VALUE) + Result itemCategoryStatistics(ItemCategoryStatisticsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java index 2bf587ba3..af46bc983 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; @@ -36,4 +37,13 @@ public interface ItemService { Result evaluation(TokenDto userDetail, EvaluationFormDTO evaluationFormDTO); + + /** + * 项目分类统计 + * @Params: [userDetail, categoryId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/12 13:27 + */ + Result getItemCategoryStatistics(TokenDto userDetail, String categoryId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index eb951070f..6197c25c2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -2,9 +2,11 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.feign.ItemFeignClient; @@ -45,4 +47,12 @@ public class ItemServiceImpl implements ItemService { evaluationFormDTO.setUserId(userDetail.getUserId()); return itemFeignClient.evaluation(evaluationFormDTO); } + + @Override + public Result getItemCategoryStatistics(TokenDto userDetail, String categoryId) { + ItemCategoryStatisticsFormDTO formDto = new ItemCategoryStatisticsFormDTO(); + formDto.setCategoryId(categoryId); + formDto.setGridId(userDetail.getGridId()); + return itemFeignClient.itemCategoryStatistics(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java index df8f6d386..270625505 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.issue.form; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -16,7 +17,7 @@ public class IssueCategoryStatisticsFormDTO implements Serializable { /** * 网格ID */ - @NotBlank(message = "网格ID不能为空") + @NotNull(message = "网格ID不能为空") private Long gridId; /** * 议题类别ID diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueCategoryStatisticsResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueCategoryStatisticsResultDTO.java index 88daf180e..e8c3cdd74 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueCategoryStatisticsResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueCategoryStatisticsResultDTO.java @@ -24,7 +24,7 @@ public class IssueCategoryStatisticsResultDTO implements Serializable { /** * 议题个数 */ - private String caseNum; + private String issueNum; /** * 态度总数 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java new file mode 100644 index 000000000..4f39764e0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 项目分类统计表单DTO + * @Author LC + * @Date 2019/9/12 13:21 + */ +@Data +public class ItemCategoryStatisticsFormDTO implements Serializable { + private static final long serialVersionUID = 2999035593195412516L; + + /** + * 网格ID + */ + @NotNull(message = "网格ID不能为空") + private Long gridId; + /** + * 议题类别ID + */ + @NotBlank(message = "议题类别ID不能为空") + private String categoryId; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemCategoryStatisticsResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemCategoryStatisticsResultDTO.java new file mode 100644 index 000000000..9fcddf472 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemCategoryStatisticsResultDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 项目分类统计DTO + * @Author LC + * @Date 2019/9/12 13:22 + */ +@Data +public class ItemCategoryStatisticsResultDTO implements Serializable { + + private static final long serialVersionUID = 1156180616337484819L; + /** + * 类别ID + */ + private String categoryId; + /** + * 类别名称 + */ + private String categoryName; + /** + * 项目个数 + */ + private String itemNum; + /** + * 态度总数 + */ + private String attitudeNum; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java index 024926f89..b4b3cbd9c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java @@ -19,8 +19,6 @@ package com.elink.esua.epdc.modules.events.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.events.*; -import com.elink.esua.epdc.dto.issue.form.IssueCategoryStatisticsFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -114,13 +112,4 @@ public interface EpdcEventsDao extends BaseDao { * @param eventId */ void updateOpposeNumSubtract(String eventId); - - /** - * 移动端-事件分类统计 - * @Params: [formDTO] - * @Return: com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO - * @Author: liuchuang - * @Date: 2019/9/9 12:59 - */ - IssueCategoryStatisticsResultDTO selectOneIssueCategoryStatistics(IssueCategoryStatisticsFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index af5ba3b84..c059c53da 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java @@ -23,8 +23,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.events.*; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueCategoryStatisticsFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import java.util.List; @@ -148,13 +146,4 @@ public interface EpdcEventsService extends BaseService { * @Date: 2019/9/9 11:57 */ boolean modifyBrowseNumById(String eventId); - - /** - * 移动端-事件分类统计 - * @Params: [formDTO] - * @Return: com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO - * @Author: liuchuang - * @Date: 2019/9/9 13:01 - */ - IssueCategoryStatisticsResultDTO getEventsCategoryStatistics(IssueCategoryStatisticsFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index f5c9a2a43..428445325 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -30,8 +30,6 @@ import com.elink.esua.epdc.constant.ImageConstant; import com.elink.esua.epdc.dto.events.*; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueCategoryStatisticsFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.modules.events.dao.EpdcEventsDao; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; @@ -198,11 +196,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl { */ List selectListOfHandleProgress(String issueId); + /** + * 移动端-议题分类统计 + * @Params: [formDTO] + * @Return: com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO + * @Author: liuchuang + * @Date: 2019/9/9 12:59 + */ + IssueCategoryStatisticsResultDTO selectOneIssueCategoryStatistics(IssueCategoryStatisticsFormDTO formDTO); + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index cfc3adfd7..aa17622df 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -35,14 +35,12 @@ import com.elink.esua.epdc.dto.issue.form.IssueCategoryStatisticsFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO; -import com.elink.esua.epdc.dto.issue.form.StatementFormDTO; import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.modules.comment.service.EventCommentService; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import com.elink.esua.epdc.modules.issue.dao.IssueDao; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; import com.elink.esua.epdc.modules.issue.entity.IssueHandleEntity; -import com.elink.esua.epdc.modules.issue.service.EventUserAttitudeService; import com.elink.esua.epdc.modules.issue.service.IssueHandleService; import com.elink.esua.epdc.modules.issue.service.IssueService; import com.elink.esua.epdc.modules.item.entity.ItemEntity; @@ -234,7 +232,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override public Result getIssueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto) { - IssueCategoryStatisticsResultDTO resultDTO = epdcEventsService.getEventsCategoryStatistics(formDto); + IssueCategoryStatisticsResultDTO resultDTO = baseDao.selectOneIssueCategoryStatistics(formDto); return new Result().ok(resultDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java index c6d2acda1..b4fb17fb6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java @@ -3,9 +3,11 @@ package com.elink.esua.epdc.modules.item.controller; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.modules.item.service.ItemService; @@ -58,5 +60,16 @@ public class EpdcAppItemController { return this.itemService.evaluation(evaluationFormDTO); } - + /** + * 项目分类统计 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/12 13:31 + */ + @GetMapping("statistics") + public Result itemCategoryStatistics(@RequestBody ItemCategoryStatisticsFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return this.itemService.getItemCategoryStatistics(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 7b2d116f2..3001005c9 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -19,8 +19,10 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.item.ItemDTO; +import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEntity; @@ -65,4 +67,13 @@ public interface ItemDao extends BaseDao { */ ItemDetailResultDTO selectOneItemDetail(ItemDetailFormDTO formDto); + /** + * 移动端-议题分类统计 + * @Params: [formDTO] + * @Return: com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO + * @Author: liuchuang + * @Date: 2019/9/12 13:37 + */ + ItemCategoryStatisticsResultDTO selectOneItemCategoryStatistics(ItemCategoryStatisticsFormDTO formDTO); + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 14caea99a..344a21574 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -21,9 +21,11 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.ItemDTO; +import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEntity; @@ -128,4 +130,13 @@ public interface ItemService extends BaseService { Result evaluation(EvaluationFormDTO evaluationFormDTO); + + /** + * 项目分类统计 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/12 13:32 + */ + Result getItemCategoryStatistics(ItemCategoryStatisticsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 402ed90c0..af1ad883e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -27,9 +27,11 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.ItemDTO; +import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; @@ -148,4 +150,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().error("您无法评价"); } } + @Override + public Result getItemCategoryStatistics(ItemCategoryStatisticsFormDTO formDto) { + ItemCategoryStatisticsResultDTO resultDTO = baseDao.selectOneItemCategoryStatistics(formDto); + return new Result().ok(resultDTO); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index f6ea44084..14436c017 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -198,23 +198,4 @@ WHERE ID = #{eventId} - - - - diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 33032d508..e5fbf16ab 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -177,7 +177,7 @@ issue.ISSUE_ADDRESS FROM epdc_issue issue - LEFT JOIN epdc_img img ON issue.id = img.REFERENCE_ID + LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.id AND eve.DEL_FLAG = '0' @@ -245,7 +245,7 @@ img.IMG_URL FROM epdc_issue issue - LEFT JOIN epdc_img img ON issue.ID = img.REFERENCE_ID + LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' @@ -285,4 +285,23 @@ CREATED_TIME DESC + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index b2a9ec37a..c247e246f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -69,7 +69,7 @@ AND eve.DEL_FLAG = '0' LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID AND cate.DEL_FLAG = '0' - LEFT JOIN epdc_img img ON item.ID = img.REFERENCE_ID + LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID AND hp.DEL_FLAG = '0' @@ -145,7 +145,7 @@ img.IMG_URL FROM epdc_item item - LEFT JOIN epdc_img img ON item.ID = img.REFERENCE_ID + LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' @@ -169,4 +169,22 @@ ORDER BY img.CREATED_TIME + +