移动端议题类别统计接口 init

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.service.IssueService;
@@ -75,4 +76,16 @@ public class ApiIssueController {
         return issueService.getIssueDetail(userDetail, issueId);
     }
 
+    /**
+     * 议题分类统计
+     * @Params: [userDetail, categoryId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 12:26
+     */
+    @GetMapping("statistics/{categoryId}")
+    public Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryId) {
+        return issueService.getIssueCategoryStatistics(userDetail, categoryId);
+    }
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java

@@ -3,8 +3,10 @@ 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.events.form.EpdcEventSubmitFormDTO;
+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.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.feign.fallback.IssueFeignClientFallback;
@@ -43,6 +45,23 @@ public interface IssueFeignClient {
     @GetMapping(value = "events/epdc-app/issue/list", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<IssueResultDTO>> listIssues(IssueFormDTO formDto);
 
+    /**
+     * 议题详情
+     * @Params: [formDto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 12:33
+     */
     @GetMapping(value = "events/epdc-app/issue/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<IssueDetailResultDTO> getIssueDetail(IssueDetailFormDTO formDto);
+
+    /**
+     * 议题分类统计
+     * @Params: [formDto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 12:34
+     */
+    @GetMapping(value = "events/epdc-app/issue/statistics", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java

@@ -4,8 +4,10 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
+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.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.feign.IssueFeignClient;
@@ -34,4 +36,9 @@ public class IssueFeignClientFallback implements IssueFeignClient {
     public Result<IssueDetailResultDTO> getIssueDetail(IssueDetailFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getIssueDetail", formDto);
     }
+
+    @Override
+    public Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "issueCategoryStatistics", formDto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import org.springframework.web.multipart.MultipartFile;
@@ -53,4 +54,13 @@ public interface IssueService {
      * @Date: 2019/9/9 11:16
      */
     Result<IssueDetailResultDTO> getIssueDetail(TokenDto userDetail, String issueId);
+
+    /**
+     * 议题分类统计
+     * @Params: [userDetail, categoryId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 12:27
+     */
+    Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java

@@ -5,8 +5,10 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
+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.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
@@ -76,4 +78,12 @@ public class IssueServiceImpl implements IssueService {
         formDto.setIssueId(issueId);
         return issueFeignClient.getIssueDetail(formDto);
     }
+
+    @Override
+    public Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryId) {
+        IssueCategoryStatisticsFormDTO formDto = new IssueCategoryStatisticsFormDTO();
+        formDto.setCategoryId(categoryId);
+        formDto.setGridId(userDetail.getGridId());
+        return issueFeignClient.issueCategoryStatistics(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java

@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 议题分类统计表单DTO
+ * @Author LC
+ * @Date 2019/9/9 12:28
+ */
+@Data
+public class IssueCategoryStatisticsFormDTO implements Serializable {
+    private static final long serialVersionUID = -6382725012003300283L;
+    /**
+     * 网格ID
+     */
+    @NotBlank(message = "网格ID不能为空")
+    private Long gridId;
+    /**
+     * 议题类别ID
+     */
+    @NotBlank(message = "议题类别ID不能为空")
+    private String categoryId;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueCategoryStatisticsResultDTO.java

@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 议题分类统计DTO
+ * @Author LC
+ * @Date 2019/9/9 12:22
+ */
+@Data
+public class IssueCategoryStatisticsResultDTO implements Serializable {
+    private static final long serialVersionUID = 4793536739383889544L;
+
+    /**
+     * 类别ID
+     */
+    private String categoryId;
+    /**
+     * 类别名称
+     */
+    private String categoryName;
+    /**
+     * 议题个数
+     */
+    private String caseNum;
+    /**
+     * 态度总数
+     */
+    private String attitudeNum;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java

@@ -19,6 +19,8 @@ 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;
@@ -89,4 +91,13 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
      * 修改评论数+1
      */
     void updateCommentNum(String id);
+
+    /**
+     * 移动端-事件分类统计
+     * @Params: [formDTO]
+     * @Return: com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO
+     * @Author: liuchuang
+     * @Date: 2019/9/9 12:59
+     */
+    IssueCategoryStatisticsResultDTO selectOneIssueCategoryStatistics(IssueCategoryStatisticsFormDTO formDTO);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java

@@ -23,6 +23,8 @@ 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;
@@ -120,4 +122,13 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @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);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -30,6 +30,8 @@ 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;
@@ -196,6 +198,11 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         return this.updateById(epdcEventsEntity);
     }
 
+    @Override
+    public IssueCategoryStatisticsResultDTO getEventsCategoryStatistics(IssueCategoryStatisticsFormDTO formDTO) {
+        return baseDao.selectOneIssueCategoryStatistics(formDTO);
+    }
+
     /**
      * 初始化议题
      * @Params: [entity]

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java

@@ -3,8 +3,10 @@ package com.elink.esua.epdc.modules.issue.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.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.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
@@ -53,4 +55,17 @@ public class EpdcAppIssueController {
         ValidatorUtils.validateEntity(formDto);
         return this.issueService.getIssueDetail(formDto);
     }
+
+    /**
+     * 议题分类统计
+     * @Params: [formDto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 12:37
+     */
+    @GetMapping("statistics")
+    public Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(@RequestBody IssueCategoryStatisticsFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return this.issueService.getIssueCategoryStatistics(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java

@@ -18,12 +18,15 @@
 package com.elink.esua.epdc.modules.issue.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.issue.IssueContentDetailDTO;
 import com.elink.esua.epdc.dto.issue.IssueJobFeedbackDTO;
 import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO;
 import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
+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.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java

@@ -25,9 +25,11 @@ import com.elink.esua.epdc.dto.issue.IssueContentDetailDTO;
 import com.elink.esua.epdc.dto.issue.IssueDTO;
 import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO;
 import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
+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.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
@@ -165,4 +167,13 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @Date: 2019/9/9 11:04
      */
     Result<IssueDetailResultDTO> getIssueDetail(IssueDetailFormDTO formDto);
+
+    /**
+     * 议题分类统计
+     * @Params: [formDto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 12:37
+     */
+    Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -30,9 +30,11 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.EventIssueItemState;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import com.elink.esua.epdc.dto.issue.*;
+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.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
@@ -194,6 +196,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result modifyCommentById(String[] commentIds) {
         baseDao.updateCommentDelFlag(commentIds);
         return new Result();
@@ -217,6 +220,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return new Result<IssueDetailResultDTO>().ok(resultDTO);
     }
 
+    @Override
+    public Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto) {
+        IssueCategoryStatisticsResultDTO resultDTO = epdcEventsService.getEventsCategoryStatistics(formDto);
+        return new Result<IssueCategoryStatisticsResultDTO>().ok(resultDTO);
+    }
+
     /**
      * 初始化项目
      * @Params: [issueEntity]

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -164,4 +164,21 @@
         UPDATE epdc_events SET COMMENT_NUM = COMMENT_NUM + 1 WHERE ID = #{id}
     </update>
 
+    <select id="selectOneIssueCategoryStatistics" resultType="com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO">
+        SELECT
+            cate.CATEGORY_NAME AS categoryName,
+            cate.ID AS categoryId,
+            COUNT( eve.ID ) AS caseNum,
+            SUM( eve.OPPOSE_NUM + eve.APPROVE_NUM + eve.BROWSE_NUM + eve.COMMENT_NUM ) AS attitudeNum
+        FROM
+            epdc_events eve
+            LEFT JOIN epdc_event_category cate ON eve.ISSUE_CATEGORY_ID = cate.ID
+            AND cate.DEL_FLAG = '0'
+        WHERE
+            eve.DEL_FLAG = '0'
+            AND eve.EVENT_STATE = 4
+            AND eve.ISSUE_CATEGORY_ID = #{categoryId}
+            AND eve.GRID_ID = #{gridId}
+    </select>
+
 </mapper>