返回参数新增链接内容

qinkelan@diligrp.com
1 parent d46a5bd4
Showing 5 changed files with 26 additions and 20 deletions
etrade-admin/src/main/java/com/diligrp/etrade/admin/api/BannerApi.java
etrade-admin/src/main/java/com/diligrp/etrade/admin/dao/BannerMapper.java
etrade-admin/src/main/java/com/diligrp/etrade/admin/service/BannerService.java
etrade-admin/src/main/java/com/diligrp/etrade/admin/service/impl/BannerServiceImpl.java
etrade-admin/src/main/resources/com/diligrp/etrade/dao/mapper/BannerMapper.xml
 package com.diligrp.etrade.admin.api;
  
 import com.diligrp.etrade.admin.domain.req.BannerQuery;
-import com.diligrp.etrade.admin.model.Banner;
+import com.diligrp.etrade.admin.domain.resp.BannerVo;
 import com.diligrp.etrade.admin.service.BannerService;
 import com.diligrp.etrade.admin.type.BannerDeleted;
 import com.diligrp.etrade.admin.type.BannerState;
 import com.diligrp.etrade.core.domain.Message;
-import kotlin.collections.EmptyList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
  
-import java.util.Collections;
 import java.util.List;
  
 /** 【小程序/APP】--轮播图接口
@@ -36,14 +37,14 @@ public class BannerApi {
     * @return: com.diligrp.etrade.core.domain.Message<?>
     **/
     @GetMapping(value = "/listByMarketId.api")
-    public Message<List<Banner>> listByMarketId(@RequestParam Long marketId, Long bannerTypeId) {
+    public Message<List<BannerVo>> listByMarketId(@RequestParam Long marketId, Long bannerTypeId) {
         try {
             BannerQuery bannerQuery = new BannerQuery();
             bannerQuery.setMarketId(marketId);
             bannerQuery.setState(BannerState.ENABLE.getCode());
             bannerQuery.setDeleted(BannerDeleted.NO.getCode());
             bannerQuery.setBannerTypeId(bannerTypeId);
-            List<Banner> bannerList = bannerService.listByMarketId(bannerQuery);
+            List<BannerVo> bannerList = bannerService.listByMarketId(bannerQuery);
             return Message.success(bannerList);
         }catch (Exception e){
             LOG.error("获取轮播图失败:{}", e.getMessage());
@@ -59,17 +60,17 @@ public class BannerApi {
      * @return: com.diligrp.etrade.core.domain.Message<?>
      **/
     @GetMapping(value = "/listByMarketIdLimitTwo.api")
-    public Message<List<Banner>> listByMarketIdLimitTwo(@RequestParam Long marketId, Long bannerTypeId) {
+    public Message<List<BannerVo>> listByMarketIdLimitTwo(@RequestParam Long marketId, Long bannerTypeId) {
         try {
             BannerQuery bannerQuery = new BannerQuery();
             bannerQuery.setMarketId(marketId);
             bannerQuery.setState(BannerState.ENABLE.getCode());
             bannerQuery.setDeleted(BannerDeleted.NO.getCode());
             bannerQuery.setBannerTypeId(bannerTypeId);
-            List<Banner> bannerList = bannerService.listByMarketId(bannerQuery);
+            List<BannerVo> bannerList = bannerService.listByMarketId(bannerQuery);
             if (!CollectionUtils.isEmpty(bannerList) && bannerList.size()>2){
                 //如果轮播图大于2张，就取前2张；
-                List<Banner> bannerTwo = bannerList.subList(0, 2);
+                List<BannerVo> bannerTwo = bannerList.subList(0, 2);
                 return Message.success(bannerTwo);
             }else {
                 return Message.success(bannerList);
 package com.diligrp.etrade.admin.dao;
  
 import com.diligrp.etrade.admin.domain.req.BannerQuery;
+import com.diligrp.etrade.admin.domain.resp.BannerVo;
 import com.diligrp.etrade.admin.model.Banner;
 import com.diligrp.etrade.core.mybatis.MybatisMapperSupport;
 import org.springframework.stereotype.Repository;
@@ -28,5 +29,5 @@ public interface BannerMapper extends MybatisMapperSupport {
     **/
     List<Banner> listPage(BannerQuery bannerQuery);
  
-    List<Banner> listByMarketId(BannerQuery bannerQuery);
+    List<BannerVo> listByMarketId(BannerQuery bannerQuery);
 }
 \ No newline at end of file
@@ -28,7 +28,7 @@ public interface BannerService {
     * @param: [bannerQuery]
     * @return: java.util.List<com.diligrp.etrade.admin.domain.resp.BannerVo>
     **/
-    List<Banner> listByMarketId(BannerQuery bannerQuery);
+    List<BannerVo> listByMarketId(BannerQuery bannerQuery);
  
     /**
     * @description: 通过ID查询记录
@@ -81,8 +81,8 @@ public class BannerServiceImpl implements BannerService {
     }
  
     @Override
-    public List<Banner> listByMarketId(BannerQuery bannerQuery) {
-        List<Banner> bannerList = bannerMapper.listByMarketId(bannerQuery);
+    public List<BannerVo> listByMarketId(BannerQuery bannerQuery) {
+        List<BannerVo> bannerList = bannerMapper.listByMarketId(bannerQuery);
         if (CollectionUtils.isEmpty(bannerList)) {
             return Collections.emptyList();
         }
@@ -268,20 +268,24 @@
   </select>
  
   <!-- 根据市场查询 -->
-  <select id="listByMarketId" resultType="com.diligrp.etrade.admin.model.Banner">
-    select <include refid="Base_Column_List"/>
-    from banner
+  <select id="listByMarketId" resultType="com.diligrp.etrade.admin.domain.resp.BannerVo">
+    select
+    b.id, b.created_time, b.modified_time, b.creater_id, b.creater, b.modifier_id, b.modifier, b.sort,
+    b.banner_type_id, b.title, b.pic_url, b.link_type, b.link, b.remark, b.`state`, b.market_id, b.deleted, b.version,
+    bc.content, bc.pic_url as linkPicUrl
+    from banner b
+    left join banner_content bc on b.id = bc.banner_id
     where 1=1
     <if test="state != null">
-      and state = #{state}
+      and b.state = #{state}
     </if>
     <if test="deleted != null">
-      and deleted = #{deleted}
+      and b.deleted = #{deleted}
     </if>
     <if test="bannerTypeId != null">
-      and banner_type_id = #{bannerTypeId}
+      and b.banner_type_id = #{bannerTypeId}
     </if>
-    and market_id=#{marketId,jdbcType=BIGINT}
+    and b.market_id=#{marketId,jdbcType=BIGINT}
     ORDER BY sort ASC
   </select>