Merge branch 'dev_review' into dev

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

@@ -60,7 +60,8 @@ public enum EpmetErrorCode {
 
 	ALREADY_EVALUATE(8501,"您已评价"),
 	ALREADY_VOTE(8502,"您已表态"),
-
+	TEXT_SCAN_FAILED(8503,"内容审核失败，请重新编辑"),
+	IMG_SCAN_FAILED(8504,"图片审核失败，请重新上传"),
 	PROJECT_IS_CLOSED(8601,"项目已结案"),
 
     // 该错误不会提示给前端，只是后端传输错误信息用。

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

@@ -147,6 +147,7 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
             </properties>
         </profile>
         <profile>
@@ -179,6 +180,7 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
             </properties>
         </profile>
     </profiles>

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

@@ -7,10 +7,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.IssueConstant;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageConstant;
@@ -42,6 +47,7 @@ import com.epmet.utils.ModuleConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -86,6 +92,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     private IssueVoteStatisticalDao issueVoteStatisticalDao;
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
+	@Value("${openapi.scan.server.url}")
+	private String scanApiUrl;
+	@Value("${openapi.scan.method.textSyncScan}")
+	private String textSyncScanMethod;
 
     @Override
     public PageData<IssueDTO> page(Map<String, Object> params) {
@@ -351,6 +361,20 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void closeIssue(CloseIssueFormDTO formDTO) {
+		//公开回复内容审核
+		TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+		TextTaskDTO taskDTO = new TextTaskDTO();
+		taskDTO.setContent(formDTO.getCloseReason());
+		textScanParamDTO.getTasks().add(taskDTO);
+		Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+		if (!textSyncScanResult.success()){
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+		} else {
+			if (!textSyncScanResult.getData().isAllPass()) {
+				throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+			}
+		}
+
         Date date = new Date();
         //1:更新议题详情表数据
         IssueEntity entity = baseDao.selectById(formDTO.getIssueId());
@@ -479,6 +503,20 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void shiftProject(ShiftProjectFormDTO formDTO) {
+		//公开回复内容审核
+		TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+		TextTaskDTO taskDTO = new TextTaskDTO();
+		taskDTO.setContent(formDTO.getPublicReply());
+		textScanParamDTO.getTasks().add(taskDTO);
+		Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+		if (!textSyncScanResult.success()){
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+		} else {
+			if (!textSyncScanResult.getData().isAllPass()) {
+				throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+			}
+		}
+
 		//因需要保证议题表中的转项目时间与创建项目时间一致 因此先新增项目数据再更新议题数据
 		//1:查询议题数据
 		IssueEntity entity = baseDao.selectById(formDTO.getIssueId());

epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@@ -103,6 +103,14 @@ ribbon:
   ReadTimeout: 300000
   ConnectTimeout: 300000
 
+openapi:
+  scan:
+    server:
+      url: @openapi.scan.server.url@
+    method:
+      imgSyncScan: /imgSyncScan
+      textSyncScan: /textSyncScan
+
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql

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

@@ -147,6 +147,7 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
             </properties>
         </profile>
         <profile>
@@ -179,6 +180,7 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
             </properties>
         </profile>
     </profiles>

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

@@ -23,10 +23,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageConstant;
@@ -46,6 +51,7 @@ import com.epmet.service.ProjectService;
 import com.epmet.service.ProjectStaffService;
 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;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -77,6 +83,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
     private ProjectStaffService projectStaffService;
     @Autowired
     private com.epmet.feign.MessageFeignClient messageFeignClient;
+    @Value("${openapi.scan.server.url}")
+    private String scanApiUrl;
+    @Value("${openapi.scan.method.textSyncScan}")
+    private String textSyncScanMethod;
 
     @Override
     public PageData<ProjectProcessDTO> page(Map<String, Object> params) {
@@ -176,6 +186,20 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void transfer(TransferFormDTO formDTO) {
+        //公开回复内容审核
+        TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+        TextTaskDTO taskDTO = new TextTaskDTO();
+        taskDTO.setContent(formDTO.getPublicReply());
+        textScanParamDTO.getTasks().add(taskDTO);
+        Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+        if (!textSyncScanResult.success()){
+            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        } else {
+            if (!textSyncScanResult.getData().isAllPass()) {
+                throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+            }
+        }
+
         //1:更新项目人员关联表数据状态为已处理
         ProjectStaffEntity staffEntity = projectStaffDao.selectById(formDTO.getProjectStaffId());
         if (null == staffEntity) {

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

@@ -27,8 +27,12 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ParameterKeyConstant;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.constant.UserMessageConstant;
@@ -48,6 +52,7 @@ import com.epmet.redis.ProjectRedis;
 import com.epmet.service.*;
 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;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -82,6 +87,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	private MessageFeignClient messageFeignClient;
 	@Autowired
 	private ProjectRelatedPersonnelService projectRelatedPersonnelService;
+	@Value("${openapi.scan.server.url}")
+	private String scanApiUrl;
+	@Value("${openapi.scan.method.textSyncScan}")
+	private String textSyncScanMethod;
 
 	private final static String ONE_DAY = "<1";
 
@@ -290,6 +299,20 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void closed(ProjectClosedFromDTO fromDTO) {
+		//公开回复内容审核
+		TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+		TextTaskDTO taskDTO = new TextTaskDTO();
+		taskDTO.setContent(fromDTO.getPublicReply());
+		textScanParamDTO.getTasks().add(taskDTO);
+		Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+		if (!textSyncScanResult.success()){
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+		} else {
+			if (!textSyncScanResult.getData().isAllPass()) {
+				throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+			}
+		}
+
 		//更新项目表状态
 		ProjectEntity projectEntity = baseDao.selectById(fromDTO.getProjectId());
 		if (ProjectConstant.CLOSED.equals(projectEntity.getStatus())) {
@@ -298,7 +321,6 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		projectEntity.setStatus(ProjectConstant.CLOSED);
 		projectEntity.setClosedStatus(fromDTO.getClosedStatus());
 		baseDao.updateById(projectEntity);
-
 		//更新项目关联表
 		ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity();
 		projectStaffEntity.setId(fromDTO.getProjectStaffId());
@@ -353,6 +375,20 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void projectReturn(ReturnFromDTO fromDTO) {
+		//公开回复内容审核
+		TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+		TextTaskDTO taskDTO = new TextTaskDTO();
+		taskDTO.setContent(fromDTO.getPublicReply());
+		textScanParamDTO.getTasks().add(taskDTO);
+		Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+		if (!textSyncScanResult.success()){
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+		} else {
+			if (!textSyncScanResult.getData().isAllPass()) {
+				throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+			}
+		}
+
 		ProjectEntity projectEntity = baseDao.selectById(fromDTO.getProjectId());
 		if (ProjectConstant.CLOSED.equals(projectEntity.getStatus())) {
 			throw new RenException(EpmetErrorCode.PROJECT_IS_CLOSED.getCode());

epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml

@@ -103,6 +103,14 @@ ribbon:
   ReadTimeout: 300000
   ConnectTimeout: 300000
 
+openapi:
+  scan:
+    server:
+      url: @openapi.scan.server.url@
+    method:
+      imgSyncScan: /imgSyncScan
+      textSyncScan: /textSyncScan
+
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql