轮播图链接加链接类型

qinkelan@diligrp.com
1 parent 5fb3f442
Showing 6 changed files with 158 additions and 3 deletions
etrade-admin/src/main/java/com/diligrp/etrade/admin/domain/req/BannerCo.java
etrade-admin/src/main/java/com/diligrp/etrade/admin/domain/resp/BannerVo.java
etrade-admin/src/main/java/com/diligrp/etrade/admin/model/Banner.java
etrade-admin/src/main/java/com/diligrp/etrade/admin/service/impl/BannerServiceImpl.java
etrade-admin/src/main/java/com/diligrp/etrade/admin/type/BannerLinkType.java
etrade-admin/src/main/resources/com/diligrp/etrade/dao/mapper/BannerMapper.xml
@@ -41,12 +41,28 @@ public class BannerCo implements Serializable {
      * 链接
      */
     private String link;
+    /**
+     * 链接类型
+     * {@link com.diligrp.etrade.admin.type.BannerLinkType}
+     */
+    private Integer linkType;
+
+    /**
+     * 链接内容
+     */
+    private String content;
+
+    /**
+     * 链接内容-图片链接
+     */
+    private String likPicUrl;
     /**
      * 备注
      */
     private String remark;
+
     private static final long serialVersionUID = 1L;
     public Long getId() {
@@ -105,4 +121,27 @@ public class BannerCo implements Serializable {
         this.remark = remark;
     }
+    public Integer getLinkType() {
+        return linkType;
+    }
+
+    public void setLinkType(Integer linkType) {
+        this.linkType = linkType;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getLikPicUrl() {
+        return likPicUrl;
+    }
+
+    public void setLikPicUrl(String likPicUrl) {
+        this.likPicUrl = likPicUrl;
+    }
 }
 \ No newline at end of file
@@ -77,6 +77,22 @@ public class BannerVo implements Serializable {
     private String link;
     /**
+     * 链接类型
+     * {@link com.diligrp.etrade.admin.type.BannerLinkType}
+     */
+    private Integer linkType;
+
+    /**
+     * 链接内容
+     */
+    private String content;
+
+    /**
+     * 链接内容-图片链接
+     */
+    private String likPicUrl;
+
+    /**
      * 备注
      */
     private String remark;
@@ -243,4 +259,28 @@ public class BannerVo implements Serializable {
     public void setBannerTypeName(String bannerTypeName) {
         this.bannerTypeName = bannerTypeName;
     }
+
+    public Integer getLinkType() {
+        return linkType;
+    }
+
+    public void setLinkType(Integer linkType) {
+        this.linkType = linkType;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getLikPicUrl() {
+        return likPicUrl;
+    }
+
+    public void setLikPicUrl(String likPicUrl) {
+        this.likPicUrl = likPicUrl;
+    }
 }
 \ No newline at end of file
@@ -47,6 +47,11 @@ public class Banner extends BaseDo implements Serializable {
      * 图片链接
      */
     private String picUrl;
+    /**
+     * 链接类型
+     * {@link com.diligrp.etrade.admin.type.BannerLinkType}
+     */
+    private Integer linkType;
     /**
      * 链接
@@ -178,4 +183,12 @@ public class Banner extends BaseDo implements Serializable {
     public void setDeleted(Integer deleted) {
         this.deleted = deleted;
     }
+
+    public Integer getLinkType() {
+        return linkType;
+    }
+
+    public void setLinkType(Integer linkType) {
+        this.linkType = linkType;
+    }
 }
 \ No newline at end of file
 package com.diligrp.etrade.admin.service.impl;
+import com.diligrp.etrade.admin.dao.BannerContentMapper;
 import com.diligrp.etrade.admin.dao.BannerMapper;
 import com.diligrp.etrade.admin.domain.req.BannerCo;
 import com.diligrp.etrade.admin.domain.req.BannerQuery;
@@ -24,6 +25,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -44,6 +46,8 @@ public class BannerServiceImpl implements BannerService {
     @Autowired
     private BannerMapper bannerMapper;
     @Autowired
+    private BannerContentMapper bannerContentMapper;
+    @Autowired
     private BannerTypeService bannerTypeService;
     @Override
@@ -91,11 +95,13 @@ public class BannerServiceImpl implements BannerService {
             LOG.warn("未查询到该记录， 参数id={}", id);
             return Message.failure("该记录不存在！");
         }
+        //@TODO 查询组装内容数据
         BannerVo bannerVo = new BannerVo();
         BeanUtils.copyProperties(banner, bannerVo);
         return Message.success(bannerVo);
     }
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Message<Integer> insert(BannerCo bannerCo) {
         Banner banner = new Banner();
@@ -108,6 +114,7 @@ public class BannerServiceImpl implements BannerService {
         banner.setDeleted(BannerDeleted.NO.getCode());
         int count = bannerMapper.insert(banner);
         Assert.isTrue(count > 0, "新增失败，请稍后重试！");
+        //@TODO 组装新增 内容数据
         return Message.success();
     }
@@ -124,6 +131,7 @@ public class BannerServiceImpl implements BannerService {
         return Message.success();
     }
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Message<Integer> update(BannerCo bannerCo) {
         Banner banner = bannerMapper.selectByPrimaryKey(bannerCo.getId());
@@ -136,6 +144,7 @@ public class BannerServiceImpl implements BannerService {
         banner.setModifier(userTicket.getRealName());
         int count = bannerMapper.updateByPrimaryKey(banner);
         Assert.isTrue(count > 0, "修改失败，请稍后重试！");
+        //@TODO 组装删除/新增 -- 内容数据
         return Message.success();
     }
+package com.diligrp.etrade.admin.type;
+
+import com.diligrp.etrade.core.type.EnumArrayValuableEnums;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public enum BannerLinkType implements EnumArrayValuableEnums {
+    CONTACT(1,"电话"),
+    LINK(2,"链接"),
+    CONTENT(3,"内容");
+    private Integer code;
+    private String value;
+
+    BannerLinkType(Integer code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    private final static Map<Integer, String> DATA = Stream.of(BannerLinkType.values())
+            .collect(Collectors.toMap(BannerLinkType::getCode, BannerLinkType::getValue));
+
+
+    /**
+     * 自定义序列化
+     *
+     * @return {@link Map}<{@link String}, {@link String}>
+     */
+    @Override
+    public Map<String, String> keyValue() {
+        return DATA.entrySet().stream()
+                .collect(Collectors.toMap(vo -> vo.getKey().toString(), Map.Entry::getValue));
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
@@ -13,6 +13,7 @@
     <result column="banner_type_id" jdbcType="BIGINT" property="bannerTypeId" />
     <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="pic_url" jdbcType="VARCHAR" property="picUrl" />
+    <result column="link_type" jdbcType="INTEGER" property="linkType" />
     <result column="link" jdbcType="VARCHAR" property="link" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="state" jdbcType="TINYINT" property="state" />
@@ -22,7 +23,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     id, created_time, modified_time, creater_id, creater, modifier_id, modifier, sort, 
-    banner_type_id, title, pic_url, link, remark, `state`, market_id, deleted, version
+    banner_type_id, title, pic_url, link_type, link, remark, `state`, market_id, deleted, version
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
@@ -38,12 +39,12 @@
     insert into banner (creater_id,
       creater, modifier_id, modifier, 
       sort, banner_type_id, title, 
-      pic_url, link, remark, 
+      pic_url, link_type, link, remark,
       `state`, market_id, deleted)
     values (#{createrId,jdbcType=BIGINT},
       #{creater,jdbcType=VARCHAR}, #{modifierId,jdbcType=BIGINT}, #{modifier,jdbcType=VARCHAR}, 
       #{sort,jdbcType=INTEGER}, #{bannerTypeId,jdbcType=BIGINT}, #{title,jdbcType=VARCHAR}, 
-      #{picUrl,jdbcType=VARCHAR}, #{link,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{picUrl,jdbcType=VARCHAR}, #{link_type,jdbcType=INTEGER}, #{link,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
       #{state,jdbcType=TINYINT}, #{marketId,jdbcType=BIGINT}, #{deleted,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.diligrp.etrade.admin.model.Banner" useGeneratedKeys="true">
@@ -79,6 +80,9 @@
       <if test="picUrl != null">
         pic_url,
       </if>
+      <if test="linkType != null">
+        link_type,
+      </if>
       <if test="link != null">
         link,
       </if>
@@ -129,6 +133,9 @@
       <if test="picUrl != null">
         #{picUrl,jdbcType=VARCHAR},
       </if>
+      <if test="linkType != null">
+        #{linkType,jdbcType=INTEGER},
+      </if>
       <if test="link != null">
         #{link,jdbcType=VARCHAR},
       </if>
@@ -182,6 +189,9 @@
       <if test="picUrl != null">
         pic_url = #{picUrl,jdbcType=VARCHAR},
       </if>
+      <if test="linkType != null">
+        link_type = #{linkType,jdbcType=INTEGER},
+      </if>
       <if test="link != null">
         link = #{link,jdbcType=VARCHAR},
       </if>
@@ -212,6 +222,7 @@
       banner_type_id = #{bannerTypeId,jdbcType=BIGINT},
       title = #{title,jdbcType=VARCHAR},
       pic_url = #{picUrl,jdbcType=VARCHAR},
+      link_type = #{linkType,jdbcType=INTEGER},
       link = #{link,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       `state` = #{state,jdbcType=TINYINT},