From 5f14bc8fbde07a7cd731ebd60668a67099d626b7 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 29 Dec 2020 14:40:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/dao/TopicDraftScanTaskDao.java | 12 +++++++ .../service/TopicDraftScanTaskService.java | 2 ++ .../impl/TopicDraftScanTaskServiceImpl.java | 5 +++ .../service/impl/TopicDraftServiceImpl.java | 33 ++++++++++++------- .../mapper/topic/TopicDraftScanTaskDao.xml | 17 ++++++++++ 5 files changed, 57 insertions(+), 12 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftScanTaskDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftScanTaskDao.java index 15be6e2e7c..ea0029cb1b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftScanTaskDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftScanTaskDao.java @@ -19,7 +19,9 @@ package com.epmet.modules.topic.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.topic.entity.TopicDraftScanTaskEntity; +import com.epmet.resi.group.dto.topic.TopicDraftScanTaskDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 话题附件检测任务表 @@ -29,5 +31,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface TopicDraftScanTaskDao extends BaseDao { + void updateByTask(TopicDraftScanTaskEntity entity); + + /** + * 获取检测任务信息 + * @author zhaoqifeng + * @date 2020/12/29 14:30 + * @param taskId + * @return com.epmet.resi.group.dto.topic.TopicDraftScanTaskDTO + */ + TopicDraftScanTaskDTO selectScanByTask(@Param("taskId") String taskId); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java index 91ae43076d..3b1608a18c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java @@ -94,4 +94,6 @@ public interface TopicDraftScanTaskService extends BaseService list = voiceResults.getData(); for (VoiceResultDTO item : list) { + TopicDraftScanTaskDTO taskDTO = topicDraftScanTaskService.getScanByTask(item.getTaskId()); if (TopicConstant.REVIEW.equals(item.getSuggestion())) { //结果不确定 TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); - dto.setId(item.getDataId()); + dto.setId(taskDTO.getTopicDraftAttachmentId()); dto.setStatus(TopicConstant.REVIEW); dto.setReason(item.getLabelDesc()); topicDraftAttachmentService.update(dto); - TopicDraftScanTaskDTO taskDTO = new TopicDraftScanTaskDTO(); - taskDTO.setTaskId(item.getTaskId()); taskDTO.setStatus(TopicConstant.REVIEW); - topicDraftScanTaskService.updateByTask(taskDTO); + topicDraftScanTaskService.update(taskDTO); + + TopicDraftEntity draftEntity = new TopicDraftEntity(); + draftEntity.setId(topic.getId()); + draftEntity.setDraftStatus(TopicConstant.REVIEW); + draftEntity.setDraftReason("需要人工审核"); + baseDao.updateById(draftEntity); + isAllPass = false; } else if (TopicConstant.BLOCK.equals(item.getSuggestion())) { //结果违规 TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); - dto.setId(item.getDataId()); + dto.setId(taskDTO.getTopicDraftAttachmentId()); dto.setStatus(TopicConstant.BLOCK); dto.setReason(item.getLabelDesc()); topicDraftAttachmentService.update(dto); - TopicDraftScanTaskDTO taskDTO = new TopicDraftScanTaskDTO(); - taskDTO.setTaskId(item.getTaskId()); taskDTO.setStatus(TopicConstant.BLOCK); - topicDraftScanTaskService.updateByTask(taskDTO); + topicDraftScanTaskService.update(taskDTO); + + TopicDraftEntity draftEntity = new TopicDraftEntity(); + draftEntity.setId(topic.getId()); + draftEntity.setDraftStatus(TopicConstant.BLOCK); + draftEntity.setDraftReason(item.getLabelDesc()); + baseDao.updateById(draftEntity); + isAllPass = false; } else { //审核通过 TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); - dto.setId(item.getDataId()); + dto.setId(taskDTO.getTopicDraftAttachmentId()); dto.setStatus(TopicConstant.AUTO_PASSED); dto.setReason(item.getLabelDesc()); topicDraftAttachmentService.update(dto); - TopicDraftScanTaskDTO taskDTO = new TopicDraftScanTaskDTO(); - taskDTO.setTaskId(item.getTaskId()); taskDTO.setStatus(TopicConstant.AUTO_PASSED); - topicDraftScanTaskService.updateByTask(taskDTO); + topicDraftScanTaskService.update(taskDTO); } //审核通过，发布话题 if(isAllPass) { diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftScanTaskDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftScanTaskDao.xml index 83c0305ab6..33a9869a66 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftScanTaskDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftScanTaskDao.xml @@ -23,6 +23,23 @@ `STATUS` = #{status} WHERE TASK_ID = #{taskId} + \ No newline at end of file