调整后端轮播图管理

Administrator

2018-11-07 093e4c12d0ae253276f3fdfbd4718692aa7956fc

调整后端轮播图管理

 fanli/src/main/java/com/yeshi/fanli/controller/admin/JumpDetailAdminController.java

@@ -1,24 +1,27 @@
package com.yeshi.fanli.controller.admin;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.common.JumpDetail;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.exception.NotExistObjectException;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.JumpDetailService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/jumpDetail")

@@ -26,6 +29,8 @@


    @Resource

    private JumpDetailService jumpDetailService;

    @Resource

    private JumpDetailV2Service JumpDetailV2Service;

    

    @RequestMapping(value="getJumpDetailList",method=RequestMethod.POST)

    public void getJumpDetailList(int pageIndex,String key,PrintWriter out){

@@ -88,4 +93,30 @@
        out.print(JsonUtil.loadTrueResult("删除成功"));

    }

    

    @RequestMapping({ "getJumpOption" })

    public void getJumpOption(String callback, PrintWriter out) {

        try {

            List<JumpDetailV2> listJump = this.JumpDetailV2Service.listJump();

            JSONObject data = new JSONObject();



            JumpDetailV2 jumpDetailV2 = new JumpDetailV2();

            jumpDetailV2.setName("-未选择-");

            jumpDetailV2.setType("default");



            List<JumpDetailV2> result = new ArrayList<JumpDetailV2>();

            result.add(jumpDetailV2);



            for (JumpDetailV2 jumpDetail : listJump) {

                result.add(jumpDetail);

            }



            data.put("result_list", result);



            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

        } catch (Exception e) {

            e.printStackTrace();

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

        }

    }

	
}


 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/controller/admin/SwiperBannerAdminController.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.controller.admin;

package com.yeshi.fanli.controller.admin.homemodule;



import java.io.PrintWriter;

import java.util.ArrayList;

@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.multipart.commons.CommonsMultipartFile;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -22,16 +23,18 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperBanner;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.exception.banner.SwiperBannerException;

import com.yeshi.fanli.exception.banner.SwiperPictureException;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.SystemConfigService;

import com.yeshi.fanli.service.inter.homemodule.SwiperBannerService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.annotation.RequestNoLogin;

import org.yeshi.utils.JsonUtil;



/**

 * 轮播图管理

@@ -50,6 +53,12 @@
    

    @Resource

    private SwiperPictureService swiperPictureService;

	
    @Resource

    private SystemConfigService systemConfigService;

	
    @Resource

    private JumpDetailV2Service jumpDetailV2Service;

    

    

    /**

@@ -302,6 +311,29 @@
                return;

            }

            

            // 跳转链接

            for (SwiperPicture swiperPicture: list) {

                String params = swiperPicture.getParams();

                if (!StringUtil.isNullOrEmpty(params)) {

                    JSONObject jsonData = JSONObject.fromObject(params);

                    if (jsonData.get("url") != null){

                        swiperPicture.setParams(jsonData.get("url").toString());

                    } else {

                        swiperPicture.setParams(null);

                    }

                }

				
                JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();

                if (jumpDetail == null) {

                    // 默认未选择

                    JumpDetailV2 jumpDetailV2 = new JumpDetailV2();

                    jumpDetailV2.setName("-未选择-");

                    jumpDetailV2.setType("default");

                    swiperPicture.setJumpDetail(jumpDetailV2);

                }

				
            }

			


            long count = swiperPictureService.countQueryByBannerID(bannerId);

            

@@ -368,6 +400,20 @@
            record.setState(1);

            record.setCreatetime(new Date());

            record.setUpdatetime(new Date());

			
            String params = record.getParams();

            if (!StringUtil.isNullOrEmpty(params)) {

				
                String jumpValue = systemConfigService.get("jump");

                if (StringUtil.isNullOrEmpty(jumpValue)) {

                    jumpValue = "{\"url\":\"#\"}";

                }

				
                params = jumpValue.replace("#", params);

				
                record.setParams(params);

            }

			
            swiperPictureService.insertSelective(record);

            

            // 上传图片

@@ -440,7 +486,8 @@
     */

    @RequestNoLogin()

    @RequestMapping(value = "changePicInfo")

    public void changePicInfo(String callback, SwiperPicture record, PrintWriter out) {

    public void changePicInfo(String callback, SwiperPicture record, String jumpType,

            PrintWriter out) {

        

        try {

            Long id = record.getId();

@@ -455,11 +502,38 @@
                return;

            }

            

            String params = record.getParams();

            String remark = record.getRemark();

            if (StringUtil.isNullOrEmpty(params) && StringUtil.isNullOrEmpty(jumpType)

                    && StringUtil.isNullOrEmpty(remark)) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作内容不能为空"));

                return;

            }

			
			
            if (!StringUtil.isNullOrEmpty(params)) {

				
                String jumpValue = systemConfigService.get("jump");

                if (StringUtil.isNullOrEmpty(jumpValue)) {

                    jumpValue = "{\"url\":\"#\"}";

                }

				
                params = jumpValue.replace("#", params);

                record.setParams(params);

            }

			
            if (!StringUtil.isNullOrEmpty(jumpType)) {

                List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);

                if (listByType !=null && listByType.size() > 0) {

                    record.setJumpDetail(listByType.get(0));

                } 
            }

			
            swiperPictureService.updateByPrimaryKeySelective(record);

            

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

            

        } catch (SwiperPictureException e) {

        } catch (Exception e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败"));

            e.printStackTrace();

        }


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/common/JumpDetailV2Mapper.java

@@ -25,5 +25,10 @@
     */
    List<JumpDetailV2> listByType(String type);
    
    /**
     * 所有方式
     * @return
     */
    List<JumpDetailV2> listJump();
    
}

 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java

@@ -3,70 +3,69 @@
import java.io.Serializable;

import java.util.Date;



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;



/**

 *  轮播图

 * 
 * @author yj

 *

 * @date 2018年10月15日

 */

import com.yeshi.fanli.entity.common.JumpDetailV2;



@Entity

@Table(name = "yeshi_ec_swiper_banner_picture")

@org.yeshi.utils.mybatis.Table("yeshi_ec_swiper_banner_picture")

public class SwiperPicture implements Serializable{



    private static final long serialVersionUID = 1L;

public class SwiperPicture implements Serializable {

    

    private static final long serialVersionUID = 1L;



    @Id

    @Column(name = "pic_id")

    @javax.persistence.Column(name = "pic_id")

    @GeneratedValue(strategy = GenerationType.AUTO)

    @org.yeshi.utils.mybatis.Column(name = "pic_id")

    private Long id;



	
    @JoinColumn(name = "pic_banner_id")

    @org.yeshi.utils.mybatis.Column(name = "pic_banner_id")

    private Long bannerId;// 管理id

	
    private Long bannerId;



    @JoinColumn(name = "pic_src")

    @org.yeshi.utils.mybatis.Column(name = "pic_src")

    private String src;// 图片地址

    private String src;



    @JoinColumn(name = "pic_link")

    @org.yeshi.utils.mybatis.Column(name = "pic_link")

    private String link; // 跳转地址

	
    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "pic_jumpid")

    @org.yeshi.utils.mybatis.Column(name = "pic_jumpid")

    private JumpDetailV2 jumpDetail;



    @JoinColumn(name = "pic_params")

    @org.yeshi.utils.mybatis.Column(name = "pic_params")

    private String params;



    @JoinColumn(name = "pic_order")

    @org.yeshi.utils.mybatis.Column(name = "pic_order")

    private Integer order; // 排序

	
    private Integer order;



    @JoinColumn(name = "pic_remark")

    @org.yeshi.utils.mybatis.Column(name = "pic_remark")

    private String remark; // 备注

    private String remark;



    @JoinColumn(name = "pic_state")

    @org.yeshi.utils.mybatis.Column(name = "pic_state")

    private Integer state; // 状态： 1 停用  0启用

	
    private Integer state;



    @JoinColumn(name = "pic_createtime")

    @org.yeshi.utils.mybatis.Column(name = "pic_createtime")

    private Date createtime; // 创建时间

    private Date createtime;



    @JoinColumn(name = "pic_updatetime")

    @org.yeshi.utils.mybatis.Column(name = "pic_updatetime")

    private Date updatetime; // 更新时间（修改时间）

    private Date updatetime;



    public Long getId() {

        return id;

        return this.id;

    }



    public void setId(Long id) {

@@ -74,7 +73,7 @@
    }



    public Long getBannerId() {

        return bannerId;

        return this.bannerId;

    }



    public void setBannerId(Long bannerId) {

@@ -82,23 +81,15 @@
    }



    public String getSrc() {

        return src;

        return this.src;

    }



    public void setSrc(String src) {

        this.src = src;

    }



    public String getLink() {

        return link;

    }



    public void setLink(String link) {

        this.link = link;

    }



    public String getRemark() {

        return remark;

        return this.remark;

    }



    public void setRemark(String remark) {

@@ -106,7 +97,7 @@
    }



    public Integer getState() {

        return state;

        return this.state;

    }



    public void setState(Integer state) {

@@ -114,7 +105,7 @@
    }



    public Date getCreatetime() {

        return createtime;

        return this.createtime;

    }



    public void setCreatetime(Date createtime) {

@@ -122,7 +113,7 @@
    }



