From c1c0e762483c81550422c977fd6a888bbc54a764 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 5 Sep 2019 20:16:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86=E5=BE=85?= =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=81=E5=B7=B2=E5=85=B3=E9=97=AD=E3=80=81?= =?UTF-8?q?=E5=B7=B2=E8=BD=AC=E9=A1=B9=E7=9B=AE=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/constant/EventIssueItemState.java | 12 +++++ .../epdc/dto/events/EpdcEventsDetailDTO.java | 4 ++ .../dto/issue/IssueWaitHandleOrClosedDTO.java | 52 +++++++++++++++++++ .../controller/EpdcEventsController.java | 7 +-- .../modules/events/dao/EpdcEventsDao.java | 22 +++++++- .../events/service/EpdcEventsService.java | 11 +++- .../service/impl/EpdcEventsServiceImpl.java | 24 ++++----- .../issue/controller/IssueController.java | 50 ++++++++++++++++-- .../esua/epdc/modules/issue/dao/IssueDao.java | 21 ++++++++ .../modules/issue/service/IssueService.java | 3 +- .../issue/service/impl/IssueServiceImpl.java | 17 ++---- .../resources/mapper/events/EpdcEventsDao.xml | 41 ++++++++++++++- .../main/resources/mapper/issue/IssueDao.xml | 43 ++++++++++++++- 13 files changed, 268 insertions(+), 39 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java index 63be703d2..3d79d38f2 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java @@ -77,4 +77,16 @@ public interface EventIssueItemState { * 议题处理-关闭 */ int ISSUE_HANDLED_CLOSED= 2; + /** + * 事件状态字段 + */ + String EVENT_STATE = "EVENT_STATE"; + /** + * 议题状态字段 + */ + String ISSUE_STATE = "ISSUE_STATE"; + /** + * 项目状态字段 + */ + String ITEM_STATE = "ITEM_STATE"; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java index bb9dd80be..3a59bdba1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java @@ -38,4 +38,8 @@ public class EpdcEventsDetailDTO implements Serializable { * 图片数据 */ private String[] imageArray; + /** + * 事件地址 + */ + private String address; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java new file mode 100644 index 000000000..3ea5c0d6c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java @@ -0,0 +1,52 @@ +package com.elink.esua.epdc.dto.issue; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author LC + * @Date 2019/9/5 14:19 + */ +@Data +public class IssueWaitHandleOrClosedDTO implements Serializable { + private static final long serialVersionUID = -9108628659586683187L; + + /** + * 议题ID + */ + private String id; + /** + * 议题内容 + */ + private String issueContent; + /** + * 提交时间 + */ + private Date createdTime; + /** + * 提交人 + */ + private String nickName; + /** + * 参与人数 + */ + private Integer participateNum; + /** + * 支持人数 + */ + private Integer approveNum; + /** + * 反对人数 + */ + private Integer opposeNum; + /** + * 评论数 + */ + private Integer commentNum; + /** + * 浏览数 + */ + private Integer browseNum; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java index 8bc5e9666..1fdc5717f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.modules.events.controller; +import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -25,7 +26,6 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.constant.EventIssueItemState; import com.elink.esua.epdc.dto.events.EpdcEventsDTO; import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; @@ -52,15 +52,16 @@ public class EpdcEventsController { private EpdcEventsService epdcEventsService; @GetMapping("page") + @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND") public Result> page(@RequestParam Map params){ - PageData page = epdcEventsService.page(params); + PageData page = epdcEventsService.listOfPendingReviewEvents(params); return new Result>().ok(page); } @GetMapping("{id}") public Result get(@PathVariable("id") String id){ - EpdcEventsDetailDTO data = epdcEventsService.get(id); + EpdcEventsDetailDTO data = epdcEventsService.getEvent(id); data.setImageArray(data.getImages().split(",")); return new Result().ok(data); } 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 1a605f71d..e18aaf626 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 @@ -18,11 +18,15 @@ package com.elink.esua.epdc.modules.events.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.events.EpdcEventsDTO; import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Map; + /** * 事件表 事件表 * @@ -38,5 +42,21 @@ public interface EpdcEventsDao extends BaseDao { * @Author: liuchuang * @Date: 2019/9/4 20:31 */ - EpdcEventsDetailDTO getEventDetailById(@Param("id") String id); + EpdcEventsDetailDTO selectOneOfEventDetailById(@Param("id") String id); + /** + * 事件待审核列表 + * @Params: [params] + * @Return: java.util.List + * @Author: liuchuang + * @Date: 2019/9/5 19:42 + */ + List selectListOfPendingReviewEvents(Map params); + /** + * 事件待审核列表总数 + * @Params: [params] + * @Return: long + * @Author: liuchuang + * @Date: 2019/9/5 19:46 + */ + long selectCountOfEvents(Map params); } 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 e4bc32b85..05a62dc70 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 @@ -36,7 +36,14 @@ import java.util.Map; */ public interface EpdcEventsService extends BaseService { - PageData page(Map params); + /** + * 事件待审核列表 + * @Params: [params] + * @Return: com.elink.esua.epdc.commons.tools.page.PageData + * @Author: liuchuang + * @Date: 2019/9/5 19:50 + */ + PageData listOfPendingReviewEvents(Map params); List list(Map params); @@ -47,7 +54,7 @@ public interface EpdcEventsService extends BaseService { * @Author: liuchuang * @Date: 2019/9/4 20:47 */ - EpdcEventsDetailDTO get(String id); + EpdcEventsDetailDTO getEvent(String id); void save(EpdcEventsDTO dto); 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 d708e93ab..d2d4e458d 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 @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -37,6 +38,7 @@ 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.IssueHandleService; import com.elink.esua.epdc.modules.issue.service.IssueService; +import com.elink.esua.epdc.modules.item.entity.ItemEntity; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,13 +64,10 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, Constant.CREATED_TIME, false), - getWrapper(params) - ); - - return getPageData(page, EpdcEventsDTO.class); + public PageData listOfPendingReviewEvents(Map params) { + List list = baseDao.selectListOfPendingReviewEvents(params); + long total = baseDao.selectCountOfEvents(params); + return new PageData<>(list, total); } @Override @@ -79,19 +78,17 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String startTime = (String)params.get("startTime"); - String endTime = (String)params.get("endTime"); + String id = (String)params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.between(StringUtils.isNotBlank(startTime), Constant.CREATED_TIME, startTime, endTime); - wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value()); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public EpdcEventsDetailDTO get(String id) { - return baseDao.getEventDetailById(id); + public EpdcEventsDetailDTO getEvent(String id) { + return baseDao.selectOneOfEventDetailById(id); } @Override @@ -126,6 +123,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl> page(@RequestParam Map params){ - PageData page = issueService.page(params); - return new Result>().ok(page); + /** + * 议题管理-待处理列表 + * @Params: [params] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/5 16:49 + */ + @GetMapping("waitHandlePage") + @DataFilter(tableAlias = "issue", deptId = "grid_id", prefix = "AND") + public Result> waitHandlePage(@RequestParam Map params){ + params.put("state", EventIssueItemState.ISSUE_REVIEW_PASS); + PageData page = issueService.listOfIssueWaitHandleOrClosed(params); + return new Result>().ok(page); + } + + /** + * 议题管理-已关闭列表 + * @Params: [params] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/5 17:04 + */ + @GetMapping("closedPage") + @DataFilter(tableAlias = "issue", deptId = "grid_id", prefix = "AND") + public Result> closedPage(@RequestParam Map params){ + params.put("state", EventIssueItemState.ISSUE_CLOSED); + PageData page = issueService.listOfIssueWaitHandleOrClosed(params); + return new Result>().ok(page); + } + + /** + * 议题管理-已转项目列表 + * @Params: [params] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/5 17:32 + */ + @GetMapping("changedToItemPage") + @DataFilter(tableAlias = "issue", deptId = "grid_id", prefix = "AND") + public Result> changedToItemPage(@RequestParam Map params){ + params.put("state", EventIssueItemState.ISSUE_CHANGE_TO_ITEM); + PageData page = issueService.listOfIssueWaitHandleOrClosed(params); + return new Result>().ok(page); } @GetMapping("{id}") diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java index a4cbe1646..5eb1111ad 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java @@ -18,9 +18,14 @@ package com.elink.esua.epdc.modules.issue.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + + /** * 议题表 议题表 * @@ -29,5 +34,21 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IssueDao extends BaseDao { + /** + * 议题待处理列表总数 + * @Params: [startTime, endTime] + * @Return: java.util.List + * @Author: liuchuang + * @Date: 2019/9/5 15:32 + */ + long selectCountOfIssue(Map params); + /** + * 议题待处理列表 + * @Params: [startTime, endTime, curPage, pageSize] + * @Return: java.util.List + * @Author: liuchuang + * @Date: 2019/9/5 14:47 + */ + List selectListOfIssueWaitHandleOrClosed(Map params); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java index 0a3c7cea8..06b4d6d32 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.issue.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.issue.IssueDTO; +import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; import java.util.List; @@ -41,7 +42,7 @@ public interface IssueService extends BaseService { * @author * @date */ - PageData page(Map params); + PageData listOfIssueWaitHandleOrClosed(Map params); /** * 默认查询 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 433d5b23e..7865564c0 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 @@ -18,18 +18,16 @@ package com.elink.esua.epdc.modules.issue.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dto.issue.IssueDTO; +import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; 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.redis.IssueRedis; import com.elink.esua.epdc.modules.issue.service.IssueService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,16 +44,11 @@ import java.util.Map; @Service public class IssueServiceImpl extends BaseServiceImpl implements IssueService { - @Autowired - private IssueRedis issueRedis; - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IssueDTO.class); + public PageData listOfIssueWaitHandleOrClosed(Map params) { + List list = baseDao.selectListOfIssueWaitHandleOrClosed(params); + long total = baseDao.selectCountOfIssue(params); + return new PageData<>(list, total); } @Override 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 c43604107..ff20bbc84 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 @@ -7,17 +7,19 @@ + - SELECT e.ID, e.EVENT_CONTENT, i.IMG_URL, e.NICK_NAME, - e.CREATED_TIME + e.CREATED_TIME, + e.ISSUE_ADDRESS FROM epdc_events e LEFT JOIN epdc_img i ON e.ID = i.REFERENCE_ID @@ -28,4 +30,39 @@ ORDER BY i.CREATED_TIME + + + + 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 c91187d16..6818d2ffb 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 @@ -2,5 +2,46 @@ - + +