Browse Source

新闻开发

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
c69be9cf3c

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <javaModelGenerator targetPackage="com.kede.common.model" targetProject="kede-officialWeb-HN" />
     <sqlMapGenerator targetPackage="com.kede.common.mapper" targetProject="kede-officialWeb-HN" />
     <javaClientGenerator targetPackage="com.kede.common.dao" targetProject="kede-officialWeb-HN" type="XMLMAPPER" />
-    <table schema="aft_ow" tableName="banner_details"/>
+    <table schema="aft_ow" tableName="customer_case"/>
   </context>
 </generatorConfiguration>

+ 18 - 12
src/main/java/com/kede/banners/controller/AdminBannersApiController.java

@@ -27,7 +27,10 @@ public class AdminBannersApiController extends BaseApiController {
 	@RequestMapping(value = "/addBanners", method = RequestMethod.POST)
 	public Result addBanners(InputBannerDetails ibd) {
 		Result res =new Result();
-		inuptcheck(ibd, res);
+		if(StringUtils.isBlank(ibd.getBannerUrl())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"图片","图片"));
+			return res;
+		}
 		if (!res.getError().isEmpty()) {
 			return res;
 		}
@@ -35,19 +38,16 @@ public class AdminBannersApiController extends BaseApiController {
 		return res;
 	}
 
-	private void inuptcheck(InputBannerDetails ibd, Result res) {
-		if(StringUtils.isBlank(ibd.getBannerUrl())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"图片","图片"));
-		}
-		if (StringUtils.isBlank(ibd.getTitle())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"标题","标题"));
-		}
-	}
+		
+		
 	
 	@RequestMapping(value = "/updateBanners", method = RequestMethod.POST)
 	public Result updateBanners(InputBannerDetails ibd) {
 		Result res =new Result();
-		inuptcheck(ibd, res);
+		if(StringUtils.isBlank(ibd.getBannerUrl())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"图片","图片"));
+			return res;
+		}
 		if (!res.getError().isEmpty()) return res;
 		
 		res.data(bannersService.updateBannersDetails(ibd));
