Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

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

@@ -176,7 +176,9 @@ public enum EpmetErrorCode {
 	//8910的msg动态赋值
 	GROUP_ACT_CAN_NOT_COMMENT(8910,"当前活动,不能评论"),
 	SIGN_IN_TIME_NOT_START(8911,"未到签到时间,不允许签到"),
-	SIGN_IN_TIME_PASSED(8912,"当前时间已超过签到时间");
+	SIGN_IN_TIME_PASSED(8912,"当前时间已超过签到时间"),
+	INVITATION_NOT_EXIST(8913,"链接不存在");
+
 
 	private int code;
 	private String msg;

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

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

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

@@ -0,0 +1,14 @@
+package com.epmet.resi.group.dto.act.result;
+
+import lombok.Data;
+
+/**
+ * 015、点击分享链接，查看活动详情
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/21 11:16
+ */
+@Data
+public class ActDetailByLinkResultDTO extends ActDetailResultDTO{
+    private String invitationRecordId;
+}

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

@@ -150,4 +150,14 @@ public class ActDetailResultDTO implements Serializable {
      * 已签到人数（有人签到自动+1）
      */
     private Integer signedInNum;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
 }

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

@@ -0,0 +1,29 @@
+package com.epmet.resi.group.dto.act.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 012、初始化活动总结模板
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/21 12:24
+ */
+@Data
+public class ActSummaryTemplateResultDTO implements Serializable {
+    private String groupActId;
+    private String title;
+    private String allCategoryName;
+    private Date startTime;
+    private String address;
+    private Integer shouldAttend;
+    private Integer signedInNum;
+    private String signedInUsers;
+    private List<String> textList;
+    private List<String> imgList;
+    private Integer summaryFlag;
+    private List<String> signedInUserIds;
+}

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

@@ -0,0 +1,21 @@
+package com.epmet.resi.group.dto.invitation.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author sun
+ * @Description 通知、活动分享Id查询数据-接口入参
+ */
+@Data
+public class GetInvitationFormDTO {
+
+    /**
+     * 分享Id
+     */
+    @NotBlank(message = "分享Id不能为空",groups = {GetInvitationFormDTO.Invitation.class})
+    private String invitationRecordId;
+
+    public interface Invitation{}
+}

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

@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.invitation.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -20,7 +21,7 @@ public class ShareFormDTO implements Serializable {
 	/**
 	 * 类型(notice:通知  act:活动)
 	 */
-	@NotBlank(message = "类型(notice:通知  act:活动)不能为空",groups = {ShareFormDTO.Add.class})
+	@NotBlank(message = "类型(notice:通知  act:活动)不能为空",groups = {ShareFormDTO.UserShow.class})
 	private String type;
 	/**
 	 * token中用户Id
@@ -28,4 +29,5 @@ public class ShareFormDTO implements Serializable {
 	private String userId;
 
 	public interface Add{}
+	public interface UserShow extends CustomerClientShowGroup {}
 }

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

@@ -0,0 +1,40 @@
+package com.epmet.resi.group.dto.invitation.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 通知、活动分享Id查询数据-接口返参
+ */
+@Data
+public class GetInvitationResultDTO implements Serializable {
+	private static final long serialVersionUID = 6136787210623326830L;
+
+	/**
+	 * 客户Id
+	 */
+	private String customerId;
+	/**
+	 * 网格Id
+	 */
+	private String gridId;
+	/**
+	 * 小组Id
+	 */
+	private String groupId;
+	/**
+	 * 通知或活动Id
+	 */
+	private String sourceId;
+	/**
+	 * notice:通知  act:活动
+	 */
+	private String sourceType;
+	/**
+	 * notice:通知  act:活动
+	 */
+	private String shareUserId;
+
+}

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

@@ -64,7 +64,7 @@ public class NoticeReadRecordDTO implements Serializable {
 	private String userId;
 
     /**
-     * read已读、unread未读
+     * read已读、un_read未读
      */
 	private String readFlag;
 

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

@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.notice.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.epmet.resi.group.dto.topic.form.FileDTO;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
@@ -22,14 +23,14 @@ public class AddNoticeFormDTO {
     /**
      * 通知标题
      */
-    @NotBlank(message = "通知标题不能为空",groups = {AddNoticeFormDTO.Add.class})
-    @Length(max = 20, message = "通知标题不能超过20个字符")
+    @NotBlank(message = "通知标题不能为空",groups = {AddNoticeFormDTO.AddUserShow.class})
+    @Length(max = 20, message = "通知标题不能超过20个字符",groups = {AddNoticeFormDTO.AddUserShow.class})
     private String title;
     /**
      * 通知内容
      */
-    @NotBlank(message = "通知内容不能为空",groups = {AddNoticeFormDTO.Add.class})
-    @Length(max = 1000, message = "通知内容不能超过1000个字符")
+    @NotBlank(message = "通知内容不能为空",groups = {AddNoticeFormDTO.AddUserShow.class})
+    @Length(max = 1000, message = "通知内容不能超过1000个字符",groups = {AddNoticeFormDTO.AddUserShow.class})
     private String content;
     /**
      * 图片附件集合
@@ -41,4 +42,5 @@ public class AddNoticeFormDTO {
     private List<FileDTO> docList;
 
     public interface Add{}
+    public interface AddUserShow extends CustomerClientShowGroup {}
 }

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

@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.notice.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.epmet.resi.group.dto.topic.form.FileDTO;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
@@ -22,12 +23,12 @@ public class EditNoticeFormDTO {
     /**
      * 通知标题
      */
-    @Length(max = 20, message = "通知标题不能超过20个字符")
+    @Length(max = 20, message = "通知标题不能超过20个字符",groups = {EditNoticeFormDTO.EditUserShow.class})
     private String title;
     /**
      * 通知内容
      */
-    @Length(max = 1000, message = "通知内容不能超过1000个字符")
+    @Length(max = 1000, message = "通知内容不能超过1000个字符",groups = {EditNoticeFormDTO.EditUserShow.class})
     private String content;
     /**
      * 图片附件集合
@@ -39,4 +40,5 @@ public class EditNoticeFormDTO {
     private List<FileDTO> docList;
 
     public interface Edit{}
+    public interface EditUserShow extends CustomerClientShowGroup {}
 }

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

@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.notice.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -20,9 +21,10 @@ public class NoticeCommentFormDTO {
     /**
      * 评论内容300
      */
-    @NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.Comment.class})
-    @Length(max = 20, message = "评论内容不能超过300个字符")
+    @NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class})
+    @Length(max = 20, message = "评论内容不能超过300个字符",groups = {NoticeCommentFormDTO.UserShow.class})
     private String commentContent;
 
     public interface Comment{}
