Browse Source

Merge branch 'dev_group_act_notice' into dev

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java
master
sunyuchao 4 years ago
parent
commit
4083bf051c
  1. 42
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/FileCommonDTO.java
  2. 23
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
  3. 30
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
  4. 20
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
  5. 1
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java
  6. 5
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java
  7. 10
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
  8. 3
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
  9. 2
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java
  10. 6
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java
  11. 146
      epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/ActDetailGovResultDTO.java
  12. 22
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
  13. 16
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java
  14. 12
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
  15. 14
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
  16. 7
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java
  17. 10
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java
  18. 19
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java
  19. 29
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java
  20. 5
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java
  21. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  22. 20
      epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
  23. 102
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCategoryDictDTO.java
  24. 27
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java
  25. 99
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java
  26. 112
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java
  27. 87
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSignInCodeDTO.java
  28. 102
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSignInRecordDTO.java
  29. 102
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryContentDTO.java
  30. 102
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryDTO.java
  31. 96
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActContentDTO.java
  32. 17
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActIdDTO.java
  33. 196
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActInfoDTO.java
  34. 29
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActCategoryFormDTO.java
  35. 28
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActDetailByLinkFormDTO.java
  36. 35
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActDetailFormDTO.java
  37. 28
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActMenuFormDTO.java
  38. 29
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActReadViewFormDTO.java
  39. 22
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActSummaryDetailFormDTO.java
  40. 42
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActSummaryFormDTO.java
  41. 32
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeFormDTO.java
  42. 14
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeResultDTO.java
  43. 38
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CancelActFormDTO.java
  44. 27
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CloseGroupActFormDTO.java
  45. 39
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java
  46. 25
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentQueryFormDTO.java
  47. 22
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/InitTemplateFormDTO.java
  48. 106
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/PublishGroupActFormDTO.java
  49. 39
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SetSignTimeFormDTO.java
  50. 50
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SignInFormDTO.java
  51. 25
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SignInRecFormDTO.java
  52. 19
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailByLinkResultDTO.java
  53. 177
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
  54. 28
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActMenuResultDTO.java
  55. 33
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActSummaryDetailResultDTO.java
  56. 79
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActSummaryTemplateResultDTO.java
  57. 24
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CategoryCodeResultDTO.java
  58. 18
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CategoryDTO.java
  59. 30
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CommentResultDTO.java
  60. 21
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/SetSignTimeResultDTO.java
  61. 31
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/SignInRecResultDTO.java
  62. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java
  63. 107
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupMessageDTO.java
  64. 4
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
  65. 5
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java
  66. 101
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupSetupDTO.java
  67. 39
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/AllGroupListFormDTO.java
  68. 8
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java
  69. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java
  70. 41
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/MemExitGroupFormDTO.java
  71. 50
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java
  72. 5
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupResultDTO.java
  73. 5
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CreatedResultDTO.java
  74. 40
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupTypeListResultDTO.java
  75. 5
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupsInGridResultDTO.java
  76. 5
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/MyGroupResultDTO.java
  77. 5
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java
  78. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/TopicInfoResultDTO.java
  79. 28
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/UserReadFlagResultDTO.java
  80. 26
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/UserUnReadResultDTO.java
  81. 107
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/InvitationRecordDTO.java
  82. 25
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java
  83. 33
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/ShareFormDTO.java
  84. 44
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java
  85. 19
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/ShareResultDTO.java
  86. 4
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java
  87. 121
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeAttachmentDTO.java
  88. 27
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentDTO.java
  89. 116
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeDTO.java
  90. 106
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java
  91. 62
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/AddNoticeFormDTO.java
  92. 62
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/EditNoticeFormDTO.java
  93. 35
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
  94. 33
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentListFormDTO.java
  95. 21
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeDetailFormDTO.java
  96. 23
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeFileDTO.java
  97. 21
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeReadListFormDTO.java
  98. 26
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/ReadTypeFormDTO.java
  99. 24
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/UnReadListFormDTO.java
  100. 45
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java

42
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/FileCommonDTO.java

@ -0,0 +1,42 @@
package com.epmet.commons.tools.dto.form;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/12/21 15:37
*/
@NoArgsConstructor
@Data
public class FileCommonDTO implements Serializable {
private static final long serialVersionUID = -5307959406648243353L;
/**
* 文件名
*/
private String name;
/**
* url地址
*/
private String url;
/**
* 文件类型(图片 - image 视频 - video 语音 - voice 文档 - doc)
*/
private String type;
/**
* 后缀名
*/
private String format;
/**
* 文件大小 kb
*/
private Integer size;
/**
* 语音或视频文件时长单位秒
*/
private Integer duration;
}

23
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@ -161,7 +161,28 @@ public enum EpmetErrorCode {
OPEN_API_SIGN_ERROR(10104, "签名错误"),
OPEN_API_PARAMS_APPID_DIFF(10105, "app_id不一致"), // app_id在请求参数中和在token中不一致
OPEN_API_REQUEST_EXPIRED(10106, "请求过期"),
OPEN_API_REQUEST_REPEAT(10107, "请求重复");
OPEN_API_REQUEST_REPEAT(10107, "请求重复"),
//楼院小组89
GROUP_ACT_CANCELED_CAN_NOT_EDIT(8901,"活动已取消,不能编辑"),
GROUP_ACT_CLOSED_CAN_NOT_EDIT(8902,"活动已关闭,不能编辑"),
PLEASE_INPUT_ACT_CONTENT(8903,"请输入活动内容,或添加图片"),
GROUP_ACT_CONTENT_MAX(8904,"活动内容至多输入1000字"),
GROUP_ACT_IMG_MAX(8905,"最多可添加3张图片"),
PARTY_MEMBER_CREATE_BRANCH_GROUP(8906,"您不是党员,不能创建支部小组"),
NOT_IN_GROUP_CAN_NOT_VIEW(8907,"当前内容仅允许组内成员查看"),
PARTY_MEMBER_JOIN_BRANCH_GROUP(8908,"您不是党员,不能加入支部小组"),
GROUP_ACT_CAN_NOT_CANCEL(8909,"当前活动已关闭或已取消"),
CHANGE_LEADER(8910,"请先转移组长身份在退组"),
//8910的msg动态赋值
GROUP_ACT_CAN_NOT_COMMENT(8910,"当前活动,不能评论"),
SIGN_IN_TIME_NOT_START(8911,"未到签到时间,不允许签到"),
SIGN_IN_TIME_PASSED(8912,"当前时间已超过签到时间"),
INVITATION_NOT_EXIST(8913,"链接不存在"),
NOTICE_EXPIRATION_TIME(8914,"通知过期时间不能早于当前时间"),
NOTICE_BE_OVERDUE(8915,"通知已过期不允许再次变更");
private int code;
private String msg;

30
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@ -8,7 +8,9 @@
package com.epmet.commons.tools.redis;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
/**
@ -429,4 +431,32 @@ public class RedisKeys {
public static String getThirdPlatformAccessTokenKey(String platformId) {
return rootPrefix.concat("thirdplatform:accesstoken:").concat(platformId);
}
/**
* @return 设置组员已读未读标识
* @param source :act notice
* @param groupId 小组id
* @param sourceId 活动id或者通知id
* @author yinzuomei
* @description groupread:202104:act:groupId:actId
* @Date 2021/4/22 16:38
**/
public static String getGroupMsgReadKey(String source, String groupId, String sourceId) {
String currentMonth= DateUtils.getBeforeNMonth(NumConstant.ZERO);
return "groupread:".concat(currentMonth).concat(":").concat(source).concat(":").concat(groupId).concat(":").concat(sourceId);
}
/**
* @return 设置应读人员标识 默认全部赋值1
* @param source :act notice
* @param groupId 小组id
* @param sourceId 活动id或者通知id
* @author yinzuomei
* @description groupread:user:202104:act:groupId:actId
* @Date 2021/4/22 16:38
**/
public static String getGroupMsgShouldReadUser(String source, String groupId, String sourceId) {
String currentMonth= DateUtils.getBeforeNMonth(NumConstant.ZERO);
return "groupread:user:".concat(currentMonth).concat(":").concat(source).concat(":").concat(groupId).concat(":").concat(sourceId);
}
}

20
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java

