luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

话题语音

dev
zhaoqifeng 5 years ago
parent
84576d84c8
commit
490fc0c970
10 changed files with 200 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/service/BaseService.java
  2. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftAttachmentDTO.java
  3. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftScanTaskDao.java
  4. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftAttachmentEntity.java
  5. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java
  6. 1
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java
  7. 6
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftScanTaskServiceImpl.java
  8. 206
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
  9. 6
      epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.11__topicShare.sql
  10. 5
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftScanTaskDao.xml

2
epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/service/BaseService.java
View File

@ -122,4 +122,6 @@ public interface BaseService<T> {
* @param idList 主键ID列表
*/
boolean deleteBatchIds(Collection<? extends Serializable> idList);
}

2
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftAttachmentDTO.java
View File

@ -84,6 +84,8 @@ public class TopicDraftAttachmentDTO implements Serializable {
*/
private String status;
private String reason;
/**
* 语音或视频时长，秒
* */

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftScanTaskDao.java
View File

@ -29,5 +29,5 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface TopicDraftScanTaskDao extends BaseDao<TopicDraftScanTaskEntity> {
void updateByTask(TopicDraftScanTaskEntity entity);
}

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftAttachmentEntity.java
View File

@ -84,6 +84,8 @@ public class TopicDraftAttachmentEntity extends BaseEpmetEntity {
*/
private String status;
private String reason;
/**
* 语音或视频时长，秒
* */

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java
View File

@ -92,4 +92,6 @@ public interface TopicDraftScanTaskService extends BaseService<TopicDraftScanTas
* @date 2020-12-18
*/
void delete(String[] ids);
void updateByTask(TopicDraftScanTaskDTO dto);
}

1
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java
View File

@ -83,6 +83,7 @@ public class TopicDraftAttachmentServiceImpl extends BaseServiceImpl<TopicDraftA
public void save(TopicDraftAttachmentDTO dto) {
TopicDraftAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, TopicDraftAttachmentEntity.class);
insert(entity);
ConvertUtils.sourceToTarget(entity, TopicDraftAttachmentDTO.class);
}
@Override

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

@ -96,4 +96,10 @@ public class TopicDraftScanTaskServiceImpl extends BaseServiceImpl<TopicDraftSca
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
public void updateByTask(TopicDraftScanTaskDTO dto) {
TopicDraftScanTaskEntity entity = ConvertUtils.sourceToTarget(dto, TopicDraftScanTaskEntity.class);
baseDao.updateByTask(entity);
}
}

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

