提交分支代码

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/BannerController.java

@@ -34,7 +34,7 @@ public class BannerController {
 
     @ApiOperation(value = "首页运营banner接口", notes = "获取首页运营banner")
     @RequestMapping(value = "/banner/{bannerId}", method = RequestMethod.GET)
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "bannerId", value = "运营banner图Id") })
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "bannerId", value = "运营banner图Id") })
     public ResponseBean selectToBannerImg(@PathVariable("bannerId")Integer bannerId){
         ResponseBean responseBean = new ResponseBean();
         ToBanner toBannerList = bannerService.viewBannerImg(bannerId);
@@ -42,4 +42,12 @@ public class BannerController {
         return responseBean;
     }
 
+    @ApiOperation(value = "首页运营所有banner接口", notes = "获取首页所有运营banner")
+    @RequestMapping(value = "/banners", method = RequestMethod.GET)
+    public ResponseBean selectAllToBannerImg(){
+        ResponseBean responseBean = new ResponseBean();
+        List<ToBanner> toBannerList = bannerService.viewAllBannerImg();
+        responseBean.addSuccess(toBannerList);
+        return responseBean;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/ToBannerMapper.java

@@ -11,4 +11,5 @@ public interface ToBannerMapper {
 
     ToBanner selectByCommunityId(@Param("bannerId") Integer bannerId, @Param("nowTime") String nowTime);
 
+    List<ToBanner> selectAllByNum(@Param("nowTime") String nowTime, @Param("num")Integer num);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpCarouselSettingMapper.java

@@ -1,7 +1,9 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpCarouselSetting;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface TpCarouselSettingMapper {
     int deleteByPrimaryKey(Integer id);
 
@@ -14,4 +16,6 @@ public interface TpCarouselSettingMapper {
     int updateByPrimaryKeySelective(TpCarouselSetting record);
 
     int updateByPrimaryKey(TpCarouselSetting record);
+
+    Integer selectCarouselNum(String carouselType);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/BannerServiceI.java

@@ -12,5 +12,5 @@ import java.util.List;
 public interface BannerServiceI {
 
     ToBanner viewBannerImg(Integer bannerId);
-
+    List<ToBanner> viewAllBannerImg();
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/BannerServiceImpl.java

@@ -1,7 +1,9 @@
 package com.community.huiju.service.impl;
 
+import com.community.commom.constant.Constant;
 import com.community.commom.utils.DateUtils;
 import com.community.huiju.dao.ToBannerMapper;
+import com.community.huiju.dao.TpCarouselSettingMapper;
 import com.community.huiju.model.ToBanner;
 import com.community.huiju.service.BannerServiceI;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +22,21 @@ public class BannerServiceImpl implements BannerServiceI {
     @Autowired
     private ToBannerMapper toBannerMapper;
 
+    @Autowired
+    private TpCarouselSettingMapper tpCarouselSettingMapper;
+
     @Override
     public ToBanner viewBannerImg(Integer bannerId) {
         String nowTime = DateUtils.getDate("yyyy-MM-dd");
         return toBannerMapper.selectByCommunityId(bannerId, nowTime);
     }
+
+    @Override
+    public List<ToBanner> viewAllBannerImg() {
+        //查询轮播图数量
+        Integer bannerNum = tpCarouselSettingMapper.selectCarouselNum(Constant.ANNOUNCEMENT);
+
+        String nowTime = DateUtils.getDate("yyyy-MM-dd");
+        return toBannerMapper.selectAllByNum(nowTime, bannerNum);
+    }
 }

CODE/smart-community/app-api/src/main/resources/mapper/ToBannerMapper.xml

@@ -24,6 +24,21 @@
   <select id="selectByCommunityId" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List"></include>
-    from to_banner t where id = #{bannerId} and t.eff_time &lt; #{nowTime} and t.exp_time &gt; #{nowTime} order by t.sort, t.eff_time
+    from to_banner t where id = #{bannerId}
+    and t.eff_time &lt; #{nowTime}
+    and t.exp_time &gt; #{nowTime}
+    order by t.sort, t.eff_time
+  </select>
+
+  <select id="selectAllByNum" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"></include>
+    from to_banner t where t.eff_time &lt; #{nowTime}
+    and t.exp_time &gt; #{nowTime}
+    order by t.sort, t.eff_time
+    <if test="num != null">
+      limit #{num}
+    </if>
+
   </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpCarouselSettingMapper.xml

@@ -16,6 +16,12 @@
     from tp_carousel_setting
     where id = #{id,jdbcType=INTEGER}
   </select>
+  <select id="selectCarouselNum" resultType="java.lang.Integer" parameterType="java.lang.String" >
+    select
+    carousel_num
+    from tp_carousel_setting
+    where carousel_type = #{carouselType}
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tp_carousel_setting
     where id = #{id,jdbcType=INTEGER}