Merge remote-tracking branch 'remotes/origin/dev' into release

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java

@@ -2,7 +2,6 @@ package com.epmet.commons.tools.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.StrConstant;
-import com.epmet.commons.tools.dto.form.DingTalkTextMsg;
 import com.epmet.commons.tools.exception.RenException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.CharEncoding;
@@ -38,9 +37,6 @@ public class ModuleUtils {
         String errorMessage = "Failure to connect " + serverName;
         String errorLog = errorMessage + "::[method]->{}::[params]->{}";
         log.error(errorLog, methodName, JSON.toJSONString(params));
-        DingdingMsgSender msgSender = new DingdingMsgSender();
-        DingTalkTextMsg dingTalkTextMsg = new DingTalkTextMsg();
-        msgSender.sendMsgAsync(dingTalkTextMsg);
         return new Result().error();
     }
 

epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.47
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.49
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.47</version>
+    <version>0.3.49</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java

@@ -157,6 +157,7 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
     public void evaluate(EvaluateFormDTO formDTO) {
         String comment = formDTO.getComment();
         //议题评论内容审核
+        if (StringUtils.isNotBlank(comment)) {
             TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
             TextTaskDTO taskDTO = new TextTaskDTO();
             taskDTO.setContent(comment);
@@ -171,6 +172,7 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
         IssueSatisfactionDetailEntity entity = new IssueSatisfactionDetailEntity();
         BeanUtils.copyProperties(formDTO,entity);
         InitEvaluationFormDTO initEvaluation = new InitEvaluationFormDTO();

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -362,6 +362,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Transactional(rollbackFor = Exception.class)
     public void closeIssue(CloseIssueFormDTO formDTO) {
 		//公开回复内容审核
+		if (StringUtils.isNotBlank(formDTO.getCloseReason())) {
 			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
 			TextTaskDTO taskDTO = new TextTaskDTO();
 			taskDTO.setContent(formDTO.getCloseReason());
@@ -374,6 +375,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 					throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
 				}
 			}
+		}
 
         Date date = new Date();
         //1:更新议题详情表数据
@@ -504,6 +506,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 	@Transactional(rollbackFor = Exception.class)
 	public void shiftProject(ShiftProjectFormDTO formDTO) {
 		//公开回复内容审核
+		if (StringUtils.isNotBlank(formDTO.getPublicReply())) {
 			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
 			TextTaskDTO taskDTO = new TextTaskDTO();
 			taskDTO.setContent(formDTO.getPublicReply());
@@ -516,6 +519,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 					throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
 				}
 			}
+		}
 
 		//因需要保证议题表中的转项目时间与创建项目时间一致 因此先新增项目数据再更新议题数据
 		//1:查询议题数据

epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.32
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.34
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

epmet-module/gov-project/gov-project-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.32</version>
+    <version>0.3.34</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -187,6 +187,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
     @Transactional(rollbackFor = Exception.class)
     public void transfer(TransferFormDTO formDTO) {
         //公开回复内容审核
+        if (StringUtils.isNotBlank(formDTO.getPublicReply())) {
             TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
             TextTaskDTO taskDTO = new TextTaskDTO();
             taskDTO.setContent(formDTO.getPublicReply());
@@ -199,6 +200,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
 
         //1:更新项目人员关联表数据状态为已处理
         ProjectStaffEntity staffEntity = projectStaffDao.selectById(formDTO.getProjectStaffId());

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java

@@ -189,6 +189,7 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
     @Transactional(rollbackFor = Exception.class)
     public void projectEvaluate(ProjectEvaluateFormDTO formDTO) {
         String comment = formDTO.getComment();
+        if (StringUtils.isNotBlank(comment)) {
             //项目满意度评价内容审核
             TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
             TextTaskDTO taskDTO = new TextTaskDTO();
@@ -204,6 +205,7 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
         ProjectSatisfactionDetailEntity entity = new ProjectSatisfactionDetailEntity();
         BeanUtils.copyProperties(formDTO,entity);
         //校验是否评价

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -300,6 +300,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Transactional(rollbackFor = Exception.class)
 	public void closed(ProjectClosedFromDTO fromDTO) {
 		//公开回复内容审核
+		if (StringUtils.isNotBlank(fromDTO.getPublicReply())) {
 			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
 			TextTaskDTO taskDTO = new TextTaskDTO();
 			taskDTO.setContent(fromDTO.getPublicReply());
@@ -312,6 +313,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
 				}
 			}
+		}
 
 		//更新项目表状态
 		ProjectEntity projectEntity = baseDao.selectById(fromDTO.getProjectId());
@@ -376,6 +378,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Transactional(rollbackFor = Exception.class)
 	public void projectReturn(ReturnFromDTO fromDTO) {
 		//公开回复内容审核
+		if (com.alibaba.nacos.client.utils.StringUtils.isNotBlank(fromDTO.getPublicReply())) {
 			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
 			TextTaskDTO taskDTO = new TextTaskDTO();
 			taskDTO.setContent(fromDTO.getPublicReply());
@@ -388,6 +391,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
 				}
 			}
+		}
 
 		ProjectEntity projectEntity = baseDao.selectById(fromDTO.getProjectId());
 		if (ProjectConstant.CLOSED.equals(projectEntity.getStatus())) {

epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.54
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.55
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

epmet-module/resi-group/resi-group-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.54</version>
+    <version>0.3.55</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

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

@@ -165,6 +165,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
     @Transactional(rollbackFor = Exception.class)
     public Result commentTopic(TokenDto tokenDto, ResiPublishCommentFormDTO resiCommentFormDTO) {
         String commentContent = resiCommentFormDTO.getCommentContent();
+        if (StringUtils.isNotBlank(commentContent)) {
             //评论话题内容审核
             TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
             TextTaskDTO taskDTO = new TextTaskDTO();
@@ -180,6 +181,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
         //1.判断当前用户是否被禁言
         ResiTopicDTO topic = resiTopicService.get(resiCommentFormDTO.getTopicId());
         if(null == topic){

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

@@ -217,6 +217,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     public Result createTopic(TokenDto tokenDto, ResiTopicPublishFormDTO resiTopicPublishFormDTO) {
         String topicContent = resiTopicPublishFormDTO.getTopicContent();
         List<String> attachmentList = resiTopicPublishFormDTO.getAttachmentList();
+        if (StringUtils.isNotBlank(topicContent)) {
             //创建话题内容审核
             TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
             TextTaskDTO taskDTO = new TextTaskDTO();
@@ -232,6 +233,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
         //创建话题图片审核
         if (attachmentList.size() != NumConstant.ZERO){
             ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
@@ -1099,6 +1101,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         //话题转议题审核：标题、建议
         String issueTitle = topicTurnIssueFromDTO.getIssueTitle();
         String suggestion = topicTurnIssueFromDTO.getSuggestion();
+        if (StringUtils.isNotBlank(issueTitle) || StringUtils.isNotBlank(suggestion)) {
             TextScanParamDTO textScan = new TextScanParamDTO();
             //标题
             TextTaskDTO taskTitle = new TextTaskDTO();
@@ -1119,6 +1122,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
         //1.统一时间(群组服务 -> 议题服务)
         Date now = new Date();
         //2.调用gov-org获取数据权限