@@ -57,7 +57,10 @@ public class AdminBannersApiController extends BaseApiController {
 	@RequestMapping(value = "/deleteBanners", method = RequestMethod.POST)
 	public Result deleteBanners(InputBannerDetails ibd) {
 		Result res =new Result();
-		if(ibd.getId()==null)res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
+		if(ibd.getId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
+			return res;
+		}
 		res.data(bannersService.deleteBannersDetails(ibd));
 		return res;
 	}
@@ -73,7 +76,10 @@ public class AdminBannersApiController extends BaseApiController {
 	@RequestMapping(value = "/selectBanners", method = RequestMethod.GET)
 	public Result selectBanners(InputBannerDetails ibd) {
 		Result res =new Result();
-		if(ibd.getId()==null)res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
+		if(ibd.getId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
+			return res;
+		}
 		if (!res.getError().isEmpty()) return res;
 		res.data(bannersService.selectBannersDetails(ibd));
 		return res;

+ 74 - 95
src/main/java/com/kede/common/dao/CustomerCaseMapper.java

@@ -1,96 +1,75 @@
-package com.kede.common.dao;
-
-import com.kede.common.model.CustomerCase;
-import com.kede.common.model.CustomerCaseExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface CustomerCaseMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    long countByExample(CustomerCaseExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    int deleteByExample(CustomerCaseExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    int deleteByPrimaryKey(Integer id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    int insert(CustomerCase record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    int insertSelective(CustomerCase record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    List<CustomerCase> selectByExample(CustomerCaseExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    CustomerCase selectByPrimaryKey(Integer id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    int updateByExampleSelective(@Param("record") CustomerCase record, @Param("example") CustomerCaseExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    int updateByExample(@Param("record") CustomerCase record, @Param("example") CustomerCaseExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    int updateByPrimaryKeySelective(CustomerCase record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer_case
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    int updateByPrimaryKey(CustomerCase record);
+package com.kede.common.dao;
+
+import com.kede.common.model.CustomerCase;
+import com.kede.common.model.CustomerCaseExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CustomerCaseMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	long countByExample(CustomerCaseExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	int deleteByExample(CustomerCaseExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	int insert(CustomerCase record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	int insertSelective(CustomerCase record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	List<CustomerCase> selectByExample(CustomerCaseExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	CustomerCase selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") CustomerCase record, @Param("example") CustomerCaseExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	int updateByExample(@Param("record") CustomerCase record, @Param("example") CustomerCaseExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	int updateByPrimaryKeySelective(CustomerCase record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_case
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	int updateByPrimaryKey(CustomerCase record);
 }

+ 96 - 119
src/main/java/com/kede/common/dao/NewsMapper.java

@@ -1,120 +1,97 @@
-package com.kede.common.dao;
-
-import com.kede.common.model.News;
-import com.kede.common.model.NewsExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface NewsMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    long countByExample(NewsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    int deleteByExample(NewsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    int deleteByPrimaryKey(Integer id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    int insert(News record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    int insertSelective(News record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    List<News> selectByExampleWithBLOBs(NewsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    List<News> selectByExample(NewsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    News selectByPrimaryKey(Integer id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    int updateByExampleSelective(@Param("record") News record, @Param("example") NewsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    int updateByExampleWithBLOBs(@Param("record") News record, @Param("example") NewsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    int updateByExample(@Param("record") News record, @Param("example") NewsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    int updateByPrimaryKeySelective(News record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    int updateByPrimaryKeyWithBLOBs(News record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table news
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    int updateByPrimaryKey(News record);
+package com.kede.common.dao;
+
+import com.kede.common.model.News;
+import com.kede.common.model.NewsExample;
+import com.kede.news.bo.OutNews;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface NewsMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	long countByExample(NewsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	int deleteByExample(NewsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	int insert(News record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	int insertSelective(News record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	List<News> selectByExampleWithBLOBs(NewsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	List<News> selectByExample(NewsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	News selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") News record, @Param("example") NewsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	int updateByExampleWithBLOBs(@Param("record") News record, @Param("example") NewsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	int updateByExample(@Param("record") News record, @Param("example") NewsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	int updateByPrimaryKeySelective(News record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	int updateByPrimaryKeyWithBLOBs(News record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	int updateByPrimaryKey(News record);
+
+	OutNews selectByid(Integer id);
 }

+ 1 - 1
src/main/java/com/kede/common/mapper/BannerDetailsMapper.xml

@@ -339,7 +339,7 @@
     <if test="b.position!=null">
     and position = #{b.position}
     </if>
-    order by display,sort desc,create_time desc
+    order by display desc,sort desc,create_time desc
     <if test="page_sql!=null">
 			${page_sql}
 	</if>

+ 350 - 317
src/main/java/com/kede/common/mapper/CustomerCaseMapper.xml

@@ -1,318 +1,351 @@
-<?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.kede.common.dao.CustomerCaseMapper">
-  <resultMap id="BaseResultMap" type="com.kede.common.model.CustomerCase">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="picture_url" jdbcType="VARCHAR" property="pictureUrl" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="release_status" jdbcType="INTEGER" property="releaseStatus" />
-    <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    id, name, picture_url, status, release_status, release_time, create_time
-  </sql>
-  <select id="selectByExample" parameterType="com.kede.common.model.CustomerCaseExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from customer_case
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from customer_case
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    delete from customer_case
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.kede.common.model.CustomerCaseExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    delete from customer_case
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.kede.common.model.CustomerCase">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    insert into customer_case (id, name, picture_url, 
-      status, release_status, release_time, 
-      create_time)
-    values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{pictureUrl,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{releaseStatus,jdbcType=INTEGER}, #{releaseTime,jdbcType=TIMESTAMP}, 
-      #{createTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.kede.common.model.CustomerCase">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    insert into customer_case
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="pictureUrl != null">
-        picture_url,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="releaseStatus != null">
-        release_status,
-      </if>
-      <if test="releaseTime != null">
-        release_time,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="pictureUrl != null">
-        #{pictureUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="releaseStatus != null">
-        #{releaseStatus,jdbcType=INTEGER},
-      </if>
-      <if test="releaseTime != null">
-        #{releaseTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.kede.common.model.CustomerCaseExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    select count(*) from customer_case
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    update customer_case
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pictureUrl != null">
-        picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=INTEGER},
-      </if>
-      <if test="record.releaseStatus != null">
-        release_status = #{record.releaseStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.releaseTime != null">
-        release_time = #{record.releaseTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    update customer_case
-    set id = #{record.id,jdbcType=INTEGER},
-      name = #{record.name,jdbcType=VARCHAR},
-      picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=INTEGER},
-      release_status = #{record.releaseStatus,jdbcType=INTEGER},
-      release_time = #{record.releaseTime,jdbcType=TIMESTAMP},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.kede.common.model.CustomerCase">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    update customer_case
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="pictureUrl != null">
-        picture_url = #{pictureUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="releaseStatus != null">
-        release_status = #{releaseStatus,jdbcType=INTEGER},
-      </if>
-      <if test="releaseTime != null">
-        release_time = #{releaseTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.kede.common.model.CustomerCase">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:59 CST 2019.
-    -->
-    update customer_case
-    set name = #{name,jdbcType=VARCHAR},
-      picture_url = #{pictureUrl,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
-      release_status = #{releaseStatus,jdbcType=INTEGER},
-      release_time = #{releaseTime,jdbcType=TIMESTAMP},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+<?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.kede.common.dao.CustomerCaseMapper">
+  <resultMap id="BaseResultMap" type="com.kede.common.model.CustomerCase">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="picture_url" jdbcType="VARCHAR" property="pictureUrl" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="release_status" jdbcType="INTEGER" property="releaseStatus" />
+    <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="province" jdbcType="INTEGER" property="province" />
+    <result column="region" jdbcType="INTEGER" property="region" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    id, name, picture_url, status, release_status, release_time, create_time, province, 
+    region
+  </sql>
+  <select id="selectByExample" parameterType="com.kede.common.model.CustomerCaseExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from customer_case
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from customer_case
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    delete from customer_case
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.kede.common.model.CustomerCaseExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    delete from customer_case
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.kede.common.model.CustomerCase">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    insert into customer_case (id, name, picture_url, 
+      status, release_status, release_time, 
+      create_time, province, region
+      )
+    values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{pictureUrl,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{releaseStatus,jdbcType=INTEGER}, #{releaseTime,jdbcType=TIMESTAMP}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{province,jdbcType=INTEGER}, #{region,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.kede.common.model.CustomerCase">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    insert into customer_case
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="pictureUrl != null">
+        picture_url,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="releaseStatus != null">
+        release_status,
+      </if>
+      <if test="releaseTime != null">
+        release_time,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="province != null">
+        province,
+      </if>
+      <if test="region != null">
+        region,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="pictureUrl != null">
+        #{pictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="releaseStatus != null">
+        #{releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="releaseTime != null">
+        #{releaseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="province != null">
+        #{province,jdbcType=INTEGER},
+      </if>
+      <if test="region != null">
+        #{region,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.kede.common.model.CustomerCaseExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    select count(*) from customer_case
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    update customer_case
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pictureUrl != null">
+        picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.releaseStatus != null">
+        release_status = #{record.releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.releaseTime != null">
+        release_time = #{record.releaseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.province != null">
+        province = #{record.province,jdbcType=INTEGER},
+      </if>
+      <if test="record.region != null">
+        region = #{record.region,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    update customer_case
+    set id = #{record.id,jdbcType=INTEGER},
+      name = #{record.name,jdbcType=VARCHAR},
+      picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      release_status = #{record.releaseStatus,jdbcType=INTEGER},
+      release_time = #{record.releaseTime,jdbcType=TIMESTAMP},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      province = #{record.province,jdbcType=INTEGER},
+      region = #{record.region,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.kede.common.model.CustomerCase">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    update customer_case
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="pictureUrl != null">
+        picture_url = #{pictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="releaseStatus != null">
+        release_status = #{releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="releaseTime != null">
+        release_time = #{releaseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="province != null">
+        province = #{province,jdbcType=INTEGER},
+      </if>
+      <if test="region != null">
+        region = #{region,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.kede.common.model.CustomerCase">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 19:51:04 CST 2019.
+    -->
+    update customer_case
+    set name = #{name,jdbcType=VARCHAR},
+      picture_url = #{pictureUrl,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      release_status = #{releaseStatus,jdbcType=INTEGER},
+      release_time = #{releaseTime,jdbcType=TIMESTAMP},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      province = #{province,jdbcType=INTEGER},
+      region = #{region,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

+ 498 - 457
src/main/java/com/kede/common/mapper/NewsMapper.xml

@@ -1,458 +1,499 @@
-<?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.kede.common.dao.NewsMapper">
-  <resultMap id="BaseResultMap" type="com.kede.common.model.News">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="publisher" jdbcType="VARCHAR" property="publisher" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-    <result column="picture_url" jdbcType="VARCHAR" property="pictureUrl" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-    <result column="release_status" jdbcType="INTEGER" property="releaseStatus" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.kede.common.model.News">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    <result column="content" jdbcType="LONGVARCHAR" property="content" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    id, title, publisher, type, picture_url, status, sort, release_status, create_time, 
-    release_time
-  </sql>
-  <sql id="Blob_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    content
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.kede.common.model.NewsExample" resultMap="ResultMapWithBLOBs">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from news
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.kede.common.model.NewsExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from news
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from news
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    delete from news
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.kede.common.model.NewsExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    delete from news
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.kede.common.model.News">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    insert into news (id, title, publisher, 
-      type, picture_url, status, 
-      sort, release_status, create_time, 
-      release_time, content)
-    values (#{id,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{publisher,jdbcType=VARCHAR}, 
-      #{type,jdbcType=INTEGER}, #{pictureUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{sort,jdbcType=INTEGER}, #{releaseStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{releaseTime,jdbcType=TIMESTAMP}, #{content,jdbcType=LONGVARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.kede.common.model.News">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    insert into news
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="title != null">
-        title,
-      </if>
-      <if test="publisher != null">
-        publisher,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-      <if test="pictureUrl != null">
-        picture_url,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-      <if test="releaseStatus != null">
-        release_status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="releaseTime != null">
-        release_time,
-      </if>
-      <if test="content != null">
-        content,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="publisher != null">
-        #{publisher,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
-      </if>
-      <if test="pictureUrl != null">
-        #{pictureUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="releaseStatus != null">
-        #{releaseStatus,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="releaseTime != null">
-        #{releaseTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="content != null">
-        #{content,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.kede.common.model.NewsExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    select count(*) from news
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    update news
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.title != null">
-        title = #{record.title,jdbcType=VARCHAR},
-      </if>
-      <if test="record.publisher != null">
-        publisher = #{record.publisher,jdbcType=VARCHAR},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
-      </if>
-      <if test="record.pictureUrl != null">
-        picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=INTEGER},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </if>
-      <if test="record.releaseStatus != null">
-        release_status = #{record.releaseStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.releaseTime != null">
-        release_time = #{record.releaseTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.content != null">
-        content = #{record.content,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    update news
-    set id = #{record.id,jdbcType=INTEGER},
-      title = #{record.title,jdbcType=VARCHAR},
-      publisher = #{record.publisher,jdbcType=VARCHAR},
-      type = #{record.type,jdbcType=INTEGER},
-      picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=INTEGER},
-      sort = #{record.sort,jdbcType=INTEGER},
-      release_status = #{record.releaseStatus,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      release_time = #{record.releaseTime,jdbcType=TIMESTAMP},
-      content = #{record.content,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    update news
-    set id = #{record.id,jdbcType=INTEGER},
-      title = #{record.title,jdbcType=VARCHAR},
-      publisher = #{record.publisher,jdbcType=VARCHAR},
-      type = #{record.type,jdbcType=INTEGER},
-      picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=INTEGER},
-      sort = #{record.sort,jdbcType=INTEGER},
-      release_status = #{record.releaseStatus,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      release_time = #{record.releaseTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.kede.common.model.News">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    update news
-    <set>
-      <if test="title != null">
-        title = #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="publisher != null">
-        publisher = #{publisher,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
-      </if>
-      <if test="pictureUrl != null">
-        picture_url = #{pictureUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="releaseStatus != null">
-        release_status = #{releaseStatus,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="releaseTime != null">
-        release_time = #{releaseTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="content != null">
-        content = #{content,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.kede.common.model.News">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    update news
-    set title = #{title,jdbcType=VARCHAR},
-      publisher = #{publisher,jdbcType=VARCHAR},
-      type = #{type,jdbcType=INTEGER},
-      picture_url = #{pictureUrl,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
-      sort = #{sort,jdbcType=INTEGER},
-      release_status = #{releaseStatus,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      release_time = #{releaseTime,jdbcType=TIMESTAMP},
-      content = #{content,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.kede.common.model.News">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 11 15:57:50 CST 2019.
-    -->
-    update news
-    set title = #{title,jdbcType=VARCHAR},
-      publisher = #{publisher,jdbcType=VARCHAR},
-      type = #{type,jdbcType=INTEGER},
-      picture_url = #{pictureUrl,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
-      sort = #{sort,jdbcType=INTEGER},
-      release_status = #{releaseStatus,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      release_time = #{releaseTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+<?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.kede.common.dao.NewsMapper">
+  <resultMap id="BaseResultMap" type="com.kede.common.model.News">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="publisher" jdbcType="VARCHAR" property="publisher" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="picture_url" jdbcType="VARCHAR" property="pictureUrl" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="release_status" jdbcType="INTEGER" property="releaseStatus" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.kede.common.model.News">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    <result column="content" jdbcType="LONGVARCHAR" property="content" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    id, title, publisher, type, picture_url, status, sort, release_status, create_time, 
+    release_time
+  </sql>
+  <sql id="Blob_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    content
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.kede.common.model.NewsExample" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from news
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.kede.common.model.NewsExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from news
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from news
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    delete from news
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.kede.common.model.NewsExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    delete from news
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.kede.common.model.News">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    insert into news (id, title, publisher, 
+      type, picture_url, status, 
+      sort, release_status, create_time, 
+      release_time, content)
+    values (#{id,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{publisher,jdbcType=VARCHAR}, 
+      #{type,jdbcType=INTEGER}, #{pictureUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{sort,jdbcType=INTEGER}, #{releaseStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{releaseTime,jdbcType=TIMESTAMP}, #{content,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.kede.common.model.News">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    insert into news
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="publisher != null">
+        publisher,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="pictureUrl != null">
+        picture_url,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="releaseStatus != null">
+        release_status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="releaseTime != null">
+        release_time,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="publisher != null">
+        #{publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="pictureUrl != null">
+        #{pictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="releaseStatus != null">
+        #{releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="releaseTime != null">
+        #{releaseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.kede.common.model.NewsExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    select count(*) from news
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    update news
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publisher != null">
+        publisher = #{record.publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
+      <if test="record.pictureUrl != null">
+        picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </if>
+      <if test="record.releaseStatus != null">
+        release_status = #{record.releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.releaseTime != null">
+        release_time = #{record.releaseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.content != null">
+        content = #{record.content,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    update news
+    set id = #{record.id,jdbcType=INTEGER},
+      title = #{record.title,jdbcType=VARCHAR},
+      publisher = #{record.publisher,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=INTEGER},
+      picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      sort = #{record.sort,jdbcType=INTEGER},
+      release_status = #{record.releaseStatus,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      release_time = #{record.releaseTime,jdbcType=TIMESTAMP},
+      content = #{record.content,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    update news
+    set id = #{record.id,jdbcType=INTEGER},
+      title = #{record.title,jdbcType=VARCHAR},
+      publisher = #{record.publisher,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=INTEGER},
+      picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      sort = #{record.sort,jdbcType=INTEGER},
+      release_status = #{record.releaseStatus,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      release_time = #{record.releaseTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.kede.common.model.News">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    update news
+    <set>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="publisher != null">
+        publisher = #{publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="pictureUrl != null">
+        picture_url = #{pictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="releaseStatus != null">
+        release_status = #{releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="releaseTime != null">
+        release_time = #{releaseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="content != null">
+        content = #{content,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.kede.common.model.News">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    update news
+    set title = #{title,jdbcType=VARCHAR},
+      publisher = #{publisher,jdbcType=VARCHAR},
+      type = #{type,jdbcType=INTEGER},
+      picture_url = #{pictureUrl,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      sort = #{sort,jdbcType=INTEGER},
+      release_status = #{releaseStatus,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      release_time = #{releaseTime,jdbcType=TIMESTAMP},
+      content = #{content,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.kede.common.model.News">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Dec 25 16:41:04 CST 2019.
+    -->
+    update news
+    set title = #{title,jdbcType=VARCHAR},
+      publisher = #{publisher,jdbcType=VARCHAR},
+      type = #{type,jdbcType=INTEGER},
+      picture_url = #{pictureUrl,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      sort = #{sort,jdbcType=INTEGER},
+      release_status = #{releaseStatus,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      release_time = #{releaseTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectByid" resultType="com.kede.news.bo.OutNews">
+   select id, title, publisher, type, picture_url pictureUrl, status, sort, release_status releaseStatus,content,
+    date_format(create_time,'%Y-%m-%d %H:%i:%S') as createTimeConvert, release_time releaseTime,
+    date_format(release_time,'%Y-%m-%d %H:%i:%S') as releaseTimeConvert 
+    from news where id = #{id,jdbcType=INTEGER}
+  </select>
+  <select id="findNewsList" resultType="com.kede.news.bo.OutNews">
+  select id, title, publisher, type, picture_url pictureUrl, status, sort, release_status releaseStatus,content,
+  	date_format(create_time,'%Y-%m-%d %H:%i:%S') as createTimeConvert,release_time releaseTime,  
+    date_format(release_time,'%Y-%m-%d %H:%i:%S') as releaseTimeConvert 
+    from news where 1=1
+    <if test="n.id!=null">
+    and id = #{n.id}
+    </if>
+    <if test="n.title!=null">
+    and title = #{n.title}
+    </if>
+    <if test="n.releaseStatus!=null">
+    and release_status = #{n.releaseStatus}
+    </if>
+    order by releaseStatus desc,sort desc,create_time desc
+    <if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+  
+  <select id="findNewsCount" resultType="java.lang.Integer">
+  select count(*)
+    from news where 1=1
+    <if test="n.id!=null">
+    and id = #{n.id}
+    </if>
+    <if test="n.title!=null">
+    and title = #{n.title}
+    </if>
+    <if test="n.releaseStatus!=null">
+    and release_status = #{n.releaseStatus}
+    </if>
+  </select>
+  
 </mapper>

+ 213 - 235
src/main/java/com/kede/common/model/CustomerCase.java

@@ -1,236 +1,214 @@
-package com.kede.common.model;
-
-import java.util.Date;
-
-public class CustomerCase {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer_case.id
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    private Integer id;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer_case.name
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    private String name;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer_case.picture_url
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    private String pictureUrl;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer_case.status
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    private Integer status;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer_case.release_status
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    private Integer releaseStatus;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer_case.release_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    private Date releaseTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer_case.create_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    private Date createTime;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer_case.id
-     *
-     * @return the value of customer_case.id
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer_case.id
-     *
-     * @param id the value for customer_case.id
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer_case.name
-     *
-     * @return the value of customer_case.name
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer_case.name
-     *
-     * @param name the value for customer_case.name
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer_case.picture_url
-     *
-     * @return the value of customer_case.picture_url
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public String getPictureUrl() {
-        return pictureUrl;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer_case.picture_url
-     *
-     * @param pictureUrl the value for customer_case.picture_url
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public void setPictureUrl(String pictureUrl) {
-        this.pictureUrl = pictureUrl;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer_case.status
-     *
-     * @return the value of customer_case.status
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer_case.status
-     *
-     * @param status the value for customer_case.status
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer_case.release_status
-     *
-     * @return the value of customer_case.release_status
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public Integer getReleaseStatus() {
-        return releaseStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer_case.release_status
-     *
-     * @param releaseStatus the value for customer_case.release_status
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public void setReleaseStatus(Integer releaseStatus) {
-        this.releaseStatus = releaseStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer_case.release_time
-     *
-     * @return the value of customer_case.release_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public Date getReleaseTime() {
-        return releaseTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer_case.release_time
-     *
-     * @param releaseTime the value for customer_case.release_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public void setReleaseTime(Date releaseTime) {
-        this.releaseTime = releaseTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer_case.create_time
-     *
-     * @return the value of customer_case.create_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer_case.create_time
-     *
-     * @param createTime the value for customer_case.create_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:59 CST 2019
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+package com.kede.common.model;
+
+import java.util.Date;
+
+public class CustomerCase {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_case.id
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_case.name
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	private String name;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_case.picture_url
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	private String pictureUrl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_case.status
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	private Integer status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_case.release_status
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	private Integer releaseStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_case.release_time
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	private Date releaseTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_case.create_time
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_case.province
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	private Integer province;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_case.region
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	private Integer region;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_case.id
+	 * @return  the value of customer_case.id
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_case.id
+	 * @param id  the value for customer_case.id
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_case.name
+	 * @return  the value of customer_case.name
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_case.name
+	 * @param name  the value for customer_case.name
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_case.picture_url
+	 * @return  the value of customer_case.picture_url
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public String getPictureUrl() {
+		return pictureUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_case.picture_url
+	 * @param pictureUrl  the value for customer_case.picture_url
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public void setPictureUrl(String pictureUrl) {
+		this.pictureUrl = pictureUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_case.status
+	 * @return  the value of customer_case.status
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_case.status
+	 * @param status  the value for customer_case.status
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_case.release_status
+	 * @return  the value of customer_case.release_status
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public Integer getReleaseStatus() {
+		return releaseStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_case.release_status
+	 * @param releaseStatus  the value for customer_case.release_status
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public void setReleaseStatus(Integer releaseStatus) {
+		this.releaseStatus = releaseStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_case.release_time
+	 * @return  the value of customer_case.release_time
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public Date getReleaseTime() {
+		return releaseTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_case.release_time
+	 * @param releaseTime  the value for customer_case.release_time
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public void setReleaseTime(Date releaseTime) {
+		this.releaseTime = releaseTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_case.create_time
+	 * @return  the value of customer_case.create_time
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_case.create_time
+	 * @param createTime  the value for customer_case.create_time
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_case.province
+	 * @return  the value of customer_case.province
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public Integer getProvince() {
+		return province;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_case.province
+	 * @param province  the value for customer_case.province
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public void setProvince(Integer province) {
+		this.province = province;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_case.region
+	 * @return  the value of customer_case.region
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public Integer getRegion() {
+		return region;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_case.region
+	 * @param region  the value for customer_case.region
+	 * @mbg.generated  Wed Dec 25 19:51:04 CST 2019
+	 */
+	public void setRegion(Integer region) {
+		this.region = region;
+	}
 }

File diff suppressed because it is too large
+ 821 - 742
src/main/java/com/kede/common/model/CustomerCaseExample.java


+ 259 - 367
src/main/java/com/kede/common/model/News.java

@@ -1,368 +1,260 @@
-package com.kede.common.model;
-
-import java.util.Date;
-
-public class News {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.id
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private Integer id;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.title
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private String title;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.publisher
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private String publisher;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.type
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private Integer type;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.picture_url
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private String pictureUrl;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.status
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private Integer status;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.sort
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private Integer sort;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.release_status
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private Integer releaseStatus;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.create_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private Date createTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.release_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private Date releaseTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column news.content
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    private String content;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.id
-     *
-     * @return the value of news.id
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.id
-     *
-     * @param id the value for news.id
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.title
-     *
-     * @return the value of news.title
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.title
-     *
-     * @param title the value for news.title
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.publisher
-     *
-     * @return the value of news.publisher
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public String getPublisher() {
-        return publisher;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.publisher
-     *
-     * @param publisher the value for news.publisher
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setPublisher(String publisher) {
-        this.publisher = publisher;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.type
-     *
-     * @return the value of news.type
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public Integer getType() {
-        return type;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.type
-     *
-     * @param type the value for news.type
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.picture_url
-     *
-     * @return the value of news.picture_url
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public String getPictureUrl() {
-        return pictureUrl;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.picture_url
-     *
-     * @param pictureUrl the value for news.picture_url
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setPictureUrl(String pictureUrl) {
-        this.pictureUrl = pictureUrl;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.status
-     *
-     * @return the value of news.status
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.status
-     *
-     * @param status the value for news.status
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.sort
-     *
-     * @return the value of news.sort
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public Integer getSort() {
-        return sort;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.sort
-     *
-     * @param sort the value for news.sort
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.release_status
-     *
-     * @return the value of news.release_status
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public Integer getReleaseStatus() {
-        return releaseStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.release_status
-     *
-     * @param releaseStatus the value for news.release_status
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setReleaseStatus(Integer releaseStatus) {
-        this.releaseStatus = releaseStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.create_time
-     *
-     * @return the value of news.create_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.create_time
-     *
-     * @param createTime the value for news.create_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.release_time
-     *
-     * @return the value of news.release_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public Date getReleaseTime() {
-        return releaseTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.release_time
-     *
-     * @param releaseTime the value for news.release_time
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setReleaseTime(Date releaseTime) {
-        this.releaseTime = releaseTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column news.content
-     *
-     * @return the value of news.content
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public String getContent() {
-        return content;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column news.content
-     *
-     * @param content the value for news.content
-     *
-     * @mbg.generated Wed Sep 11 15:57:50 CST 2019
-     */
-    public void setContent(String content) {
-        this.content = content;
-    }
+package com.kede.common.model;
+
+import java.util.Date;
+
+public class News {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.id
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.title
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private String title;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.publisher
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private String publisher;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.type
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private Integer type;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.picture_url
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private String pictureUrl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.status
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private Integer status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.sort
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private Integer sort;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.release_status
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private Integer releaseStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.create_time
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.release_time
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private Date releaseTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news.content
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	private String content;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.id
+	 * @return  the value of news.id
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.id
+	 * @param id  the value for news.id
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.title
+	 * @return  the value of news.title
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public String getTitle() {
+		return title;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.title
+	 * @param title  the value for news.title
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.publisher
+	 * @return  the value of news.publisher
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public String getPublisher() {
+		return publisher;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.publisher
+	 * @param publisher  the value for news.publisher
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setPublisher(String publisher) {
+		this.publisher = publisher;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.type
+	 * @return  the value of news.type
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.type
+	 * @param type  the value for news.type
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.picture_url
+	 * @return  the value of news.picture_url
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public String getPictureUrl() {
+		return pictureUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.picture_url
+	 * @param pictureUrl  the value for news.picture_url
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setPictureUrl(String pictureUrl) {
+		this.pictureUrl = pictureUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.status
+	 * @return  the value of news.status
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.status
+	 * @param status  the value for news.status
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.sort
+	 * @return  the value of news.sort
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public Integer getSort() {
+		return sort;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.sort
+	 * @param sort  the value for news.sort
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.release_status
+	 * @return  the value of news.release_status
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public Integer getReleaseStatus() {
+		return releaseStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.release_status
+	 * @param releaseStatus  the value for news.release_status
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setReleaseStatus(Integer releaseStatus) {
+		this.releaseStatus = releaseStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.create_time
+	 * @return  the value of news.create_time
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.create_time
+	 * @param createTime  the value for news.create_time
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.release_time
+	 * @return  the value of news.release_time
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public Date getReleaseTime() {
+		return releaseTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.release_time
+	 * @param releaseTime  the value for news.release_time
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setReleaseTime(Date releaseTime) {
+		this.releaseTime = releaseTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news.content
+	 * @return  the value of news.content
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public String getContent() {
+		return content;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news.content
+	 * @param content  the value for news.content
+	 * @mbg.generated  Wed Dec 25 16:41:04 CST 2019
+	 */
+	public void setContent(String content) {
+		this.content = content;
+	}
 }

File diff suppressed because it is too large
+ 891 - 932
src/main/java/com/kede/common/model/NewsExample.java


+ 18 - 0
src/main/java/com/kede/news/bo/InputNews.java

@@ -0,0 +1,18 @@
+package com.kede.news.bo;
+
+import com.kede.common.model.News;
+
+public class InputNews extends News{
+	private String releaseTimes;
+
+	public String getReleaseTimes() {
+		return releaseTimes;
+	}
+
+	public void setReleaseTimes(String releaseTimes) {
+		this.releaseTimes = releaseTimes;
+	}
+
+	
+
+}

+ 23 - 0
src/main/java/com/kede/news/bo/OutNews.java

@@ -0,0 +1,23 @@
+package com.kede.news.bo;
+
+import com.kede.common.model.News;
+
+public class OutNews extends News {
+	
+    private String createTimeConvert;
+    private String releaseTimeConvert;
+	public String getCreateTimeConvert() {
+		return createTimeConvert;
+	}
+	public void setCreateTimeConvert(String createTimeConvert) {
+		this.createTimeConvert = createTimeConvert;
+	}
+	public String getReleaseTimeConvert() {
+		return releaseTimeConvert;
+	}
+	public void setReleaseTimeConvert(String releaseTimeConvert) {
+		this.releaseTimeConvert = releaseTimeConvert;
+	} 
+    
+
+}

+ 113 - 0
src/main/java/com/kede/news/controller/AdminNewsApiController.java

@@ -0,0 +1,113 @@
+package com.kede.news.controller;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+
+import com.kede.common.bo.Result;
+import com.kede.common.constant.ErrorConstants;
+import com.kede.common.controller.BaseApiController;
+import com.kede.common.utils.StringUtils;
+import com.kede.news.bo.InputNews;
+import com.kede.news.service.NewsService;
+
+
+
+
+@RestController
+@RequestMapping(value = "/open/admin/news")
+public class AdminNewsApiController extends BaseApiController {
+	@Resource
+ 	private NewsService	newsService;
+	
+
+	@RequestMapping(value = "/addNews", method = RequestMethod.POST)
+	public Result addNews(InputNews in) {
+		Result res =new Result();
+		inputcheke(in, res);
+		if(!res.getError().isEmpty())return res;
+		res.data(newsService.addNews(in));
+		return res;
+	}
+
+
+
+
+	private Result inputcheke(InputNews in, Result res) {
+		if(StringUtils.isBlank(in.getContent())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"内容","内容"));
+			return res;
+		}
+		if(StringUtils.isBlank(in.getTitle())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"标题","标题"));
+			return res;
+		}
+		if(StringUtils.isBlank(in.getPublisher())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"发布人","发布人"));
+			return res;
+		}
+		if(null==in.getType()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"类型","类型"));
+			return res;
+		}
+		return res;
+	}
+
+		
+		
+	
+	@RequestMapping(value = "/updateNews", method = RequestMethod.POST)
+	public Result updateNews(InputNews in) {
+		Result res =new Result();
+		inputcheke(in, res);
+		if(!res.getError().isEmpty())return res;
+		res.data(newsService.updateNews(in));
+		return res;
+	}
+	
+	@RequestMapping(value = "/deleteNews", method = RequestMethod.POST)
+	public Result deleteNews(InputNews in) {
+		Result res =new Result();
+		if(in.getId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
+			return res;
+		}
+		res.data(newsService.deleteNews(in));
+		return res;
+	}
+	
+	@RequestMapping(value = "/listNews", method = RequestMethod.GET)
+	public Result listNews(InputNews in,Integer pageSize,Integer pageNo) {
+		Result res =new Result();
+		
+		res.data(newsService.listnewsDetails(in,pageSize,pageNo));
+		return res;
+	}
+	
+	@RequestMapping(value = "/selectNews", method = RequestMethod.GET)
+	public Result selectNews(InputNews in) {
+		Result res =new Result();
+		if(in.getId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
+			return res;
+		}
+		if (!res.getError().isEmpty()) return res;
+		res.data(newsService.selectNews(in));
+		return res;
+	}
+	
+	/** 上传图片 **/
+	@RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+	public Result uploadOrderInvoiceFile(HttpServletRequest req){
+		Result res = new Result();
+		res.setData(handleFile(res, "/news/", false, req, "news"));
+		return res;
+	}
+
+	
+
+}

+ 19 - 0
src/main/java/com/kede/news/service/NewsService.java

@@ -0,0 +1,19 @@
+package com.kede.news.service;
+
+import com.kede.core.mybatis.page.Pagination;
+import com.kede.news.bo.InputNews;
+import com.kede.news.bo.OutNews;
+
+public interface NewsService {
+
+	int addNews(InputNews in);
+
+	int updateNews(InputNews in);
+
+	int deleteNews(InputNews in);
+
+	Pagination<OutNews> listnewsDetails(InputNews in, Integer pageSize, Integer pageNo);
+
+	OutNews selectNews(InputNews in);
+
+}

+ 81 - 0
src/main/java/com/kede/news/service/impl/NewsServiceImpl.java

@@ -0,0 +1,81 @@
+package com.kede.news.service.impl;
+
+
+
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.kede.common.constant.AFTConstants;
+import com.kede.common.dao.NewsMapper;
+import com.kede.common.error.BusinessException;
+import com.kede.common.utils.DateUtils;
+import com.kede.core.mybatis.BaseMybatisDao;
+import com.kede.core.mybatis.page.Pagination;
+import com.kede.news.bo.InputNews;
+import com.kede.news.bo.OutNews;
+import com.kede.news.service.NewsService;
+@Service
+public class NewsServiceImpl extends BaseMybatisDao<NewsMapper> implements NewsService {
+	
+	@Autowired
+	private NewsMapper	newsMapper;
+
+	@Override
+	public int addNews(InputNews in) {
+		if (in.getReleaseTimes()!=null) {
+			try {
+				in.setReleaseTime(DateUtils.StringToDate(in.getReleaseTimes(), AFTConstants.YYYYMMDDHHMMSS));
+			} catch (ParseException e) {
+				throw new BusinessException("转换异常");
+			}
+		}
+		if (in.getReleaseStatus()==1&&in.getReleaseTime()==null) {
+			in.setReleaseTime(new Date());
+		}
+		
+		return newsMapper.insertSelective(in);
+	}
+
+	@Override
+	public int updateNews(InputNews in) {
+		if (in.getReleaseTimes()!=null) {
+			try {
+				in.setReleaseTime(DateUtils.StringToDate(in.getReleaseTimes(), AFTConstants.YYYYMMDDHHMMSS));
+			} catch (ParseException e) {
+				throw new BusinessException("转换异常");
+			}
+		}
+		if (in.getReleaseStatus()==1&&in.getReleaseTime()==null) {
+			in.setReleaseTime(new Date());
+		}
+		
+		return newsMapper.updateByPrimaryKeySelective(in);
+	}
+
+	@Override
+	public int deleteNews(InputNews in) {
+		return newsMapper.deleteByPrimaryKey(in.getId());
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OutNews> listnewsDetails(InputNews in, Integer pageSize, Integer pageNo) {
+		Map<String, Object> params = new HashMap<>();
+		if(pageSize==null||pageSize<0)pageSize=10;
+		if(pageNo==null||pageNo<0)pageNo=1;
+		params.put("n", in);
+		return (Pagination<OutNews>) findPage("findNewsList", "findNewsCount", params, pageNo, pageSize);
+	}
+
+	@Override
+	public OutNews selectNews(InputNews in) {
+		return newsMapper.selectByid(in.getId());
+	} 
+	
+}