Merge remote-tracking branch 'origin/dev_review' into dev

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java

@@ -91,4 +91,6 @@ public interface IssueConstant {
      * 北京时区（北京时间）
      */
     String BEIJING_TIME_ZONE = "+8";
+
+    String REVIEW_ISSUE = "议题评论失败，评论内容为：%s";
 }

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

@@ -43,6 +43,7 @@ import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.entity.IssueSatisfactionDetailEntity;
 import com.epmet.redis.IssueSatisfactionDetailRedis;
 import com.epmet.service.IssueSatisfactionDetailService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +63,7 @@ import java.util.UUID;
  * @since v1.0.0 2020-05-11
  */
 @Service
+@Slf4j
 public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSatisfactionDetailDao, IssueSatisfactionDetailEntity> implements IssueSatisfactionDetailService {
 
     @Autowired
@@ -165,6 +167,7 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         } else {
             if (!textSyncScanResult.getData().isAllPass()) {
+                log.error(String.format(IssueConstant.REVIEW_ISSUE,comment));
                 throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
             }
         }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -118,4 +118,6 @@ public interface ProjectConstant {
 	 * 议题转项目 项目服务数据入库成功，议题数据更新或发送消息失败导致议题数据可以回滚，项目服务数据不能回滚
 	 */
 	String SAVE_PROJECT_EXCEPTION = "已存在项目数据，不能重复转项目";
+
+	String REVIEW_PROJECT = "项目评论失败，评论内容为：%s";
 }

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

@@ -40,6 +40,7 @@ import com.epmet.entity.ProjectSatisfactionDetailEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.ProjectSatisfactionDetailRedis;
 import com.epmet.service.ProjectSatisfactionDetailService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,7 @@ import java.util.stream.Collectors;
  * @since v1.0.0 2020-05-11
  */
 @Service
+@Slf4j
 public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<ProjectSatisfactionDetailDao, ProjectSatisfactionDetailEntity> implements ProjectSatisfactionDetailService {
 
     @Autowired
@@ -198,6 +200,7 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         } else {
             if (!textSyncScanResult.getData().isAllPass()) {
+                log.error(String.format(ProjectConstant.REVIEW_PROJECT,comment));
                 throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
             }
         }