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

Merge branch 'dev_voice_share_point' into dev_temp

dev
zhaoqifeng 5 years ago
parent
a21eafa848 687072536c
commit
4eed432d32
2 changed files with 12 additions and 1 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-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java
  2. 11
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java

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

@ -83,7 +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);
dto.setId(entity.getId());
}
@Override

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

@ -267,6 +267,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
TopicDraftEntity topic = ConvertUtils.sourceToTarget(formDTO,TopicDraftEntity.class);
topic.setCreatedBy(tokenDto.getUserId());
topic.setDraftStatus(TopicConstant.AUDITING);
topic.setIsSee(NumConstant.ZERO_STR);
baseDao.insert(topic);
if (StringUtils.isNotEmpty(formDTO.getTopicDraftId())) {
//隐藏旧话题草稿
@ -280,12 +281,14 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO();
int sort = 0;
for(String url : formDTO.getImageList()){
attachment.setCustomerId(formDTO.getCustomerId());
attachment.setAttachmentUrl(url);
attachment.setTopicDraftId(topic.getId());
attachment.setCreatedBy(tokenDto.getUserId());
attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
attachment.setSort(sort++);
attachment.setAttachmentType("image");
attachment.setStatus(TopicConstant.AUDITING);
topicDraftAttachmentService.save(attachment);
ImgTaskDTO task = new ImgTaskDTO();
@ -299,12 +302,14 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO();
int sort = 0;
for(FileDTO file : formDTO.getVideoList()){
attachment.setCustomerId(formDTO.getCustomerId());
attachment.setAttachmentUrl(file.getUrl());
attachment.setTopicDraftId(topic.getId());
attachment.setCreatedBy(tokenDto.getUserId());
attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
attachment.setSort(sort++);
attachment.setAttachmentType("voice");
attachment.setStatus(TopicConstant.AUDITING);
topicDraftAttachmentService.save(attachment);
VoiceTaskDTO task = new VoiceTaskDTO();
@ -316,6 +321,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
//话题操作记录
TopicDraftOperationDTO operation = new TopicDraftOperationDTO();
operation.setCustomerId(formDTO.getCustomerId());
operation.setTopicDraftId(topic.getId());
operation.setOperateType(TopicConstant.SUBMIT);
operation.setCreatedBy(tokenDto.getUserId());
@ -343,6 +349,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
baseDao.updateById(draftEntity);
//话题操作记录
TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
operationDTO.setCustomerId(formDTO.getCustomerId());
operationDTO.setTopicDraftId(topic.getId());
operationDTO.setOperateType(TopicConstant.BLOCK);
operationDTO.setCreatedBy(tokenDto.getUserId());
@ -370,6 +377,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
baseDao.updateById(draftEntity);
//话题操作记录
TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
operationDTO.setCustomerId(formDTO.getCustomerId());
operationDTO.setTopicDraftId(topic.getId());
operationDTO.setOperateType(TopicConstant.BLOCK);
operationDTO.setCreatedBy(tokenDto.getUserId());
@ -493,6 +501,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
baseDao.updateById(draftEntity);
//话题操作记录
TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
operationDTO.setCustomerId(formDTO.getCustomerId());
operationDTO.setTopicDraftId(topic.getId());
operationDTO.setOperateType(TopicConstant.AUTO_PASSED);
operationDTO.setCreatedBy(tokenDto.getUserId());
@ -632,7 +641,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
sendMqMsg(draft.getCreatedBy(), draft.getCustomerId());
}
//记录操作记录
entity = baseDao.selectById(formDTO.getTopicDraftId());
TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
operationDTO.setCustomerId(entity.getCustomerId());
operationDTO.setTopicDraftId(formDTO.getTopicDraftId());
operationDTO.setOperateType(formDTO.getAuditType());
operationDTO.setCreatedBy(tokenDto.getUserId());

Write Preview
Loading…
Cancel
Save