+    public interface UserShow extends CustomerClientShowGroup {}
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java

@@ -17,8 +17,14 @@
 
 package com.epmet.modules.act.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.modules.act.service.ActSummaryService;
+import com.epmet.resi.group.dto.act.form.InitTemplateFormDTO;
+import com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -32,9 +38,20 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("actsummary")
 public class ActSummaryController {
-    
+
     @Autowired
     private ActSummaryService actSummaryService;
 
-
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO>
+     * @author yinzuomei
+     * @description 012、初始化活动总结模板
+     * @Date 2021/4/21 12:30
+     **/
+    @PostMapping("inittem")
+    public Result<ActSummaryTemplateResultDTO> initTemplate(@RequestBody InitTemplateFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, InitTemplateFormDTO.class);
+        return new Result<ActSummaryTemplateResultDTO>().ok(actSummaryService.initTemplate(formDTO));
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java

@@ -23,10 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.modules.act.service.GroupActInfoService;
 import com.epmet.resi.group.dto.act.GroupActIdDTO;
-import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
-import com.epmet.resi.group.dto.act.form.ActReadViewFormDTO;
-import com.epmet.resi.group.dto.act.form.CancelActFormDTO;
-import com.epmet.resi.group.dto.act.form.PublishGroupActFormDTO;
+import com.epmet.resi.group.dto.act.form.*;
+import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO;
 import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -108,4 +106,20 @@ public class GroupActInfoController {
         ValidatorUtils.validateEntity(formDTO,CancelActFormDTO.AddUserShowGroup.class,CancelActFormDTO.AddUserInternalGroup.class);
         return new Result<GroupActIdDTO>().ok(groupActInfoService.cancelAct(formDTO));
     }
+
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO>
+     * @param tokenDto
+     * @param formDTO
+     * @author yinzuomei
+     * @description 015、点击分享链接，查看活动详情
+     * @Date 2021/4/21 11:17
+     **/
+    @PostMapping("actdetailbylink")
+    public Result<ActDetailByLinkResultDTO> queryActDetailByLink(@LoginUser TokenDto tokenDto, @RequestBody ActDetailByLinkFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ActDetailByLinkFormDTO.AddUserInternalGroup.class);
+        return new Result<ActDetailByLinkResultDTO>().ok(groupActInfoService.queryActDetailByLink(formDTO));
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java

@@ -58,4 +58,12 @@ public interface ActSignInRecordDao extends BaseDao<ActSignInRecordEntity> {
      * @return com.epmet.modules.act.entity.ActSignInRecordEntity
      */
     ActSignInRecordEntity queryActSignInRecord(@Param("groupActId") String groupActId, @Param("signUserId")String signUserId);
+
+    /**
+     * 查询已签到人员id
+     *
+     * @param groupActId
+     * @return String
+     */
+    List<String> selectUserIds(String groupActId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java

@@ -19,6 +19,8 @@ package com.epmet.modules.act.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.modules.act.entity.ActSummaryEntity;
+import com.epmet.resi.group.dto.act.form.InitTemplateFormDTO;
+import com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO;
 
 /**
  * 活动总结
@@ -27,4 +29,12 @@ import com.epmet.modules.act.entity.ActSummaryEntity;
  * @since v1.0.0 2021-04-16
  */
 public interface ActSummaryService extends BaseService<ActSummaryEntity> {
+
+    /**
+     * 012、初始化活动总结模板
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO
+     */
+    ActSummaryTemplateResultDTO initTemplate(InitTemplateFormDTO formDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java

@@ -21,10 +21,8 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.modules.act.entity.GroupActInfoEntity;
 import com.epmet.resi.group.dto.act.GroupActIdDTO;
 import com.epmet.resi.group.dto.act.GroupActInfoDTO;
-import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
-import com.epmet.resi.group.dto.act.form.ActReadViewFormDTO;
-import com.epmet.resi.group.dto.act.form.CancelActFormDTO;
-import com.epmet.resi.group.dto.act.form.PublishGroupActFormDTO;
+import com.epmet.resi.group.dto.act.form.*;
+import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO;
 import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO;
 
@@ -75,4 +73,12 @@ public interface GroupActInfoService extends BaseService<GroupActInfoEntity> {
      * @return com.epmet.resi.group.dto.act.GroupActInfoDTO
      */
     GroupActInfoDTO getGroupActInfoDTO(String groupActId);
+
+    /**
+     * 015、点击分享链接，查看活动详情
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO
+     */
+    ActDetailByLinkResultDTO queryActDetailByLink(ActDetailByLinkFormDTO formDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java

@@ -18,18 +18,77 @@
 package com.epmet.modules.act.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.modules.act.dao.ActSignInRecordDao;
 import com.epmet.modules.act.dao.ActSummaryDao;
+import com.epmet.modules.act.dao.GroupActContentDao;
+import com.epmet.modules.act.dao.GroupActInfoDao;
 import com.epmet.modules.act.entity.ActSummaryEntity;
+import com.epmet.modules.act.entity.GroupActInfoEntity;
 import com.epmet.modules.act.service.ActSummaryService;
+import com.epmet.modules.constant.GroupActConstant;
+import com.epmet.resi.group.dto.act.form.InitTemplateFormDTO;
+import com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 活动总结
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-04-16
  */
+@Slf4j
 @Service
 public class ActSummaryServiceImpl extends BaseServiceImpl<ActSummaryDao, ActSummaryEntity> implements ActSummaryService {
+    @Autowired
+    private GroupActInfoDao groupActInfoDao;
+    @Autowired
+    private GroupActContentDao groupActContentDao;
+    @Autowired
+    private ActSignInRecordDao actSignInRecordDao;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
+    /**
+     * 012、初始化活动总结模板
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.ActSummaryTemplateResultDTO
+     */
+    @Override
+    public ActSummaryTemplateResultDTO initTemplate(InitTemplateFormDTO formDTO) {
+        GroupActInfoEntity groupActInfoEntity=groupActInfoDao.selectById(formDTO.getGroupActId());
+        if(null==groupActInfoEntity){
+            throw new RenException(String.format("根据groupActId:%s,查询活动信息为null",formDTO.getGroupActId()));
+        }
+        ActSummaryTemplateResultDTO resultDTO= ConvertUtils.sourceToTarget(groupActInfoEntity,ActSummaryTemplateResultDTO.class);
+        resultDTO.setTextList(groupActContentDao.selectContentList(formDTO.getGroupActId(), GroupActConstant.TEXT));
+        resultDTO.setImgList(groupActContentDao.selectContentList(formDTO.getGroupActId(),GroupActConstant.IMG));
+        List<String> signedInUserIds=actSignInRecordDao.selectUserIds(formDTO.getGroupActId());
+        resultDTO.setSignedInUserIds(signedInUserIds);
+        if(CollectionUtils.isNotEmpty(signedInUserIds)){
+            Result<List<UserBaseInfoResultDTO>> result = epmetUserOpenFeignClient.queryUserBaseInfo(signedInUserIds);
+            if (!result.success()) {
+                throw new RenException("调用user服务，获取用户基础数据失败");
+            }
+            result.getData().forEach(userBaseInfo->{
+                resultDTO.setSignedInUsers(userBaseInfo.getSurname().concat(userBaseInfo.getName()));
+            });
+        }else{
+            resultDTO.setSignedInUserIds(new ArrayList<>());
+            resultDTO.setSignedInUsers(StrConstant.EPMETY_STR);
+        }
+        return resultDTO;
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

@@ -19,6 +19,7 @@ package com.epmet.modules.act.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -33,8 +34,11 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
+import com.epmet.constant.ReadFlagConstant;
+import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.act.dao.ActOperationRecordDao;
@@ -49,16 +53,17 @@ import com.epmet.modules.act.service.ActCategoryDictService;
 import com.epmet.modules.act.service.ActSignInRecordService;
 import com.epmet.modules.act.service.GroupActInfoService;
 import com.epmet.modules.constant.GroupActConstant;
+import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.group.service.ResiGroupService;
+import com.epmet.modules.invitation.service.InvitationRecordService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.resi.group.dto.act.GroupActIdDTO;
 import com.epmet.resi.group.dto.act.GroupActInfoDTO;
-import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
-import com.epmet.resi.group.dto.act.form.ActReadViewFormDTO;
-import com.epmet.resi.group.dto.act.form.CancelActFormDTO;
-import com.epmet.resi.group.dto.act.form.PublishGroupActFormDTO;
+import com.epmet.resi.group.dto.act.form.*;
+import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO;
 import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
+import com.epmet.resi.group.dto.invitation.InvitationRecordDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -108,6 +113,11 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private ActSignInRecordService actSignInRecordService;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private InvitationRecordService invitationRecordService;
+
     /**
      * 003、发布（编辑）组织活动
      *
@@ -145,11 +155,13 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         //构造活动内容表
         List<GroupActContentEntity> contentList = constructText(groupActInfoEntity.getId(), formDTO.getCustomerId(), formDTO.getTextList());
         List<GroupActContentEntity> imgList = constructImg(groupActInfoEntity.getId(), formDTO.getCustomerId(), formDTO.getImgList());
+        List<ResiGroupMemberDTO> memberDTOList=resiGroupMemberService.getMemberList(formDTO.getGroupId());
         List<ActReadRecordEntity> readRecordEntityList=constructReadRec(groupActInfoEntity.getId(),
                         formDTO.getCustomerId(),
                         formDTO.getGroupId(),
                         formDTO.getPublishUserId(),
-                        groupDTO.getGridId());
+                        groupDTO.getGridId(),
+                        memberDTOList);
         //2、插入活动内容
         contentList.forEach(textContentEntity->{
             groupActContentDao.insert(textContentEntity);
@@ -163,14 +175,44 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         readRecordEntityList.forEach(readRecordEntity->{
             actReadRecordDao.insert(readRecordEntity);
         });
+        //5、发送站内信
+        sendMessage(memberDTOList,formDTO,groupActInfoEntity,groupDTO);
 
         result.setGroupActId(groupActInfoEntity.getId());
         return result;
     }
 
-    private List<ActReadRecordEntity> constructReadRec(String groupActId, String customerId, String groupId,String publishUserId,String gridId) {
+    private void sendMessage(List<ResiGroupMemberDTO> memberDTOList, PublishGroupActFormDTO formDTO, GroupActInfoEntity groupActInfoEntity,ResiGroupDTO resiGroupDTO) {
+
+        List<UserMessageFormDTO> list = new ArrayList<>();
+        memberDTOList.forEach(memberDTO -> {
+            //不需要给当前操作人发送
+            if (!formDTO.getPublishUserId().equals(memberDTO.getCustomerUserId())) {
+                UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO();
+                userMessageFormDTO.setCustomerId(formDTO.getCustomerId());
+                userMessageFormDTO.setUserId(memberDTO.getCustomerUserId());
+                userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
+                userMessageFormDTO.setApp(AppClientConstant.APP_RESI);
+                userMessageFormDTO.setTitle(UserMessageConstant.GROUP_TITLE);
+                userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
+                if(StringUtils.isNotBlank(formDTO.getGroupActId())){
+                    // 活动修改后，站内信通知全组成员“您有一条小组消息   【某某小组】更新了********活动详情，请查看。
+                    userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.CHANGED_GROUP_ACT, resiGroupDTO.getGroupName(), groupActInfoEntity.getTitle()));
+                }else{
+                    // 活动发布，站内信通知全组成员“您有一条小组消息   【某某小组】发布了*******活动，请查看。
+                    userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.PUBLISH_GROUP_ACT, resiGroupDTO.getGroupName(), groupActInfoEntity.getTitle()));
+                }
+                list.add(userMessageFormDTO);
+            }
+        });
+        Result sendMessageRes = epmetMessageOpenFeignClient.saveUserMessageList(list);
+        if (!sendMessageRes.success()) {
+            log.warn("发布（编辑）组织活动,发送站内信异常");
+        }
+    }
+
+    private List<ActReadRecordEntity> constructReadRec(String groupActId, String customerId, String groupId,String publishUserId,String gridId,List<ResiGroupMemberDTO> memberDTOList) {
         List<ActReadRecordEntity> list=new ArrayList<>();
-        List<ResiGroupMemberDTO> memberDTOList=resiGroupMemberService.getMemberList(groupId);
         memberDTOList.forEach(memberDTO->{
             ActReadRecordEntity actReadRecordEntity=new ActReadRecordEntity();
             actReadRecordEntity.setCustomerId(customerId);
@@ -376,6 +418,10 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
     @Override
     public ActDetailResultDTO queryActDetail(ActDetailFormDTO formDTO) {
         GroupActInfoEntity groupActInfoEntity=baseDao.selectById(formDTO.getGroupActId());
+        if(null==groupActInfoEntity){
+            throw new RenException(String.format("根据groupActId:%s,查询活动信息为null",formDTO.getGroupActId()));
+        }
+        //当前内容仅允许组内成员查看
         ResiGroupMemberDTO resiGroupMemberDTO=resiGroupMemberService.getResiGroupMember(groupActInfoEntity.getGroupId(),formDTO.getUserId());
         if(null==resiGroupMemberDTO){
             throw new RenException(EpmetErrorCode.NOT_IN_GROUP_CAN_NOT_VIEW.getCode(), EpmetErrorCode.NOT_IN_GROUP_CAN_NOT_VIEW.getMsg());
@@ -385,7 +431,9 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         resultDTO.setTextList(groupActContentDao.selectContentList(formDTO.getGroupActId(),GroupActConstant.TEXT));
         resultDTO.setImgList(groupActContentDao.selectContentList(formDTO.getGroupActId(),GroupActConstant.IMG));
         resultDTO.setCanceledReason(GroupActConstant.CANCELED.equals(resultDTO.getStatus()) ? actOperationRecordDao.selectCanceledReason(formDTO.getGroupActId()) : StrConstant.EPMETY_STR);
+
         handleSignInDesc(resultDTO,formDTO.getUserId());
+
         resultDTO.setUserRole(resiGroupMemberDTO.getGroupLeaderFlag());
         // 有签到后不可以修改活动时间：true可以修改，false不可以，
         resultDTO.setStartTimeEditFlag(groupActInfoEntity.getSignedInNum()>NumConstant.ZERO?false:true);
@@ -589,12 +637,40 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         actOperationRecordEntity.setNote(formDTO.getReason());
         actOperationRecordDao.insert(actOperationRecordEntity);
 
-        baseDao.updateById(actInfoEntity);
+        //6、发送站内信
+        sendUserMessageForCancelAct(actInfoEntity,formDTO.getUserId());
+
         GroupActIdDTO resultDTO=new GroupActIdDTO();
         resultDTO.setGroupActId(formDTO.getGroupActId());
         return resultDTO;
     }
 
+    private void sendUserMessageForCancelAct(GroupActInfoEntity actInfoEntity,String currentUserId) {
+        ResiGroupDTO resiGroupDTO = resiGroupService.get(actInfoEntity.getGroupId());
+        if (null != resiGroupDTO) {
+            List<ResiGroupMemberDTO> memberDTOList = resiGroupMemberService.getMemberList(actInfoEntity.getGroupId());
+            List<UserMessageFormDTO> list = new ArrayList<>();
+            memberDTOList.forEach(memberDTO -> {
+                //不需要给当前操作人发送
+                if (!currentUserId.equals(memberDTO.getCustomerUserId())) {
+                    UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO();
+                    userMessageFormDTO.setCustomerId(actInfoEntity.getCustomerId());
+                    userMessageFormDTO.setUserId(memberDTO.getCustomerUserId());
+                    userMessageFormDTO.setGridId(actInfoEntity.getGridId());
+                    userMessageFormDTO.setApp(AppClientConstant.APP_RESI);
+                    userMessageFormDTO.setTitle(UserMessageConstant.GROUP_TITLE);
+                    userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
+                    userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.CANCEL_GROUP_ACT, resiGroupDTO.getGroupName(), actInfoEntity.getTitle()));
+                    list.add(userMessageFormDTO);
+                }
+            });
+            Result sendMessageRes = epmetMessageOpenFeignClient.saveUserMessageList(list);
+            if (!sendMessageRes.success()) {
+                log.warn("发布（编辑）组织活动,发送站内信异常");
+            }
+        }
+    }
+
     /**
      * 查询活动主信息
      *
@@ -605,4 +681,28 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
     public GroupActInfoDTO getGroupActInfoDTO(String groupActId) {
         return ConvertUtils.sourceToTarget(baseDao.selectById(groupActId), GroupActInfoDTO.class);
     }
+
+    /**
+     * 015、点击分享链接，查看活动详情
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO
+     */
+    @Override
+    public ActDetailByLinkResultDTO queryActDetailByLink(ActDetailByLinkFormDTO formDTO) {
+        InvitationRecordDTO invitationRecordDTO = invitationRecordService.get(formDTO.getInvitationRecordId());
+        if (null == invitationRecordDTO) {
+            log.warn("invitation_record is null  invitationRecordId=" + formDTO.getInvitationRecordId());
+            throw new RenException(EpmetErrorCode.INVITATION_NOT_EXIST.getCode(), EpmetErrorCode.INVITATION_NOT_EXIST.getMsg());
+        }
+        ActDetailFormDTO actDetailFormDTO = new ActDetailFormDTO();
+        actDetailFormDTO.setUserId(formDTO.getUserId());
+        actDetailFormDTO.setGroupActId(invitationRecordDTO.getSourceId());
+        //调用查看活动详情接口
+        ActDetailResultDTO actDetailResultDTO = queryActDetail(actDetailFormDTO);
+
+        ActDetailByLinkResultDTO resultDTO = ConvertUtils.sourceToTarget(actDetailResultDTO, ActDetailByLinkResultDTO.class);
+        resultDTO.setInvitationRecordId(formDTO.getInvitationRecordId());
+        return resultDTO;
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java

@@ -108,4 +108,16 @@ public interface UserMessageConstant {
      * 小组通知变更
      * */
     String GROUP_NOTICE_EDIT = "【%s】变更了%s通知，请查看。";
+
+    /**
+     * 【某某小组】更新了********活动详情，请查看。
+     * */
+    String CHANGED_GROUP_ACT="【%s】更新了%s活动详情，请查看。";
+
+    /**
+     * 【某某小组】发布了*******活动，请查看。
+     * */
+    String PUBLISH_GROUP_ACT="【%s】发布了%s活动，请查看。";
+
+    String CANCEL_GROUP_ACT="【%s】的%s活动已取消，请查看。";
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java

@@ -24,6 +24,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.modules.invitation.service.InvitationRecordService;
 import com.epmet.resi.group.dto.invitation.form.ShareFormDTO;
 import com.epmet.resi.group.dto.invitation.result.ShareResultDTO;
+import com.epmet.resi.group.dto.invitation.form.GetInvitationFormDTO;
+import com.epmet.resi.group.dto.invitation.result.GetInvitationResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -53,9 +55,21 @@ public class InvitationRecordController {
      **/
     @PostMapping(value = "share")
     public Result<ShareResultDTO> share(@LoginUser TokenDto tokenDto, @RequestBody ShareFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO, ShareFormDTO.Add.class);
+        ValidatorUtils.validateEntity(formDTO, ShareFormDTO.Add.class, ShareFormDTO.UserShow.class);
         formDTO.setUserId(tokenDto.getUserId());
         return new Result<ShareResultDTO>().ok(invitationRecordService.share(formDTO));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 通知、活动分享Id查询数据
+     **/
+    @PostMapping(value = "getinvitation")
+    public Result<GetInvitationResultDTO> getInvitation(@RequestBody GetInvitationFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GetInvitationFormDTO.Invitation.class);
+        return new Result<GetInvitationResultDTO>().ok(invitationRecordService.getInvitation(formDTO));
+    }
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java

@@ -19,7 +19,10 @@ package com.epmet.modules.invitation.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.modules.invitation.entity.InvitationRecordEntity;
+import com.epmet.resi.group.dto.invitation.InvitationRecordDTO;
+import com.epmet.resi.group.dto.invitation.form.GetInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.ShareFormDTO;
+import com.epmet.resi.group.dto.invitation.result.GetInvitationResultDTO;
 import com.epmet.resi.group.dto.invitation.result.ShareResultDTO;
 
 /**
@@ -37,4 +40,20 @@ public interface InvitationRecordService extends BaseService<InvitationRecordEnt
      * @Description 小组通知、活动分享
      **/
     ShareResultDTO share(ShareFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 通知、活动分享Id查询数据
+     **/
+    GetInvitationResultDTO getInvitation(GetInvitationFormDTO formDTO);
+
+    /**
+     * 根据主键查询
+     *
+     * @param id
+     * @return com.epmet.resi.group.dto.invitation.InvitationRecordDTO
+     */
+    InvitationRecordDTO get(String id);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java

@@ -19,6 +19,7 @@ package com.epmet.modules.invitation.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.modules.act.dao.GroupActInfoDao;
 import com.epmet.modules.act.entity.GroupActInfoEntity;
 import com.epmet.modules.invitation.dao.InvitationRecordDao;
@@ -26,7 +27,10 @@ import com.epmet.modules.invitation.entity.InvitationRecordEntity;
 import com.epmet.modules.invitation.service.InvitationRecordService;
 import com.epmet.modules.notice.dao.NoticeDao;
 import com.epmet.modules.notice.entity.NoticeEntity;
+import com.epmet.resi.group.dto.invitation.InvitationRecordDTO;
+import com.epmet.resi.group.dto.invitation.form.GetInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.ShareFormDTO;
+import com.epmet.resi.group.dto.invitation.result.GetInvitationResultDTO;
 import com.epmet.resi.group.dto.invitation.result.ShareResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -88,4 +92,32 @@ public class InvitationRecordServiceImpl extends BaseServiceImpl<InvitationRecor
 
         return resultDTO;
     }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 通知、活动分享Id查询数据
+     **/
+    @Override
+    public GetInvitationResultDTO getInvitation(GetInvitationFormDTO formDTO) {
+        //查询通知、活动分享表数据
+        InvitationRecordEntity entity = baseDao.selectById(formDTO.getInvitationRecordId());
+        if (null == entity) {
+            throw new RenException(String.format("根据分享Id查询数据失败，分享Id->", formDTO.getInvitationRecordId()));
+        }
+        GetInvitationResultDTO resultDTO = ConvertUtils.sourceToTarget(entity, GetInvitationResultDTO.class);
+        return resultDTO;
+    }
+
+    /**
+     * 根据主键查询
+     *
+     * @param id
+     * @return com.epmet.resi.group.dto.invitation.InvitationRecordDTO
+     */
+    @Override
+    public InvitationRecordDTO get(String id) {
+        return ConvertUtils.sourceToTarget(baseDao.selectById(id),InvitationRecordDTO.class);
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeCommentController.java

@@ -54,47 +54,6 @@ public class NoticeCommentController {
     @Autowired
     private NoticeCommentService noticeCommentService;
 
-    @GetMapping("page")
-    public Result<PageData<NoticeCommentDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<NoticeCommentDTO> page = noticeCommentService.page(params);
-        return new Result<PageData<NoticeCommentDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<NoticeCommentDTO> get(@PathVariable("id") String id){
-        NoticeCommentDTO data = noticeCommentService.get(id);
-        return new Result<NoticeCommentDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody NoticeCommentDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        noticeCommentService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody NoticeCommentDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        noticeCommentService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        noticeCommentService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<NoticeCommentDTO> list = noticeCommentService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, NoticeCommentExcel.class);
-    }
 
     /**
      * @param formDTO
@@ -104,7 +63,7 @@ public class NoticeCommentController {
      **/
     @PostMapping(value = "noticecomment")
     public Result noticeComment(@LoginUser TokenDto tokenDto, @RequestBody NoticeCommentFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO, NoticeCommentFormDTO.Comment.class);
+        ValidatorUtils.validateEntity(formDTO, NoticeCommentFormDTO.Comment.class, NoticeCommentFormDTO.UserShow.class);
         noticeCommentService.noticeComment(tokenDto, formDTO);
         return new Result();
     }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java

@@ -55,48 +55,12 @@ public class NoticeController {
     @Autowired
     private NoticeService noticeService;
 
-    @GetMapping("page")
-    public Result<PageData<NoticeDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<NoticeDTO> page = noticeService.page(params);
-        return new Result<PageData<NoticeDTO>>().ok(page);
-    }
-
     @GetMapping("{id}")
     public Result<NoticeDTO> get(@PathVariable("id") String id){
         NoticeDTO data = noticeService.get(id);
         return new Result<NoticeDTO>().ok(data);
     }
 
-    @PostMapping
-    public Result save(@RequestBody NoticeDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        noticeService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody NoticeDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        noticeService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        noticeService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<NoticeDTO> list = noticeService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, NoticeExcel.class);
-    }
-
     /**
      * @param formDTO
      * @return
@@ -105,7 +69,7 @@ public class NoticeController {
      **/
     @PostMapping(value = "add")
     public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddNoticeFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO, AddNoticeFormDTO.Add.class);
+        ValidatorUtils.validateEntity(formDTO, AddNoticeFormDTO.Add.class, AddNoticeFormDTO.AddUserShow.class);
         noticeService.add(tokenDto, formDTO);
         return new Result();
     }
@@ -118,7 +82,7 @@ public class NoticeController {
      **/
     @PostMapping(value = "edit")
     public Result edit(@LoginUser TokenDto tokenDto, @RequestBody EditNoticeFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO, EditNoticeFormDTO.Edit.class);
+        ValidatorUtils.validateEntity(formDTO, EditNoticeFormDTO.Edit.class, EditNoticeFormDTO.EditUserShow.class);
         noticeService.edit(tokenDto, formDTO);
         return new Result();
     }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java

@@ -54,48 +54,6 @@ public class NoticeReadRecordController {
     @Autowired
     private NoticeReadRecordService noticeReafdRecordService;
 
-    @GetMapping("page")
-    public Result<PageData<NoticeReadRecordDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<NoticeReadRecordDTO> page = noticeReafdRecordService.page(params);
-        return new Result<PageData<NoticeReadRecordDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<NoticeReadRecordDTO> get(@PathVariable("id") String id){
-        NoticeReadRecordDTO data = noticeReafdRecordService.get(id);
-        return new Result<NoticeReadRecordDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody NoticeReadRecordDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        noticeReafdRecordService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody NoticeReadRecordDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        noticeReafdRecordService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        noticeReafdRecordService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<NoticeReadRecordDTO> list = noticeReafdRecordService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, NoticeReadRecordExcel.class);
-    }
-
     /**
      * @param formDTO
      * @return

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java

@@ -33,7 +33,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("notice_reafd_record")
+@TableName("notice_read_record")
 public class NoticeReadRecordEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
@@ -64,7 +64,7 @@ public class NoticeReadRecordEntity extends BaseEpmetEntity {
 	private String userId;
 
     /**
-     * read已读、unread未读
+     * read已读、un_read未读
      */
 	private String readFlag;
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeCommentService.java

@@ -37,66 +37,6 @@ import java.util.Map;
  */
 public interface NoticeCommentService extends BaseService<NoticeCommentEntity> {
 
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<NoticeCommentDTO>
-     * @author generator
-     * @date 2021-04-19
-     */
-    PageData<NoticeCommentDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<NoticeCommentDTO>
-     * @author generator
-     * @date 2021-04-19
-     */
-    List<NoticeCommentDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return NoticeCommentDTO
-     * @author generator
-     * @date 2021-04-19
-     */
-    NoticeCommentDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-04-19
-     */
-    void save(NoticeCommentDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-04-19
-     */
-    void update(NoticeCommentDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2021-04-19
-     */
-    void delete(String[] ids);
-
     /**
      * @param formDTO
      * @return

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReadRecordService.java

@@ -37,66 +37,6 @@ import java.util.Map;
  */
 public interface NoticeReadRecordService extends BaseService<NoticeReadRecordEntity> {
 
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<NoticeReafdRecordDTO>
-     * @author generator
-     * @date 2021-04-19
-     */
-    PageData<NoticeReadRecordDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<NoticeReafdRecordDTO>
-     * @author generator
-     * @date 2021-04-19
-     */
-    List<NoticeReadRecordDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return NoticeReafdRecordDTO
-     * @author generator
-     * @date 2021-04-19
-     */
-    NoticeReadRecordDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-04-19
-     */
-    void save(NoticeReadRecordDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-04-19
-     */
-    void update(NoticeReadRecordDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2021-04-19
-     */
-    void delete(String[] ids);
-
     /**
      * @param formDTO
      * @return

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeService.java

@@ -38,26 +38,6 @@ import java.util.Map;
  */
 public interface NoticeService extends BaseService<NoticeEntity> {
 
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<NoticeDTO>
-     * @author generator
-     * @date 2021-04-19
-     */
-    PageData<NoticeDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<NoticeDTO>
-     * @author generator
-     * @date 2021-04-19
-     */
-    List<NoticeDTO> list(Map<String, Object> params);
-
     /**
      * 单条查询
      *
@@ -68,36 +48,6 @@ public interface NoticeService extends BaseService<NoticeEntity> {
      */
     NoticeDTO get(String id);
 
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-04-19
-     */
-    void save(NoticeDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-04-19
-     */
-    void update(NoticeDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2021-04-19
-     */
-    void delete(String[] ids);
-
     /**
      * @param formDTO
      * @return

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java

@@ -84,58 +84,6 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
 
-    @Override
-    public PageData<NoticeCommentDTO> page(Map<String, Object> params) {
-        IPage<NoticeCommentEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, NoticeCommentDTO.class);
-    }
-
-    @Override
-    public List<NoticeCommentDTO> list(Map<String, Object> params) {
-        List<NoticeCommentEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, NoticeCommentDTO.class);
-    }
-
-    private QueryWrapper<NoticeCommentEntity> getWrapper(Map<String, Object> params) {
-        String id = (String) params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<NoticeCommentEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public NoticeCommentDTO get(String id) {
-        NoticeCommentEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, NoticeCommentDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(NoticeCommentDTO dto) {
-        NoticeCommentEntity entity = ConvertUtils.sourceToTarget(dto, NoticeCommentEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(NoticeCommentDTO dto) {
-        NoticeCommentEntity entity = ConvertUtils.sourceToTarget(dto, NoticeCommentEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
     /**
      * @param formDTO
      * @return

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java

@@ -66,57 +66,6 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecor
     @Autowired
     private NoticeDao noticeDao;
 
-    @Override
-    public PageData<NoticeReadRecordDTO> page(Map<String, Object> params) {
-        IPage<NoticeReadRecordEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, NoticeReadRecordDTO.class);
-    }
-
-    @Override
-    public List<NoticeReadRecordDTO> list(Map<String, Object> params) {
-        List<NoticeReadRecordEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, NoticeReadRecordDTO.class);
-    }
-
-    private QueryWrapper<NoticeReadRecordEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<NoticeReadRecordEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public NoticeReadRecordDTO get(String id) {
-        NoticeReadRecordEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, NoticeReadRecordDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(NoticeReadRecordDTO dto) {
-        NoticeReadRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReadRecordEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(NoticeReadRecordDTO dto) {
-        NoticeReadRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReadRecordEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
 
     /**
      * @param formDTO

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java

@@ -114,58 +114,12 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     private NoticeReadRecordDao noticeReafdRecordDao;
 
 
-    @Override
-    public PageData<NoticeDTO> page(Map<String, Object> params) {
-        IPage<NoticeEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, NoticeDTO.class);
-    }
-
-    @Override
-    public List<NoticeDTO> list(Map<String, Object> params) {
-        List<NoticeEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, NoticeDTO.class);
-    }
-
-    private QueryWrapper<NoticeEntity> getWrapper(Map<String, Object> params) {
-        String id = (String) params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<NoticeEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
     @Override
     public NoticeDTO get(String id) {
         NoticeEntity entity = baseDao.selectById(id);
         return ConvertUtils.sourceToTarget(entity, NoticeDTO.class);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(NoticeDTO dto) {
-        NoticeEntity entity = ConvertUtils.sourceToTarget(dto, NoticeEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(NoticeDTO dto) {
-        NoticeEntity entity = ConvertUtils.sourceToTarget(dto, NoticeEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
     /**
      * @param formDTO
      * @return

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml

@@ -37,4 +37,16 @@
             AND acr.GROUP_ACT_ID = #{groupActId}
             AND acr.SIGN_USER_ID =#{signUserId}
     </select>
+
+    <!--    查询已签到人员id -->
+    <select id="selectUserIds" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT
+            acr.SIGN_USER_ID
+        FROM
+            act_sign_in_record acr
+        WHERE
+            acr.DEL_FLAG = '0'
+            AND acr.GROUP_ACT_ID = #{groupActId}
+            order by acr.CREATED_TIME asc
+    </select>
 </mapper>