From ce9124f610317e2578290bb7a5528bcea184adf9 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 17 Sep 2019 17:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiIssueController.java | 12 ++++++ .../result/EventAppDetailResultDTO.java | 40 +++++++++++++++++++ .../modules/events/dao/EpdcEventsDao.java | 10 +++++ .../events/service/EpdcEventsService.java | 10 +++++ .../service/impl/EpdcEventsServiceImpl.java | 7 ++++ .../controller/EpdcAppIssueController.java | 13 ++++++ .../resources/mapper/events/EpdcEventsDao.xml | 27 +++++++++++++ 7 files changed, 119 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java index 94065d5e1..14747db71 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; +import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssuesAndEventsOfMineFormDTO; import com.elink.esua.epdc.dto.issue.form.StatementFormDTO; @@ -145,5 +146,16 @@ public class ApiIssueController { return issueService.listIssuesAndEventsOfMine(userDetail, formDTO); } + /** + * 事件详情 + * @Params: [eventId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/17 17:36 + */ + @GetMapping("eventDetail/{eventId}") + public Result eventDetail(@PathVariable String eventId) { + return issueService.getEventDetail(eventId); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java new file mode 100644 index 000000000..0c349cbec --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java @@ -0,0 +1,40 @@ +package com.elink.esua.epdc.dto.events.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 待审核或审核不通过事件详情 + * @Author LC + * @Date 2019/9/17 17:28 + */ +@Data +public class EventAppDetailResultDTO implements Serializable { + private static final long serialVersionUID = 1171586248033198322L; + /** + * 事件ID + */ + private String id; + /** + * 事件内容 + */ + private String content; + /** + * 发布时间 + */ + private String distributeTime; + /** + * 图片 + */ + private List images; + /** + * 事件地址 + */ + private String address; + /** + * 审核不通过意见 + */ + private String advice; +} 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 b4b3cbd9c..19d8d4dd1 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,6 +19,7 @@ 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.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -112,4 +113,13 @@ public interface EpdcEventsDao extends BaseDao { * @param eventId */ void updateOpposeNumSubtract(String eventId); + + /** + * 移动端-事件详情 + * @Params: [eventId] + * @Return: com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO + * @Author: liuchuang + * @Date: 2019/9/17 17:44 + */ + EventAppDetailResultDTO selectOneOfEventDetail(String eventId); } 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 c059c53da..512e1bb48 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,6 +23,7 @@ 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.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import java.util.List; @@ -146,4 +147,13 @@ public interface EpdcEventsService extends BaseService { * @Date: 2019/9/9 11:57 */ boolean modifyBrowseNumById(String eventId); + + /** + * 移动端-事件详情 + * @Params: [eventId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/17 17:36 + */ + Result getEventDetail(String eventId); } 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 428445325..b59c33c9d 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,6 +30,7 @@ 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.events.result.EventAppDetailResultDTO; 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 +197,12 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl getEventDetail(String eventId) { + EventAppDetailResultDTO data = baseDao.selectOneOfEventDetail(eventId); + return new Result().ok(data); + } + /** * 初始化议题 * @Params: [entity] diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java index 4cc449a9a..8231f18fb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java @@ -3,6 +3,7 @@ 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.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.modules.issue.service.EventUserAttitudeService; @@ -102,4 +103,16 @@ public class EpdcAppIssueController { ValidatorUtils.validateEntity(formDTO); return issueService.listIssuesAndEventsOfMine(formDTO); } + + /** + * 事件详情 + * @Params: [eventId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/17 17:40 + */ + @GetMapping("eventDetail/{eventId}") + public Result eventDetail(@PathVariable String eventId) { + return issueService.getEventDetail(eventId); + } } 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 14436c017..ac484eab0 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,4 +198,31 @@ WHERE ID = #{eventId} + + + + + + + + + + + +