@ -17,24 +17,26 @@
package com.epmet.modules.topic.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.MqConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
import com.epmet.commons.tools.enums.EventEnum;
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.ImgScanParamDTO;
import com.epmet.commons.tools.scan.param.ImgTaskDTO;
import com.epmet.commons.tools.scan.param.TextScanParamDTO;
import com.epmet.commons.tools.scan.param.TextTaskDTO;
import com.epmet.commons.tools.scan.param.*;
import com.epmet.commons.tools.scan.result.AsyncScanResult;
import com.epmet.commons.tools.scan.result.AsyncScanTaskDTO;
import com.epmet.commons.tools.scan.result.SyncScanResult;
import com.epmet.commons.tools.scan.result.VoiceResultDTO;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.ScanContentUtils;
import com.epmet.commons.tools.utils.*;
import com.epmet.dto.result.AllGridsByUserIdResultDTO;
import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.modules.feign.EpmetUserFeignClient;
@ -53,6 +55,7 @@ import com.epmet.modules.topic.dao.TopicDraftDao;
import com.epmet.modules.topic.entity.*;
import com.epmet.modules.topic.service.TopicDraftAttachmentService;
import com.epmet.modules.topic.service.TopicDraftOperationService;
import com.epmet.modules.topic.service.TopicDraftScanTaskService;
import com.epmet.modules.topic.service.TopicDraftService;
import com.epmet.modules.utils.ModuleConstant;
import com.epmet.resi.group.constant.MemberStateConstant;
@ -61,10 +64,10 @@ import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO;
import com.epmet.resi.group.dto.group.ResiGroupStatisticalInfoRedisDTO;
import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
import com.epmet.resi.group.dto.topic.ResiTopicDTO;
import com.epmet.resi.group.dto.topic.TopicDraftAttachmentDTO;
import com.epmet.resi.group.dto.topic.TopicDraftDTO;
import com.epmet.resi.group.dto.topic.TopicDraftOperationDTO;
import com.epmet.resi.group.dto.topic.TopicDraftScanTaskDTO;
import com.epmet.resi.group.dto.topic.form.*;
import com.epmet.resi.group.dto.topic.result.DraftDetailResultDTO;
import com.epmet.resi.group.dto.topic.result.MyAuditingListResultDTO;
@ -96,6 +99,12 @@ import java.util.stream.Collectors;
public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicDraftEntity> implements TopicDraftService {
private static Logger logger = LoggerFactory.getLogger(TopicDraftServiceImpl.class);
private ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("TopicDraftService-pool-%d").build();
private ExecutorService threadPool = new ThreadPoolExecutor(1, 1,
1L, TimeUnit.MINUTES,
new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
@Autowired
private GovOrgOpenFeignClient govOrgOpenFeignClient;
@ -132,6 +141,8 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
private TopicDraftOperationService topicDraftOperationService;
@Autowired
private ResiGroupMemberRedis resiGroupMemberRedis;
@Autowired
private TopicDraftScanTaskService topicDraftScanTaskService;
@Value("${openapi.scan.server.url}")
private String scanApiUrl;
@ -139,6 +150,10 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
private String textSyncScanMethod;
@Value("${openapi.scan.method.imgSyncScan}")
private String imgSyncScanMethod;
@Value("${openapi.scan.method.voiceAsyncScan}")
private String voiceAsyncScanMethod;
@Value("${openapi.scan.method.voiceResults}")
private String voiceResultsMethod;
@Override
public PageData<TopicDraftDTO> page(Map<String, Object> params) {
@ -234,6 +249,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
* @date 2020/12/17 15:49
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void createTopic(TokenDto tokenDto, CreateTopicFormDTO formDTO) {
if(StringUtils.isEmpty(formDTO.getTopicContent()) && CollectionUtils.isEmpty(formDTO.getVideoList())) {
//话题内容和语音不能同时为空
@ -259,7 +275,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
old.setIsSee(NumConstant.ONE_STR);
baseDao.updateById(old);
}
List<ImgTaskDTO> imageDTOList = new ArrayList<>();
if(CollectionUtils.isNotEmpty(formDTO.getImageList())){
TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO();
int sort = 0;
@ -271,9 +287,14 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
attachment.setSort(sort++);
attachment.setAttachmentType("image");
topicDraftAttachmentService.save(attachment);
ImgTaskDTO task = new ImgTaskDTO();
task.setDataId(attachment.getId());
task.setUrl(url);
imageDTOList.add(task);
}
}
List<VoiceTaskDTO> voiceDTOList = new ArrayList<>();
if(CollectionUtils.isNotEmpty(formDTO.getVideoList())){
TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO();
int sort = 0;
@ -283,8 +304,13 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
attachment.setCreatedBy(tokenDto.getUserId());
attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
attachment.setSort(sort++);
attachment.setAttachmentType("image");
attachment.setAttachmentType("voice");
topicDraftAttachmentService.save(attachment);
VoiceTaskDTO task = new VoiceTaskDTO();
task.setDataId(attachment.getId());
task.setUrl(url);
voiceDTOList.add(task);
}
}
@ -313,7 +339,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
TopicDraftEntity draftEntity = new TopicDraftEntity();
draftEntity.setId(topic.getId());
draftEntity.setDraftStatus(TopicConstant.BLOCK);
draftEntity.setDraftReason("内容审核失败");
draftEntity.setDraftReason("话题存在违规内容");
baseDao.updateById(draftEntity);
//话题操作记录
TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
@ -328,14 +354,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
}
}
//创建话题图片审核
if (CollectionUtils.isNotEmpty(formDTO.getImageList())){
if (CollectionUtils.isNotEmpty(imageDTOList)){
ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
formDTO.getImageList().forEach(url -> {
ImgTaskDTO task = new ImgTaskDTO();
task.setDataId(UUID.randomUUID().toString().replace("-", ""));
task.setUrl(url);
imgScanParamDTO.getTasks().add(task);
});
imgScanParamDTO.setTasks(imageDTOList);
Result<SyncScanResult> imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
if (!imgScanResult.success()){
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
@ -345,7 +366,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
TopicDraftEntity draftEntity = new TopicDraftEntity();
draftEntity.setId(topic.getId());
draftEntity.setDraftStatus(TopicConstant.BLOCK);
draftEntity.setDraftReason("图片审核失败");
draftEntity.setDraftReason("图片存在违规内容");
baseDao.updateById(draftEntity);
//话题操作记录
TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
@ -355,21 +376,116 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
topicDraftOperationService.save(operationDTO);
throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode());
}
if(CollectionUtils.isNotEmpty(imgScanResult.getData().getSuccessDataIds())) {
imgScanResult.getData().getSuccessDataIds().forEach(item -> {
TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO();
dto.setId(item);
dto.setStatus(TopicConstant.AUTO_PASSED);
topicDraftAttachmentService.update(dto);
});
}
if(CollectionUtils.isNotEmpty(imgScanResult.getData().getFailDataIds())) {
imgScanResult.getData().getFailDataIds().forEach(item -> {
TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO();
dto.setId(item);
dto.setStatus(TopicConstant.BLOCK);
dto.setReason("图片存在违规内容");
topicDraftAttachmentService.update(dto);
});
}
}
}
//TODO 创建话题语音审核
if (CollectionUtils.isNotEmpty(formDTO.getVideoList())){
ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
formDTO.getVideoList().forEach(url -> {
ImgTaskDTO task = new ImgTaskDTO();
task.setDataId(UUID.randomUUID().toString().replace("-", ""));
task.setUrl(url);
imgScanParamDTO.getTasks().add(task);
//TODO 根据返回值，
});
//创建话题语音审核
if (CollectionUtils.isNotEmpty(voiceDTOList)){
VoiceScanParamDTO voiceScanParamDTO = new VoiceScanParamDTO();
voiceScanParamDTO.setTasks(voiceDTOList);
voiceScanParamDTO.setOpenCallBack(false);
Result<AsyncScanResult> voiceScanResult = ScanContentUtils.voiceAsyncScan(scanApiUrl.concat(voiceAsyncScanMethod), voiceScanParamDTO);
if (!voiceScanResult.success() || !voiceScanResult.getData().isAllSuccess()){
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
} else {
List<AsyncScanTaskDTO> taskList = voiceScanResult.getData().getSuccessTasks();
List<String> taskIds = taskList.stream().map(AsyncScanTaskDTO :: getTaskId).collect(Collectors.toList());
//提交记录存入task表
List<TopicDraftScanTaskEntity> scanTaskEntityList = taskList.stream().map(item -> {
TopicDraftScanTaskEntity taskEntity = new TopicDraftScanTaskEntity();
taskEntity.setCustomerId(formDTO.getCustomerId());
taskEntity.setTopicDraftId(topic.getId());
taskEntity.setTopicDraftAttachmentId(item.getDataId());
taskEntity.setTaskId(item.getTaskId());
taskEntity.setStatus(TopicConstant.AUDITING);
taskEntity.setAttachmentType(TopicConstant.VOICE);
return taskEntity;
}).collect(Collectors.toList());
topicDraftScanTaskService.insertBatch(scanTaskEntityList);
//轮询
threadPool.submit(() -> {
while (true) {
Result<List<VoiceResultDTO>> voiceResults = ScanContentUtils.voiceResults(scanApiUrl.concat(voiceResultsMethod), taskIds);
if (voiceResults.success()) {
boolean isAllPass = true;
List<VoiceResultDTO> list = voiceResults.getData();
for (VoiceResultDTO item : list) {
if (TopicConstant.REVIEW.equals(item.getSuggestion())) {
//结果不确定
TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO();
dto.setId(item.getDataId());
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);
isAllPass = false;
} else if (TopicConstant.BLOCK.equals(item.getSuggestion())) {
//结果违规
TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO();
dto.setId(item.getDataId());
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);
isAllPass = false;
} else {
//审核通过
TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO();
dto.setId(item.getDataId());
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);
}
//审核通过，发布话题
if(isAllPass) {
saveTopic(tokenDto, formDTO, topic.getId());
}
}
break;
}
try {
Thread.sleep(600000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
});
}
} else {
//TODO 话题草稿状态为 auto_passed: 自动通过
//话题草稿状态为 auto_passed: 自动通过
//更新话题状态block
TopicDraftEntity draftEntity = new TopicDraftEntity();
draftEntity.setId(topic.getId());
@ -512,6 +628,8 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
voiceList.forEach(item -> item.setStatus(TopicConstant.APPROVED));
topicDraftAttachmentService.updateBatchById(ConvertUtils.sourceToTarget(voiceList, TopicDraftAttachmentEntity.class));
}
//发送积分
sendMqMsg(draft.getCreatedBy(), draft.getCustomerId());
}
//记录操作记录
TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
@ -605,6 +723,30 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
draftEntity.setId(draftId);
draftEntity.setTopicId(topic.getId());
baseDao.updateById(draftEntity);
sendMqMsg(tokenDto.getUserId(), formDTO.getCustomerId());
}
private void sendMqMsg(String userId, String customerId) {
//6.发送积分
MqBaseMsgDTO mqBaseMsgDTO=new MqBaseMsgDTO();
//mq的事件类型
mqBaseMsgDTO.setEventClass(EventEnum.PUBLISH_ONE_TOPIC.getEventClass());
//事件code
mqBaseMsgDTO.setEventTag(EventEnum.PUBLISH_ONE_TOPIC.getEventTag());
List<BasePointEventMsg> actPointEventMsgList=new ArrayList<>();
BasePointEventMsg actPointEventMsg=new BasePointEventMsg();
actPointEventMsg.setCustomerId(customerId);
actPointEventMsg.setUserId(userId);
actPointEventMsg.setActionFlag(MqConstant.PLUS);
actPointEventMsg.setIsCommon(false);
actPointEventMsgList.add(actPointEventMsg);
mqBaseMsgDTO.setMsg(JSON.toJSONString(actPointEventMsgList));
Result mqResult = SendMqMsgUtils.sendMsg(mqBaseMsgDTO);
if(!mqResult.success()){
logger.error("发表话题积分添加失败");
}
}

6
epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.11__topicShare.sql
View File

@ -37,4 +37,8 @@ CREATE TABLE `topic_share_link_visit_record`
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='话题分享链接访问记录表';
DEFAULT CHARSET = utf8mb4 COMMENT ='话题分享链接访问记录表';
ALTER TABLE `topic_draft_attachment`
ADD COLUMN `REASON` varchar(255) NULL COMMENT '失败原因' AFTER `STATUS`;

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

@ -18,6 +18,11 @@
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<update id="updateByTask">
update topic_draft_scan_task set
`STATUS` = #{status}
WHERE TASK_ID = #{taskId}
</update>
</mapper>
Write Preview
Loading…
Cancel
Save