平安榆山banner

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

@@ -135,4 +135,18 @@ public class EpdcAppNewsController {
     public Result<List<EpdcBannerListResultDTO>> listBanner(@RequestBody EpdcBannerListFromDTO fromDTO) {
         return new Result().ok(bannerService.listBanner(fromDTO));
     }
+
+    /**
+     * 根据新闻类别，获取banner列表
+     *
+     * @param fromDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/5/22 17:53
+     */
+    @GetMapping("listBannerByCategory")
+    public Result<List<EpdcBannerListResultDTO>> listBannerByCategory(@RequestBody EpdcBannerListByCategoryFromDTO fromDTO) {
+        List<EpdcBannerListResultDTO> bannerList = bannerService.listBannerByCategory(fromDTO);
+        return new Result().ok(bannerList);
+    }
 }

epdc-cloud-news/src/main/java/com/elink/esua/epdc/dao/BannerDao.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.BannerDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListByCategoryFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.entity.BannerEntity;
@@ -43,6 +44,16 @@ public interface BannerDao extends BaseDao<BannerEntity> {
      */
     List<EpdcBannerListResultDTO> selectListBanner(EpdcBannerListFromDTO fromDTO);
 
+    /**
+     * 根据新闻类别，获取banner列表
+     *
+     * @param fromDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2020/5/22 17:53
+     */
+    List<EpdcBannerListResultDTO> listBannerByCategory(EpdcBannerListByCategoryFromDTO fromDTO);
+
 
     /***
      * 根据新闻id获取bannerID
@@ -54,7 +65,6 @@ public interface BannerDao extends BaseDao<BannerEntity> {
     String selectBannerIdByNewsId(String newsId);
 
 
-
     /***
      * 新闻下线 删除 banner同步下架
      * @param newsId
@@ -65,22 +75,20 @@ public interface BannerDao extends BaseDao<BannerEntity> {
     void updateSoltOut(String newsId);
 
     /**
-     *
      * 查询需要修改的组织机构信息
      *
-     * @params [deptId]
      * @return java.util.List<com.elink.esua.epdc.dto.BannerDTO>
+     * @params [deptId]
      * @author liuchuang
      * @since 2020/3/7 14:37
      */
     List<BannerDTO> selectListOfOrganizationInfo(String deptId);
 
     /**
-     *
      * 更新部门名称
      *
-     * @params [newDeptName, deptId]
      * @return void
+     * @params [newDeptName, deptId]
      * @author liuchuang
      * @since 2020/3/7 1:20
      */

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

@@ -21,6 +21,7 @@ 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.EpdcBannerListByCategoryFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.entity.BannerEntity;
@@ -105,6 +106,16 @@ public interface BannerService extends BaseService<BannerEntity> {
      */
     List<EpdcBannerListResultDTO> listBanner(EpdcBannerListFromDTO fromDTO);
 
+    /**
+     * 根据新闻类别，获取banner列表
+     *
+     * @param fromDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2020/5/22 17:52
+     */
+    List<EpdcBannerListResultDTO> listBannerByCategory(EpdcBannerListByCategoryFromDTO fromDTO);
+
     /***
      * 新闻上banner
      * @param banner
@@ -134,13 +145,14 @@ public interface BannerService extends BaseService<BannerEntity> {
     void updateSoltOut(String newsId);
 
     /**
-     *
      * 修改组织机构信息
      *
-     * @params [dto]
      * @return void
+     * @params [dto]
      * @author liuchuang
      * @since 2020/3/7 1:23
      */
     void modifyOrganizationInfo(OrganizationModifyDTO dto);
+
+
 }

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

@@ -34,6 +34,7 @@ import com.elink.esua.epdc.dao.BannerDao;
 import com.elink.esua.epdc.dto.BannerDTO;
 import com.elink.esua.epdc.dto.NewsUserAttitudeDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListByCategoryFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.entity.BannerEntity;
@@ -160,8 +161,16 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
     }
 
     @Override
-    public List<EpdcBannerListResultDTO> listBanner(EpdcBannerListFromDTO fromDTO) {
-        return baseDao.selectListBanner(fromDTO);
+    public List<EpdcBannerListResultDTO> listBanner(EpdcBannerListFromDTO fromDto) {
+        return baseDao.selectListBanner(fromDto);
+    }
+
+    @Override
+    public List<EpdcBannerListResultDTO> listBannerByCategory(EpdcBannerListByCategoryFromDTO fromDto) {
+        if (CollUtil.isEmpty(fromDto.getCategoryCodeList())) {
+            return Lists.newArrayList();
+        }
+        return baseDao.listBannerByCategory(fromDto);
     }
 
     @Override
@@ -204,17 +213,16 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
     }
 
     /**
-     *
      * 组织机构信息处理
      *
-     * @params [dto, bannerList]
      * @return java.util.List<com.elink.esua.epdc.entity.BannerEntity>
+     * @params [dto, bannerList]
      * @author liuchuang
      * @since 2020/3/7 14:41
      */
     private List<BannerEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<BannerDTO> bannerList) {
         List<BannerEntity> entities = new ArrayList<>();
-        for (BannerDTO banner: bannerList) {
+        for (BannerDTO banner : bannerList) {
             BannerEntity entity = new BannerEntity();
             if (StringUtils.isNotEmpty(banner.getParentDeptIds()) && StringUtils.isNotEmpty(banner.getParentDeptNames())) {
                 List<String> parentDeptIds = Arrays.asList(banner.getParentDeptIds().split(","));

epdc-cloud-news/src/main/resources/mapper/BannerDao.xml

@@ -24,6 +24,29 @@
         limit 5
     </select>
 
+    <select id="listBannerByCategory" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO">
+        SELECT
+            eb.ID AS id,
+            eb.NEWS_FLAG AS newsFlag,
+            eb.NEWS_ID AS newsId,
+            eb.IMG_URL AS imgUrl,
+            eb.TITLE AS title,
+            eb.URL AS url
+        FROM
+            ( SELECT ed.BANNER_ID FROM epdc_banner_department ed WHERE ed.GRID_ID = #{deptId} AND ed.DEL_FLAG = '0' ORDER BY ed.CREATED_TIME DESC ) ed
+            LEFT JOIN epdc_banner eb ON ed.BANNER_ID = eb.ID
+            LEFT JOIN epdc_news en ON eb.NEWS_ID = en.ID
+            LEFT JOIN epdc_news_category nc ON en.NEWS_CATERORY_ID = nc.ID
+        WHERE
+            eb.STATE = '1'
+        AND eb.POSITION = #{position}
+        AND eb.DEL_FLAG = '0'
+        AND eb.NEWS_FLAG = '1'
+        AND nc.CATEGORY_CODE in <foreach collection="categoryCodeList" open="(" separator="," close=")" item="code">#{code}</foreach>
+        order by eb.CREATED_TIME desc
+        limit 5
+    </select>
+
     <select id="selectBannerIdByNewsId" resultType="String">
         SELECT
             eb.ID