专题修改

admin

2019-09-04 6a90de16db3c98d2c7e37cbd61f8ff22d495b23a

专题修改

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

@@ -37,7 +37,6 @@
    @Resource

    private SpecialCardService specialCardService;

    



    /**

     * 保存信息

     * 

@@ -67,15 +66,16 @@
    

    /**

     * 查询

     * 
     * @param callback

     * @param pageIndex

     * @param pageSize

     * @param key  模糊查询：说明、标识

     * @param key

     *            模糊查询：说明、标识

     * @param out

     */

    @RequestMapping(value = "query")

    public void query(String callback, Integer pageIndex, Integer pageSize, String key,

            Integer sort, PrintWriter out) {

    public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort, PrintWriter out) {



        if (pageIndex == null || pageIndex < 1) {

            pageIndex = 1;

@@ -86,8 +86,7 @@
        }



        try {

            List<SpecialCard> list = specialCardService.listQuery((pageIndex - 1) * pageSize, 
                    pageSize, key, sort);

            List<SpecialCard> list = specialCardService.listQuery((pageIndex - 1) * pageSize, pageSize, key, sort);



            if (list == null || list.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

@@ -116,9 +115,9 @@


    }





    /**

     * 删除

     * 
     * @param callback

     * @param idArray

     * @param out

@@ -133,7 +132,8 @@
            }



            Gson gson = new Gson();

            List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());

            List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {

            }.getType());



            if (list == null || list.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("未检测到删除的数据"));

@@ -151,9 +151,6 @@


    }



	
	
	
    /**

     * 保存信息

     * 

@@ -162,12 +159,14 @@
     * @param out

     */

    @RequestMapping(value = "saveSpecial")

    public void saveSpecial(String callback, Special record, String jumpType, HttpServletRequest request,PrintWriter out) {

    public void saveSpecial(String callback, Special record, String jumpType, HttpServletRequest request,

            PrintWriter out) {

        try {

            // 1. 先判断httpRequest 是否含有文件类型 

            if (request instanceof MultipartHttpServletRequest) {

                MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;

                specialService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"), fileRequest.getFile("file3"), record, jumpType);

                specialService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"),

                        fileRequest.getFile("file3"), record, jumpType);

            }else{

                specialService.saveObject(null, null, null,  record, jumpType);

            }

@@ -181,9 +180,9 @@
        }

    }



	
    /**

     * 删除专题

     * 
     * @param callback

     * @param idArray

     * @param out

@@ -198,7 +197,8 @@
            }



            Gson gson = new Gson();

            List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());

            List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {

            }.getType());



            if (list == null || list.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("未检测到删除的数据"));

@@ -215,7 +215,6 @@
        }



    }

	


    /**

     * 修改排序

@@ -239,6 +238,7 @@
    

    /**

     *  查询专题

     * 
     * @param callback

     * @param pageIndex

     * @param pageSize

@@ -246,8 +246,8 @@
     * @param out

     */

    @RequestMapping(value = "querySpecial")

    public void querySpecial(String callback, Integer pageIndex, Integer pageSize, String key,

        Long cardId, Integer sex, PrintWriter out) {

    public void querySpecial(String callback, Integer pageIndex, Integer pageSize, String key, Long cardId, Integer sex,

            PrintWriter out) {



        if (pageIndex == null || pageIndex < 1) {

            pageIndex = 1;

@@ -292,6 +292,5 @@
        }



    }

	
    

}


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

@@ -25,7 +25,6 @@


    private static final long serialVersionUID = 1L;



	
    public final static int SEX_DEFAULT = 0;  // 通用

    public final static int SEX_WOMAN = 1;  // 女

    public final static int SEX_MAN = 2;  // 男

@@ -111,13 +110,13 @@
    @Column(name = "b_remark")

    private String remark;

    

    // 平台：1-android 2-IOS

    @Column(name = "b_platform")

    private Integer platform;

    // android最小版本

    @Column(name = "b_min_android_version_code")

    private Integer minAndroidVersionCode;

    

    // 版本号

    @Column(name = "b_version_code")

    private Integer versionCode;

    // ios最小版本

    @Column(name = "b_min_ios_version_code")

    private Integer minIOSVersionCode;

    

    // 创建时间

    @Column(name = "b_createtime")

@@ -127,11 +126,9 @@
    @Column(name = "b_updatetime")

    private Date updatetime;

    

	
    // 是否弹框

    @Expose

    private boolean elastic;

	
    

    // 背景图片

    private String bottomPicture; 

@@ -142,7 +139,6 @@
    

    // 限制最低版本

    private String version; 

	


    public Long getId() {

        return id;

@@ -167,7 +163,6 @@
    public void setCard(String card) {

        this.card = card;

    }





    public String getPicture() {

        return picture;

@@ -234,6 +229,7 @@
    }



    public Long getState() {



        return state;

    }



@@ -337,22 +333,6 @@
        this.orderWoman = orderWoman;

    }



    public Integer getPlatform() {

        return platform;

    }



    public void setPlatform(Integer platform) {

        this.platform = platform;

    }



    public Integer getVersionCode() {

        return versionCode;

    }



    public void setVersionCode(Integer versionCode) {

        this.versionCode = versionCode;

    }



    public String getVersion() {

        return version;

    }

@@ -360,4 +340,21 @@
    public void setVersion(String version) {

        this.version = version;

    }



    public Integer getMinAndroidVersionCode() {

        return minAndroidVersionCode;

    }



    public void setMinAndroidVersionCode(Integer minAndroidVersionCode) {

        this.minAndroidVersionCode = minAndroidVersionCode;

    }



    public Integer getMinIOSVersionCode() {

        return minIOSVersionCode;

    }



    public void setMinIOSVersionCode(Integer minIOSVersionCode) {

        this.minIOSVersionCode = minIOSVersionCode;

    }



}


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

@@ -19,8 +19,8 @@
        <result column="b_sex" property="sex" jdbcType="INTEGER" />

        <result column="b_show_type" property="showType" jdbcType="VARCHAR" />

        <result column="b_remark" property="remark" jdbcType="VARCHAR" />

        <result column="b_platform" property="platform" jdbcType="INTEGER"/>

        <result column="b_version_code" property="versionCode" jdbcType="INTEGER"/>

        <result column="b_min_android_version_code" property="minAndroidVersionCode" jdbcType="INTEGER"/>

        <result column="b_min_ios_version_code" property="minIOSVersionCode" jdbcType="INTEGER"/>

        <result column="b_createtime" property="createtime" jdbcType="TIMESTAMP" />

        <result column="b_updatetime" property="updatetime" jdbcType="TIMESTAMP" />



@@ -33,7 +33,7 @@
        </association>



    </resultMap>

    <sql id="Base_Column_List">b_id,b_name,b_card,b_card_id,b_main_picture,b_icon,b_sub_picture,b_jumpid,b_params,b_jump_login,b_orderby,b_order_man,b_order_woman,b_state,b_sex,b_show_type,b_remark,b_platform,b_version_code,b_createtime,b_updatetime</sql>

    <sql id="Base_Column_List">b_id,b_name,b_card,b_card_id,b_main_picture,b_icon,b_sub_picture,b_jumpid,b_params,b_jump_login,b_orderby,b_order_man,b_order_woman,b_state,b_sex,b_show_type,b_remark,b_min_android_version_code,b_min_ios_version_code,b_createtime,b_updatetime</sql>

    <select id="selectByPrimaryKey" resultMap="BaseResultMap"

        parameterType="java.lang.Long">

        select

@@ -44,9 +44,9 @@
        yeshi_ec_special where b_id = #{id,jdbcType=BIGINT}</delete>

    <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.homemodule.Special"

        useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_special

        (b_id,b_name,b_card,b_card_id,b_main_picture,b_icon,b_sub_picture,b_jumpid,b_params,b_jump_login,b_orderby,b_order_man,b_order_woman,b_state,b_sex,b_show_type,b_remark,b_platform,b_version_code,b_createtime,b_updatetime)

        (b_id,b_name,b_card,b_card_id,b_main_picture,b_icon,b_sub_picture,b_jumpid,b_params,b_jump_login,b_orderby,b_order_man,b_order_woman,b_state,b_sex,b_show_type,b_remark,b_min_android_version_code,b_min_ios_version_code,b_createtime,b_updatetime)

        values

        (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{card,jdbcType=VARCHAR},#{cardId,jdbcType=BIGINT},#{picture,jdbcType=VARCHAR},#{icon,jdbcType=VARCHAR},#{subPicture,jdbcType=VARCHAR},#{jumpDetail.id,jdbcType=BIGINT},#{params,jdbcType=VARCHAR},#{jumpLogin,jdbcType=VARCHAR},#{orderby,jdbcType=INTEGER},#{orderMan,jdbcType=INTEGER},#{orderWoman,jdbcType=INTEGER},#{state,jdbcType=BIGINT},#{sex,jdbcType=INTEGER},#{showType,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},#{platform,jdbcType=INTEGER},#{versionCode,jdbcType=INTEGER},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>

        (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{card,jdbcType=VARCHAR},#{cardId,jdbcType=BIGINT},#{picture,jdbcType=VARCHAR},#{icon,jdbcType=VARCHAR},#{subPicture,jdbcType=VARCHAR},#{jumpDetail.id,jdbcType=BIGINT},#{params,jdbcType=VARCHAR},#{jumpLogin,jdbcType=VARCHAR},#{orderby,jdbcType=INTEGER},#{orderMan,jdbcType=INTEGER},#{orderWoman,jdbcType=INTEGER},#{state,jdbcType=BIGINT},#{sex,jdbcType=INTEGER},#{showType,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},#{minAndroidVersionCode,jdbcType=INTEGER},#{minIOSVersionCode,jdbcType=INTEGER},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.Special"

        useGeneratedKeys="true" keyProperty="id">

        insert into yeshi_ec_special

@@ -68,8 +68,8 @@
            <if test="sex != null">b_sex,</if>

            <if test="showType != null">b_show_type,</if>

            <if test="remark != null">b_remark,</if>

            <if test="platform != null">b_platform,</if>

            <if test="versionCode != null">b_version_code,</if>

            <if test="minAndroidVersionCode != null">b_min_android_version_code,</if>

            <if test="minIOSVersionCode != null">b_min_ios_version_code,</if>

            <if test="createtime != null">b_createtime,</if>

            <if test="updatetime != null">b_updatetime,</if>

        </trim>

@@ -92,8 +92,8 @@
            <if test="sex != null">#{sex,jdbcType=INTEGER},</if>

            <if test="showType != null">#{showType,jdbcType=VARCHAR},</if>

            <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>

            <if test="platform != null">#{platform,jdbcType=INTEGER},</if>

            <if test="versionCode != null">#{versionCode,jdbcType=INTEGER},</if>

            <if test="minAndroidVersionCode != null">#{minAndroidVersionCode,jdbcType=INTEGER},</if>

            <if test="minIOSVersionCode != null">#{minIOSVersionCode,jdbcType=INTEGER},</if>

            <if test="createtime != null">#{createtime,jdbcType=TIMESTAMP},</if>

            <if test="updatetime != null">#{updatetime,jdbcType=TIMESTAMP},</if>

        </trim>

@@ -113,7 +113,7 @@
        #{orderWoman,jdbcType=INTEGER},b_state =

        #{state,jdbcType=BIGINT},b_show_type =

        #{showType,jdbcType=VARCHAR},b_remark =

        #{remark,jdbcType=VARCHAR},b_platform = #{platform,jdbcType=INTEGER},b_version_code = #{versionCode,jdbcType=INTEGER},

        #{remark,jdbcType=VARCHAR},b_min_android_version_code = #{minAndroidVersionCode,jdbcType=INTEGER},b_min_ios_version_code = #{minIOSVersionCode,jdbcType=INTEGER},

        b_createtime =

        #{createtime,jdbcType=TIMESTAMP},b_updatetime =

        #{updatetime,jdbcType=TIMESTAMP},b_sex=#{sex,jdbcType=INTEGER} where

@@ -137,8 +137,8 @@
            <if test="sex != null">b_sex=#{sex,jdbcType=INTEGER},</if>

            <if test="showType != null">b_show_type=#{showType,jdbcType=VARCHAR},</if>

            <if test="remark != null">b_remark=#{remark,jdbcType=VARCHAR},</if>

            <if test="platform != null">b_platform=#{platform,jdbcType=INTEGER},</if>

              <if test="versionCode != null">b_version_code=#{versionCode,jdbcType=INTEGER},</if>

            <if test="minAndroidVersionCode != null">b_min_android_version_code=#{minAndroidVersionCode,jdbcType=INTEGER},</if>

              <if test="minIOSVersionCode != null">b_min_ios_version_code=#{minIOSVersionCode,jdbcType=INTEGER},</if>

            <if test="createtime != null">b_createtime=#{createtime,jdbcType=TIMESTAMP},</if>

            <if test="updatetime != null">b_updatetime=#{updatetime,jdbcType=TIMESTAMP},</if>

        </set>

@@ -311,7 +311,7 @@
        SELECT p.* FROM`yeshi_ec_special` p 

        LEFT JOIN `yeshi_ec_special_card` c ON p.`b_card_id` = c.`cd_id`

        WHERE p.`b_state` = 0 AND c.`cd_state` = 0 AND c.`cd_card` = #{card}

                 AND IF(p.`b_platform` IS NOT NULL, IF(#{versionCode} <![CDATA[>=]]> p.`b_version_code` AND p.`b_platform`=#{platform}, TRUE,FALSE), TRUE)

                 AND IF(p.`b_min_android_version_code` IS NOT NULL, IF(#{minIOSVersionCode} <![CDATA[>=]]> p.`b_min_ios_version_code` AND p.`b_min_android_version_code`=#{minAndroidVersionCode}, TRUE,FALSE), TRUE)

        ORDER BY p.`b_orderby`

        LIMIT ${start},${count}

    </select>


 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java

@@ -56,7 +56,6 @@
    @Resource

    private AppVersionService appVersionService;

    



    @Override

    public Special selectByPrimaryKey(Long id) {

        return specialMapper.selectByPrimaryKey(id);

@@ -79,26 +78,6 @@
        Integer sex = record.getSex();

        if (sex == null) {

            throw new SpecialException(1, "性别不能为空");

        }



        String version = record.getVersion();

        Integer platformCode = record.getPlatform();

        if (!StringUtil.isNullOrEmpty(version) && platformCode != null) {

            String platform = "android";

            if (platformCode == 2)

                platform = "ios";

            AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, version);

            if (versionInfo == null)

                throw new SpecialException(1, "版本号信息缺失");

			
            record.setVersionCode(versionInfo.getVersionCode());

            record.setPlatform(platformCode);

        } else {

            if (!StringUtil.isNullOrEmpty(version))

                throw new SpecialException(1, "平台类型不能为空");

			
            if (platformCode != null) 
                throw new SpecialException(1, "版本号不能为空");

        }



        String params = record.getParams();

@@ -396,7 +375,6 @@
    public List<Special> listByVersion(long start, int count, String card, Integer platform, Integer versionCode) {

        return specialMapper.listByVersion(start, count, card, platform, versionCode);

    }

	
    

    @Override

    @Cacheable(value = "specialCache", key = "'listCacheSpecialToIndex'+#acceptData.platform+'-'+#acceptData.version+'-'+#sex")