Authored by 张帅

merge

@@ -144,7 +144,7 @@ public class TopicServiceImpl implements ITopicService { @@ -144,7 +144,7 @@ public class TopicServiceImpl implements ITopicService {
144 record.setId(id); 144 record.setId(id);
145 record.setIsHot(isHot); 145 record.setIsHot(isHot);
146 grassTopicDAO.updateByPrimaryKeySelective(record); 146 grassTopicDAO.updateByPrimaryKeySelective(record);
147 - logger.info("changeTopicHotStatus success! req={}",req); 147 + logger.info("changeTopicHotStatus success! req={}", req);
148 return new ApiResponse.ApiResponseBuilder().code(200).build(); 148 return new ApiResponse.ApiResponseBuilder().code(200).build();
149 } 149 }
150 150
@@ -158,7 +158,7 @@ public class TopicServiceImpl implements ITopicService { @@ -158,7 +158,7 @@ public class TopicServiceImpl implements ITopicService {
158 List<GrassTopic> topicList = grassTopicDAO.selectTopicByGroupId(groupId); 158 List<GrassTopic> topicList = grassTopicDAO.selectTopicByGroupId(groupId);
159 List<TopicRespBo> rsp = Lists.newArrayList(); 159 List<TopicRespBo> rsp = Lists.newArrayList();
160 topicList.forEach(grassTopic -> { 160 topicList.forEach(grassTopic -> {
161 - TopicRespBo rspbo = new TopicRespBo(); 161 + TopicRespBo rspbo = new TopicRespBo();
162 rspbo.setId(grassTopic.getId()); 162 rspbo.setId(grassTopic.getId());
163 rspbo.setTopicName(grassTopic.getTopicName()); 163 rspbo.setTopicName(grassTopic.getTopicName());
164 rsp.add(rspbo); 164 rsp.add(rspbo);
@@ -209,7 +209,7 @@ public class TopicServiceImpl implements ITopicService { @@ -209,7 +209,7 @@ public class TopicServiceImpl implements ITopicService {
209 logger.warn("addArticlesTop with topicId null"); 209 logger.warn("addArticlesTop with topicId null");
210 return new ApiResponse(201,"话题id不可为空!"); 210 return new ApiResponse(201,"话题id不可为空!");
211 } 211 }
212 - int updateTime = DateUtil.getCurrentTimeSeconds(); 212 + long updateTime = System.currentTimeMillis();
213 if(StringUtils.isEmpty(req.getTopArticleIds())){ 213 if(StringUtils.isEmpty(req.getTopArticleIds())){
214 //该种情况取消该话题下的置顶 214 //该种情况取消该话题下的置顶
215 articleTopicDao.updateTopByTopicId(req.getId(),updateTime); 215 articleTopicDao.updateTopByTopicId(req.getId(),updateTime);