话题语音

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<TopicDraftScanTaskEntity> {
+
 	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);
 }

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<TopicDraftScanTas
     void delete(String[] ids);
 
     void updateByTask(TopicDraftScanTaskDTO dto);
+
+    TopicDraftScanTaskDTO getScanByTask(String taskId);
 }

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

@@ -102,4 +102,9 @@ public class TopicDraftScanTaskServiceImpl extends BaseServiceImpl<TopicDraftSca
         baseDao.updateByTask(entity);
     }
 
+    @Override
+    public TopicDraftScanTaskDTO getScanByTask(String taskId) {
+        return baseDao.selectScanByTask(taskId);
+    }
+
 }

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

@@ -438,44 +438,53 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                             boolean isAllPass = true;
                             List<VoiceResultDTO> 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) {

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftScanTaskDao.xml

@@ -23,6 +23,23 @@
            `STATUS` = #{status}
         WHERE TASK_ID = #{taskId}
     </update>
+    <select id="selectScanByTask" resultType="com.epmet.resi.group.dto.topic.TopicDraftScanTaskDTO">
+        select ID,
+            CUSTOMER_ID,
+            TOPIC_DRAFT_ID,
+            TOPIC_DRAFT_ATTACHMENT_ID,
+            TASK_ID,
+            STATUS,
+            ATTACHMENT_TYPE,
+            DEL_FLAG,
+            REVISION,
+            CREATED_BY,
+            CREATED_TIME,
+            UPDATED_BY,
+            UPDATED_TIME
+        from topic_draft_scan_task
+        where TASK_ID = #{taskId}
+    </select>
 
 
 </mapper>