    public Date getUpdatetime() {

        return updatetime;

        return this.updatetime;

    }



    public void setUpdatetime(Date updatetime) {

@@ -130,11 +121,26 @@
    }



    public Integer getOrder() {

        return order;

        return this.order;

    }



    public void setOrder(Integer order) {

        this.order = order;

    }



}

    public JumpDetailV2 getJumpDetail() {

        return this.jumpDetail;

    }



    public void setJumpDetail(JumpDetailV2 jumpDetail) {

        this.jumpDetail = jumpDetail;

    }



    public String getParams() {

        return this.params;

    }



    public void setParams(String params) {

        this.params = params;

    }

}

 fanli/src/main/java/com/yeshi/fanli/mapping/common/JumpDetailV2Mapper.xml

@@ -54,4 +54,8 @@
       where jp_type = #{type,jdbcType=VARCHAR}
  </select>
  
   <select id="listJump" resultMap="BaseResultMap">
      select <include refid="Base_Column_List"/> from yeshi_ec_action_jumpdetail_v2 
  </select>
  
</mapper>

 fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SwiperPictureMapper.xml

@@ -6,25 +6,29 @@
    <id column="pic_id" property="id" jdbcType="BIGINT"/>
    <result column="pic_banner_id" property="bannerId" jdbcType="BIGINT"/>
    <result column="pic_src" property="src" jdbcType="VARCHAR"/>
    <result column="pic_link" property="link" jdbcType="VARCHAR"/>
    <result column="pic_params" property="params" jdbcType="VARCHAR"/>
    <result column="pic_order" property="order" jdbcType="INTEGER"/>
    <result column="pic_remark" property="remark" jdbcType="VARCHAR"/>
    <result column="pic_state" property="state" jdbcType="INTEGER"/>
    <result column="pic_createtime" property="createtime" jdbcType="TIMESTAMP"/>
    <result column="pic_updatetime" property="updatetime" jdbcType="TIMESTAMP"/>
    
    <association property="jumpDetail" column="pic_jumpid" resultMap="com.yeshi.fanli.dao.mybatis.common.JumpDetailV2Mapper.BaseResultMap"/>
  
  </resultMap>
  <sql id="Base_Column_List">pic_id,pic_banner_id,pic_src,pic_link,pic_order,pic_remark,pic_state,pic_createtime,pic_updatetime</sql>
  <sql id="Base_Column_List">pic_id,pic_banner_id,pic_src,pic_jumpid,pic_params,pic_order,pic_remark,pic_state,pic_createtime,pic_updatetime</sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
    <include refid="Base_Column_List"/>from yeshi_ec_swiper_banner_picture where pic_id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_swiper_banner_picture where pic_id = #{id,jdbcType=BIGINT}</delete>
  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.homemodule.SwiperPicture" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_swiper_banner_picture (pic_id,pic_banner_id,pic_src,pic_link,pic_order,pic_remark,pic_state,pic_createtime,pic_updatetime) values (#{id,jdbcType=BIGINT},#{bannerId,jdbcType=BIGINT},#{src,jdbcType=VARCHAR},#{link,jdbcType=VARCHAR},#{order,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>
  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.homemodule.SwiperPicture" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_swiper_banner_picture (pic_id,pic_banner_id,pic_src,pic_jumpid,pic_params,pic_order,pic_remark,pic_state,pic_createtime,pic_updatetime) values (#{id,jdbcType=BIGINT},#{bannerId,jdbcType=BIGINT},#{src,jdbcType=VARCHAR},#{jumpDetail.id,jdbcType=BIGINT},#{params,jdbcType=VARCHAR},#{order,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>
  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.SwiperPicture" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_swiper_banner_picture
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">pic_id,</if>
      <if test="bannerId != null">pic_banner_id,</if>
      <if test="src != null">pic_src,</if>
      <if test="link != null">pic_link,</if>
      <if test="jumpDetail != null">pic_jumpid,</if>
      <if test="params != null">pic_params,</if>
      <if test="order != null">pic_order,</if>
      <if test="remark != null">pic_remark,</if>
      <if test="state != null">pic_state,</if>
@@ -35,7 +39,8 @@
      <if test="id != null">#{id,jdbcType=BIGINT},</if>
      <if test="bannerId != null">#{bannerId,jdbcType=BIGINT},</if>
      <if test="src != null">#{src,jdbcType=VARCHAR},</if>
      <if test="link != null">#{link,jdbcType=VARCHAR},</if>
      <if test="jumpDetail != null">#{jumpDetail.id,jdbcType=BIGINT},</if>
      <if test="params != null">#{params,jdbcType=VARCHAR},</if>
      <if test="order != null">#{order,jdbcType=INTEGER},</if>
      <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
      <if test="state != null">#{state,jdbcType=INTEGER},</if>