@ -13,10 +13,7 @@ import com.epmet.commons.tools.exception.RenException;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ZSetOperations;
import org.springframework.data.redis.core.*;
import org.springframework.data.redis.support.atomic.RedisAtomicLong;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@ -422,4 +419,19 @@ public class RedisUtils {
return redisTemplate.hasKey(key);
}
public Boolean setBit(String key, long offset, boolean value) {
return redisTemplate.opsForValue().setBit(key, offset, value);
}
public Boolean getBit(String key, long offset) {
return redisTemplate.opsForValue().getBit(key, offset);
}
public Long bitCount(String key) {
return redisTemplate.execute((RedisCallback<Long>) con -> con.bitCount(key.getBytes()));
}
public Long bitCount(String key, int start, int end) {
return redisTemplate.execute((RedisCallback<Long>) con -> con.bitCount(key.getBytes(), start, end));
}
}

1
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java

@ -17,5 +17,6 @@ public class UserInfosResultDTO implements Serializable {
private String userId;
private String userShowName;
private String headPhoto;
private String realName;
}

5
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java

@ -83,4 +83,9 @@ Ps: 如果一个小组被拒绝,当前小组的状态将永久停留在“审
* VISIT_SWITCH 小组是否允许参观:允许open;不允许closed
*/
private String visitSwitch;
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
}

10
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java

@ -5,9 +5,11 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
import com.epmet.dataaggre.dao.resigroup.ResiGroupDao;
import com.epmet.dataaggre.dao.resigroup.ResiTopicDao;
import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
import com.epmet.dataaggre.dto.resigroup.ResiGroupDTO;
import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity;
import com.epmet.dataaggre.redis.ResiGroupRedis;
import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
import com.epmet.dataaggre.service.resigroup.ResiGroupService;
@ -63,12 +65,18 @@ public class ResiGroupServiceImpl implements ResiGroupService {
List<String> userIds = result.stream().map(m -> m.getUserId()).collect(Collectors.toList());
// 查询用户信息【名字 头像】
List<UserInfosResultDTO> userInfos = epmetUserService.selectUserInfosByUserIds(userIds);
//查询小组信息
ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId());
result.forEach(r -> {
if (!CollectionUtils.isEmpty(userInfos)){
userInfos.forEach(u -> {
if (r.getUserId().equals(u.getUserId())){
r.setHeadPhoto(u.getHeadPhoto());
r.setUserShowName(u.getUserShowName());
if("branch".equals(group.getGroupType())){
r.setUserShowName(u.getRealName());
}else {
r.setUserShowName(u.getUserShowName());
}
}
});
}

3
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml

@ -12,7 +12,8 @@
WHEN GENDER = '2' THEN '女士'
ELSE '先生/女士' END
) AS userShowName,
HEAD_IMG_URL AS headPhoto
HEAD_IMG_URL AS headPhoto,
CONCAT(STREET,'-',REAL_NAME) AS realName
FROM user_base_info
WHERE DEL_FLAG = 0
AND

2
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java

@ -58,7 +58,7 @@ public class UserMessageFormDTO implements Serializable {
private String readFlag;
/**
* 调用者
* 调用者 分内部调用和外部调用内部调用值为空外部默认为外挂-站内信
*/
private String referer;
}

6
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java

@ -51,8 +51,10 @@ public class WxLoginServiceImpl implements WxLoginService {
String resultStr = HttpClientManager.getInstance().sendGet(WxLoginConstant.WXCODE_BY_OPENID, map).getData();
HashMap<String, String> hashMap = JSON.parseObject(resultStr, HashMap.class);
if (null != hashMap.get("errcode")) {
logger.error("wxcode换取openid接口调用失败");
throw new RenException(hashMap.get("errmsg"));
//45011:API 调用太频繁,请稍候再试;40029: code 无效 【错误码:https://developers.weixin.qq.com/doc/oplatform/Return_codes/Return_code_descriptions_new.html】
throw new RenException(String.format("wxcode换取用户基本信息失败,wxcode->%s,错误码->%s,错误信息->%s", wxCode, hashMap.get("errcode"), hashMap.get("errmsg")));
/*logger.error("wxcode换取openid接口调用失败");
throw new RenException(hashMap.get("errmsg"));*/
}
String openid = hashMap.get("openid");
String sessionKey = hashMap.get("session_key");

146
epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/ActDetailGovResultDTO.java

@ -0,0 +1,146 @@
package com.epmet.dto.result;
import com.epmet.commons.tools.dto.form.FileCommonDTO;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 工作端小组内活动详情返参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/29 9:30
*/
@Data
public class ActDetailGovResultDTO implements Serializable {
private static final long serialVersionUID = 3982724635100043221L;
private String groupActId;
/**
* 小组id
*/
private String groupId;
/**
* 活动标题
*/
private String title;
/**
* 活动时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date startTime;
/**
* 活动所属类别编码
*/
private String categoryCode;
/**
* 上级类别编码
*/
private String parentCode;
private String menuCode;
/**
* 活动类别名称eg支部建设-三会一课
*/
private String allCategoryName;
/**
* 活动地点
*/
private String address;
/**
* 应参加人数组长填入此列也是应签到人数
*/
private Integer shouldAttend;
/**
* 活动状态已发布published;已取消canceled已变更changed已关闭closed
*/
private String status;
/**
* 签到开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signInStartTime;
/**
* 签到截止时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signInEndTime;
/**
* 是否填写总结1已填写0未填写
*/
private Integer summaryFlag;
/**
* 取消时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date canceledTime;
/**
* 关闭时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date closedTime;
/**
* 活动发布人用户id
*/
private String publishUserId;
/**
* 内容列表
*/
private List<String> textList;
/**
* 图片列表
*/
private List<String> imgArrayList;
/**
* 图片列表最多3张
*/
private List<FileCommonDTO> imgList;
//以下字段需要单独赋值
/**
* 取消原因
*/
private String canceledReason;
/**
* 已签到人数有人签到自动+1
*/
private Integer signedInNum;
/**
* 网格id
*/
private String gridId;
/**
* 客户id
*/
private String customerId;
/**
* 最后一次编辑时间首次发布与CREATED_TIME一致
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date changedTime;
}

22
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java

@ -2,15 +2,15 @@ package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.annotation.RequirePermission;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.enums.RequirePermissionEnum;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.result.ActDetailGovResultDTO;
import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
import com.epmet.resi.group.dto.group.form.*;
import com.epmet.resi.group.dto.group.result.*;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
import com.epmet.service.ResiGroupService;
import org.springframework.beans.factory.annotation.Autowired;
@ -175,5 +175,19 @@ public class ResiGroupController {
return groupOpenFeignClient.govAuditEdit(param);
}
/**
* @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailResultDTO>
* @param tokenDto
* @param actDetailFormDTO
* @author yinzuomei
* @description 工作端查看小组内活动详情
* @Date 2021/4/29 9:38
**/
@PostMapping("actdetail")
public Result<ActDetailGovResultDTO> queryActDetailForWork(@LoginUser TokenDto tokenDto, @RequestBody ActDetailFormDTO actDetailFormDTO){
actDetailFormDTO.setUserId(tokenDto.getUserId());
actDetailFormDTO.setClient(AppClientConstant.APP_GOV);
ValidatorUtils.validateEntity(actDetailFormDTO,ActDetailFormDTO.AddUserInternalGroup.class);
return new Result<ActDetailGovResultDTO>().ok(resiGroupService.queryActDetailForWork(actDetailFormDTO));
}
}

16
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java

@ -6,8 +6,10 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO;
import com.epmet.resi.group.dto.topic.form.AllMessagesFormDTO;
import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
import com.epmet.resi.group.dto.topic.result.AllMessagesResultDTO;
import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO;
import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO;
import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
@ -70,6 +72,18 @@ public class ResiTopicController {
return resiTopicService.topicDetail(topicDetailFormDTO);
}
/**
* @Description 小组内所有历史消息话题通知活动
* @Param tokenDto
* @Param topicPageFormDTO
* @author zxc
* @date 2021/4/28 上午10:41
*/
@PostMapping("allmessages")
public Result<List<AllMessagesResultDTO>> allMessages(@LoginUser TokenDto tokenDto, @RequestBody AllMessagesFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, AllMessagesFormDTO.AllMessagesForm.class);
formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<List<AllMessagesResultDTO>>().ok(resiTopicService.allMessages(formDTO));
}
}

12
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@ -6,6 +6,8 @@ import com.epmet.controller.TestFormDTO1;
import com.epmet.controller.TestResultDTO1;
import com.epmet.dto.result.GridProcessingCountResultDTO;
import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
import com.epmet.resi.group.dto.group.form.*;
@ -151,4 +153,14 @@ public interface ResiGroupFeignClient {
@PostMapping(value = "/resi/group/group/test",consumes = MediaType.APPLICATION_JSON_VALUE)
Result<TestResultDTO1> test(@RequestBody TestFormDTO1 testFormDTO1);
/**
* @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailResultDTO>
* @param actDetailFormDTO
* @author yinzuomei
* @description 查询活动详情
* @Date 2021/4/29 9:57
**/
@PostMapping(value = "/resi/group/act/actdetail-internal",consumes = MediaType.APPLICATION_JSON_VALUE)
Result<ActDetailResultDTO> queryActDetailInternal(@RequestBody ActDetailFormDTO actDetailFormDTO);
}

