平安榆山banner相关

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java

@@ -8,8 +8,10 @@ import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListByCategoryFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListByCategoryFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
@@ -340,4 +342,19 @@ public class ApiPropertyController {
         formDto.setCategoryCode(categoryCode);
         return propertyService.listNewsByCategory(userDetail, formDto);
     }
+
+    /**
+     * 根据新闻类别获取banner列表(用于平安榆山banner)
+     *
+     * @param userDetail 用户信息
+     * @param formDto    查询参数
+     * @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/25 09:17
+     */
+    @GetMapping("safety/bannerList")
+    public Result<List<EpdcBannerListResultDTO>> listBnnerByCategory(@LoginUser TokenDto userDetail, EpdcBannerListByCategoryFromDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return propertyService.listBnnerByCategory(userDetail, formDto);
+    }
 }

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

@@ -76,7 +76,7 @@ public interface NewsFeignClient {
      * @date 2020/5/22 15:54
      */
     @GetMapping(value = "news/epdc-app/news/listNewsByCategory", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<EpdcNewsListResultDTO>> listNewsByCategory(@RequestBody EpdcNewsListFromDTO formDto);
+    Result<List<EpdcNewsListResultDTO>> listNewsByCategory(@RequestBody EpdcNewsListByCategoryFromDTO formDto);
 
     /**
      * 移动端获取新闻详情
@@ -157,6 +157,18 @@ public interface NewsFeignClient {
     Result<List<EpdcBannerListResultDTO>> listBanner(@RequestBody EpdcBannerListFromDTO fromDTO);
 
 
+    /**
+     * 根据新闻类别获取banner列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/5/25 09:14
+     */
+    @GetMapping(value = "news/epdc-app/news/listBannerByCategory", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcBannerListResultDTO>> listBannerByCategory(@RequestBody EpdcBannerListByCategoryFromDTO formDto);
+
+
     /***
      *  获取第一条通知消息
      * @param userId

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

@@ -39,10 +39,15 @@ public class NewsFeignClientFallback implements NewsFeignClient {
     }
 
     @Override
-    public Result<List<EpdcNewsListResultDTO>> listNewsByCategory(EpdcNewsListFromDTO formDto) {
+    public Result<List<EpdcNewsListResultDTO>> listNewsByCategory(EpdcNewsListByCategoryFromDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNewsByCategory", formDto);
     }
 
+    @Override
+    public Result<List<EpdcBannerListResultDTO>> listBannerByCategory(EpdcBannerListByCategoryFromDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "EpdcBannerListByCategoryFromDTO", formDto);
+    }
+
     @Override
     public Result<EpdcNewsDetailResultDTO> getNewsDetail(EpdcNewsDetailFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNewsDetail", formDto);

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java

@@ -7,8 +7,10 @@ import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListByCategoryFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListByCategoryFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
@@ -261,4 +263,15 @@ public interface PropertyService {
      * @date 2020/5/22 15:51
      */
     Result<List<EpdcNewsListResultDTO>> listNewsByCategory(TokenDto userDetail, EpdcNewsListByCategoryFromDTO formDto);
+
+    /**
+     * 根据新闻类别获取banner列表
+     *
+     * @param userDetail 用户信息
+     * @param formDto    查询参数
+     * @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/25 09:15
+     */
+    Result<List<EpdcBannerListResultDTO>> listBnnerByCategory(TokenDto userDetail, EpdcBannerListByCategoryFromDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java

@@ -11,8 +11,10 @@ import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
 import com.elink.esua.epdc.dto.enums.TopicStateEnum;
+import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListByCategoryFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListByCategoryFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
@@ -27,11 +29,13 @@ import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
 import com.elink.esua.epdc.dto.topic.form.*;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
+import com.elink.esua.epdc.enums.IndependentFunctionCodeEnum;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.NewsFeignClient;
 import com.elink.esua.epdc.feign.PropertyFeignClient;
 import com.elink.esua.epdc.service.PropertyService;
 import com.elink.esua.epdc.utils.UserTagUtils;
+import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -315,4 +319,15 @@ public class PropertyServiceImpl implements PropertyService {
         formDto.setDeptId(userDetail.getGridId());
         return newsFeignClient.listNewsByCategory(formDto);
     }
+
+    @Override
+    public Result<List<EpdcBannerListResultDTO>> listBnnerByCategory(TokenDto userDetail, EpdcBannerListByCategoryFromDTO formDto) {
+        List<String> categoryCodes = Lists.newArrayList();
+        categoryCodes.add(IndependentFunctionCodeEnum.POLICE_NOTICE.getCode());
+        categoryCodes.add(IndependentFunctionCodeEnum.SAFETY_PRECAUTIONS.getCode());
+
+        formDto.setDeptId(userDetail.getGridId());
+        formDto.setCategoryCodeList(categoryCodes);
+        return newsFeignClient.listBannerByCategory(formDto);
+    }
 }