|
@ -57,9 +57,7 @@ import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; |
|
|
import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; |
|
|
import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; |
|
|
|
|
|
import org.springframework.data.redis.core.RedisTemplate; |
|
|
import org.springframework.data.redis.core.RedisTemplate; |
|
|
import org.springframework.data.redis.core.ValueOperations; |
|
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
@ -203,7 +201,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
attachment.setAttachmentUrl(url); |
|
|
attachment.setAttachmentUrl(url); |
|
|
attachment.setTopicId(topic.getId()); |
|
|
attachment.setTopicId(topic.getId()); |
|
|
attachment.setCreatedBy(tokenDto.getUserId()); |
|
|
attachment.setCreatedBy(tokenDto.getUserId()); |
|
|
attachment.setAttachmentFormat(url.substring(url.lastIndexOf("\\.") + 1).toLowerCase()); |
|
|
attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + 1).toLowerCase()); |
|
|
attachment.setSort(sort++); |
|
|
attachment.setSort(sort++); |
|
|
resiTopicAttachmentDao.insertOne(attachment); |
|
|
resiTopicAttachmentDao.insertOne(attachment); |
|
|
} |
|
|
} |
|
@ -287,7 +285,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
**/ |
|
|
**/ |
|
|
@Override |
|
|
@Override |
|
|
public Result<List<ResiTopicInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { |
|
|
public Result<List<ResiTopicInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { |
|
|
|
|
|
|
|
|
if (null == tokenDto) { |
|
|
if (null == tokenDto) { |
|
|
return new Result().error(ModuleConstant.USER_NOT_NULL); |
|
|
return new Result().error(ModuleConstant.USER_NOT_NULL); |
|
|
} |
|
|
} |
|
|