14
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java

@ -7,6 +7,8 @@ import com.epmet.controller.TestFormDTO1;
import com.epmet.controller.TestResultDTO1;
import com.epmet.dto.result.GridProcessingCountResultDTO;
import com.epmet.feign.ResiGroupFeignClient;
import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
@ -120,4 +122,16 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
public Result<TestResultDTO1> test(TestFormDTO1 testFormDTO1) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "test", testFormDTO1);
}
/**
* @param actDetailFormDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailResultDTO>
* @author yinzuomei
* @description 查询活动详情
* @Date 2021/4/29 9:57
**/
@Override
public Result<ActDetailResultDTO> queryActDetailInternal(ActDetailFormDTO actDetailFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryActDetailInternal", actDetailFormDTO);
}
}

7
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java

@ -1,10 +1,10 @@
package com.epmet.service;
import com.epmet.commons.tools.utils.Result;
import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
import com.epmet.resi.group.dto.group.result.*;
import com.epmet.dto.result.ActDetailGovResultDTO;
import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
import com.epmet.resi.group.dto.group.form.*;
import com.epmet.resi.group.dto.group.result.*;
import java.util.List;
@ -74,4 +74,5 @@ public interface ResiGroupService {
**/
Result disagreeApplying(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO);
ActDetailGovResultDTO queryActDetailForWork(ActDetailFormDTO actDetailFormDTO);
}

10
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java

@ -3,8 +3,10 @@ package com.epmet.service;
import com.epmet.commons.tools.utils.Result;
import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO;
import com.epmet.resi.group.dto.topic.form.AllMessagesFormDTO;
import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
import com.epmet.resi.group.dto.topic.result.AllMessagesResultDTO;
import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO;
import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO;
import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
@ -53,5 +55,13 @@ public interface ResiTopicService {
**/
Result<List<GovCommentResultDTO>> topicComments(ResiQueryCommentFormDTO queryCommentFormDTO);
/**
* @Description 小组内所有历史消息话题通知活动
* @Param formDTO
* @author zxc
* @date 2021/4/28 下午1:29
*/
List<AllMessagesResultDTO> allMessages(AllMessagesFormDTO formDTO);
}

19
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java

@ -1,11 +1,14 @@
package com.epmet.service.impl;
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.ActDetailGovResultDTO;
import com.epmet.feign.ResiGroupFeignClient;
import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
import com.epmet.resi.group.dto.group.result.*;
import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
import com.epmet.resi.group.dto.group.form.*;
import com.epmet.resi.group.dto.group.result.*;
import com.epmet.service.ResiGroupService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -57,5 +60,15 @@ public class ResiGroupServiceImpl implements ResiGroupService{
return resiGroupFeignClient.disagreeApplying(disAgreeApplyGroupFormDTO);
}
@Override
public ActDetailGovResultDTO queryActDetailForWork(ActDetailFormDTO actDetailFormDTO) {
Result<ActDetailResultDTO> actDetailResult=resiGroupFeignClient.queryActDetailInternal(actDetailFormDTO);
if(actDetailResult.success()&&null!=actDetailResult.getData()){
ActDetailGovResultDTO resultDTO= ConvertUtils.sourceToTarget(actDetailResult.getData(),ActDetailGovResultDTO.class);
return resultDTO;
}
throw new RenException("调用resi-group服务,查询活动详情异常");
}
}

29
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java

@ -1,20 +1,21 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.ResiGroupFeignClient;
import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO;
import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
import com.epmet.resi.group.dto.topic.form.AllMessagesFormDTO;
import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO;
import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO;
import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
import com.epmet.resi.group.dto.topic.result.*;
import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
import com.epmet.service.ResiTopicService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
@ -24,6 +25,8 @@ public class ResiTopicServiceImpl implements ResiTopicService {
@Autowired
private ResiGroupFeignClient resiGroupFeignClient;
@Autowired
private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
/**
* @Description 政府端群组管理-屏蔽话题列表查询
@ -125,4 +128,22 @@ public class ResiTopicServiceImpl implements ResiTopicService {
return new Result<List<GovCommentResultDTO>>().ok(commentsResult);
}
/**
* @Description 小组内所有历史消息话题通知活动
* @Param formDTO
* @author zxc
* @date 2021/4/28 下午1:29
*/
@Override
public List<AllMessagesResultDTO> allMessages(AllMessagesFormDTO formDTO) {
Result<List<AllMessagesResultDTO>> listResult = resiGroupOpenFeignClient.allMessages(formDTO);
if (!listResult.success()){
throw new RenException(listResult.getMsg());
}
if (CollectionUtils.isEmpty(listResult.getData())){
return new ArrayList<>();
}
return listResult.getData();
}
}

5
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java

