Merge branches 'dev_group_msg' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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

@@ -26,8 +26,8 @@ public class CommentFormDTO implements Serializable {
     @NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
     private String groupActId;
 
-    @NotBlank(message = "评论内容不能为空", groups = AddUserShowGroup.class)
-    @Length(max = 500, message = "评论内容最多输入500字", groups = AddUserShowGroup.class)
+    //@NotBlank(message = "评论内容不能为空", groups = AddUserShowGroup.class)
+    @Length(max = 500, message = "评论内容最多输入500字")
     private String commentContent;
     /**
      * 图片附件集合

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

@@ -22,8 +22,8 @@ public class NoticeCommentFormDTO {
     /**
      * 评论内容300
      */
-    @NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class})
-    @Length(max = 300, message = "评论内容不能超过300个字符",groups = {NoticeCommentFormDTO.UserShow.class})
+    //@NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class})
+    @Length(max = 300, message = "评论内容不能超过300个字符")
     private String commentContent;
 
     /**

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java

@@ -21,7 +21,7 @@ public class ResiPublishCommentFormDTO implements Serializable {
    @NotBlank(message = "话题Id不能为空")
    private String topicId;
 
-   @NotBlank(message = "评论内容不能为空")
+   //@NotBlank(message = "评论内容不能为空")
    private String commentContent;
 
    /**

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

@@ -43,6 +43,7 @@ import com.epmet.resi.group.dto.act.result.CommentResultDTO;
 import com.epmet.resi.group.dto.group.result.CommentFileDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeFileDTO;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -89,6 +90,9 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void submitComment(CommentFormDTO formDTO) {
+        if(StringUtils.isBlank(formDTO.getCommentContent())&& org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getImageList())){
+            throw new RenException("请至少填写评论内容或上传评论图片！");
+        }
         //1、关闭和已取消不能评论
         GroupActInfoDTO groupActInfoDTO = groupActInfoService.getGroupActInfoDTO(formDTO.getGroupActId());
         if (GroupActConstant.CLOSED.equals(groupActInfoDTO.getStatus())) {

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

@@ -100,6 +100,9 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void noticeComment(NoticeCommentFormDTO formDTO) {
+        if(StringUtils.isBlank(formDTO.getCommentContent())&&CollectionUtils.isEmpty(formDTO.getImageList())){
+            throw new RenException("请至少填写评论内容或上传评论图片！");
+        }
         //1.内容安全校验
         String commentContent = formDTO.getCommentContent();
         if (StringUtils.isNotBlank(commentContent)) {

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@@ -198,6 +198,9 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result commentTopic(TokenDto tokenDto, ResiPublishCommentFormDTO resiCommentFormDTO) {
+        if(StringUtils.isBlank(resiCommentFormDTO.getCommentContent())&&CollectionUtils.isEmpty(resiCommentFormDTO.getImageList())){
+            throw new RenException("请至少填写评论内容或上传评论图片！");
+        }
         String commentContent = resiCommentFormDTO.getCommentContent();
         if (StringUtils.isNotBlank(commentContent)) {
             //评论话题内容审核