diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java index 35a3ddb84..6fdba874f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java @@ -18,7 +18,7 @@ import java.util.List; * @email yujintao@elink-cn.com * @date 2019/9/5 19:20 */ -@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class,url = "http://localhost:9064") public interface NewsFeignClient { /** diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index b1e2ae1f8..93a9eccaf 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java @@ -139,7 +139,7 @@ public class NewsServiceImpl extends BaseServiceImpl implem @Override @Transactional(rollbackFor = Exception.class) public void saveToDrafts(NewsDTO newsDto) { - saveOrUpdateNews(newsDto, YesOrNoEnum.YES.value()); + saveOrUpdateNews(newsDto, YesOrNoEnum.YES.value(),YesOrNoEnum.NO.value()); } @Override @@ -147,9 +147,9 @@ public class NewsServiceImpl extends BaseServiceImpl implem public void update(NewsDTO dto) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(FieldConstant.ID, dto.getId()) - .select("NEWS_UP_DOWN_STATE"); + .select("NEWS_RELEASE_STATE"); NewsEntity entity = this.baseDao.selectOne(wrapper); - this.saveOrUpdateNews(dto, entity.getNewsReleaseState()); + this.saveOrUpdateNews(dto, entity.getNewsReleaseState(),YesOrNoEnum.NO.value()); } @Override @@ -184,12 +184,12 @@ public class NewsServiceImpl extends BaseServiceImpl implem @Override public void savePublishNews(NewsDTO newsDTO) { - saveOrUpdateNews(newsDTO, YesOrNoEnum.NO.value()); + saveOrUpdateNews(newsDTO, YesOrNoEnum.NO.value(),YesOrNoEnum.NO.value()); } @Override public void modifyDraftsPublic(String id) { - saveOrUpdateNews(this.get(id), YesOrNoEnum.NO.value()); + saveOrUpdateNews(this.get(id), YesOrNoEnum.NO.value(),YesOrNoEnum.YES.value()); } /** @@ -197,11 +197,12 @@ public class NewsServiceImpl extends BaseServiceImpl implem * * @param newsDto 新闻数据传输对象 * @param newsReleaseState 是否是草稿箱操作(存草稿或草稿箱中修改操作) + * @param isDraftsPublishNews 判断是是修改还是从草稿箱里面发布(修改不更新createdTime 从草稿箱里面发布更新createdTime 为了列表排序) * @return void * @author qushutong * @date */ - private void saveOrUpdateNews(NewsDTO newsDto, String newsReleaseState) { + private void saveOrUpdateNews(NewsDTO newsDto, String newsReleaseState,String isDraftsPublishNews) { NewsEntity entity = ConvertUtils.sourceToTarget(newsDto, NewsEntity.class); UserDetail user = SecurityUser.getUser(); //是不是草稿箱 @@ -258,7 +259,9 @@ public class NewsServiceImpl extends BaseServiceImpl implem } else { entity.setUpdatedBy(user.getRealName()); entity.setUpdatedTime(new Date()); - entity.setCreatedTime(new Date()); + if(YesOrNoEnum.YES.value().equals(isDraftsPublishNews)){ + entity.setCreatedTime(new Date()); + } this.baseDao.updateNewsById(entity); newsDepartmentService.deleteByNewsId(entity.getId()); }