@@ -43,12 +48,13 @@
      <if test="updatetime != null">#{updatetime,jdbcType=TIMESTAMP},</if>
    </trim>
  </insert>
  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.homemodule.SwiperPicture">update yeshi_ec_swiper_banner_picture set pic_banner_id = #{bannerId,jdbcType=BIGINT},pic_src = #{src,jdbcType=VARCHAR},pic_link = #{link,jdbcType=VARCHAR},pic_order = #{order,jdbcType=INTEGER},pic_remark = #{remark,jdbcType=VARCHAR},pic_state = #{state,jdbcType=INTEGER},pic_createtime = #{createtime,jdbcType=TIMESTAMP},pic_updatetime = #{updatetime,jdbcType=TIMESTAMP} where pic_id = #{id,jdbcType=BIGINT}</update>
  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.homemodule.SwiperPicture">update yeshi_ec_swiper_banner_picture set pic_banner_id = #{bannerId,jdbcType=BIGINT},pic_src = #{src,jdbcType=VARCHAR},pic_jumpid = #{jumpDetail.id,jdbcType=BIGINT},pic_params = #{params,jdbcType=VARCHAR},pic_order = #{order,jdbcType=INTEGER},pic_remark = #{remark,jdbcType=VARCHAR},pic_state = #{state,jdbcType=INTEGER},pic_createtime = #{createtime,jdbcType=TIMESTAMP},pic_updatetime = #{updatetime,jdbcType=TIMESTAMP} where pic_id = #{id,jdbcType=BIGINT}</update>
  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.SwiperPicture">update yeshi_ec_swiper_banner_picture
    <set>
      <if test="bannerId != null">pic_banner_id=#{bannerId,jdbcType=BIGINT},</if>
      <if test="src != null">pic_src=#{src,jdbcType=VARCHAR},</if>
      <if test="link != null">pic_link=#{link,jdbcType=VARCHAR},</if>
      <if test="jumpDetail != null">pic_jumpid=#{jumpDetail.id,jdbcType=BIGINT},</if>
      <if test="params != null">pic_params=#{params,jdbcType=VARCHAR},</if>
      <if test="order != null">pic_order=#{order,jdbcType=INTEGER},</if>
      <if test="remark != null">pic_remark=#{remark,jdbcType=VARCHAR},</if>
      <if test="state != null">pic_state=#{state,jdbcType=INTEGER},</if>
@@ -57,12 +63,12 @@
    </set> where pic_id = #{id,jdbcType=BIGINT}
  </update>
  
  
   <select id="queryByBannerID" resultMap="BaseResultMap">
        SELECT <include refid="Base_Column_List" />  FROM yeshi_ec_swiper_banner_picture
        WHERE pic_banner_id = #{bannerId}
           ORDER BY pic_order 
        LIMIT ${start},${count}
       SELECT *  FROM yeshi_ec_swiper_banner_picture p 
       LEFT JOIN `yeshi_ec_action_jumpdetail_v2` j ON j.`jp_id` = p.`pic_jumpid`
       WHERE pic_banner_id = #{bannerId}
          ORDER BY pic_order 
       LIMIT ${start},${count}
   </select>
   
   <select id="countQueryByBannerID" resultType="java.lang.Long">
@@ -117,8 +123,9 @@
   
   
    <select id="getByBannerCard" resultMap="BaseResultMap">
        SELECT <include refid="Base_Column_List" /> FROM `yeshi_ec_swiper_banner` w 
        SELECT * FROM `yeshi_ec_swiper_banner` w 
        LEFT JOIN  `yeshi_ec_swiper_banner_picture` p ON p.`pic_banner_id` = w.`sp_id`
        LEFT JOIN `yeshi_ec_action_jumpdetail_v2` j ON j.`jp_id` = p.`pic_jumpid`
        WHERE w.`sp_card` = #{card} AND w.`sp_state` = 0 AND p.`pic_state`= 0
        ORDER BY p.`pic_order`
   </select>

 fanli/src/main/java/com/yeshi/fanli/service/impl/common/JumpDetailV2ServiceImpl.java

@@ -72,4 +72,10 @@
        return jumpDetailV2;

    }

    

    @Override

    public List<JumpDetailV2> listJump() {

        return this.jumpDetailV2Mapper.listJump();

    }

	
	
}


 fanli/src/main/java/com/yeshi/fanli/service/inter/common/JumpDetailV2Service.java

@@ -38,4 +38,7 @@
     */

    public JumpDetailV2 getByTypeCache(String type);



	
    public List<JumpDetailV2> listJump();



}