From 74a5bcc08281ac1f838bdf6ffaa444147cf10d34 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Jun 2022 17:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/work/ActDetailResultDTO.java | 167 ++++++++++++++++++ .../work/ActPreviewContentResultDTO.java | 2 +- .../epmet/controller/WorkActController.java | 11 ++ .../com/epmet/service/WorkActService.java | 8 + .../service/impl/WorkActServiceImpl.java | 23 ++- 5 files changed, 209 insertions(+), 2 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDetailResultDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDetailResultDTO.java new file mode 100644 index 0000000000..99d00721fd --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDetailResultDTO.java @@ -0,0 +1,167 @@ +package com.epmet.dto.result.work; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/6/30 16:47 + */ +@Data +public class ActDetailResultDTO implements Serializable { + private static final long serialVersionUID = 4235569576711312094L; + + private String actId; + + /** + * 活动标题 + */ + private String title; + + /** + * 封面图 + */ + private String coverPic; + + /** + * 活动地点 + */ + private String actAddress; + + /** + * 活动地点-经度 + */ + private BigDecimal actLongitude; + + /** + * 活动地点-纬度 + */ + private BigDecimal actLatitude; + + /** + * 活动预计开始时间yyyy-MM-dd HH:mm + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date actStartTime; + + /** + * 活动预计结束时间yyyy-MM-dd HH:mm + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date actEndTime; + + /** + * 活动人数 + */ + private Integer actQuota; + + /** + * 活动积分 + */ + private Integer reward; + + /** + * 报名审核：true：只有志愿者才可以参加活动，false: 只要是居民就可以参加活动 + */ + private Boolean volunteerLimit; + + /** + * 报名审核： true: 需人工审核 false: 无需审核 + */ + private Boolean auditSwitch; + + /** + * 报名截止时间：yyyy-MM-dd HH:mm + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signUpEndTime; + + /** + * 报名条件 + */ + private String requirement; + + /** + * 签到开始时间：yyyy-MM-dd HH:mm + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signInStartTime; + + /** + * 签到结束时间: yyyy-MM-dd HH:mm + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signInEndTime; + + /** + * 签到地址 + */ + private String signInAddress; + + /** + * 签到地址-纬度 + */ + private BigDecimal signInLatitude; + + /** + * 签到地址-经度 + */ + private BigDecimal signInLongitude; + + /** + * 签到有效范围(米) + */ + private Integer signInRadius; + + /** + * 主办方id + */ + private String sponsorId; + + /** + * 主办方类型：以网格名义：grid , 以机关名义： agency + */ + private String sponsorType; + + /** + * 主办方名称 + */ + private String sponsorName; + + /** + * 联系人 + */ + private String sponsorContacts; + + /** + * 联系电话 + */ + private String sponsorTel; + + /** + * 活动类型爱心活动heart 联建活动party + */ + @JsonIgnore + private String actType; + @JsonIgnore + private String createdBy; + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; + + /** + * true，我发布的，false,其他人发布的 + */ + private Boolean isMyPublish; + + private List actContent; +} + diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewContentResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewContentResultDTO.java index 73609e486f..c626fd0bba 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewContentResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewContentResultDTO.java @@ -19,7 +19,7 @@ public class ActPreviewContentResultDTO implements Serializable { private String content; /** - * 内容类型 图片：img；文字：text + * 内容类型 图片：img；文字：text;富文本：rich_text */ private String contentType; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java index 985e549bba..fd014695a2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java @@ -316,4 +316,15 @@ public class WorkActController { PageData page = workActService.pageList(formDTO); return new Result>().ok(page); } + + /** + * 数字社区，查看活动详情 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("detail") + public Result queryActDetail(@LoginUser TokenDto tokenDto,@RequestBody ActIdFormDTO formDTO){ + return new Result() .ok(workActService.queryActDetail(formDTO.getActId(),tokenDto.getUserId())); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java index 244303c84c..588f8c4ef2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java @@ -156,4 +156,12 @@ public interface WorkActService { * @return */ PageData pageList(ActPageFormDTO formDTO); + + /** + * 数字社区查看活动详情 + * @param actId + * @param userId + * @return + */ + ActDetailResultDTO queryActDetail(String actId, String userId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index 8f1ec3e74e..42128bb066 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -1688,5 +1688,26 @@ public class WorkActServiceImpl implements WorkActService { } - + /** + * 数字社区查看活动详情 + * + * @param actId + * @param userId + * @return + */ + @Override + public ActDetailResultDTO queryActDetail(String actId, String userId) { + ActInfoEntity actInfoEntity=actInfoDao.selectById(actId); + ActDetailResultDTO resultDTO=ConvertUtils.sourceToTarget(actInfoEntity,ActDetailResultDTO.class); + //查询活动详情 + List list = actContentDao.selectByActId(actId); + resultDTO.setActContent(list); + //当前活动是否是我发布的 + if(resultDTO.getCreatedBy().equals(loginUserUtil.getLoginUserId())){ + resultDTO.setIsMyPublish(true); + }else{ + resultDTO.setIsMyPublish(false); + } + return resultDTO; + } }