移动端获取bannerList

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java

@@ -153,4 +153,16 @@ public class ApiNewsController {
     public Result<List<EpdcInformationListResultDTO>> listInformationByUserId(@LoginUser TokenDto userDetail, @RequestBody EpdcInformationListFormDTO formDto) {
         return newsService.listInformationByUserId(userDetail, formDto);
     }
+    /***
+     *   banner 列表
+     * @param userDetail
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO>>
+     * @author qushutong
+     * @date 2019/9/11 9:21
+     */
+    @GetMapping("banner/list")
+    public Result<List<EpdcBannerListResultDTO>> listBanner(@LoginUser TokenDto userDetail) {
+        return newsService.listBanner(userDetail);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java

@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.feign;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.*;
@@ -25,7 +26,7 @@ public interface NewsFeignClient {
      * 获取通知列表
      *
      * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List       <       com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>>
      * @author yujintao
      * @date 2019/9/5 20:07
      */
@@ -60,7 +61,7 @@ public interface NewsFeignClient {
      * @Author qushutong
      * @Date 2019/9/9 9:17
      * @Param [formDto]
-     * @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>>
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List       <       com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>>
      * @Exception
      *
      */
@@ -71,7 +72,7 @@ public interface NewsFeignClient {
      * @Description 获取详情
      * @Author qushutong
      * @Date 2019/9/9 10:20
-     * @Param [id]
+     * @Param id
      * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO>
      * @Exception
      *
@@ -129,10 +130,20 @@ public interface NewsFeignClient {
      * 移动端用户消息列表
      *
      * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List       <       com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO>>
      * @author yujintao
      * @date 2019/9/10 17:09
      */
     @GetMapping(value = "news/epdc-app/information/listByUserId", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<EpdcInformationListResultDTO>> listInformationByUserId(EpdcInformationListFormDTO formDto);
+
+    /***
+     * 移动端banner列表
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO>>
+     * @author qushutong
+     * @date 2019/9/11 9:25
+     */
+    @GetMapping(value = "news/epdc-app/news/list/{deptId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcBannerListResultDTO>> listBanner(@PathVariable("deptId") Long deptId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java

@@ -67,4 +67,10 @@ public class NewsFeignClientFallback implements NewsFeignClient {
     public Result<List<EpdcInformationListResultDTO>> listInformationByUserId(EpdcInformationListFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listInformationByUserId", formDto);
     }
+
+    @Override
+    public Result<List<EpdcBannerListResultDTO>> listBanner(Long deptId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listBanner", deptId);
+    }
+
 }

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

@@ -112,4 +112,14 @@ public interface NewsService {
      * @date 2019/9/10 17:05
      */
     Result<List<EpdcInformationListResultDTO>> listInformationByUserId(TokenDto userDetail, EpdcInformationListFormDTO formDto);
+
+
+    /***
+     * 移动端 banner列表
+     * @param userDetail
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO>>
+     * @author qushutong
+     * @date 2019/9/11 9:22
+     */
+    Result<List<EpdcBannerListResultDTO>> listBanner( TokenDto userDetail);
 }

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

@@ -74,4 +74,9 @@ public class NewsServiceImpl implements NewsService {
         formDto.setUserId(userDetail.getUserId());
         return newsFeignClient.listInformationByUserId(formDto);
     }
+
+    @Override
+    public Result<List<EpdcBannerListResultDTO>> listBanner(TokenDto userDetail) {
+        return newsFeignClient.listBanner(userDetail.getGridId());
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2019/9/11 9:06
+ *  @Description: banner列表
+ */
+@Data
+public class EpdcBannerListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 130844542701370110L;
+    /**
+     * id : 50799
+     * imgUrl : X8Z0iszHt0
+     * title : uxlJbM48gM
+     */
+
+    private String id;
+    private String imgUrl;
+    private String title;
+
+}

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

@@ -20,11 +20,14 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.BannerDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
+import com.elink.esua.epdc.service.BannerService;
 import com.elink.esua.epdc.service.NewsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -46,6 +49,9 @@ public class EpdcAppNewsController {
     @Autowired
     private NewsService newsService;
 
+    @Autowired
+    private BannerService bannerService;
+
     /***
      * @Description 新闻列表
      * @Author qushutong
@@ -106,4 +112,17 @@ public class EpdcAppNewsController {
         ValidatorUtils.validateEntity(newsBrowseFromDTO);
         return newsService.modifyNewsBrowse(newsBrowseFromDTO);
     }
+
+
+    /***
+     *  banner列表
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.BannerDTO>>
+     * @author qushutong
+     * @date 2019/9/10 20:58
+     */
+    @GetMapping("list/{deptId}")
+    public Result<List<EpdcBannerListResultDTO>> listBanner(@PathVariable("deptId") Long deptId ){
+        return new Result<List<EpdcBannerListResultDTO>>().ok(bannerService.listBanner(deptId));
+    }
 }

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

@@ -18,9 +18,13 @@
 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.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.entity.BannerEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * banner表
  *
@@ -29,5 +33,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface BannerDao extends BaseDao<BannerEntity> {
-	
+    /***
+     * banner 列表
+     * @param deptId
+     * @return java.util.List<com.elink.esua.epdc.dto.BannerDTO>
+     * @author qushutong
+     * @date 2019/9/11 9:00
+     */
+    List<EpdcBannerListResultDTO> selectListBanner(Long deptId);
 }

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

@@ -20,6 +20,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.dto.BannerDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.entity.BannerEntity;
 
 import java.util.List;
@@ -63,13 +64,13 @@ public interface BannerService extends BaseService<BannerEntity> {
      */
     BannerDTO get(String id);
 
-   /***
-    *  新增 或者更新
-    * @param dto
-    * @return void
-    * @author qushutong
-    * @date 2019/9/10 20:13
-    */
+    /***
+     *  新增 或者更新
+     * @param dto
+     * @return void
+     * @author qushutong
+     * @date 2019/9/10 20:13
+     */
     void saveOrUpdate(BannerDTO dto);
 
     /**
@@ -91,4 +92,13 @@ public interface BannerService extends BaseService<BannerEntity> {
      * @date 2019-09-10
      */
     void delete(String[] ids);
+
+    /***
+     *  banner列表
+     * @param deptId
+     * @return java.util.List<com.elink.esua.epdc.dto.BannerDTO>
+     * @author qushutong
+     * @date 2019/9/11 8:59
+     */
+    List<EpdcBannerListResultDTO> listBanner(Long deptId);
 }

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

@@ -21,7 +21,6 @@ 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;
@@ -32,9 +31,9 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.BannerDao;
 import com.elink.esua.epdc.dto.BannerDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.entity.BannerEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
-import com.elink.esua.epdc.redis.BannerRedis;
 import com.elink.esua.epdc.service.BannerDepartmentService;
 import com.elink.esua.epdc.service.BannerService;
 import com.google.common.collect.Lists;
@@ -156,4 +155,9 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<EpdcBannerListResultDTO> listBanner(Long deptId) {
+        return baseDao.selectListBanner(deptId);
+    }
+
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml

@@ -27,6 +27,18 @@
         <result property="grid" column="GRID"/>
         <result property="creatorName" column="CREATOR_NAME"/>
     </resultMap>
-
+    <select id="selectListBanner" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO">
+        SELECT
+            eb.ID AS id,
+            eb.IMG_URL AS imgUrl,
+            eb.TITLE AS title
+        FROM
+            epdc_banner eb
+        LEFT JOIN epdc_banner_department ed ON ed.GRID_ID = #{deptId}
+        WHERE
+            eb.STATE = '1'
+        AND eb.DEL_FLAG = '0'
+        AND ed.DEL_FLAG = '0'
+    </select>
 
 </mapper>