yujian
2019-03-25 31f64845425a6ca1b6003ba77d01bafdbdacb8e2
部分对象清理 + RecommendBannerV2Dao改造
18个文件已删除
8个文件已修改
4个文件已添加
1909 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/goods/DynamicRecommendDao.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendBannerV2Dao.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendDetailsDao.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendLikeDao.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendReplyDao.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/goods/SuperRecommendBannerV2Dao.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/RecommendBannerV2Mapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/SuperRecommendBannerV2Mapper.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/DynamicRecommend.java 203 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendBannerV2.java 128 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendDetails.java 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendLike.java 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendReply.java 149 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/su/recommend/SuperRecommendBannerV2.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/RecommendBannerV2Mapper.xml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/SuperRecommendBannerV2Mapper.xml 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendBannerV2ServiceImpl.java 197 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendDetailsServiceImpl.java 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendLikeServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendReplyServiceImpl.java 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerV2ServiceImpl.java 138 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/DynamicRecommendServiceImpl.java 270 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendBannerV2Service.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendDetailsService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendLikeService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendReplyService.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/SuperRecommendBannerV2Service.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/user/DynamicRecommendService.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
@@ -2,7 +2,6 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -15,27 +14,17 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.taobao.api.ApiException;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.recommend.DynamicRecommend;
import com.yeshi.fanli.entity.bus.recommend.RecommendDetails;
import com.yeshi.fanli.entity.bus.recommend.RecommendReply;
import com.yeshi.fanli.entity.taobao.RelateGoods;
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.RecommendDetailsService;
import com.yeshi.fanli.service.inter.goods.RecommendReplyService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.DynamicRecommendService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONObject;
@@ -45,15 +34,6 @@
    @Resource
    private HongBaoManageService hongBaoManageService;
    @Resource
    private DynamicRecommendService dynamicRecommendService;
    @Resource
    private RecommendDetailsService recommendDetailsService;
    @Resource
    private RecommendReplyService recommendReplyService;
    @Resource
    private UserInfoService userInfoService;
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -1369,26 +1369,8 @@
        }
        // 首页Banner
        List<RecommendBannerV2> listBanner = null;
        List<RecommendBannerV2> listBanner = superRecommendBannerV2Service.getSuperRecommendBannerV2sBySystem(system.getId());
        List<SuperRecommendBannerV2> listRecommendBanner = superRecommendBannerV2Service
                .getSuperRecommendBannerV2sBySystem(system);
        if (listRecommendBanner != null && listRecommendBanner.size() > 0) {
            listBanner = new ArrayList<RecommendBannerV2>();
            for (SuperRecommendBannerV2 superRecommendBanner : listRecommendBanner) {
                RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner();
                // 淘特价暂时修改
                if (system.getId() == 7) {
                    recommendBanner.getJumpDetail().setActivity(recommendBanner.getJumpDetail().getActivity()
                            .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial"));
                }
                listBanner.add(recommendBanner);
            }
        }
        JSONObject root = new JSONObject();
        root.put("banner", listBanner);
fanli/src/main/java/com/yeshi/fanli/dao/goods/DynamicRecommendDao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendBannerV2Dao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendDetailsDao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendLikeDao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendReplyDao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/dao/goods/SuperRecommendBannerV2Dao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/RecommendBannerV2Mapper.java
New file
@@ -0,0 +1,8 @@
package com.yeshi.fanli.dao.mybatis;
import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
public interface RecommendBannerV2Mapper extends BaseMapper<RecommendBannerV2>{
}
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/SuperRecommendBannerV2Mapper.java
New file
@@ -0,0 +1,13 @@
package com.yeshi.fanli.dao.mybatis;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;
public interface SuperRecommendBannerV2Mapper extends BaseMapper<SuperRecommendBannerV2> {
    List<SuperRecommendBannerV2> listBySystemId(@Param("systemId") Long systemId);
}
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/DynamicRecommend.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendBannerV2.java
@@ -2,61 +2,48 @@
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
import com.yeshi.fanli.entity.common.JumpDetailV2;
//推荐Banner  v.2
@Entity
@Table(name = "yeshi_ec_recommend_banner_v2")
public class RecommendBannerV2 implements Serializable{
@Table("yeshi_ec_recommend_banner_v2")
public class RecommendBannerV2 implements Serializable {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id")
    private long id;
    @Column(name = "`name`")
    private String name;
    @Column(name = "`picture`",length = 256)
    private String picture;// 图片链接
    @ManyToOne(fetch = FetchType.EAGER)
    @JoinColumn(name = "jumpid")
    private JumpDetailV2 jumpDetail;// 跳转详情
    @Column(name = "`params`",length = 256)
    private String params;// 跳转参数
    @Column(name = "`createtime`")
    private long createtime;
    @Column(name = "`orderby`")
    private int orderby;// 值越小越�?
    @Column(name = "`show`")
    private boolean show;// 是否显示
    public RecommendBannerV2() {}
    public RecommendBannerV2(JumpDetailV2 jumpDetail, String params,
            String picture, long createtime, int orderby, boolean show) {
    @Column(name = "id")
    private Long id;
    @Column(name = "name")
    private String name;
    @Column(name = "picture")
    private String picture;// 图片链接
    @Column(name = "jumpid")
    private JumpDetailV2 jumpDetail;// 跳转详情
    @Column(name = "params", length = 256)
    private String params;// 跳转参数
    @Column(name = "createtime")
    private Long createtime;
    @Column(name = "orderby")
    private Integer orderby;// 值越小越�?
    @Column(name = "show")
    private boolean show;// 是否显示
    public RecommendBannerV2() {
    }
    public RecommendBannerV2(JumpDetailV2 jumpDetail, String params, String picture, Long createtime, Integer orderby,
            boolean show) {
        super();
        this.jumpDetail = jumpDetail;
        this.params = params;
@@ -64,6 +51,14 @@
        this.createtime = createtime;
        this.orderby = orderby;
        this.show = show;
    }
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getName() {
@@ -74,20 +69,12 @@
        this.name = name;
    }
    public boolean isShow() {
        return show;
    public String getPicture() {
        return picture;
    }
    public void setShow(boolean show) {
        this.show = show;
    }
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    public void setPicture(String picture) {
        this.picture = picture;
    }
    public JumpDetailV2 getJumpDetail() {
@@ -106,27 +93,28 @@
        this.params = params;
    }
    public String getPicture() {
        return picture;
    }
    public void setPicture(String picture) {
        this.picture = picture;
    }
    public long getCreatetime() {
    public Long getCreatetime() {
        return createtime;
    }
    public void setCreatetime(long createtime) {
    public void setCreatetime(Long createtime) {
        this.createtime = createtime;
    }
    public int getOrderby() {
    public Integer getOrderby() {
        return orderby;
    }
    public void setOrderby(int orderby) {
    public void setOrderby(Integer orderby) {
        this.orderby = orderby;
    }
    public boolean isShow() {
        return show;
    }
    public void setShow(boolean show) {
        this.show = show;
    }
}
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendDetails.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendLike.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendReply.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/su/recommend/SuperRecommendBannerV2.java
@@ -2,38 +2,26 @@
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
import com.yeshi.fanli.entity.system.BusinessSystem;
@Entity
@Table(name = "yeshi_ec_super_recommendbanner_v2")
@Table("yeshi_ec_super_recommendbanner_v2")
public class SuperRecommendBannerV2 implements Serializable{
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id")
    private long id;
    private Long id;
    
    @ManyToOne(fetch = FetchType.EAGER)
    @JoinColumn(name = "recommendbanner_id")
    @Column(name = "recommendbanner_id")
    private RecommendBannerV2 recommendBanner;
    
    @ManyToOne(fetch = FetchType.EAGER)
    @JoinColumn(name = "system_id")
    @Column(name = "system_id")
    private BusinessSystem system;
    public SuperRecommendBannerV2() {
@@ -45,11 +33,11 @@
        this.system = system;
    }
    public long getId() {
    public Long getId() {
        return id;
    }
    public void setId(long id) {
    public void setId(Long id) {
        this.id = id;
    }
fanli/src/main/java/com/yeshi/fanli/mapping/RecommendBannerV2Mapper.xml
New file
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeshi.fanli.dao.mybatis.RecommendBannerV2Mapper">
  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2">
    <id column="id" property="id" jdbcType="BIGINT"/>
    <result column="name" property="name" jdbcType="VARCHAR"/>
    <result column="picture" property="picture" jdbcType="VARCHAR"/>
    <result column="params" property="params" jdbcType="VARCHAR"/>
    <result column="createtime" property="createtime" jdbcType="BIGINT"/>
    <result column="orderby" property="orderby" jdbcType="INTEGER"/>
    <result column="show" property="show" jdbcType="VARCHAR"/>
    <association property="jumpDetail" column="jumpid" javaType="com.yeshi.fanli.entity.common.JumpDetailV2">
        <id column="jumpid" property="id" jdbcType="BIGINT" />
    </association>
  </resultMap>
  <sql id="Base_Column_List">id,`name`,`picture`,jumpid,`params`,`createtime`,`orderby`,`show`</sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
      select <include refid="Base_Column_List"/>from yeshi_ec_recommend_banner_v2 where id = #{id,jdbcType=BIGINT}
  </select>
</mapper>
fanli/src/main/java/com/yeshi/fanli/mapping/SuperRecommendBannerV2Mapper.xml
New file
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeshi.fanli.dao.mybatis.SuperRecommendBannerV2Mapper">
  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2">
    <id column="id" property="id" jdbcType="BIGINT"/>
     <association property="recommendBanner" column="recommendbanner_id"
        select="com.yeshi.fanli.dao.mybatis.RecommendBannerV2Mapper.selectByPrimaryKey"/>
    <association property="system" column="system_id" javaType="com.yeshi.fanli.entity.system.BusinessSystem">
        <id column="system_id" property="id" jdbcType="BIGINT" />
    </association>
  </resultMap>
  <sql id="Base_Column_List">id,recommendbanner_id,system_id</sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
    <include refid="Base_Column_List"/>from yeshi_ec_super_recommendbanner_v2 where id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_super_recommendbanner_v2 where id = #{id,jdbcType=BIGINT}</delete>
  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_super_recommendbanner_v2 (id,recommendbanner_id,system_id) values (#{id,jdbcType=BIGINT},#{recommendBanner.id,jdbcType=BIGINT},#{system.id,jdbcType=BIGINT})</insert>
  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_super_recommendbanner_v2
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">id,</if>
      <if test="recommendBanner != null">recommendbanner_id,</if>
      <if test="system != null">system_id,</if>
    </trim>values
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">#{id,jdbcType=BIGINT},</if>
      <if test="recommendBanner != null">#{recommendBanner.id,jdbcType=BIGINT},</if>
      <if test="system != null">#{system.id,jdbcType=BIGINT},</if>
    </trim>
  </insert>
  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2">update yeshi_ec_super_recommendbanner_v2 set recommendbanner_id = #{recommendBanner.id,jdbcType=BIGINT},system_id = #{system.id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}</update>
  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2">update yeshi_ec_super_recommendbanner_v2
    <set>
      <if test="recommendBanner != null">recommendbanner_id=#{recommendBanner.id,jdbcType=BIGINT},</if>
      <if test="system != null">system_id=#{system.id,jdbcType=BIGINT},</if>
    </set> where id = #{id,jdbcType=BIGINT}
  </update>
  <select id="listBySystemId" resultMap="BaseResultMap">
      SELECT vp.* FROM yeshi_ec_super_recommendbanner_v2 vp
    LEFT JOIN yeshi_ec_recommend_banner_v2  vb ON vb.`id` = vp.`recommendbanner_id`
    WHERE vp.`system_id` = #{systemId}
    ORDER BY vb.`orderby`
  </select>
</mapper>
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendBannerV2ServiceImpl.java
@@ -16,7 +16,7 @@
import org.springframework.orm.hibernate4.HibernateCallback;
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.goods.RecommendBannerV2Dao;
import com.yeshi.fanli.dao.mybatis.RecommendBannerV2Mapper;
import com.yeshi.fanli.entity.admin.RecommendBannerV2Admin;
import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;
@@ -31,7 +31,7 @@
public class RecommendBannerV2ServiceImpl implements RecommendBannerV2Service {
    @Resource
    private RecommendBannerV2Dao recommendBannerV2Dao;
    private RecommendBannerV2Mapper recommendBannerV2Mapper;
    @Resource
    private SuperRecommendBannerV2Service superRecommendBannerV2Service;
@@ -40,198 +40,5 @@
    private BusinessSystemService businessSystemService;
    
    
    public List<RecommendBannerV2> getRecommendBanners() {
        return recommendBannerV2Dao.list("from RecommendBannerV2 rb order by rb.orderby");
    }
    public void addRecommendBanner(RecommendBannerV2 banner) {
        banner.setCreatetime(java.lang.System.currentTimeMillis());
        recommendBannerV2Dao.create(banner);
    }
    @SuppressWarnings("unchecked")
    public List<RecommendBannerV2Admin> getRecommendBanners(int pageIndex, String platform, String packages, String key) {
        final int strat = pageIndex * Constant.PAGE_SIZE;
        platform = Utils.getMap().get(platform);
        BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);
    
        List<RecommendBannerV2> recommendBannerList = null;
        List<SuperRecommendBannerV2> superRecommendBannerList = null;
        Map<Long, RecommendBannerV2Admin> recommendBannerAdminMap = new HashMap<Long, RecommendBannerV2Admin>();
        List<RecommendBannerV2Admin> recommendBannerAdmin = new ArrayList<RecommendBannerV2Admin>();
        if (system == null) {
            if ("".equals(key.trim())) {
                recommendBannerList = (List<RecommendBannerV2>) recommendBannerV2Dao.excute(new HibernateCallback<List<RecommendBannerV2>>() {
                    public List<RecommendBannerV2> doInHibernate(Session session) throws HibernateException {
                        Query query = session.createQuery(" from RecommendBannerV2 rb order by rb.orderby ");
                        query.setFirstResult(strat);
                        query.setMaxResults(Constant.PAGE_SIZE);
                        return query.list();
                    }
                });
            } else {
                final String likekey = "%" + key + "%";
                recommendBannerList = (List<RecommendBannerV2>) recommendBannerV2Dao.excute(new HibernateCallback<List<RecommendBannerV2>>() {
                    public List<RecommendBannerV2> doInHibernate(Session session) throws HibernateException {
                        Query query = session.createQuery(" from RecommendBannerV2 rs where rs.name like ? order by rs.orderby ");
                        query.setFirstResult(strat);
                        query.setMaxResults(Constant.PAGE_SIZE);
                        query.setParameter(0, likekey);
                        return query.list();
                    }
                });
            }
            List<Long> rsIdList = new ArrayList<Long>();
            for (RecommendBannerV2 rs : recommendBannerList) {
                rsIdList.add(rs.getId());
            }
            superRecommendBannerList = superRecommendBannerV2Service.getSuperRecommendBannersByBanners(rsIdList);
            Map<Long, List<BusinessSystem>> superMap = new HashMap<Long, List<BusinessSystem>>();
            Long rsId = null;
            List<BusinessSystem> systemList = null;
            for (SuperRecommendBannerV2 srs : superRecommendBannerList) {
                rsId = srs.getRecommendBanner().getId();
                systemList = superMap.get(rsId);
                if (systemList == null) {
                    systemList = new ArrayList<BusinessSystem>();
                }
                systemList.add(srs.getSystem());
                superMap.put(rsId, systemList);
            }
            RecommendBannerV2Admin rsa = null;
            for (RecommendBannerV2 recommendBanner : recommendBannerList) {
                long id = recommendBanner.getId();
                rsa = recommendBannerAdminMap.get(id);
                if (rsa == null) {
                    rsa = new RecommendBannerV2Admin();
                }
                List<BusinessSystem> list = superMap.get(id);
                if (list != null) {
                    rsa.getSystemList().addAll(superMap.get(id));
                }
                rsa.setRecommendBanner(recommendBanner);
                recommendBannerAdminMap.put(id, rsa);
            }
        } else if (system != null) {
            if ("".equals(key.trim())) {
                superRecommendBannerList = superRecommendBannerV2Service.getSuperRecommendBannerBySystemId(system.getId(), strat, Constant.PAGE_SIZE);
            } else {
                String likekey = "%" + key + "%";
                superRecommendBannerList = superRecommendBannerV2Service.getSuperRecommendBannerBySystemId(system.getId(), strat, Constant.PAGE_SIZE,
                        likekey);
            }
            List<Long> rsIdList = new ArrayList<Long>();
            for (SuperRecommendBannerV2 superRecommendBanner : superRecommendBannerList) {
                RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner();
                rsIdList.add(recommendBanner.getId());
            }
            superRecommendBannerList = superRecommendBannerV2Service.getSuperRecommendBannersByBanners(rsIdList);
            RecommendBannerV2Admin rsa = null;
            for (SuperRecommendBannerV2 superRecommendBanner : superRecommendBannerList) {
                RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner();
                rsa = recommendBannerAdminMap.get(recommendBanner.getId());
                if (rsa == null) {
                    rsa = new RecommendBannerV2Admin(recommendBanner);
                }
                rsa.getSystemList().add(superRecommendBanner.getSystem());
                recommendBannerAdminMap.put(recommendBanner.getId(), rsa);
            }
        }
        Map<Long, RecommendBannerV2Admin> obMap = (LinkedHashMap<Long, RecommendBannerV2Admin>) Utils.orderBy(recommendBannerAdminMap);
        Collection<RecommendBannerV2Admin> values = obMap.values();
        recommendBannerAdmin.addAll(values);
        return recommendBannerAdmin;
    }
    public long getCount() {
        return recommendBannerV2Dao.getCount("select count(*) from RecommendBannerV2");
    }
    @Transactional
    public void deleteBanners(final long[] rbids) {
        superRecommendBannerV2Service.deleteSuperRecommendBanners(rbids);
        recommendBannerV2Dao.excute(new HibernateCallback() {
            public Object doInHibernate(Session session) throws HibernateException {
                StringBuffer sb = new StringBuffer("delete b from yeshi_ec_recommend_banner_v2 b ");
                for (int i = 0; i < rbids.length; i++) {
                    if (i == 0) {
                        sb.append(" where b.id=? ");
                    } else {
                        sb.append(" or b.id=?");
                    }
                }
                Query query = session.createSQLQuery(sb.toString());
                for (int i = 0; i < rbids.length; i++) {
                    query.setLong(i, rbids[i]);
                }
                query.executeUpdate();
                return null;
            }
        });
    }
    public RecommendBannerV2 getRecommendBanner(long id) {
        RecommendBannerV2 banner = recommendBannerV2Dao.find(RecommendBannerV2.class, id);
        return banner;
    }
    public void updateBanner(RecommendBannerV2 banner) {
        recommendBannerV2Dao.update(banner);
    }
    public int getCount(String platform, String packages, final String key) {
        platform = Utils.getMap().get(platform);
        final BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);
        return (Integer) recommendBannerV2Dao.excute(new HibernateCallback<Integer>() {
            public Integer doInHibernate(Session session) throws HibernateException {
                String k = "%" + key + "%";
                Query query;
                if (system == null) {
                    query = session.createQuery("select count(rb.id) from RecommendBannerV2 rb where rb.name like ? ");
                    query.setParameter(0, k);
                } else {
                    query = session
                            .createQuery("select count(srb.id) from SuperRecommendBannerV2 srb where srb.system.id = ? and srb.recommendBanner.name like ?");
                    query.setParameter(0, system.getId());
                    query.setParameter(1, k);
                }
                Long result = (Long) query.uniqueResult();
                int intValue = result.intValue();
                return intValue;
            }
        });
    }
    public void updateBannerJumpDetail(final long id) {
        recommendBannerV2Dao.excute(new HibernateCallback() {
            public Object doInHibernate(Session session) throws HibernateException {
                Query query = session.createQuery("update RecommendBannerV2 rb set rb.jumpDetail.id = NULL where  rb.jumpDetail.id = ?");
                query.setParameter(0, id);
                return query.executeUpdate();
            }
        });
    }
}
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendDetailsServiceImpl.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendLikeServiceImpl.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendReplyServiceImpl.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerV2ServiceImpl.java
@@ -1,141 +1,57 @@
package com.yeshi.fanli.service.impl.goods;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import org.hibernate.HibernateException;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.orm.hibernate4.HibernateCallback;
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.goods.SuperRecommendBannerV2Dao;
import com.yeshi.fanli.dao.mybatis.SuperRecommendBannerV2Mapper;
import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerV2Service;
import com.yeshi.fanli.util.Constant;
@Service
public class SuperRecommendBannerV2ServiceImpl implements SuperRecommendBannerV2Service {
    @Resource
    private SuperRecommendBannerV2Dao superRecommendBannerV2Dao;
    private SuperRecommendBannerV2Mapper superRecommendBannerV2Mapper;
    
    @Resource
    private BusinessSystemService businessSystemService;
    @Cacheable(value = "bannerCache", key = "'getSuperRecommendBannerV2sBySystem-'+#system.id")
    public List<SuperRecommendBannerV2> getSuperRecommendBannerV2sBySystem(
            final BusinessSystem system) {
        List<SuperRecommendBannerV2> list = superRecommendBannerV2Dao.list(
                "from SuperRecommendBannerV2 srb where srb.system.id=? order by srb.recommendBanner.orderby",
                new Serializable[] { system.getId() });
        return list;
    }
    private JumpDetailV2Service jumpDetailV2Service;
    public List<SuperRecommendBannerV2> getSuperRecommendBanners(int pageIndex) {
        int start = pageIndex * Constant.PAGE_SIZE;
        List<SuperRecommendBannerV2> list = superRecommendBannerV2Dao.list(
                "from SuperRecommendBannerV2 srb order by srb.recommendBanner.orderby", start, Constant.PAGE_SIZE,
                new Serializable[] {});
    @Cacheable(value = "bannerCache", key = "'getSuperRecommendBannerV2sBySystem-'+#systemId")
    public List<RecommendBannerV2> getSuperRecommendBannerV2sBySystem(Long systemId) {
        // 首页Banner
        List<RecommendBannerV2> listBanner = null;
        return list;
    }
    public List<SuperRecommendBannerV2> getSuperRecommendBannersByBanners(
            List<Long> rbIdList) {
        if (rbIdList.size() == 0) {
            return new ArrayList<SuperRecommendBannerV2>();
        }
        StringBuffer sb = new StringBuffer(" from SuperRecommendBannerV2 srb ");
        Serializable[] serArr = new Serializable[rbIdList.size()];
        for (int i = 0; i < rbIdList.size(); i++) {
            if (i == 0) {
                sb.append(" where srb.recommendBanner.id=? ");
            } else {
                sb.append(" or srb.recommendBanner.id=? ");
            }
            serArr[i] = rbIdList.get(i);
        }
        sb.append(" order by srb.recommendBanner.orderby ");
        String hql = sb.toString();
        return superRecommendBannerV2Dao.list(hql, serArr);
    }
    public Integer deleteSuperRecommendBanner(final long rbid, final String platform,final String packageName) {
        return  (Integer) superRecommendBannerV2Dao.excute(new HibernateCallback<Integer>() {
            public Integer doInHibernate(Session session)
                    throws HibernateException {
                BusinessSystem system = businessSystemService.getBusinessSystem(platform, packageName);
                Transaction transaction = session.beginTransaction();
                Query query = session.createQuery("delete SuperRecommendBannerV2 srb "
                            + " where srb.recommendBanner.id=? and srb.system.id=?");
                query.setLong(0, rbid);
                query.setLong(1, system.getId());
                int i = query.executeUpdate();
                transaction.commit();
                return i ;
            }
        });
    }
    public void addSuperRecommendBanner(long rbid, String platform,String packageName) {
        BusinessSystem system = businessSystemService.getBusinessSystem(platform,packageName);
        SuperRecommendBannerV2 superRecommendBanner = new SuperRecommendBannerV2();
        RecommendBannerV2 recommendBanner = new RecommendBannerV2();
        recommendBanner.setId(rbid);
        superRecommendBanner.setRecommendBanner(recommendBanner);
        superRecommendBanner.setSystem(system);
        superRecommendBannerV2Dao.create(superRecommendBanner);
    }
    public void deleteSuperRecommendBanners(final long[] rbids) {
        superRecommendBannerV2Dao.excute(new HibernateCallback() {
            public Object doInHibernate(Session session) throws HibernateException {
        List<SuperRecommendBannerV2> listRecommendBanner = superRecommendBannerV2Mapper.listBySystemId(systemId);
        if (listRecommendBanner != null && listRecommendBanner.size() > 0) {
            listBanner = new ArrayList<RecommendBannerV2>();
            for (SuperRecommendBannerV2 superRecommendBanner : listRecommendBanner) {
                RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner();
                // 淘特价暂时修改
                if (systemId == 7) {
                    recommendBanner.getJumpDetail().setActivity(recommendBanner.getJumpDetail().getActivity()
                            .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial"));
                }
                
                StringBuffer sb = new StringBuffer("delete from SuperRecommendBannerV2 s ");
                for (int i = 0; i < rbids.length; i++) {
                    if(i==0){
                        sb.append(" where s.recommendBanner.id=? ");
                    }else{
                        sb.append(" or s.recommendBanner.id=?");
                    }
                JumpDetailV2 jumpDetail = recommendBanner.getJumpDetail();
                if (jumpDetail != null) {
                    jumpDetail = jumpDetailV2Service.selectByPrimaryKey(jumpDetail.getId());
                    recommendBanner.setJumpDetail(jumpDetail);
                }
                Query query = session.createQuery(sb.toString());
                for (int i = 0; i < rbids.length; i++) {
                    query.setLong(i, rbids[i]);
                }
                query.executeUpdate();
                return null;
                listBanner.add(recommendBanner);
            }
        });
    }
    public List<SuperRecommendBannerV2> getSuperRecommendBannerBySystemId(
            long id, int strat, int count) {
        return superRecommendBannerV2Dao.list("from SuperRecommendBannerV2 srs where srs.system.id=? order by srs.recommendBanner.orderby ",strat,count,new Serializable[]{id});
        }
        
        return listBanner;
    }
    public List<SuperRecommendBannerV2> getSuperRecommendBannerBySystemId(
            long id, int strat, int count, String key) {
        return superRecommendBannerV2Dao.list("from SuperRecommendBannerV2 srs where srs.system.id=? and srs.recommendBanner.name like ?",strat,count,new Serializable[]{id, key});
    }
}
fanli/src/main/java/com/yeshi/fanli/service/impl/user/DynamicRecommendServiceImpl.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendBannerV2Service.java
@@ -7,21 +7,4 @@
public interface RecommendBannerV2Service {
    public List<RecommendBannerV2> getRecommendBanners();
    public void addRecommendBanner(RecommendBannerV2 banner);
    public List<RecommendBannerV2Admin> getRecommendBanners(int pageIndex, String platform, String packages, String key);
    public long getCount();
    public void deleteBanners(long[] rbids);
    public RecommendBannerV2 getRecommendBanner(long id);
    public void updateBanner(RecommendBannerV2 banner);
    public int getCount(String platform, String packages, String key);
    public void updateBannerJumpDetail(long id);
}
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendDetailsService.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendLikeService.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendReplyService.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/SuperRecommendBannerV2Service.java
@@ -2,26 +2,10 @@
import java.util.List;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
public interface SuperRecommendBannerV2Service {
    
    public List<SuperRecommendBannerV2> getSuperRecommendBannerV2sBySystem(BusinessSystem system);
    public List<SuperRecommendBannerV2> getSuperRecommendBannersByBanners(
            List<Long> rbIdList);
    public List<RecommendBannerV2> getSuperRecommendBannerV2sBySystem(Long systemId);
    
    public Integer deleteSuperRecommendBanner(long rbid, String platform, String packageName);
    public void addSuperRecommendBanner(long rbid, String platform,String packageName);
    public void deleteSuperRecommendBanners(long[] rbids);
    public List<SuperRecommendBannerV2> getSuperRecommendBannerBySystemId(
            long id, int strat, int count);
    public List<SuperRecommendBannerV2> getSuperRecommendBannerBySystemId(
            long id, int strat, int pAGE_SIZE, String likekey);
}
fanli/src/main/java/com/yeshi/fanli/service/inter/user/DynamicRecommendService.java
File was deleted