志愿者banner修改

1、PC端修改，支持发布内容
2、banner列表和详情接口修改，增加内容等信息返回

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

@@ -114,4 +114,17 @@ public class ApiAppActInfoController {
     public Result<List<ActBannerDTO>> bannerList(EpdcAppBannerFormDTO dto) {
         return actInfoService.getBannerList(dto);
     }
+
+    /**
+     * 志愿者banner详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.activity.ActBannerDTO>
+     * @author Liuchuang
+     * @since 2020/11/5 10:57
+     */
+    @GetMapping("banner/detail/{id}")
+    public Result<ActBannerDTO> bannerDetail(@PathVariable String id) {
+        return actInfoService.getBannerDetail(id);
+    }
 }

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

@@ -62,7 +62,7 @@ public interface ActInfoFeignClient {
     @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id);
 
-    @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "heart/epdc-app/actbanner/list", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto);
 
     /**
@@ -76,4 +76,15 @@ public interface ActInfoFeignClient {
     @GetMapping(value = "heart/appactinfo/unreadactnums", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<Integer> getUserUnreadSignUpActCount(String userId);
 
+    /**
+     * 志愿者banner详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.activity.ActBannerDTO>>
+     * @author Liuchuang
+     * @since 2020/11/5 10:34
+     */
+    @GetMapping(value = "heart/epdc-app/actbanner/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<ActBannerDTO> getBannerDetail(@PathVariable("id") String id);
+
 }

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

@@ -52,4 +52,9 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getUserUnreadSignUpActCount", userId);
     }
 
+    @Override
+    public Result<ActBannerDTO> getBannerDetail(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerDetail", id);
+    }
+
 }

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

@@ -48,5 +48,14 @@ public interface ActInfoService {
 
     Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto);
 
+    /**
+     * 志愿者banner详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.activity.ActBannerDTO>
+     * @author Liuchuang
+     * @since 2020/11/5 10:56
+     */
+    Result<ActBannerDTO> getBannerDetail(String id);
 
 }

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

@@ -51,4 +51,9 @@ public class ActInfoServiceImpl implements ActInfoService {
     public Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto) {
         return actInfoFeignClient.getBannerList(dto);
     }
+
+    @Override
+    public Result<ActBannerDTO> getBannerDetail(String id) {
+        return actInfoFeignClient.getBannerDetail(id);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java

@@ -102,4 +102,9 @@ public class ActBannerDTO implements Serializable {
      * banner排序
      */
     private String sort;
+
+    /**
+     * 内容
+     */
+    private String content;
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/EpdcActBannerController.java

@@ -17,7 +17,9 @@
 
 package com.elink.esua.epdc.modules.activity.controller;
 
+import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -26,7 +28,9 @@ import com.elink.esua.epdc.modules.activity.service.ActBannerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 @RestController
@@ -44,9 +48,38 @@ public class EpdcActBannerController {
      * @Author zhangyong
      * @Date 18:27 2020-05-25
      **/
+    @Deprecated
     @GetMapping("banner/list")
     public Result<List<EpdcAppActBannerResultDTO>> bannerList(@RequestBody EpdcAppActBannerFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return actBannerService.getBannerList(formDto);
     }
+
+    /**
+     * 志愿者banner列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.activity.ActBannerDTO>>
+     * @author Liuchuang
+     * @since 2020/11/5 10:20
+     */
+    @GetMapping("list")
+    public Result<List<ActBannerDTO>> getBannerList(@RequestBody EpdcAppBannerFormDTO formDto){
+        List<ActBannerDTO> data = actBannerService.listBanners(formDto);
+        return new Result<List<ActBannerDTO>>().ok(data);
+    }
+
+    /**
+     * 志愿者banner详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.activity.ActBannerDTO>
+     * @author Liuchuang
+     * @since 2020/11/5 10:33
+     */
+    @GetMapping("detail/{id}")
+    public Result<ActBannerDTO> getBannerDetail(@PathVariable("id") String id){
+        ActBannerDTO data = actBannerService.get(id);
+        return new Result<ActBannerDTO>().ok(data);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.activity.dao;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity;
@@ -107,4 +108,14 @@ public interface ActBannerDao extends BaseDao<ActBannerEntity> {
      * @return void
      */
     void rejectActBannerInfo(@Param("relationId") String relationId);
+
+    /**
+     * 志愿者banner列表
+     *
+     * @param formDto
+     * @return java.util.List<com.elink.esua.epdc.activity.ActBannerDTO>
+     * @author Liuchuang
+     * @since 2020/11/5 10:23
+     */
+    List<ActBannerDTO> selectListBanners(EpdcAppBannerFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java

@@ -91,4 +91,9 @@ public class ActBannerEntity extends BaseEpdcEntity {
 	 * banner排序
 	 */
 	private String sort;
+
+	/**
+	 * 内容
+	 */
+	private String content;
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.activity.service;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
@@ -153,4 +154,14 @@ public interface ActBannerService extends BaseService<ActBannerEntity> {
      * @Date 15:13 2020-06-02
      **/
     Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType);
+
+    /**
+     * 志愿者banner列表
+     *
+     * @param formDto
+     * @return java.util.List<com.elink.esua.epdc.activity.ActBannerDTO>
+     * @author Liuchuang
+     * @since 2020/11/5 10:22
+     */
+    List<ActBannerDTO> listBanners(EpdcAppBannerFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -183,4 +184,9 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
     public Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType) {
         return adminFeignClient.getListSimpleDictInfo(dictType);
     }
+
+    @Override
+    public List<ActBannerDTO> listBanners(EpdcAppBannerFormDTO formDto) {
+        return baseDao.selectListBanners(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml

@@ -138,4 +138,28 @@
         UPDATE epdc_act_banner SET DEL_FLAG = 1,UPDATED_TIME=NOW()
         where ACT_ID=#{relationId}
     </update>
+
+    <select id="selectListBanners" resultType="com.elink.esua.epdc.activity.ActBannerDTO">
+        SELECT
+            ID,
+            ACT_ID,
+            TITLE,
+            BANNER_IMG,
+            BANNER_TYPE,
+            URL,
+            BANNER_POSITION,
+            SORT,
+            CREATED_TIME
+        FROM
+            epdc_act_banner
+        WHERE
+            DEL_FLAG = '0'
+            AND `STATUS` = '1'
+        <if test="bannerType != null and bannerType != ''">
+            AND BANNER_TYPE = #{bannerType}
+        </if>
+        ORDER BY
+        SORT,
+        CREATED_TIME DESC
+    </select>
 </mapper>