新闻上banner与banner列表接口修改

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 
@@ -31,7 +32,7 @@ import lombok.Data;
 @Data
 public class BannerDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -827234900237385911L;
 
     /**
      * 主键
@@ -148,4 +149,14 @@ public class BannerDTO implements Serializable {
      */
     private String position;
 
+    /**
+     * 是否来自新闻 0否；1是
+     */
+    private String newsFlag;
+
+    /**
+     * 新闻ID
+     */
+    private String newsId;
+
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsDTO.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 
@@ -31,7 +32,7 @@ import lombok.Data;
 @Data
 public class NewsDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 6646375796609160832L;
 
     /**
      * ID
@@ -174,4 +175,9 @@ public class NewsDTO implements Serializable {
      */
     private String creatorName;
 
+    /**
+     * 是否已上banner
+     */
+    private String bannerFlag;
+
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcBannerListResultDTO.java

@@ -12,15 +12,12 @@ import java.io.Serializable;
 @Data
 public class EpdcBannerListResultDTO implements Serializable {
 
-    private static final long serialVersionUID = 130844542701370110L;
-    /**
-     * id : 50799
-     * imgUrl : X8Z0iszHt0
-     * title : uxlJbM48gM
-     */
+    private static final long serialVersionUID = -513542091686248656L;
 
     private String id;
     private String imgUrl;
     private String title;
+    private String newsFlag;
+    private String newsId;
 
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/BannerController.java

@@ -61,6 +61,7 @@ public class BannerController {
         BannerDTO data = bannerService.get(id);
         return new Result<BannerDTO>().ok(data);
     }
+
     /***
      *   新增banner
      * @param dto
@@ -130,5 +131,4 @@ public class BannerController {
         return new Result();
     }
 
-
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java

@@ -120,6 +120,6 @@ public class EpdcAppNewsController {
      */
     @GetMapping("list")
     public Result<List<EpdcBannerListResultDTO>> listBanner(@RequestBody EpdcBannerListFromDTO fromDTO ){
-        return new Result<List<EpdcBannerListResultDTO>>().ok(bannerService.listBanner(fromDTO));
+        return new Result().ok(bannerService.listBanner(fromDTO));
     }
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java

@@ -136,4 +136,17 @@ public class NewsController {
         return new Result();
     }
 
+
+    /***
+     * 新闻上banner
+     * @param newsId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/9/17 19:07
+     */
+    @PostMapping("newsToBanner/{newsId}")
+    public Result newsToBanner(@PathVariable("newsId") String newsId) {
+        return newsService.newsToBanner(newsId);
+    }
+
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java

@@ -36,7 +36,7 @@ import java.util.Date;
 @TableName("epdc_banner")
 public class BannerEntity extends BaseEpdcEntity {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2121027370256705244L;
 
     /**
      * 链接地址
@@ -118,4 +118,14 @@ public class BannerEntity extends BaseEpdcEntity {
      */
     private String position;
 
+    /**
+     * 是否来自新闻 0否；1是
+     */
+    private String newsFlag;
+
+    /**
+     * 新闻ID
+     */
+    private String newsId;
+
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NewsEntity.java

@@ -37,7 +37,7 @@ import java.util.Date;
 @TableName("epdc_news")
 public class NewsEntity extends BaseEpdcEntity {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -4353839093009836919L;
 
     /**
      * 新闻标题
@@ -145,4 +145,9 @@ public class NewsEntity extends BaseEpdcEntity {
      */
     private String creatorName;
 
+    /**
+     * 是否已上banner
+     */
+    private String bannerFlag;
+
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/BannerService.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.BannerDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
@@ -102,4 +103,14 @@ public interface BannerService extends BaseService<BannerEntity> {
      * @date 2019/9/11 8:59
      */
     List<EpdcBannerListResultDTO> listBanner(EpdcBannerListFromDTO fromDTO);
+
+    /***
+     * 新闻上banner
+     * @param banner
+     * @param deptIds
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/9/17 19:42
+     */
+    Result saveNewsToBanner(BannerDTO banner, List<Long> deptIds);
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsDepartmentService.java

@@ -95,6 +95,7 @@ public interface NewsDepartmentService extends BaseService<NewsDepartmentEntity>
 
     /**
      * 修改的时候把该新闻的部门关联都清除
+     *
      * @param newsId
      */
     void deleteByNewsId(String newsId);
@@ -102,6 +103,7 @@ public interface NewsDepartmentService extends BaseService<NewsDepartmentEntity>
 
     /**
      * 保存所有网格
+     *
      * @param id
      * @param newsGridList
      */

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java

@@ -169,4 +169,12 @@ public interface NewsService extends BaseService<NewsEntity> {
      */
     Result modifyNewsBrowse(EpdcNewsBrowseFromDTO newsBrowseFromDTO);
 
+    /***
+     * 新闻上banner
+     * @param newsId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/9/17 19:21
+     */
+    Result newsToBanner(String newsId);
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java

@@ -21,6 +21,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
@@ -162,4 +163,12 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
         return baseDao.selectListBanner(fromDTO);
     }
 
+    @Override
+    public Result saveNewsToBanner(BannerDTO banner, List<Long> deptIds) {
+        BannerEntity bannerEntity = ConvertUtils.sourceToTarget(banner, BannerEntity.class);
+        if (this.baseDao.insert(bannerEntity) > NumConstant.ZERO) {
+            bannerDepartmentService.save(bannerEntity.getId(), deptIds);
+        }
+        return new Result();
+    }
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsDepartmentServiceImpl.java

@@ -29,10 +29,8 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dao.NewsDepartmentDao;
 import com.elink.esua.epdc.dto.NewsDepartmentDTO;
 import com.elink.esua.epdc.entity.NewsDepartmentEntity;
-import com.elink.esua.epdc.entity.NoticeDepartmentEntity;
 import com.elink.esua.epdc.redis.NewsDepartmentRedis;
 import com.elink.esua.epdc.service.NewsDepartmentService;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -31,10 +31,14 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.NewsDao;
+import com.elink.esua.epdc.dto.BannerDTO;
 import com.elink.esua.epdc.dto.NewsDTO;
+import com.elink.esua.epdc.dto.NewsDepartmentDTO;
 import com.elink.esua.epdc.dto.NewsUserAttitudeDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsDetailFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
+import com.elink.esua.epdc.entity.BannerEntity;
+import com.elink.esua.epdc.entity.NewsDepartmentEntity;
 import com.elink.esua.epdc.entity.NewsUserAttitudeEntity;
 import com.elink.esua.epdc.enums.AppNewsLikeEnum;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
@@ -43,9 +47,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
 import com.elink.esua.epdc.entity.NewsEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
-import com.elink.esua.epdc.service.NewsDepartmentService;
-import com.elink.esua.epdc.service.NewsService;
-import com.elink.esua.epdc.service.NewsUserAttitudeService;
+import com.elink.esua.epdc.service.*;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +55,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -364,4 +367,39 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         return new Result();
     }
 
+    @Autowired
+    private BannerService bannerService;
+
+    @Override
+    public Result newsToBanner(String newsId) {
+
+        NewsEntity newsEntity = baseDao.selectById(newsId);
+        if (null == newsEntity || YesOrNoEnum.YES.value().equals(newsEntity.getBannerFlag())) {
+            return new Result().error("操作失败，新闻不存在或已是banner");
+        }
+
+        Result<List<Long>> adminResult = adminFeignClient.listGridIdByDeptPid(SecurityUser.getDeptId());
+        if (!adminResult.success() || CollUtil.isEmpty(adminResult.getData())) {
+            throw new RenException("获取部门信息失败");
+        }
+        List<Long> deptIds = adminResult.getData();
+
+        BannerDTO banner = ConvertUtils.sourceToTarget(newsEntity, BannerDTO.class);
+        banner.setState(YesOrNoEnum.YES.value());
+        banner.setStateTime(new Date());
+        banner.setImgUrl(newsEntity.getNewsImageUrl());
+        banner.setNewsFlag(YesOrNoEnum.YES.value());
+        banner.setNewsId(newsId);
+        banner.setTitle(newsEntity.getNewsTitle());
+
+        this.bannerService.saveNewsToBanner(banner, deptIds);
+
+        NewsEntity news = new NewsEntity();
+        news.setId(newsId);
+        news.setBannerFlag(YesOrNoEnum.YES.value());
+        this.updateById(news);
+
+        return new Result();
+
+    }
 }