@ -87,5 +87,10 @@ public class GridInfoResultDTO implements Serializable {
* 网格所属机关名称
*/
private String parentAgencyName;
/**
* 网格的所有上级组织
*/
private String pids;
}

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@ -486,6 +486,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
gridInfoResultDTO.setGridName(customerGridDTO.getGridName());
gridInfoResultDTO.setParentAgencyId(customerGridDTO.getPid());
gridInfoResultDTO.setParentAgencyName(customerAgencyService.get(customerGridDTO.getPid()).getOrganizationName());
gridInfoResultDTO.setPids(customerGridDTO.getPids());
String pids=customerGridDTO.getPids();
String[] pidArray = pids.split(":");
for(String agencyId:pidArray){

20
epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml

@ -69,6 +69,8 @@
<if test='customerName != "" and customerName != null'>
AND customer_name LIKE concat('%', trim(#{customerName}), '%')
</if>
ORDER BY
created_time DESC
</select>
<select id="getAllList" resultMap="customerMap">
@ -106,19 +108,21 @@
<select id="selectAllCustomerList" resultType="com.epmet.dto.result.CustomerListResultDTO">
SELECT
ID AS "customerId",
CUSTOMER_NAME,
TITLE,
VALIDITY_TIME,
ORGANIZATION_LEVEL,
LOGO,
GRID_NUMBER
id AS "customerId",
customer_name,
title,
validity_time,
organization_level,
logo,
grid_number
FROM customer
WHERE
DEL_FLAG = '0'
del_flag = '0'
<if test='customerName != "" and customerName != null'>
AND customer_name LIKE concat('%', trim(#{customerName}), '%')
</if>
ORDER BY
created_time DESC
</select>
<select id="getExternalAndParentCustomerId" resultType="String">

102
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCategoryDictDTO.java

@ -0,0 +1,102 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.act;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 活动类别字典
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-16
*/
@Data
public class ActCategoryDictDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* 类别编码
*/
private String categoryCode;
/**
* 活动类别名称eg支部建设联建共建
*/
private String categoryName;
/**
* 等级1,2......
*/
private Integer level;
/**
* 排序
*/
private Integer sort;
/**
* 上级类别编码
*/
private String parentCode;
/**
* 逻辑删除标识
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

27
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/EnterGroupSwitchDTO.java → epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java

@ -15,22 +15,21 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dataaggre.dto.resigroup;
import lombok.Data;
package com.epmet.resi.group.dto.act;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
*
* 活动评论表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-12-25
* @since v1.0.0 2021-04-16
*/
@Data
public class EnterGroupSwitchDTO implements Serializable {
public class ActCommentDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ -45,19 +44,19 @@ public class EnterGroupSwitchDTO implements Serializable {
private String customerId;
/**
* 小组所属网格id
* group_act_info.id
*/
private String gridId;
private String groupActId;
/**
* 小组id
* 评论人id
*/
private String groupId;
private String commentUserId;
/**
* open开启 close关闭
* 评论内容目前限制500字
*/
private String auditSwitch;
private String commentContent;
/**
* 删除标记 0未删除1已删除
@ -70,12 +69,12 @@ public class EnterGroupSwitchDTO implements Serializable {
private Integer revision;
/**
* 创建人customer_user.id
* 创建人评论人Id来自user
*/
private String createdBy;
/**
* 创建时间(邀请时间)
* 创建时间
*/
private Date createdTime;

99
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java

@ -0,0 +1,99 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.act;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 活动操作表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-16
*/
@Data
public class ActOperationRecordDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键签到成功后插入此表
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* group_act_info.id
*/
private String groupActId;
/**
* 操作人id
*/
private String operateUserId;
/**
* 操作类型发布publish;
取消cancel
变更change
关闭close
*/
private String operationType;
/**
* 备注取消理由
*/
private String note;
/**
* 逻辑删除标识
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

112
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java

@ -0,0 +1,112 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.act;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 活动已读记录
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-16
*/
@Data
public class ActReadRecordDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键(发布活动后后台自动初始化记录)
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* 小组所属网格id
*/
private String gridId;
/**
* 小组id
*/
private String groupId;
/**
* group_act_info.id
*/
private String groupActId;
/**
* 活动关闭前已读:read未读:un_read
*/
private String readFlag;
/**
* 已读:read未读:un_read
*/
private String viewDetail;
/**
* 用户id
*/
private String userId;
/**
* yes应读no: 新入群的人已读
*/
private String shouldBeRead;
/**
* 删除标识 0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

87
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSignInCodeDTO.java

@ -0,0 +1,87 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.act;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 组织活动签到码
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-16
*/
@Data
public class ActSignInCodeDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* group_act_info.id
*/
private String groupActId;
/**
* 签到码url
*/
private String url;
/**
* 删除标志
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

102
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSignInRecordDTO.java

@ -0,0 +1,102 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.act;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 组织活动签到记录
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-16
*/
@Data
public class ActSignInRecordDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键签到成功后插入此表
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* group_act_info.id
*/
private String groupActId;
/**
* 签到用户id
*/
private String signUserId;
/**
* 签到地点
*/
private String signInAddress;
/**
* 签到地点-经度
*/
private BigDecimal longitude;
/**
* 签到地点-纬度
*/
private BigDecimal latitude;
/**
* 逻辑删除标识
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

102
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryContentDTO.java

@ -0,0 +1,102 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.act;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 活动总结内容
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-16
*/
@Data
public class ActSummaryContentDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* act_summary.id
*/
private String actSummaryId;
/**
* group_act_info.id
*/
private String groupActId;
/**
* 总结内容
*/
private String content;
/**
* 内容类型: 文字text图片img
*/
private String contentType;
/**
* 内容顺序 从1开始
*/
private Integer sort;
/**
* 删除标识 0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

102
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryDTO.java

@ -0,0 +1,102 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.act;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 活动总结
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-16
*/
@Data
public class ActSummaryDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键确认提交后插入此表
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* group_act_info.id
*/
private String groupActId;
/**
* 应参加人数来源于group_act_info
*/
private Integer shouldAttend;
/**
* 已签到人数
*/
private Integer signedInNum;
/**
* 已签到人员姓名列表分隔
*/
private String signedInUsers;
/**
* 填写总结的人
*/
private String userId;
/**
* 删除标识 0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

96
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActContentDTO.java

@ -0,0 +1,96 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.act;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 组织活动内容
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-16
*/
@Data
public class GroupActContentDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* group_act_info.id
*/
private String groupActId;
/**
* 活动内容
*/
private String content;
/**
* 内容类型: 文字text图片img
*/
private String contentType;
/**
* 内容顺序 从1开始
*/
private Integer sort;
/**
* 删除标识 0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

17
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActIdDTO.java

@ -0,0 +1,17 @@
package com.epmet.resi.group.dto.act;
import lombok.Data;
import java.io.Serializable;
/**
* 组织活动id
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/19 15:11
*/
@Data
public class GroupActIdDTO implements Serializable {
private static final long serialVersionUID = -729672768113053794L;
private String groupActId;
}

196
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActInfoDTO.java

@ -0,0 +1,196 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.act;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 组织活动信息
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-16
*/
@Data
public class GroupActInfoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* 小组id
*/
private String groupId;
/**
* 小组所属的网格id
*/
private String gridId;
/**
* 网格所属的组织id
*/
private String agencyId;
/**
* 网格的所有上级id
*/
private String gridPids;
/**
* 活动标题需内容审核
*/
private String title;
/**
* 活动时间
*/
private Date startTime;
/**
* 活动所属类别编码
*/
private String categoryCode;
/**
* 上级类别编码
*/
private String parentCode;
/**
* 活动类别名称eg支部建设-三会一课
*/
private String allCategoryName;
/**
* 活动地点
*/
private String address;
/**
* 活动地点-经度
*/
private BigDecimal longitude;
/**
* 活动地点-纬度
*/
private BigDecimal latitude;
/**
* 应参加人数组长填入此列也是应签到人数
*/
private Integer shouldAttend;
/**
* 活动状态已发布published;已取消canceled已变更changed已关闭closed
*/
private String status;
/**
* 最后一次编辑时间首次发布与CREATED_TIME一致
*/
private Date changedTime;
/**
* 是否变更过(:yes :no)
*/
private String isChange;
/**
* 签到开始时间
*/
private Date signInStartTime;
/**
* 签到截止时间
*/
private Date signInEndTime;
/**
* 是否填写总结1已填写0未填写
*/
private Integer summaryFlag;
/**
* 已签到人数有人签到自动+1
*/
private Integer signedInNum;
/**
* 取消时间
*/
private Date canceledTime;
/**
* 关闭时间
*/
private Date closedTime;
/**
* 活动发布人用户id
*/
private String publishUserId;
/**
* 删除标识
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间活动发布时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
/**
* 应读人数
*/
private Integer shouldRead;
}

29
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActCategoryFormDTO.java

@ -0,0 +1,29 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 002活动类别下拉框查询
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/19 14:16
*/
@Data
public class ActCategoryFormDTO implements Serializable {
public interface AddUserInternalGroup {
}
/**
* 组Id
*/
@NotBlank(message = "menuCode不能为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class)
private String menuCode;
@NotBlank(message = "tokenDto获取customerId为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class)
private String customerId;
}

28
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;
}

35
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActDetailFormDTO.java

@ -0,0 +1,35 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 004活动详情
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/19 19:16
*/
@Data
public class ActDetailFormDTO implements Serializable {
private static final long serialVersionUID = 9163803497503557861L;
public interface AddUserInternalGroup {
}
@NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
private String groupActId;
/**
* 当前用户id
*/
@NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
private String userId;
/**
* 工作端gov; 居民端resi
* 这个是代码里赋值的
*/
private String client;
}

28
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActMenuFormDTO.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;
/**
* 001活动类别列表 入参
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/19 13:13
*/
@Data
public class ActMenuFormDTO implements Serializable {
public interface AddUserInternalGroup {
}
/**
* 组Id
*/
@NotBlank(message = "groupId不能为空", groups =AddUserInternalGroup.class)
private String groupId;
@NotBlank(message = "tokenDto获取customerId为空", groups =AddUserInternalGroup.class)
private String customerId;
}

29
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActReadViewFormDTO.java

@ -0,0 +1,29 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 016活动已读未读列表
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/19 19:36
*/
@Data
public class ActReadViewFormDTO implements Serializable {
private static final long serialVersionUID = -7382937811770356934L;
public interface AddUserInternalGroup {
}
@NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
private String groupActId;
/**
* 当前用户id
*/
@NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
private String userId;
}

22
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActSummaryDetailFormDTO.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;
/**
* 014查看活动总结详情
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/21 14:14
*/
@Data
public class ActSummaryDetailFormDTO implements Serializable {
private static final long serialVersionUID = 3937952227893070145L;
public interface AddUserInternalGroup {
}
@NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
private String groupActId;
}

42
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActSummaryFormDTO.java

@ -0,0 +1,42 @@
package com.epmet.resi.group.dto.act.form;
import com.epmet.resi.group.dto.topic.form.FileDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;
/**
* 013提交活动总结
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/21 12:58
*/
@Data
public class ActSummaryFormDTO implements Serializable {
private static final long serialVersionUID = 6068480003626532767L;
public interface AddUserInternalGroup {
}
@NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
private String groupActId;
/**
* 补充内容限制1000字
*/
private List<String> textList;
/**
* 补充图片列表
*/
private List<FileDTO> imgList;
/**
* 当前用户id
*/
@NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
private String userId;
}

32
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeFormDTO.java

@ -0,0 +1,32 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 018获取签到码图片
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/21 18:01
*/
@Data
public class BuildSignInCodeFormDTO implements Serializable {
private static final long serialVersionUID = -2806512125925383053L;
public interface AddUserInternalGroup {
}
@NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
private String groupActId;
/**
* 当前用户id
*/
@NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
private String userId;
@NotBlank(message = "tokenDto获取customerId为空", groups = AddUserInternalGroup.class)
private String customerId;
}

14
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeResultDTO.java

@ -0,0 +1,14 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
/**
* 018获取签到码图片
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/21 18:13
*/
@Data
public class BuildSignInCodeResultDTO {
private String signInCodeUrl;
}

38
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CancelActFormDTO.java

@ -0,0 +1,38 @@
package com.epmet.resi.group.dto.act.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 011取消活动
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/20 12:04
*/
@Data
public class CancelActFormDTO implements Serializable {
private static final long serialVersionUID = 6126854423030661426L;
public interface AddUserInternalGroup {
}
public interface AddUserShowGroup extends CustomerClientShowGroup {
}
@NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
private String groupActId;
@NotBlank(message = "取消原因不能为空", groups = AddUserShowGroup.class)
@Length(max = 300, message = "取消原因最多输入300字", groups = AddUserShowGroup.class)
private String reason;
/**
* 当前用户id
*/
@NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
private String userId;
}

27
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CloseGroupActFormDTO.java

@ -0,0 +1,27 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 017关闭活动
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/21 15:18
*/
@Data
public class CloseGroupActFormDTO implements Serializable {
public interface AddUserInternalGroup {
}
@NotBlank(message = "groupActId不能为空", groups = ActSummaryDetailFormDTO.AddUserInternalGroup.class)
private String groupActId;
/**
* 当前用户id
*/
@NotBlank(message = "tokenDto获取userId为空", groups = ActReadViewFormDTO.AddUserInternalGroup.class)
private String userId;
}

39
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java

@ -0,0 +1,39 @@
package com.epmet.resi.group.dto.act.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 005评论活动
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/20 12:35
*/
@Data
public class CommentFormDTO implements Serializable {
public interface AddUserInternalGroup {
}
public interface AddUserShowGroup extends CustomerClientShowGroup {
}
@NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
private String groupActId;
@NotBlank(message = "评论内容不能为空", groups = AddUserShowGroup.class)
@Length(max = 500, message = "评论内容最多输入500字", groups = AddUserShowGroup.class)
private String commentContent;
/**
* 当前用户id
*/
@NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
private String userId;
@NotBlank(message = "tokenDto获取customerId为空", groups = AddUserInternalGroup.class)
private String customerId;
}

25
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentQueryFormDTO.java

@ -0,0 +1,25 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 006活动评论列表查询
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/20 12:55
*/
@Data
public class CommentQueryFormDTO implements Serializable {
private static final long serialVersionUID = 4013876445914100561L;
public interface AddUserInternalGroup {
}
@NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
private String groupActId;
private Integer pageNo;
private Integer pageSize;
}

22
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;
}

106
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/PublishGroupActFormDTO.java

@ -0,0 +1,106 @@
package com.epmet.resi.group.dto.act.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;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
/**
* 003发布编辑组织活动
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/19 15:10
*/
@Data
public class PublishGroupActFormDTO implements Serializable {
private static final long serialVersionUID = 3507465802034946254L;
public interface AddUserInternalGroup {
}
public interface AddUserShowGroup extends CustomerClientShowGroup {
}
@NotBlank(message = "tokenDto获取customerId为空", groups = AddUserInternalGroup.class)
private String customerId;
/**
* 活动发布人用户id
*/
@NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
private String publishUserId;
@NotBlank(message = "groupId不能为空", groups = AddUserInternalGroup.class)
private String groupId;
/**
* 小组活动id,此列有值代表编辑
*/
private String groupActId;
/**
* 类别编码
*/
private String categoryCode;
/**
* 类别编码所属的上一级编码
*/
private String parentCode;
@NotBlank(message = "menuCode不能为空", groups = AddUserInternalGroup.class)
private String menuCode;
/**
* 活动标题
*/
@NotBlank(message = "title不能为空,最多输入50个字", groups = AddUserShowGroup.class)
@Length(min = 1, max = 50, message = "title不能为空,最多输入50个字", groups = {AddUserShowGroup.class})
private String title;
/**
* 活动时间格式yyyy-MM-dd HH:mm
*/
private String startTime;
/**
* 活动地点
*/
@NotBlank(message = "活动地点不能为空", groups = AddUserShowGroup.class)
private String address;
/**
* 活动地点-经度
*/
private BigDecimal longitude;
/**
* 活动地点-纬度
*/
private BigDecimal latitude;
/**
* 应参加人数组长填入此列也是应签到人数
*/
@Min(value = 1, message = "应参加人数需大于0", groups = AddUserShowGroup.class)
private Integer shouldAttend;
/**
* 活动文本内容目前只有一段限制1000字
*/
private List<String> textList;
/**
* 图片列表最多3张
*/
private List<FileDTO> imgList;
private String gridId;
}

39
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SetSignTimeFormDTO.java

@ -0,0 +1,39 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 010设置修改签到时间,生成签到码
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/20 13:34
*/
@Data
public class SetSignTimeFormDTO implements Serializable {
private static final long serialVersionUID = 4134192208518833623L;
public interface AddUserInternalGroup {
}
/**
* 小组活动id
*/
@NotBlank(message = "groupActId不能为空",groups = AddUserInternalGroup.class)
private String groupActId;
/**
* 签到开始时间yyyy-MM-dd HH:mm
*/
@NotBlank(message = "开始时间不能为空",groups = AddUserInternalGroup.class)
private String signInStartTime;
/**
* 签到截止时间yyyy-MM-dd HH:mm
*/
@NotBlank(message = "截止时间不能为空",groups = AddUserInternalGroup.class)
private String signInEndTime;
@NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
private String userId;
}

50
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SignInFormDTO.java

@ -0,0 +1,50 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 007签到
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/20 15:14
*/
@Data
public class SignInFormDTO implements Serializable {
private static final long serialVersionUID = 3632452994910057034L;
public interface AddUserInternalGroup {
}
@NotBlank(message = "活动id不能为空",groups = AddUserInternalGroup.class)
private String groupActId;
/**
* 签到地址
*/
@NotBlank(message = "签到地址不能为空",groups = AddUserInternalGroup.class)
private String signInAddress;
/**
* 签到地点-经度
*/
@NotNull(message ="经度不能为空",groups = AddUserInternalGroup.class)
private BigDecimal longitude;
/**
* 签到地点-纬度
*/
@NotNull(message ="纬度不能为空",groups = AddUserInternalGroup.class)
private BigDecimal latitude;
@NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
private String userId;
@NotBlank(message = "tokenDto获取customerId为空", groups = AddUserInternalGroup.class)
private String customerId;
}

25
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SignInRecFormDTO.java

@ -0,0 +1,25 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 009签到记录列表
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/20 15:42
*/
@Data
public class SignInRecFormDTO implements Serializable {
private static final long serialVersionUID = -144395799437468448L;
public interface AddUserInternalGroup {
}
@NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
private String groupActId;
private Integer pageNo;
private Integer pageSize;
}

19
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailByLinkResultDTO.java

@ -0,0 +1,19 @@
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{
/**
* 在组内:yes不在组内no
*/
private String inGroup;
private String invitationRecordId;
}

177
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java

@ -0,0 +1,177 @@
package com.epmet.resi.group.dto.act.result;
import com.epmet.resi.group.dto.topic.form.FileDTO;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 004活动详情 返参
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/19 19:24
*/
@Data
public class ActDetailResultDTO implements Serializable {
private static final long serialVersionUID = 8912162789028312892L;
private String groupActId;
/**
* 小组id
*/
private String groupId;
/**
* 活动标题
*/
private String title;
/**
* 活动时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date startTime;
/**
* 活动所属类别编码
*/
private String categoryCode;
/**
* 上级类别编码
*/
private String parentCode;
private String menuCode;
/**
* 活动类别名称eg支部建设-三会一课
*/
private String allCategoryName;
/**
* 活动地点
*/
private String address;
/**
* 活动地点-经度
*/
private BigDecimal longitude;
/**
* 活动地点-纬度
*/
private BigDecimal latitude;
/**
* 应参加人数组长填入此列也是应签到人数
*/
private Integer shouldAttend;
/**
* 活动状态已发布published;已取消canceled已变更changed已关闭closed
*/
private String status;
/**
* 签到开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signInStartTime;
/**
* 签到截止时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signInEndTime;
/**
* 是否填写总结1已填写0未填写
*/
private Integer summaryFlag;
/**
* 取消时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date canceledTime;
/**
* 关闭时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date closedTime;
/**
* 活动发布人用户id
*/
private String publishUserId;
/**
* 内容列表
*/
private List<String> textList;
/**
* 图片列表
*/
private List<String> imgArrayList;
/**
* 图片列表最多3张
*/
private List<FileDTO> imgList;
//以下字段需要单独赋值
/**
* 取消原因
*/
private String canceledReason;
/**
* blank: 不显示 display显示
*/
private String signInButton;
/**
* 未签到时的描述可能是签到时间未开始可能是签到时间已经过
*/
private String signInDesc;
/**
* member成员leader群主
*/
private String userRole;
/**
* 有签到后不可以修改活动时间true可以修改false不可以
*/
private Boolean startTimeEditFlag;
/**
* 已签到人数有人签到自动+1
*/
private Integer signedInNum;
/**
* 网格id
*/
private String gridId;
/**
* 客户id
*/
private String customerId;
/**
* 最后一次编辑时间首次发布与CREATED_TIME一致
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date changedTime;
}

28
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActMenuResultDTO.java

@ -0,0 +1,28 @@
package com.epmet.resi.group.dto.act.result;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 001活动类别列表 返参
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/19 13:14
*/
@Data
public class ActMenuResultDTO implements Serializable {
private static final long serialVersionUID = 7376609450780826924L;
/**
* 活动应参加人数
*/
private Integer shouldAttend;
/**
* 一级菜单列表
*/
private List<CategoryDTO> categoryList;
}

33
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActSummaryDetailResultDTO.java

@ -0,0 +1,33 @@
package com.epmet.resi.group.dto.act.result;
import lombok.Data;
import java.util.List;
/**
* 014查看活动总结详情
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/21 14:17
*/
@Data
public class ActSummaryDetailResultDTO extends ActSummaryTemplateResultDTO{
private static final long serialVersionUID = -6918035750154831223L;
/**
* 活动总结id
*/
private String actSummaryId;
/**
* 补充内容列表
*/
private List<String> extraTextList;
/**
* 补充图片列表
*/
private List<String> extraImgList;
}

79
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActSummaryTemplateResultDTO.java

@ -0,0 +1,79 @@
package com.epmet.resi.group.dto.act.result;
import com.fasterxml.jackson.annotation.JsonFormat;
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 {
/**
* 小组活动id
*/
private String groupActId;
/**
* 活动标题
*/
private String title;
/**
* 标签名称 支部建设-三会一课
*/
private String allCategoryName;
/**
* 活动时间yyyy-MM-dd HH:mm
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date startTime;
/**
* 活动地点
*/
private String address;
/**
* 应参加人数
*/
private Integer shouldAttend;
/**
* 已签到人数
*/
private Integer signedInNum;
/**
* 签到人员名单分隔开
*/
private String signedInUsers;
/**
* 活动内容
*/
private List<String> textList;
/**
* 活动图片
*/
private List<String> imgList;
/**
* 是否填写总结1已填写0未填写
*/
private Integer summaryFlag;
/**
* 签到用户id
*/
private List<String> signedInUserIds;
}

24
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CategoryCodeResultDTO.java

@ -0,0 +1,24 @@
package com.epmet.resi.group.dto.act.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 002活动类别下拉框查询 返参
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/19 14:18
*/
@Data
public class CategoryCodeResultDTO implements Serializable {
private static final long serialVersionUID = 8615713807759844661L;
@JsonIgnore
private String customerId;
private String categoryCode;
private String categoryName;
private String parentCode;
private List<CategoryCodeResultDTO> children;
}

18
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CategoryDTO.java

@ -0,0 +1,18 @@
package com.epmet.resi.group.dto.act.result;
import lombok.Data;
import java.io.Serializable;
/**
* 001活动类别列表 返参-一级类别信息
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/19 13:28
*/
@Data
public class CategoryDTO implements Serializable {
private String menuCode;
private String categoryName;
private String parentCode;
}

30
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CommentResultDTO.java

@ -0,0 +1,30 @@
package com.epmet.resi.group.dto.act.result;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 006活动评论列表查询
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/20 12:58
*/
@Data
public class CommentResultDTO implements Serializable {
private static final long serialVersionUID = 6487668038520643604L;
private String commentId;
private String commentContent;
private String commentUserHeadPhoto;
private String commentUserName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date commentTime;
private String commentUserId;
}

21
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/SetSignTimeResultDTO.java

@ -0,0 +1,21 @@
package com.epmet.resi.group.dto.act.result;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 010设置修改签到时间,生成签到码
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/20 13:46
*/
@Data
public class SetSignTimeResultDTO implements Serializable {
private static final long serialVersionUID = -7444245554430563944L;
private String groupActId;
private Date signInStartTime;
private Date signInEndTime;
}

31
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/SignInRecResultDTO.java

@ -0,0 +1,31 @@
package com.epmet.resi.group.dto.act.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 009签到记录列表
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/20 15:43
*/
@Data
public class SignInRecResultDTO implements Serializable {
private static final long serialVersionUID = -2847848186325667663L;
private Integer signedInNum;
private Integer shouldAttend;
private List<SignInDetail> list;
@NoArgsConstructor
@Data
public static class SignInDetail {
private String signUserId;
private String signUserName;
private Date signInTime;
private String signInAddress;
}
}

2
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java

@ -1,6 +1,7 @@
package com.epmet.resi.group.dto.comment.result;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@ -40,6 +41,7 @@ public class ResiCommentResultDTO implements Serializable {
/**
* 用户Id 评论者Id
* */
@JsonIgnore
private String userId;
/**

107
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupMessageDTO.java

@ -0,0 +1,107 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.group;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 组内消息(话题通知活动)记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-22
*/
@Data
public class GroupMessageDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* 网格id
*/
private String gridId;
private String groupId;
/**
* 话题topic; 通知notice; 活动act
*/
private String type;
/**
* 话题id , 通知id,活动id
*/
private String messageId;
/**
* 发布人用户id
*/
private String publishUserId;
/**
* 话题状态讨论中 - discussing 已屏蔽 - hidden 已关闭 - closed
* 活动状态已发布published;已取消canceled已变更changed已关闭closed
* 通知已发布published
*/
private String status;
/**
* 逻辑删除标识
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
private Date operateTime;
}

4
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java

@ -115,4 +115,8 @@ Ps: 如果一个小组被拒绝,当前小组的状态将永久停留在“审
*/
private Date updatedTime;
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
}

5
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java

@ -56,6 +56,11 @@ public class ResiGroupInfoRedisDTO implements Serializable{
* */
private String latestTopicPublishDate;
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
/**
* 组统计信息
* */

101
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupSetupDTO.java

@ -0,0 +1,101 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.group;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 建组设置
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-20
*/
@Data
public class ResiGroupSetupDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户ID,初始默认为default
*/
private String customerId;
/**
* 默认小组头像
*/
private String logo;
/**
* 小组名称
*/
private String name;
/**
* 小组简介
*/
private String describe;
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
/**
* 专用dedicated常用common_used
*/
private String category;
/**
* 删除标记 0未删除1已删除
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

39
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/AllGroupListFormDTO.java

@ -0,0 +1,39 @@
package com.epmet.resi.group.dto.group.form;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Author sun
* @Description 所有小组查询-接口入参
*/
@Data
public class AllGroupListFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 网格Id
*/
@NotBlank(message = "网格Id不能为空", groups = {AllGroupListFormDTO.GroupList.class})
private String gridId;
/**
* 请求页码
*/
@Min(1)
private int pageNo = 1;
/**
* 每页多少条数据
*/
private int pageSize = 20;
/**
* token中用户Id
*/
private String userId;
public interface GroupList {
}
}

8
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java

@ -2,6 +2,7 @@ package com.epmet.resi.group.dto.group.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@ -39,12 +40,14 @@ public class ApplyCreateGroupFormDTO implements Serializable {
* 小组名称
*/
@NotBlank(message = "小组名称不能为空", groups = {AddUserShowGroup.class})
@Length(max = 20, message = "小组名称不能超过20个字符",groups = {AddUserShowGroup.class})
private String groupName;
/**
* 群介绍
*/
@NotBlank(message = "群介绍不能为空", groups = {AddUserShowGroup.class})
@Length(max = 500, message = "群介绍不能超过500个字符",groups = {AddUserShowGroup.class})
private String groupIntroduction;
/**
@ -69,4 +72,9 @@ public class ApplyCreateGroupFormDTO implements Serializable {
* 小组是否允许参观:允许open;不允许closed
*/
private String visitSwitch;
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
}

2
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java

@ -29,7 +29,7 @@ public class EditGroupFormDTO {
private String groupHeadPhoto;
@NotBlank(message = "组名称不能为空", groups = { SubmitGroupEditVG.class })
@Length(max = 10, message = "组名称长度不能超过10个字", groups = { SubmitGroupEditVG.class })
@Length(max = 20, message = "组名称长度不能超过20个字", groups = { SubmitGroupEditVG.class })
private String groupName;
@NotBlank(message = "组介绍不能为空", groups = { SubmitGroupEditVG.class })

41
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/MemExitGroupFormDTO.java

@ -0,0 +1,41 @@
package com.epmet.resi.group.dto.group.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 组员自主退群
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/30 15:06
*/
@Data
public class MemExitGroupFormDTO implements Serializable {
private static final long serialVersionUID = 3614704443675949069L;
public interface AddUserInternalGroup {
}
/**
* 小组ID
*/
@NotBlank(message = "小组Id不能为空", groups = AddUserInternalGroup.class)
private String groupId;
/**
* 当前客户id
*/
@NotBlank(message = "tokenDto获取customerId不能为空", groups = AddUserInternalGroup.class)
private String customerId;
/**
* 当前用户id
*/
@NotBlank(message = "tokenDto获取userId不能为空", groups = AddUserInternalGroup.class)
private String userId;
}

50
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java

@ -0,0 +1,50 @@
package com.epmet.resi.group.dto.group.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author sun
* @Description 所有小组查询-接口返参
*/
@Data
public class AllGroupListResultDTO implements Serializable {
private static final long serialVersionUID = -155229599412911489L;
/**
* 群组id
*/
private String groupId;
/**
* 群组头像
*/
private String groupHeadPhoto;
/**
* 群组名称
*/
private String groupName;
/**
* 成员总数
*/
private Integer totalMember;
/**
* 党员总数
*/
private Integer totalPartyMember;
/**
* under_auditting审核中rejected已拒绝的前端显示加入
*/
private String status="";
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
}

5
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupResultDTO.java

@ -45,6 +45,9 @@ public class ApplyingGroupResultDTO implements Serializable{
* */
private String messageText;
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
}

5
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CreatedResultDTO.java

@ -41,4 +41,9 @@ public class CreatedResultDTO implements Serializable {
* 审核通过 - approved 审核中 - under_auditting 审核未通过 - rejected 已屏蔽 - hidden 已关闭 - closed
*/
private String groupState;
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
}

40
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupTypeListResultDTO.java

@ -0,0 +1,40 @@
package com.epmet.resi.group.dto.group.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
public class GroupTypeListResultDTO {
/**
* 专用小组
*/
private List<SetUp> dedicatedGroup;
/**
* 常用小组
*/
private List<SetUp> commonUsedGroup;
@NoArgsConstructor
@Data
public static class SetUp {
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
/**
* 默认头像地址
*/
private String defaultGroupHead;
/**
* 小组介绍
*/
private String introduction;
/**
* 小组名称
*/
private String groupTypeName;
}
}

5
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupsInGridResultDTO.java

@ -38,4 +38,9 @@ public class GroupsInGridResultDTO implements Serializable {
* 当前状态审核通过 - approved 审核中 - under_auditting 审核未通过 - rejected 已屏蔽 - hidden 已关闭 - closed
*/
private String status;
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
}

5
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/MyGroupResultDTO.java

@ -52,4 +52,9 @@ public class MyGroupResultDTO implements Serializable {
* 最新话题
*/
private LatestTopicDTO latestTopic;
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
}

5
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java

@ -43,4 +43,9 @@ public class RecommendGroupResultDTO implements Serializable {
*/
private String status="";
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
private String groupType;
}

2
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/TopicInfoResultDTO.java

@ -47,6 +47,8 @@ public class TopicInfoResultDTO implements Serializable {
*/
private String topicPublishMobile;
private String groupId;
@JsonIgnore
private String topicUserId;

28
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/UserReadFlagResultDTO.java

@ -0,0 +1,28 @@
package com.epmet.resi.group.dto.group.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2021/4/21 上午9:43
* @DESC
*/
@Data
public class UserReadFlagResultDTO implements Serializable {
private static final long serialVersionUID = -5727870985731706332L;
/**
* 活动通知 ID
*/
private String id;
private String userId;
/**
* 阅读状态read已读un_read未读
*/
private String readFlag;
}

26
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/UserUnReadResultDTO.java

@ -0,0 +1,26 @@
package com.epmet.resi.group.dto.group.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2021/4/21 上午9:43
* @DESC
*/
@Data
public class UserUnReadResultDTO implements Serializable {
private static final long serialVersionUID = -5727870085731706332L;
/**
* 活动通知 ID
*/
private String id;
/**
* 未读数量
*/
private Integer unRead;
}

107
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/InvitationRecordDTO.java

@ -0,0 +1,107 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.invitation;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 分享记录(话题通知...后续支持增加)
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-16
*/
@Data
public class InvitationRecordDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* 小组所属的网格id
*/
private String gridId;
/**
* 小组id
*/
private String groupId;
/**
* act:活动;notice:通知
*/
private String sourceType;
/**
* 活动id,或者通知id....
*/
private String sourceId;
/**
* 分享人id
*/
private String shareUserId;
/**
* 分享内容
*/
private String inviteContent;
/**
* 删除标识 0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

25
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java

@ -0,0 +1,25 @@
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;
/**
* token中用户Id
*/
private String userId;
public interface Invitation{}
}

33
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/ShareFormDTO.java

@ -0,0 +1,33 @@
package com.epmet.resi.group.dto.invitation.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Author sun
* @Description 小组通知活动分享-接口入参
*/
@Data
public class ShareFormDTO implements Serializable {
private static final long serialVersionUID = 7069116393380944951L;
/**
* 通知或活动Id
*/
@NotBlank(message="通知或活动Id不能为空",groups = {ShareFormDTO.Add.class})
private String id;
/**
* 类型(notice:通知 act:活动)
*/
@NotBlank(message = "类型(notice:通知 act:活动)不能为空",groups = {ShareFormDTO.UserShow.class})
private String type;
/**
* token中用户Id
*/
private String userId;
public interface Add{}
public interface UserShow extends CustomerClientShowGroup {}
}

44
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java

@ -0,0 +1,44 @@
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;
/**
* 当前人员是否在组内:yes不在组内no
*/
private String inGroup = "yes";
}

19
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/ShareResultDTO.java

@ -0,0 +1,19 @@
package com.epmet.resi.group.dto.invitation.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author sun
* @Description 小组通知活动分享-接口返参
*/
@Data
public class ShareResultDTO implements Serializable {
private static final long serialVersionUID = 6136787210623326830L;
/**
* 分享Id
*/
private String invitationRecordId;
}

4
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java

@ -17,9 +17,10 @@
package com.epmet.resi.group.dto.member;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
@ -102,4 +103,5 @@ public class ResiGroupMemberDTO implements Serializable {
* 客户Id
* */
private String customerId;
}

121
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeAttachmentDTO.java

@ -0,0 +1,121 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.notice;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 小组通知附件表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-19
*/
@Data
public class NoticeAttachmentDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户ID
*/
private String customerId;
/**
* 通知Id
*/
private String noticeId;
/**
* 文件名
*/
private String fileName;
/**
* 附件名uuid随机生成
*/
private String attachmentName;
/**
* 文件大小单位b
*/
private Integer attachmentSize;
/**
* 文件格式JPGPNGPDFJPEGBMPMP4WMAM4AMP3DOCDOCXXLS
*/
private String attachmentFormat;
/**
* 附件类型图片 - image 视频 - video 语音 - voice 文档 - doc
*/
private String attachmentType;
/**
* 附件地址
*/
private String attachmentUrl;
/**
* 排序字段
*/
private Integer sort;
/**
* 语音或视频时长
*/
private Integer duration;
/**
* 删除标记 0未删除1已删除
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

27
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/InvitationAccessRecordDTO.java → epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentDTO.java

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dataaggre.dto.resigroup;
package com.epmet.resi.group.dto.notice;
import java.io.Serializable;
import java.util.Date;
@ -23,13 +23,13 @@ import lombok.Data;
/**
* 邀请链接访问
* 小组通知评论
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-12-25
* @since v1.0.0 2021-04-19
*/
@Data
public class InvitationAccessRecordDTO implements Serializable {
public class NoticeCommentDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ -39,19 +39,19 @@ public class InvitationAccessRecordDTO implements Serializable {
private String id;
/**
* 邀请链接主键group_invitation.id
* 客户ID
*/
private String invitationId;
private String customerId;
/**
* 用户idcustomer_user.id
* 通知Id
*/
private String customerUserId;
private String noticeId;
/**
* 状态已浏览 - viewed 同意加入小组 - tried 成功入群 - success
* 评论内容(最多300字符)
*/
private String state;
private String commentContent;
/**
* 删除标记 0未删除1已删除
@ -64,7 +64,7 @@ public class InvitationAccessRecordDTO implements Serializable {
private Integer revision;
/**
* 创建人(用户id来源于customer_user.id)
* 创建人
*/
private String createdBy;
@ -83,9 +83,4 @@ public class InvitationAccessRecordDTO implements Serializable {
*/
private Date updatedTime;
/**
* 客户ID
*/
private String customerId;
}

116
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeDTO.java

@ -0,0 +1,116 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.notice;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 小组通知表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-19
*/
@Data
public class NoticeDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户ID
*/
private String customerId;
/**
* 组织机构Id
*/
private String agencyId;
/**
* 小组所属网格id
*/
private String gridId;
/**
* 小组Id
*/
private String groupId;
/**
* 通知标题
*/
private String title;
/**
* 通知内容
*/
private String content;
/**
* 是否变更过(:yes :no)
*/
private String isChange;
/**
* 通知变更时间初始值为首次创建时间
*/
private Date changeTime;
/**
* 通知过期时间(此时间需大于变更时间)
*/
private Date expirationTime;
/**
* 删除标记 0未删除1已删除
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

106
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java

@ -0,0 +1,106 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.notice;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 小组通知组成员阅读记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-04-19
*/
@Data
public class NoticeReadRecordDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户id
*/
private String customerId;
/**
* 小组所属网格id
*/
private String gridId;
/**
* 小组id
*/
private String groupId;
/**
* 通知Id
*/
private String noticeId;
/**
* 用户id
*/
private String userId;
/**
* (通知过期前的阅读状态)read已读un_read未读
*/
private String readFlag;
/**
* (通知过期后的阅读状态)已读:read未读:un_read;
*/
private String viewDetail;
/**
* 删除标识
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

62
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/AddNoticeFormDTO.java

@ -0,0 +1,62 @@
package com.epmet.resi.group.dto.notice.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
/**
* @Author sun
* @Description 小组通知保存-接口入参
*/
@Data
public class AddNoticeFormDTO {
/**
* 小组Id
*/
@NotBlank(message = "小组Id不能为空",groups = {AddNoticeFormDTO.Add.class})
private String groupId;
/**
* 通知标题
*/
@NotBlank(message = "通知标题不能为空",groups = {AddNoticeFormDTO.AddUserShow.class})
@Length(max = 20, message = "通知标题不能超过20个字符",groups = {AddNoticeFormDTO.AddUserShow.class})
private String title;
/**
* 通知内容
*/
@NotBlank(message = "通知内容不能为空",groups = {AddNoticeFormDTO.AddUserShow.class})
@Length(max = 1000, message = "通知内容不能超过1000个字符",groups = {AddNoticeFormDTO.AddUserShow.class})
private String content;
/**
* 通知过期时间(此时间需大于变更时间)
*/
@NotNull(message = "过期时间不能为空",groups = AddNoticeFormDTO.AddUserShow.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date expirationTime;
/**
* 图片附件集合
*/
private List<NoticeFileDTO> imageList;
/**
* 文件附件url集合
*/
private List<NoticeFileDTO> docList;
/**
* token中用户Id
*/
private String userId;
public interface Add{}
public interface AddUserShow extends CustomerClientShowGroup {}
}

62
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/EditNoticeFormDTO.java

@ -0,0 +1,62 @@
package com.epmet.resi.group.dto.notice.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
/**
* @Author sun
* @Description 小组通知编辑-接口入参
*/
@Data
public class EditNoticeFormDTO {
/**
* 通知Id
*/
@NotBlank(message = "通知Id不能为空",groups = {EditNoticeFormDTO.Edit.class})
private String noticeId;
/**
* 通知标题
*/
@NotBlank(message = "通知标题不能为空",groups = {EditNoticeFormDTO.EditUserShow.class})
@Length(max = 20, message = "通知标题不能超过20个字符",groups = {EditNoticeFormDTO.EditUserShow.class})
private String title;
/**
* 通知内容
*/
@NotBlank(message = "通知内容不能为空",groups = {EditNoticeFormDTO.EditUserShow.class})
@Length(max = 1000, message = "通知内容不能超过1000个字符",groups = {EditNoticeFormDTO.EditUserShow.class})
private String content;
/**
* 通知过期时间(此时间需大于变更时间)
*/
@NotNull(message = "过期时间不能为空",groups = AddNoticeFormDTO.AddUserShow.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date expirationTime;
/**
* 图片附件集合
*/
private List<NoticeFileDTO> imageList;
/**
* 文件附件url集合
*/
private List<NoticeFileDTO> docList;
/**
* token中用户Id
*/
private String userId;
public interface Edit{}
public interface EditUserShow extends CustomerClientShowGroup {}
}

35
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java

@ -0,0 +1,35 @@
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;
import javax.validation.constraints.NotBlank;
/**
* @Author sun
* @Description 小组通知编辑-接口入参
*/
@Data
public class NoticeCommentFormDTO {
/**
* 通知Id
*/
@NotBlank(message = "通知Id不能为空",groups = {NoticeCommentFormDTO.Comment.class})
private String noticeId;
/**
* 评论内容300
*/
@NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class})
@Length(max = 20, message = "评论内容不能超过300个字符",groups = {NoticeCommentFormDTO.UserShow.class})
private String commentContent;
/**
* token中用户Id
*/
private String userId;
public interface Comment{}
public interface UserShow extends CustomerClientShowGroup {}
}

33
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentListFormDTO.java

@ -0,0 +1,33 @@
package com.epmet.resi.group.dto.notice.form;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Author sun
* @Description 通知评论列表查询-接口入参
*/
@Data
public class NoticeCommentListFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 通知Id
*/
@NotBlank(message = "通知Id不能为空",groups = {NoticeCommentListFormDTO.CommentList.class})
private String noticeId;
/**
* 请求页码
* */
@Min(1)
private int pageNo = 1;
/**
* 每页多少条数据
* */
private int pageSize = 20;
public interface CommentList{}
}

21
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeDetailFormDTO.java

@ -0,0 +1,21 @@
package com.epmet.resi.group.dto.notice.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author sun
* @Description 小组通知详情-接口入参
*/
@Data
public class NoticeDetailFormDTO {
/**
* 通知Id
*/
@NotBlank(message = "通知Id不能为空",groups = {NoticeDetailFormDTO.Detail.class})
private String noticeId;
public interface Detail{}
}

23
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeFileDTO.java

@ -0,0 +1,23 @@
package com.epmet.resi.group.dto.notice.form;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Author sun
* @Description 小组通知保存变更-接口入参
*/
@NoArgsConstructor
@Data
public class NoticeFileDTO implements Serializable {
private static final long serialVersionUID = -3930520724652521552L;
private String name;
private String url;
private String type;
private String format;
private Integer size;
private Integer duration;
}

21
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeReadListFormDTO.java

@ -0,0 +1,21 @@
package com.epmet.resi.group.dto.notice.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author sun
* @Description 通知已读未读列表查询-接口入参
*/
@Data
public class NoticeReadListFormDTO {
/**
* 通知Id
*/
@NotBlank(message = "通知Id不能为空",groups = {NoticeReadListFormDTO.List.class})
private String noticeId;
public interface List{}
}

26
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/ReadTypeFormDTO.java

@ -0,0 +1,26 @@
package com.epmet.resi.group.dto.notice.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author sun
* @Description 通知已读未读列表查询-接口入参
*/
@Data
public class ReadTypeFormDTO {
/**
* 通知Id
*/
@NotBlank(message = "通知Id不能为空",groups = {ReadTypeFormDTO.Read.class})
private String noticeId;
/**
* token中用户Id
*/
private String userId;
public interface Read{}
}

24
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/UnReadListFormDTO.java

@ -0,0 +1,24 @@
package com.epmet.resi.group.dto.notice.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2021/4/21 下午4:17
* @DESC
*/
@Data
public class UnReadListFormDTO implements Serializable {
private static final long serialVersionUID = 2312033892813352767L;
public interface UnReadListForm{}
@NotBlank(message = "小组ID不能为空",groups = UnReadListForm.class)
private String groupId;
private String userId;
}

45
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeCommentListResultDTO.java

@ -0,0 +1,45 @@
package com.epmet.resi.group.dto.notice.result;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Author sun
* @Description 通知评论列表查询-接口返参
*/
@Data
public class NoticeCommentListResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 评论Id
* */
private String noticeCommentId;
/**
* 评论内容
* */
private String commentContent;
/**
* 评论者头像
* */
private String commentUserHeadPhoto;
/**
* 评论者姓名
* */
private String commentUserName;
/**
* 评论时间 yyyy-MM-dd HH:mm
* */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date commentTime;
/**
* 用户Id 评论者Id
* */
private String userId;
}

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save