diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 50adf99875..fab6d1d2b0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -176,7 +176,9 @@ public enum EpmetErrorCode { //8910的msg动态赋值 GROUP_ACT_CAN_NOT_COMMENT(8910,"当前活动,不能评论"), SIGN_IN_TIME_NOT_START(8911,"未到签到时间,不允许签到"), - SIGN_IN_TIME_PASSED(8912,"当前时间已超过签到时间"); + SIGN_IN_TIME_PASSED(8912,"当前时间已超过签到时间"), + INVITATION_NOT_EXIST(8913,"链接不存在"); + private int code; private String msg; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActDetailByLinkFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActDetailByLinkFormDTO.java new file mode 100644 index 0000000000..f3107d21ee --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActDetailByLinkFormDTO.java @@ -0,0 +1,28 @@ +package com.epmet.resi.group.dto.act.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 015、点击分享链接，查看活动详情 + * + * @author yinzuomei@elink-cn.com + * @date 2021/4/21 11:14 + */ +@Data +public class ActDetailByLinkFormDTO implements Serializable { + private static final long serialVersionUID = 287086994875005175L; + + public interface AddUserInternalGroup { + } + @NotBlank(message = "invitationRecordId不能为空", groups = AddUserInternalGroup.class) + private String invitationRecordId; + + /** + * 当前用户id + */ + @NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class) + private String userId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/InitTemplateFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/InitTemplateFormDTO.java new file mode 100644 index 0000000000..d3b115d38e --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/InitTemplateFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.resi.group.dto.act.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 012、初始化活动总结模板 + * + * @author yinzuomei@elink-cn.com + * @date 2021/4/21 12:21 + */ +@Data +public class InitTemplateFormDTO implements Serializable { + private static final long serialVersionUID = 7608480584652986190L; + + public interface AddUserInternalGroup { + } + @NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class) + private String groupActId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailByLinkResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailByLinkResultDTO.java new file mode 100644 index 0000000000..8ee28cadb6 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailByLinkResultDTO.java @@ -0,0 +1,14 @@ +package com.epmet.resi.group.dto.act.result; + +import lombok.Data; + +/** + * 015、点击分享链接，查看活动详情 + * + * @author yinzuomei@elink-cn.com + * @date 2021/4/21 11:16 + */ +@Data +public class ActDetailByLinkResultDTO extends ActDetailResultDTO{ + private String invitationRecordId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java index f75226e850..86b4e9ed07 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java @@ -150,4 +150,14 @@ public class ActDetailResultDTO implements Serializable { * 已签到人数（有人签到自动+1） */ private Integer signedInNum; + + /** + * 网格id + */ + private String gridId; + + /** + * 客户id + */ + private String customerId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActSummaryTemplateResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActSummaryTemplateResultDTO.java new file mode 100644 index 0000000000..dbfa28b178 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActSummaryTemplateResultDTO.java @@ -0,0 +1,29 @@ +package com.epmet.resi.group.dto.act.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 012、初始化活动总结模板 + * + * @author yinzuomei@elink-cn.com + * @date 2021/4/21 12:24 + */ +@Data +public class ActSummaryTemplateResultDTO implements Serializable { + private String groupActId; + private String title; + private String allCategoryName; + private Date startTime; + private String address; + private Integer shouldAttend; + private Integer signedInNum; + private String signedInUsers; + private List textList; + private List imgList; + private Integer summaryFlag; + private List signedInUserIds; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java new file mode 100644 index 0000000000..7b6975eb89 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.resi.group.dto.invitation.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author sun + * @Description 通知、活动分享Id查询数据-接口入参 + */ +@Data +public class GetInvitationFormDTO { + + /** + * 分享Id + */ + @NotBlank(message = "分享Id不能为空",groups = {GetInvitationFormDTO.Invitation.class}) + private String invitationRecordId; + + public interface Invitation{} +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/ShareFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/ShareFormDTO.java index 879ac465ac..efb075a0b0 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/ShareFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/ShareFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.invitation.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -20,7 +21,7 @@ public class ShareFormDTO implements Serializable { /** * 类型(notice:通知 act:活动) */ - @NotBlank(message = "类型(notice:通知 act:活动)不能为空",groups = {ShareFormDTO.Add.class}) + @NotBlank(message = "类型(notice:通知 act:活动)不能为空",groups = {ShareFormDTO.UserShow.class}) private String type; /** * token中用户Id @@ -28,4 +29,5 @@ public class ShareFormDTO implements Serializable { private String userId; public interface Add{} + public interface UserShow extends CustomerClientShowGroup {} } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java new file mode 100644 index 0000000000..24f2a708f2 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java @@ -0,0 +1,40 @@ +package com.epmet.resi.group.dto.invitation.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author sun + * @Description 通知、活动分享Id查询数据-接口返参 + */ +@Data +public class GetInvitationResultDTO implements Serializable { + private static final long serialVersionUID = 6136787210623326830L; + + /** + * 客户Id + */ + private String customerId; + /** + * 网格Id + */ + private String gridId; + /** + * 小组Id + */ + private String groupId; + /** + * 通知或活动Id + */ + private String sourceId; + /** + * notice:通知 act:活动 + */ + private String sourceType; + /** + * notice:通知 act:活动 + */ + private String shareUserId; + +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java index a93531c096..45924b2e41 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java @@ -64,7 +64,7 @@ public class NoticeReadRecordDTO implements Serializable { private String userId; /** - * read已读、unread未读 + * read已读、un_read未读 */ private String readFlag; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/AddNoticeFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/AddNoticeFormDTO.java index f83f802c6c..d9345790fe 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/AddNoticeFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/AddNoticeFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.notice.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import com.epmet.resi.group.dto.topic.form.FileDTO; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -22,14 +23,14 @@ public class AddNoticeFormDTO { /** * 通知标题 */ - @NotBlank(message = "通知标题不能为空",groups = {AddNoticeFormDTO.Add.class}) - @Length(max = 20, message = "通知标题不能超过20个字符") + @NotBlank(message = "通知标题不能为空",groups = {AddNoticeFormDTO.AddUserShow.class}) + @Length(max = 20, message = "通知标题不能超过20个字符",groups = {AddNoticeFormDTO.AddUserShow.class}) private String title; /** * 通知内容 */ - @NotBlank(message = "通知内容不能为空",groups = {AddNoticeFormDTO.Add.class}) - @Length(max = 1000, message = "通知内容不能超过1000个字符") + @NotBlank(message = "通知内容不能为空",groups = {AddNoticeFormDTO.AddUserShow.class}) + @Length(max = 1000, message = "通知内容不能超过1000个字符",groups = {AddNoticeFormDTO.AddUserShow.class}) private String content; /** * 图片附件集合 @@ -41,4 +42,5 @@ public class AddNoticeFormDTO { private List docList; public interface Add{} + public interface AddUserShow extends CustomerClientShowGroup {} } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/EditNoticeFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/EditNoticeFormDTO.java index 79dd421f7f..08573cae19 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/EditNoticeFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/EditNoticeFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.notice.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import com.epmet.resi.group.dto.topic.form.FileDTO; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -22,12 +23,12 @@ public class EditNoticeFormDTO { /** * 通知标题 */ - @Length(max = 20, message = "通知标题不能超过20个字符") + @Length(max = 20, message = "通知标题不能超过20个字符",groups = {EditNoticeFormDTO.EditUserShow.class}) private String title; /** * 通知内容 */ - @Length(max = 1000, message = "通知内容不能超过1000个字符") + @Length(max = 1000, message = "通知内容不能超过1000个字符",groups = {EditNoticeFormDTO.EditUserShow.class}) private String content; /** * 图片附件集合 @@ -39,4 +40,5 @@ public class EditNoticeFormDTO { private List docList; public interface Edit{} + public interface EditUserShow extends CustomerClientShowGroup {} } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java index b2f91f22f9..5fc28f52ef 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.notice.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -20,9 +21,10 @@ public class NoticeCommentFormDTO { /** * 评论内容300 */ - @NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.Comment.class}) - @Length(max = 20, message = "评论内容不能超过300个字符") + @NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class}) + @Length(max = 20, message = "评论内容不能超过300个字符",groups = {NoticeCommentFormDTO.UserShow.class}) private String commentContent; public interface Comment{} + public interface UserShow extends CustomerClientShowGroup {} } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java index c9a9568799..0504bac3d6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java @@ -17,8 +17,14 @@ package com.epmet.modules.act.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.act.service.ActSummaryService; +import com.epmet.resi.group.dto.act.form.InitTemplateFormDTO; +import com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -32,9 +38,20 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("actsummary") public class ActSummaryController { - + @Autowired private ActSummaryService actSummaryService; - + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @description 012、初始化活动总结模板 + * @Date 2021/4/21 12:30 + **/ + @PostMapping("inittem") + public Result initTemplate(@RequestBody InitTemplateFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, InitTemplateFormDTO.class); + return new Result().ok(actSummaryService.initTemplate(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java index da9107f7c2..e69121c2d2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java @@ -23,10 +23,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.act.service.GroupActInfoService; import com.epmet.resi.group.dto.act.GroupActIdDTO; -import com.epmet.resi.group.dto.act.form.ActDetailFormDTO; -import com.epmet.resi.group.dto.act.form.ActReadViewFormDTO; -import com.epmet.resi.group.dto.act.form.CancelActFormDTO; -import com.epmet.resi.group.dto.act.form.PublishGroupActFormDTO; +import com.epmet.resi.group.dto.act.form.*; +import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO; import com.epmet.resi.group.dto.act.result.ActDetailResultDTO; import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -108,4 +106,20 @@ public class GroupActInfoController { ValidatorUtils.validateEntity(formDTO,CancelActFormDTO.AddUserShowGroup.class,CancelActFormDTO.AddUserInternalGroup.class); return new Result().ok(groupActInfoService.cancelAct(formDTO)); } + + + /** + * @return com.epmet.commons.tools.utils.Result + * @param tokenDto + * @param formDTO + * @author yinzuomei + * @description 015、点击分享链接，查看活动详情 + * @Date 2021/4/21 11:17 + **/ + @PostMapping("actdetailbylink") + public Result queryActDetailByLink(@LoginUser TokenDto tokenDto, @RequestBody ActDetailByLinkFormDTO formDTO){ + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO,ActDetailByLinkFormDTO.AddUserInternalGroup.class); + return new Result().ok(groupActInfoService.queryActDetailByLink(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java index bbc4f5fd8d..7ad9df69a4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java @@ -58,4 +58,12 @@ public interface ActSignInRecordDao extends BaseDao { * @return com.epmet.modules.act.entity.ActSignInRecordEntity */ ActSignInRecordEntity queryActSignInRecord(@Param("groupActId") String groupActId, @Param("signUserId")String signUserId); + + /** + * 查询已签到人员id + * + * @param groupActId + * @return String + */ + List selectUserIds(String groupActId); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java index d3c987bed7..e2665a6a8a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java @@ -19,6 +19,8 @@ package com.epmet.modules.act.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.modules.act.entity.ActSummaryEntity; +import com.epmet.resi.group.dto.act.form.InitTemplateFormDTO; +import com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO; /** * 活动总结 @@ -27,4 +29,12 @@ import com.epmet.modules.act.entity.ActSummaryEntity; * @since v1.0.0 2021-04-16 */ public interface ActSummaryService extends BaseService { + + /** + * 012、初始化活动总结模板 + * + * @param formDTO + * @return com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO + */ + ActSummaryTemplateResultDTO initTemplate(InitTemplateFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java index 9c066628bf..d108c976e5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java @@ -21,10 +21,8 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.modules.act.entity.GroupActInfoEntity; import com.epmet.resi.group.dto.act.GroupActIdDTO; import com.epmet.resi.group.dto.act.GroupActInfoDTO; -import com.epmet.resi.group.dto.act.form.ActDetailFormDTO; -import com.epmet.resi.group.dto.act.form.ActReadViewFormDTO; -import com.epmet.resi.group.dto.act.form.CancelActFormDTO; -import com.epmet.resi.group.dto.act.form.PublishGroupActFormDTO; +import com.epmet.resi.group.dto.act.form.*; +import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO; import com.epmet.resi.group.dto.act.result.ActDetailResultDTO; import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO; @@ -75,4 +73,12 @@ public interface GroupActInfoService extends BaseService { * @return com.epmet.resi.group.dto.act.GroupActInfoDTO */ GroupActInfoDTO getGroupActInfoDTO(String groupActId); + + /** + * 015、点击分享链接，查看活动详情 + * + * @param formDTO + * @return com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO + */ + ActDetailByLinkResultDTO queryActDetailByLink(ActDetailByLinkFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java index 6cd4a741d8..ab3ee238d0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java @@ -18,18 +18,77 @@ package com.epmet.modules.act.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.result.UserBaseInfoResultDTO; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.modules.act.dao.ActSignInRecordDao; import com.epmet.modules.act.dao.ActSummaryDao; +import com.epmet.modules.act.dao.GroupActContentDao; +import com.epmet.modules.act.dao.GroupActInfoDao; import com.epmet.modules.act.entity.ActSummaryEntity; +import com.epmet.modules.act.entity.GroupActInfoEntity; import com.epmet.modules.act.service.ActSummaryService; +import com.epmet.modules.constant.GroupActConstant; +import com.epmet.resi.group.dto.act.form.InitTemplateFormDTO; +import com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * 活动总结 * * @author generator generator@elink-cn.com * @since v1.0.0 2021-04-16 */ +@Slf4j @Service public class ActSummaryServiceImpl extends BaseServiceImpl implements ActSummaryService { + @Autowired + private GroupActInfoDao groupActInfoDao; + @Autowired + private GroupActContentDao groupActContentDao; + @Autowired + private ActSignInRecordDao actSignInRecordDao; + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + /** + * 012、初始化活动总结模板 + * + * @param formDTO + * @return com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO + */ + @Override + public ActSummaryTemplateResultDTO initTemplate(InitTemplateFormDTO formDTO) { + GroupActInfoEntity groupActInfoEntity=groupActInfoDao.selectById(formDTO.getGroupActId()); + if(null==groupActInfoEntity){ + throw new RenException(String.format("根据groupActId:%s,查询活动信息为null",formDTO.getGroupActId())); + } + ActSummaryTemplateResultDTO resultDTO= ConvertUtils.sourceToTarget(groupActInfoEntity,ActSummaryTemplateResultDTO.class); + resultDTO.setTextList(groupActContentDao.selectContentList(formDTO.getGroupActId(), GroupActConstant.TEXT)); + resultDTO.setImgList(groupActContentDao.selectContentList(formDTO.getGroupActId(),GroupActConstant.IMG)); + List signedInUserIds=actSignInRecordDao.selectUserIds(formDTO.getGroupActId()); + resultDTO.setSignedInUserIds(signedInUserIds); + if(CollectionUtils.isNotEmpty(signedInUserIds)){ + Result> result = epmetUserOpenFeignClient.queryUserBaseInfo(signedInUserIds); + if (!result.success()) { + throw new RenException("调用user服务，获取用户基础数据失败"); + } + result.getData().forEach(userBaseInfo->{ + resultDTO.setSignedInUsers(userBaseInfo.getSurname().concat(userBaseInfo.getName())); + }); + }else{ + resultDTO.setSignedInUserIds(new ArrayList<>()); + resultDTO.setSignedInUsers(StrConstant.EPMETY_STR); + } + return resultDTO; + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java index 1faac0e6ba..6b8c29a263 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.modules.act.service.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; @@ -33,8 +34,11 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.ScanContentUtils; +import com.epmet.constant.ReadFlagConstant; +import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.modules.act.dao.ActOperationRecordDao; @@ -49,16 +53,17 @@ import com.epmet.modules.act.service.ActCategoryDictService; import com.epmet.modules.act.service.ActSignInRecordService; import com.epmet.modules.act.service.GroupActInfoService; import com.epmet.modules.constant.GroupActConstant; +import com.epmet.modules.constant.UserMessageConstant; import com.epmet.modules.group.service.ResiGroupService; +import com.epmet.modules.invitation.service.InvitationRecordService; import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.resi.group.dto.act.GroupActIdDTO; import com.epmet.resi.group.dto.act.GroupActInfoDTO; -import com.epmet.resi.group.dto.act.form.ActDetailFormDTO; -import com.epmet.resi.group.dto.act.form.ActReadViewFormDTO; -import com.epmet.resi.group.dto.act.form.CancelActFormDTO; -import com.epmet.resi.group.dto.act.form.PublishGroupActFormDTO; +import com.epmet.resi.group.dto.act.form.*; +import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO; import com.epmet.resi.group.dto.act.result.ActDetailResultDTO; import com.epmet.resi.group.dto.group.ResiGroupDTO; +import com.epmet.resi.group.dto.invitation.InvitationRecordDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO; import lombok.extern.slf4j.Slf4j; @@ -108,6 +113,11 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl contentList = constructText(groupActInfoEntity.getId(), formDTO.getCustomerId(), formDTO.getTextList()); List imgList = constructImg(groupActInfoEntity.getId(), formDTO.getCustomerId(), formDTO.getImgList()); + List memberDTOList=resiGroupMemberService.getMemberList(formDTO.getGroupId()); List readRecordEntityList=constructReadRec(groupActInfoEntity.getId(), formDTO.getCustomerId(), formDTO.getGroupId(), formDTO.getPublishUserId(), - groupDTO.getGridId()); + groupDTO.getGridId(), + memberDTOList); //2、插入活动内容 contentList.forEach(textContentEntity->{ groupActContentDao.insert(textContentEntity); @@ -163,14 +175,44 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl{ actReadRecordDao.insert(readRecordEntity); }); + //5、发送站内信 + sendMessage(memberDTOList,formDTO,groupActInfoEntity,groupDTO); result.setGroupActId(groupActInfoEntity.getId()); return result; } - private List constructReadRec(String groupActId, String customerId, String groupId,String publishUserId,String gridId) { + private void sendMessage(List memberDTOList, PublishGroupActFormDTO formDTO, GroupActInfoEntity groupActInfoEntity,ResiGroupDTO resiGroupDTO) { + + List list = new ArrayList<>(); + memberDTOList.forEach(memberDTO -> { + //不需要给当前操作人发送 + if (!formDTO.getPublishUserId().equals(memberDTO.getCustomerUserId())) { + UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO(); + userMessageFormDTO.setCustomerId(formDTO.getCustomerId()); + userMessageFormDTO.setUserId(memberDTO.getCustomerUserId()); + userMessageFormDTO.setGridId(resiGroupDTO.getGridId()); + userMessageFormDTO.setApp(AppClientConstant.APP_RESI); + userMessageFormDTO.setTitle(UserMessageConstant.GROUP_TITLE); + userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ); + if(StringUtils.isNotBlank(formDTO.getGroupActId())){ + // 活动修改后，站内信通知全组成员“您有一条小组消息 【某某小组】更新了********活动详情，请查看。 + userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.CHANGED_GROUP_ACT, resiGroupDTO.getGroupName(), groupActInfoEntity.getTitle())); + }else{ + // 活动发布，站内信通知全组成员“您有一条小组消息 【某某小组】发布了*******活动，请查看。 + userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.PUBLISH_GROUP_ACT, resiGroupDTO.getGroupName(), groupActInfoEntity.getTitle())); + } + list.add(userMessageFormDTO); + } + }); + Result sendMessageRes = epmetMessageOpenFeignClient.saveUserMessageList(list); + if (!sendMessageRes.success()) { + log.warn("发布（编辑）组织活动,发送站内信异常"); + } + } + + private List constructReadRec(String groupActId, String customerId, String groupId,String publishUserId,String gridId,List memberDTOList) { List list=new ArrayList<>(); - List memberDTOList=resiGroupMemberService.getMemberList(groupId); memberDTOList.forEach(memberDTO->{ ActReadRecordEntity actReadRecordEntity=new ActReadRecordEntity(); actReadRecordEntity.setCustomerId(customerId); @@ -376,6 +418,10 @@ public class GroupActInfoServiceImpl extends BaseServiceImplNumConstant.ZERO?false:true); @@ -589,12 +637,40 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl memberDTOList = resiGroupMemberService.getMemberList(actInfoEntity.getGroupId()); + List list = new ArrayList<>(); + memberDTOList.forEach(memberDTO -> { + //不需要给当前操作人发送 + if (!currentUserId.equals(memberDTO.getCustomerUserId())) { + UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO(); + userMessageFormDTO.setCustomerId(actInfoEntity.getCustomerId()); + userMessageFormDTO.setUserId(memberDTO.getCustomerUserId()); + userMessageFormDTO.setGridId(actInfoEntity.getGridId()); + userMessageFormDTO.setApp(AppClientConstant.APP_RESI); + userMessageFormDTO.setTitle(UserMessageConstant.GROUP_TITLE); + userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ); + userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.CANCEL_GROUP_ACT, resiGroupDTO.getGroupName(), actInfoEntity.getTitle())); + list.add(userMessageFormDTO); + } + }); + Result sendMessageRes = epmetMessageOpenFeignClient.saveUserMessageList(list); + if (!sendMessageRes.success()) { + log.warn("发布（编辑）组织活动,发送站内信异常"); + } + } + } + /** * 查询活动主信息 * @@ -605,4 +681,28 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl share(@LoginUser TokenDto tokenDto, @RequestBody ShareFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, ShareFormDTO.Add.class); + ValidatorUtils.validateEntity(formDTO, ShareFormDTO.Add.class, ShareFormDTO.UserShow.class); formDTO.setUserId(tokenDto.getUserId()); return new Result().ok(invitationRecordService.share(formDTO)); } + /** + * @param formDTO + * @return + * @Author sun + * @Description 通知、活动分享Id查询数据 + **/ + @PostMapping(value = "getinvitation") + public Result getInvitation(@RequestBody GetInvitationFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, GetInvitationFormDTO.Invitation.class); + return new Result().ok(invitationRecordService.getInvitation(formDTO)); + } + } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java index 4373554965..e3a243c72d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java @@ -19,7 +19,10 @@ package com.epmet.modules.invitation.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.modules.invitation.entity.InvitationRecordEntity; +import com.epmet.resi.group.dto.invitation.InvitationRecordDTO; +import com.epmet.resi.group.dto.invitation.form.GetInvitationFormDTO; import com.epmet.resi.group.dto.invitation.form.ShareFormDTO; +import com.epmet.resi.group.dto.invitation.result.GetInvitationResultDTO; import com.epmet.resi.group.dto.invitation.result.ShareResultDTO; /** @@ -37,4 +40,20 @@ public interface InvitationRecordService extends BaseService", formDTO.getInvitationRecordId())); + } + GetInvitationResultDTO resultDTO = ConvertUtils.sourceToTarget(entity, GetInvitationResultDTO.class); + return resultDTO; + } + + /** + * 根据主键查询 + * + * @param id + * @return com.epmet.resi.group.dto.invitation.InvitationRecordDTO + */ + @Override + public InvitationRecordDTO get(String id) { + return ConvertUtils.sourceToTarget(baseDao.selectById(id),InvitationRecordDTO.class); + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeCommentController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeCommentController.java index f3972f4478..854f3c26a6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeCommentController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeCommentController.java @@ -54,47 +54,6 @@ public class NoticeCommentController { @Autowired private NoticeCommentService noticeCommentService; - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = noticeCommentService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - NoticeCommentDTO data = noticeCommentService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody NoticeCommentDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - noticeCommentService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody NoticeCommentDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - noticeCommentService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - noticeCommentService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = noticeCommentService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, NoticeCommentExcel.class); - } /** * @param formDTO @@ -104,7 +63,7 @@ public class NoticeCommentController { **/ @PostMapping(value = "noticecomment") public Result noticeComment(@LoginUser TokenDto tokenDto, @RequestBody NoticeCommentFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, NoticeCommentFormDTO.Comment.class); + ValidatorUtils.validateEntity(formDTO, NoticeCommentFormDTO.Comment.class, NoticeCommentFormDTO.UserShow.class); noticeCommentService.noticeComment(tokenDto, formDTO); return new Result(); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java index 339fd1e04a..02d6bf79ec 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java @@ -55,48 +55,12 @@ public class NoticeController { @Autowired private NoticeService noticeService; - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = noticeService.page(params); - return new Result>().ok(page); - } - @GetMapping("{id}") public Result get(@PathVariable("id") String id){ NoticeDTO data = noticeService.get(id); return new Result().ok(data); } - @PostMapping - public Result save(@RequestBody NoticeDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - noticeService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody NoticeDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - noticeService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - noticeService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = noticeService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, NoticeExcel.class); - } - /** * @param formDTO * @return @@ -105,7 +69,7 @@ public class NoticeController { **/ @PostMapping(value = "add") public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddNoticeFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AddNoticeFormDTO.Add.class); + ValidatorUtils.validateEntity(formDTO, AddNoticeFormDTO.Add.class, AddNoticeFormDTO.AddUserShow.class); noticeService.add(tokenDto, formDTO); return new Result(); } @@ -118,7 +82,7 @@ public class NoticeController { **/ @PostMapping(value = "edit") public Result edit(@LoginUser TokenDto tokenDto, @RequestBody EditNoticeFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, EditNoticeFormDTO.Edit.class); + ValidatorUtils.validateEntity(formDTO, EditNoticeFormDTO.Edit.class, EditNoticeFormDTO.EditUserShow.class); noticeService.edit(tokenDto, formDTO); return new Result(); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java index dd865bfdf8..ca1dcf86b2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java @@ -54,48 +54,6 @@ public class NoticeReadRecordController { @Autowired private NoticeReadRecordService noticeReafdRecordService; - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = noticeReafdRecordService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - NoticeReadRecordDTO data = noticeReafdRecordService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody NoticeReadRecordDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - noticeReafdRecordService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody NoticeReadRecordDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - noticeReafdRecordService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - noticeReafdRecordService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = noticeReafdRecordService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, NoticeReadRecordExcel.class); - } - /** * @param formDTO * @return diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java index 0f1498b243..b22a06c2cc 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java @@ -33,7 +33,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("notice_reafd_record") +@TableName("notice_read_record") public class NoticeReadRecordEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; @@ -64,7 +64,7 @@ public class NoticeReadRecordEntity extends BaseEpmetEntity { private String userId; /** - * read已读、unread未读 + * read已读、un_read未读 */ private String readFlag; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentService.java index 50b3beaa9d..6e3a82690d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentService.java @@ -37,66 +37,6 @@ import java.util.Map; */ public interface NoticeCommentService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2021-04-19 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2021-04-19 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return NoticeCommentDTO - * @author generator - * @date 2021-04-19 - */ - NoticeCommentDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2021-04-19 - */ - void save(NoticeCommentDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2021-04-19 - */ - void update(NoticeCommentDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2021-04-19 - */ - void delete(String[] ids); - /** * @param formDTO * @return diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReadRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReadRecordService.java index f4d048055f..17d41252c0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReadRecordService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReadRecordService.java @@ -37,66 +37,6 @@ import java.util.Map; */ public interface NoticeReadRecordService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2021-04-19 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2021-04-19 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return NoticeReafdRecordDTO - * @author generator - * @date 2021-04-19 - */ - NoticeReadRecordDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2021-04-19 - */ - void save(NoticeReadRecordDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2021-04-19 - */ - void update(NoticeReadRecordDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2021-04-19 - */ - void delete(String[] ids); - /** * @param formDTO * @return diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeService.java index a10a82fb07..48db1b92d3 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeService.java @@ -38,26 +38,6 @@ import java.util.Map; */ public interface NoticeService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2021-04-19 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2021-04-19 - */ - List list(Map params); - /** * 单条查询 * @@ -68,36 +48,6 @@ public interface NoticeService extends BaseService { */ NoticeDTO get(String id); - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2021-04-19 - */ - void save(NoticeDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2021-04-19 - */ - void update(NoticeDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2021-04-19 - */ - void delete(String[] ids); - /** * @param formDTO * @return diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java index f3b2671eb4..4bd79318c2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java @@ -84,58 +84,6 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, NoticeCommentDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, NoticeCommentDTO.class); - } - - private QueryWrapper getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public NoticeCommentDTO get(String id) { - NoticeCommentEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, NoticeCommentDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(NoticeCommentDTO dto) { - NoticeCommentEntity entity = ConvertUtils.sourceToTarget(dto, NoticeCommentEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(NoticeCommentDTO dto) { - NoticeCommentEntity entity = ConvertUtils.sourceToTarget(dto, NoticeCommentEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - /** * @param formDTO * @return diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java index ab5182fbbb..ad26bc805e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java @@ -66,57 +66,6 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, NoticeReadRecordDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, NoticeReadRecordDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public NoticeReadRecordDTO get(String id) { - NoticeReadRecordEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, NoticeReadRecordDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(NoticeReadRecordDTO dto) { - NoticeReadRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReadRecordEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(NoticeReadRecordDTO dto) { - NoticeReadRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReadRecordEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } /** * @param formDTO diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java index 50a2ef85a5..97ec4132f1 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java @@ -114,58 +114,12 @@ public class NoticeServiceImpl extends BaseServiceImpl private NoticeReadRecordDao noticeReafdRecordDao; - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, NoticeDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, NoticeDTO.class); - } - - private QueryWrapper getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - @Override public NoticeDTO get(String id) { NoticeEntity entity = baseDao.selectById(id); return ConvertUtils.sourceToTarget(entity, NoticeDTO.class); } - @Override - @Transactional(rollbackFor = Exception.class) - public void save(NoticeDTO dto) { - NoticeEntity entity = ConvertUtils.sourceToTarget(dto, NoticeEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(NoticeDTO dto) { - NoticeEntity entity = ConvertUtils.sourceToTarget(dto, NoticeEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - /** * @param formDTO * @return diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml index f542750348..ec3207549b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml @@ -37,4 +37,16 @@ AND acr.GROUP_ACT_ID = #{groupActId} AND acr.SIGN_USER_ID =#{signUserId} + + + \ No newline at end of file