Kaynağa Gözat

空指针处理,增加新闻接口

liliang4869 7 yıl önce
ebeveyn
işleme
f58ce27d2c
28 değiştirilmiş dosya ile 6158 ekleme ve 67 silme
  1. 1 2
      GeneratorConfig.xml
  2. 39 0
      src/main/java/com/goafanti/common/constant/PageConstants.java
  3. 9 4
      src/main/java/com/goafanti/common/controller/WebpageController.java
  4. 2 1
      src/main/java/com/goafanti/common/dao/NewsMapper.java
  5. 79 0
      src/main/java/com/goafanti/common/dao/NewsPublishMapper.java
  6. 97 0
      src/main/java/com/goafanti/common/dao/PolicyMapper.java
  7. 81 0
      src/main/java/com/goafanti/common/dao/PolicyPublishMapper.java
  8. 44 26
      src/main/java/com/goafanti/common/mapper/NewsMapper.xml
  9. 20 13
      src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml
  10. 374 0
      src/main/java/com/goafanti/common/mapper/NewsPublishMapper.xml
  11. 546 0
      src/main/java/com/goafanti/common/mapper/PolicyMapper.xml
  12. 373 0
      src/main/java/com/goafanti/common/mapper/PolicyPublishMapper.xml
  13. 20 0
      src/main/java/com/goafanti/common/model/News.java
  14. 237 0
      src/main/java/com/goafanti/common/model/NewsPublish.java
  15. 912 0
      src/main/java/com/goafanti/common/model/NewsPublishExample.java
  16. 375 0
      src/main/java/com/goafanti/common/model/Policy.java
  17. 1222 0
      src/main/java/com/goafanti/common/model/PolicyExample.java
  18. 237 0
      src/main/java/com/goafanti/common/model/PolicyPublish.java
  19. 912 0
      src/main/java/com/goafanti/common/model/PolicyPublishExample.java
  20. 22 0
      src/main/java/com/goafanti/news/bo/InputNews.java
  21. 19 0
      src/main/java/com/goafanti/news/bo/NewsResult.java
  22. 18 0
      src/main/java/com/goafanti/news/bo/PolicyResult.java
  23. 143 9
      src/main/java/com/goafanti/news/controller/AdminNewsApiController.java
  24. 150 0
      src/main/java/com/goafanti/news/controller/AdminPolicyApiController.java
  25. 103 3
      src/main/java/com/goafanti/news/service/NewsService.java
  26. 118 0
      src/main/java/com/goafanti/news/service/PolicyService.java
  27. 4 8
      src/main/webapp/WEB-INF/views/common.html
  28. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

+ 1 - 2
GeneratorConfig.xml

@@ -10,7 +10,6 @@
    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="jitao_server" />
    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="jitao_server" />
    <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="jitao_server" type="XMLMAPPER" />
-   <table schema="aft" tableName="jt_business_category"/>
-   <table schema="aft" tableName="jt_business_project"/>
+   <table schema="aft" tableName="policy"/>
   </context>
 </generatorConfiguration>

+ 39 - 0
src/main/java/com/goafanti/common/constant/PageConstants.java

@@ -5,12 +5,17 @@ import java.util.List;
 import java.util.Map;
 
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.news.bo.newsInterestBo;
 
 public class PageConstants {
 	static final Map<String,String> WEB_DEMAND_PAGES = new HashMap<String, String>();
 	static final Map<String,String> APP_DEMAND_PAGES = new HashMap<String, String>();
 	static final Map<String,String> WEB_ACHIEVEMENT_PAGES = new HashMap<String, String>();
 	static final Map<String,String> APP_ACHIEVEMENT_PAGES = new HashMap<String, String>();
+	static final Map<String, String>WEB_NEWS_PAGES=new HashMap<String,String>();
+	static final Map<String, String>APP_NEWS_PAGES=new HashMap<>();
+	static final Map<String, String>WEB_POLICY_PAGES=new HashMap<>();
+	static final Map<String, String>APP_POLICY_PAGES=new HashMap<>();
 	public static final int WEB_PLATFORM = 0;
 	public static final int APP_PLATFORM = 1;
 	public static final String DEFAULT_DOMAIN = "jishutao.com";
@@ -29,6 +34,16 @@ public class PageConstants {
 		APP_ACHIEVEMENT_PAGES.put("app_index", "网站首页");
 		APP_ACHIEVEMENT_PAGES.put("app_achievement_main", "APP成果主页");
 		APP_ACHIEVEMENT_PAGES.put("app_achievement_list", "APP成果列表页");
+		WEB_NEWS_PAGES.put("web_index", "网站首页");
+		WEB_NEWS_PAGES.put("web_tech_service_index", "网站科技服务首页");
+		APP_NEWS_PAGES.put("app_policy_index", "APP政策首页");
+		APP_NEWS_PAGES.put("app_tech_service_index", "APP科技服务首页");
+		WEB_POLICY_PAGES.put("web_index", "网站首页");
+		WEB_POLICY_PAGES.put("web_policy_main", "网站政策主页");
+		WEB_POLICY_PAGES.put("web_tech_service_index","网站科技服务首页");
+		APP_POLICY_PAGES.put("app_index", "APP首页");
+		APP_POLICY_PAGES.put("app_policy_main", "APP政策主页");
+		APP_POLICY_PAGES.put("app_tech_service_index", "APP科技服务首页");
 	}
 
 	public static boolean containPage(String page,Map<String,String> matchPages){
@@ -59,4 +74,28 @@ public class PageConstants {
 			}
 		}
 	}
+	
+	public static void putNews(String[] pages,List<String> webPages,List<String> appPages){
+		if(pages == null || pages.length <= 0) return;
+		for(String page : pages){
+			if(containPage(page,WEB_NEWS_PAGES)){
+				webPages.add(page);
+			}
+			if(containPage(page,APP_NEWS_PAGES)){
+				appPages.add(page);
+			}
+		}
+	}
+	
+	public static void putPolicy(String[] pages,List<String> webPages,List<String> appPages){
+		if(pages == null || pages.length <= 0) return;
+		for(String page : pages){
+			if(containPage(page,WEB_POLICY_PAGES)){
+				webPages.add(page);
+			}
+			if(containPage(page,APP_POLICY_PAGES)){
+				appPages.add(page);
+			}
+		}
+	}
 }

+ 9 - 4
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -276,9 +276,11 @@ public class WebpageController extends BaseController {
 		//高企服务
 		JtBusinessCategory gaoqi=jtBusinessService.getBusinessCategoryByLayerAndName(1, "高企服务");
 		JtBusinessCategory gaoqi2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "高企服务");
+		if(gaoqi2!=null)
+		{
 		List<JtBusinessProject>gaoqiList=jtBusinessService.getBusinessProjectByCategoryId(gaoqi2.getId(),6);
 		modelview.addObject("gaoqiList",gaoqiList); 
-		modelview.addObject("gqc1",gaoqi);
+		modelview.addObject("gqc1",gaoqi);}
 		//知识产权贯标
 		JtBusinessCategory zscqgb=jtBusinessService.getBusinessCategoryByLayerAndName(1, "知识产权");
 		List<JtBusinessCategory> zscqgbCategories=jtBusinessService.getBusinessCategoryBySuperId(zscqgb.getId(), 4);
@@ -287,22 +289,25 @@ public class WebpageController extends BaseController {
 		modelview.addObject("zscqc1",zscqgb);
 		//企业认证
 		JtBusinessCategory qiyerenzheng=jtBusinessService.getBusinessCategoryByLayerAndName(1, "企业认证");
+		if(qiyerenzheng!=null) {
 		List<JtBusinessCategory>qyrzCategories=jtBusinessService.getBusinessCategoryBySuperId(qiyerenzheng.getId(), 2);
 		int []qyrzsizes= {8,8};
 		businessHelper(modelview, "qyrz", qyrzCategories, qyrzsizes);
-		modelview.addObject("qyrzc1",qiyerenzheng);
+		modelview.addObject("qyrzc1",qiyerenzheng);}
 		//管理体系
 		JtBusinessCategory manageSys=jtBusinessService.getBusinessCategoryByLayerAndName(1, "管理体系");
 		JtBusinessCategory manageSys2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "管理体系");
+		if(manageSys2!=null) {
 		List<JtBusinessProject>manageSysPro=jtBusinessService.getBusinessProjectByCategoryId(manageSys2.getId(), 18);
 		modelview.addObject("manageSystemList",manageSysPro);
-		modelview.addObject("managerSysc1",manageSys);
+		modelview.addObject("managerSysc1",manageSys);}
 		//科技项目
 				JtBusinessCategory scienceProject=jtBusinessService.getBusinessCategoryByLayerAndName(1, "科技项目");
 				JtBusinessCategory scienceProject2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "科技项目");
+				if(scienceProject2!=null) {
 				List<JtBusinessProject>scienceProjects=jtBusinessService.getBusinessProjectByCategoryId(scienceProject2.getId(), 12);
 				modelview.addObject("scienceProjectList",scienceProjects);
-				modelview.addObject("spc1",scienceProject);
+				modelview.addObject("spc1",scienceProject);}
 		//咨询师
 			List<consultantListBo>userIdentityBos=userIdentityService.getConsultantList(8);
 			modelview.addObject("consultants",userIdentityBos);

+ 2 - 1
src/main/java/com/goafanti/common/dao/NewsMapper.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.model.News;
 import com.goafanti.news.bo.NewsPortalList;
+import com.goafanti.news.bo.NewsResult;
 import com.goafanti.news.bo.NewsSummary;
 import com.goafanti.news.bo.newsInterestBo;
 
@@ -17,7 +18,7 @@ public interface NewsMapper {
 
 	int insertSelective(News record);
 
-	News selectByPrimaryKey(Long id);
+	NewsResult selectByPrimaryKey(Long id);
 
 	int updateByPrimaryKeySelective(News record);
 

+ 79 - 0
src/main/java/com/goafanti/common/dao/NewsPublishMapper.java

@@ -0,0 +1,79 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.NewsPublish;
+import com.goafanti.common.model.NewsPublishExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface NewsPublishMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	long countByExample(NewsPublishExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int deleteByExample(NewsPublishExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int insert(NewsPublish record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int insertSelective(NewsPublish record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	List<NewsPublish> selectByExample(NewsPublishExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	NewsPublish selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int updateByExampleSelective(@Param("record") NewsPublish record, @Param("example") NewsPublishExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int updateByExample(@Param("record") NewsPublish record, @Param("example") NewsPublishExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int updateByPrimaryKeySelective(NewsPublish record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int updateByPrimaryKey(NewsPublish record);
+	
+	int deleteByNewsId(long id);
+	
+	List<NewsPublish>selectByNewsId(Long id);
+}

+ 97 - 0
src/main/java/com/goafanti/common/dao/PolicyMapper.java

@@ -0,0 +1,97 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.Policy;
+import com.goafanti.common.model.PolicyExample;
+import com.goafanti.news.bo.PolicyResult;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PolicyMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	long countByExample(PolicyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	int deleteByExample(PolicyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	int deleteByPrimaryKey(Long id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	int insert(Policy record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	int insertSelective(Policy record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	List<Policy> selectByExampleWithBLOBs(PolicyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	List<Policy> selectByExample(PolicyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	PolicyResult selectByPrimaryKey(Long id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	int updateByExampleSelective(@Param("record") Policy record, @Param("example") PolicyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	int updateByExampleWithBLOBs(@Param("record") Policy record, @Param("example") PolicyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	int updateByExample(@Param("record") Policy record, @Param("example") PolicyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	int updateByPrimaryKeySelective(Policy record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	int updateByPrimaryKeyWithBLOBs(Policy record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	int updateByPrimaryKey(Policy record);
+	
+	List<String>getPagesByPolicyId(Long id);
+}

+ 81 - 0
src/main/java/com/goafanti/common/dao/PolicyPublishMapper.java

@@ -0,0 +1,81 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.PolicyPublish;
+import com.goafanti.common.model.PolicyPublishExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PolicyPublishMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	long countByExample(PolicyPublishExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int deleteByExample(PolicyPublishExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int insert(PolicyPublish record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int insertSelective(PolicyPublish record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	List<PolicyPublish> selectByExample(PolicyPublishExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	PolicyPublish selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int updateByExampleSelective(@Param("record") PolicyPublish record, @Param("example") PolicyPublishExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int updateByExample(@Param("record") PolicyPublish record, @Param("example") PolicyPublishExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int updateByPrimaryKeySelective(PolicyPublish record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	int updateByPrimaryKey(PolicyPublish record);
+	
+	int deleteByPolicyId(Long id);
+
+	List<String> getPagesByPolicyId(Long id);
+	
+	
+}

+ 44 - 26
src/main/java/com/goafanti/common/mapper/NewsMapper.xml

@@ -26,27 +26,28 @@
   <sql id="Blob_Column_List">
     content
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultType="com.goafanti.news.bo.NewsResult">
     select 
-    id,
-    content,
-    create_time as createTime, 
-    edit_time as editTime, 
-    title, 
-    title_img as titleImg, 
-    author, 
-    type, 
-    hot,
-    source, 
-    source_url as sourceUrl, 
-    summary,
-    province_id as provinceId,
-    audit_status as auditStatus,
-    release_status as releaseStatus,
-    top_number as topNumber,
-    hotspot
-    from news
-    where id = #{id,jdbcType=BIGINT}
+    n.id,
+    n.content,
+    n.create_time as createTime, 
+    n.edit_time as editTime, 
+    n.title, 
+    n.title_img as titleImg, 
+    n.author, 
+    n.type, 
+    n.hot,
+    n.source, 
+    n.source_url as sourceUrl, 
+    n.summary,
+    n.province_id as provinceId,
+    n.audit_status as auditStatus,
+    n.release_status as releaseStatus,
+    n.top_number as topNumber,
+    n.hotspot,
+    n.release_date as releaseDate
+    from news n
+    where n.id = #{id,jdbcType=BIGINT}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from news
@@ -56,13 +57,14 @@
     insert into news (id, create_time, edit_time, 
       title, title_img, author, 
       type, hot, source, 
-      source_url, summary, content,jmrh_flag,province_id,top_number,hotspot
+      source_url, summary, content,province_id,top_number,hotspot,audit_status,release_status,release_date
       )
     values (#{id,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{editTime,jdbcType=TIMESTAMP}, 
       #{title,jdbcType=VARCHAR}, #{titleImg,jdbcType=VARCHAR}, #{author,jdbcType=VARCHAR}, 
       #{type,jdbcType=INTEGER}, #{hot,jdbcType=INTEGER}, #{source,jdbcType=VARCHAR}, 
       #{sourceUrl,jdbcType=VARCHAR}, #{summary,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR},
-      #{jmrhFlag,jdbcType=INTEGER}, #{provinceId,jdbcType=INTEGER}, #{topNumber,jdbcType=INTEGER}, #{hotspot,jdbcType=INTEGER}
+      #{provinceId,jdbcType=INTEGER}, #{topNumber,jdbcType=INTEGER}, #{hotspot,jdbcType=INTEGER},#{auditStatus,jdbcType=INTEGER},
+      #{releaseStatus,jdbcType=INTEGER},#{releaseDate,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.News">
@@ -192,8 +194,23 @@
       <if test="content != null">
         content = #{content,jdbcType=LONGVARCHAR},
       </if>
-      <if test="jmrhFlag != null">
-        content = #{jmrhFlag,jdbcType=INTEGER},
+      <if test="releaseDate!=null">
+      release_date=#{releaseDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="provinceId!=null">
+      province_id=#{provinceId,jdbcType=INTEGER},
+      </if>
+      <if test="auditStatus!=null">
+      audit_status=#{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="releaseStatus!=null">
+      release_status=#{releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="topNumber!=null">
+      top_number=#{topNumber,jdbcType=INTEGER},
+      </if>
+      <if test="hotspot!=null">
+      hotspot=#{hotspot,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -245,7 +262,8 @@
 			a.hot,
 			a.summary,
 			a.source,
-			a.content
+			a.content,
+			release_date as releaseDate
 		from news a
 		where
 		a.type != 1 and a.type != 2
@@ -392,5 +410,5 @@ left join district_glossory dg1 on dg1.id=p.province
 left join district_glossory dg2 on dg2.id=p.city
 where audit_status = 2 and p.id=#{0}
 </select>
-	
+
 </mapper>

+ 20 - 13
src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml

@@ -58,20 +58,27 @@
 	
 	<select id="findNewsListByPage" parameterType="String" resultMap="BaseResultMap">
   	select
-  		id,
-  		create_time,
-  		title,
-  		author,
-  		type,
-  		hot,
-  		source,
-  		summary,
-  		audit_status as auditStatus,
-  		release_status as releaseStatus,
-  		top_number as topNumber,
-    	hotspot
-  	from news
+  		n.id,
+  		n.create_time,
+  		n.title,
+  		n.author,
+  		n.type,
+  		n.hot,
+  		n.source,
+  		n.summary,
+  		n.audit_status as auditStatus,
+  		n.release_status as releaseStatus,
+  		n.top_number as topNumber,
+    	n.hotspot,
+    	n.release_date as releaseDate
+  	from news n
+  	<if test="publishPage !=null">
+  	left join news_publish np on np.news_id= n.id
+  	</if>
   	where 1 =1
+  	<if test="publishPage !=null">
+  	and np.publish_page =#{publishPage,jdbcType=VARCHAR}
+  	</if>
   	<if test="auditStatus != null">
   		and audit_status = #{auditStatus,jdbcType=INTEGER}
   	</if>

+ 374 - 0
src/main/java/com/goafanti/common/mapper/NewsPublishMapper.xml

@@ -0,0 +1,374 @@
+<?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.goafanti.common.dao.NewsPublishMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.NewsPublish">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="news_id" jdbcType="VARCHAR" property="newsId" />
+    <result column="publish_platform" jdbcType="VARCHAR" property="publishPlatform" />
+    <result column="publish_client" jdbcType="INTEGER" property="publishClient" />
+    <result column="publish_page" jdbcType="VARCHAR" property="publishPage" />
+    <result column="if_top" jdbcType="INTEGER" property="ifTop" />
+    <result column="top_number" jdbcType="INTEGER" property="topNumber" />
+    <result column="show_number" jdbcType="INTEGER" property="showNumber" />
+    <result column="publisher" jdbcType="VARCHAR" property="publisher" />
+    <result column="publish_time" jdbcType="TIMESTAMP" property="publishTime" />
+  </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 Thu Jun 28 10:40:11 CST 2018.
+    -->
+    <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 Thu Jun 28 10:40:11 CST 2018.
+    -->
+    <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 Thu Jun 28 10:40:11 CST 2018.
+    -->
+    id, news_id as newsId, publish_platform as publishPlatform, publish_client as publishClient, publish_page as publishPage, if_top as ifTop, top_number as topNumber, 
+    show_number as showNumber, publisher , publish_time as publishTime
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.NewsPublishExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from news_publish
+    <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.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from news_publish
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    delete from news_publish
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.NewsPublishExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    delete from news_publish
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.NewsPublish">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    insert into news_publish (id, news_id, publish_platform, 
+      publish_client, publish_page, if_top, 
+      top_number, show_number, publisher, 
+      publish_time)
+    values (#{id,jdbcType=VARCHAR}, #{newsId,jdbcType=VARCHAR}, #{publishPlatform,jdbcType=VARCHAR}, 
+      #{publishClient,jdbcType=INTEGER}, #{publishPage,jdbcType=VARCHAR}, #{ifTop,jdbcType=INTEGER}, 
+      #{topNumber,jdbcType=INTEGER}, #{showNumber,jdbcType=INTEGER}, #{publisher,jdbcType=VARCHAR}, 
+      #{publishTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.NewsPublish">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    insert into news_publish
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="newsId != null">
+        news_id,
+      </if>
+      <if test="publishPlatform != null">
+        publish_platform,
+      </if>
+      <if test="publishClient != null">
+        publish_client,
+      </if>
+      <if test="publishPage != null">
+        publish_page,
+      </if>
+      <if test="ifTop != null">
+        if_top,
+      </if>
+      <if test="topNumber != null">
+        top_number,
+      </if>
+      <if test="showNumber != null">
+        show_number,
+      </if>
+      <if test="publisher != null">
+        publisher,
+      </if>
+      <if test="publishTime != null">
+        publish_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="newsId != null">
+        #{newsId,jdbcType=VARCHAR},
+      </if>
+      <if test="publishPlatform != null">
+        #{publishPlatform,jdbcType=VARCHAR},
+      </if>
+      <if test="publishClient != null">
+        #{publishClient,jdbcType=INTEGER},
+      </if>
+      <if test="publishPage != null">
+        #{publishPage,jdbcType=VARCHAR},
+      </if>
+      <if test="ifTop != null">
+        #{ifTop,jdbcType=INTEGER},
+      </if>
+      <if test="topNumber != null">
+        #{topNumber,jdbcType=INTEGER},
+      </if>
+      <if test="showNumber != null">
+        #{showNumber,jdbcType=INTEGER},
+      </if>
+      <if test="publisher != null">
+        #{publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null">
+        #{publishTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.NewsPublishExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    select count(*) from news_publish
+    <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 Thu Jun 28 10:40:11 CST 2018.
+    -->
+    update news_publish
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.newsId != null">
+        news_id = #{record.newsId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishPlatform != null">
+        publish_platform = #{record.publishPlatform,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishClient != null">
+        publish_client = #{record.publishClient,jdbcType=INTEGER},
+      </if>
+      <if test="record.publishPage != null">
+        publish_page = #{record.publishPage,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ifTop != null">
+        if_top = #{record.ifTop,jdbcType=INTEGER},
+      </if>
+      <if test="record.topNumber != null">
+        top_number = #{record.topNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.showNumber != null">
+        show_number = #{record.showNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.publisher != null">
+        publisher = #{record.publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishTime != null">
+        publish_time = #{record.publishTime,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 Thu Jun 28 10:40:11 CST 2018.
+    -->
+    update news_publish
+    set id = #{record.id,jdbcType=VARCHAR},
+      news_id = #{record.newsId,jdbcType=VARCHAR},
+      publish_platform = #{record.publishPlatform,jdbcType=VARCHAR},
+      publish_client = #{record.publishClient,jdbcType=INTEGER},
+      publish_page = #{record.publishPage,jdbcType=VARCHAR},
+      if_top = #{record.ifTop,jdbcType=INTEGER},
+      top_number = #{record.topNumber,jdbcType=INTEGER},
+      show_number = #{record.showNumber,jdbcType=INTEGER},
+      publisher = #{record.publisher,jdbcType=VARCHAR},
+      publish_time = #{record.publishTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.NewsPublish">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    update news_publish
+    <set>
+      <if test="newsId != null">
+        news_id = #{newsId,jdbcType=VARCHAR},
+      </if>
+      <if test="publishPlatform != null">
+        publish_platform = #{publishPlatform,jdbcType=VARCHAR},
+      </if>
+      <if test="publishClient != null">
+        publish_client = #{publishClient,jdbcType=INTEGER},
+      </if>
+      <if test="publishPage != null">
+        publish_page = #{publishPage,jdbcType=VARCHAR},
+      </if>
+      <if test="ifTop != null">
+        if_top = #{ifTop,jdbcType=INTEGER},
+      </if>
+      <if test="topNumber != null">
+        top_number = #{topNumber,jdbcType=INTEGER},
+      </if>
+      <if test="showNumber != null">
+        show_number = #{showNumber,jdbcType=INTEGER},
+      </if>
+      <if test="publisher != null">
+        publisher = #{publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null">
+        publish_time = #{publishTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.NewsPublish">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    update news_publish
+    set news_id = #{newsId,jdbcType=VARCHAR},
+      publish_platform = #{publishPlatform,jdbcType=VARCHAR},
+      publish_client = #{publishClient,jdbcType=INTEGER},
+      publish_page = #{publishPage,jdbcType=VARCHAR},
+      if_top = #{ifTop,jdbcType=INTEGER},
+      top_number = #{topNumber,jdbcType=INTEGER},
+      show_number = #{showNumber,jdbcType=INTEGER},
+      publisher = #{publisher,jdbcType=VARCHAR},
+      publish_time = #{publishTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <delete id="deleteByNewsId" parameterType="java.lang.Long">
+  delete from news_publish where news_id=#{0}
+  </delete>
+  	<select id="selectByNewsId" resultType="com.goafanti.common.model.NewsPublish">
+  	select 
+      <include refid="Base_Column_List" />
+      from news_publish where news_id=#{0}
+  	</select>
+</mapper>

+ 546 - 0
src/main/java/com/goafanti/common/mapper/PolicyMapper.xml

@@ -0,0 +1,546 @@
+<?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.goafanti.common.dao.PolicyMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.Policy">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="edit_time" jdbcType="TIMESTAMP" property="editTime" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="title_img" jdbcType="VARCHAR" property="titleImg" />
+    <result column="author" jdbcType="VARCHAR" property="author" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="source" jdbcType="VARCHAR" property="source" />
+    <result column="source_url" jdbcType="VARCHAR" property="sourceUrl" />
+    <result column="summary" jdbcType="VARCHAR" property="summary" />
+    <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
+    <result column="hot" jdbcType="INTEGER" property="hot" />
+    <result column="province" jdbcType="INTEGER" property="province" />
+    <result column="city" jdbcType="INTEGER" property="city" />
+    <result column="release_date" jdbcType="TIMESTAMP" property="releaseDate" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.Policy">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    <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 Thu Jun 28 16:23:43 CST 2018.
+    -->
+    <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 Thu Jun 28 16:23:43 CST 2018.
+    -->
+    <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 Thu Jun 28 16:23:43 CST 2018.
+    -->
+    id, create_time as createTime, edit_time as editTime, title, title_img as titileImg, author, type, source, source_url as sourceUrl, summary, 
+    audit_status as auditStatus, hot, province, city, release_date as releaseDate
+  </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 Thu Jun 28 16:23:43 CST 2018.
+    -->
+    content
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.goafanti.common.model.PolicyExample" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from policy
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.PolicyExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from policy
+    <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.Long" resultType="com.goafanti.news.bo.PolicyResult">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    select 
+      <include refid="Base_Column_List" />,
+    <include refid="Blob_Column_List" />
+    from policy
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    delete from policy
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PolicyExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    delete from policy
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.Policy">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    insert into policy (id, create_time, edit_time, 
+      title, title_img, author, 
+      type, source, source_url, 
+      summary, audit_status, hot, 
+      province, city, release_date, 
+      content)
+    values (#{id,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{editTime,jdbcType=TIMESTAMP}, 
+      #{title,jdbcType=VARCHAR}, #{titleImg,jdbcType=VARCHAR}, #{author,jdbcType=VARCHAR}, 
+      #{type,jdbcType=INTEGER}, #{source,jdbcType=VARCHAR}, #{sourceUrl,jdbcType=VARCHAR}, 
+      #{summary,jdbcType=VARCHAR}, #{auditStatus,jdbcType=INTEGER}, #{hot,jdbcType=INTEGER}, 
+      #{province,jdbcType=INTEGER}, #{city,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, 
+      #{content,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.Policy">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    insert into policy
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="editTime != null">
+        edit_time,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="titleImg != null">
+        title_img,
+      </if>
+      <if test="author != null">
+        author,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="source != null">
+        source,
+      </if>
+      <if test="sourceUrl != null">
+        source_url,
+      </if>
+      <if test="summary != null">
+        summary,
+      </if>
+      <if test="auditStatus != null">
+        audit_status,
+      </if>
+      <if test="hot != null">
+        hot,
+      </if>
+      <if test="province != null">
+        province,
+      </if>
+      <if test="city != null">
+        city,
+      </if>
+      <if test="releaseDate != null">
+        release_date,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="editTime != null">
+        #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="titleImg != null">
+        #{titleImg,jdbcType=VARCHAR},
+      </if>
+      <if test="author != null">
+        #{author,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="source != null">
+        #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceUrl != null">
+        #{sourceUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="summary != null">
+        #{summary,jdbcType=VARCHAR},
+      </if>
+      <if test="auditStatus != null">
+        #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="hot != null">
+        #{hot,jdbcType=INTEGER},
+      </if>
+      <if test="province != null">
+        #{province,jdbcType=INTEGER},
+      </if>
+      <if test="city != null">
+        #{city,jdbcType=INTEGER},
+      </if>
+      <if test="releaseDate != null">
+        #{releaseDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.PolicyExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    select count(*) from policy
+    <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 Thu Jun 28 16:23:43 CST 2018.
+    -->
+    update policy
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.editTime != null">
+        edit_time = #{record.editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
+      <if test="record.titleImg != null">
+        title_img = #{record.titleImg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.author != null">
+        author = #{record.author,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
+      <if test="record.source != null">
+        source = #{record.source,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sourceUrl != null">
+        source_url = #{record.sourceUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.summary != null">
+        summary = #{record.summary,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditStatus != null">
+        audit_status = #{record.auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.hot != null">
+        hot = #{record.hot,jdbcType=INTEGER},
+      </if>
+      <if test="record.province != null">
+        province = #{record.province,jdbcType=INTEGER},
+      </if>
+      <if test="record.city != null">
+        city = #{record.city,jdbcType=INTEGER},
+      </if>
+      <if test="record.releaseDate != null">
+        release_date = #{record.releaseDate,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 Thu Jun 28 16:23:43 CST 2018.
+    -->
+    update policy
+    set id = #{record.id,jdbcType=BIGINT},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      edit_time = #{record.editTime,jdbcType=TIMESTAMP},
+      title = #{record.title,jdbcType=VARCHAR},
+      title_img = #{record.titleImg,jdbcType=VARCHAR},
+      author = #{record.author,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=INTEGER},
+      source = #{record.source,jdbcType=VARCHAR},
+      source_url = #{record.sourceUrl,jdbcType=VARCHAR},
+      summary = #{record.summary,jdbcType=VARCHAR},
+      audit_status = #{record.auditStatus,jdbcType=INTEGER},
+      hot = #{record.hot,jdbcType=INTEGER},
+      province = #{record.province,jdbcType=INTEGER},
+      city = #{record.city,jdbcType=INTEGER},
+      release_date = #{record.releaseDate,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 Thu Jun 28 16:23:43 CST 2018.
+    -->
+    update policy
+    set id = #{record.id,jdbcType=BIGINT},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      edit_time = #{record.editTime,jdbcType=TIMESTAMP},
+      title = #{record.title,jdbcType=VARCHAR},
+      title_img = #{record.titleImg,jdbcType=VARCHAR},
+      author = #{record.author,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=INTEGER},
+      source = #{record.source,jdbcType=VARCHAR},
+      source_url = #{record.sourceUrl,jdbcType=VARCHAR},
+      summary = #{record.summary,jdbcType=VARCHAR},
+      audit_status = #{record.auditStatus,jdbcType=INTEGER},
+      hot = #{record.hot,jdbcType=INTEGER},
+      province = #{record.province,jdbcType=INTEGER},
+      city = #{record.city,jdbcType=INTEGER},
+      release_date = #{record.releaseDate,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Policy">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    update policy
+    <set>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="editTime != null">
+        edit_time = #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="titleImg != null">
+        title_img = #{titleImg,jdbcType=VARCHAR},
+      </if>
+      <if test="author != null">
+        author = #{author,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="source != null">
+        source = #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceUrl != null">
+        source_url = #{sourceUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="summary != null">
+        summary = #{summary,jdbcType=VARCHAR},
+      </if>
+      <if test="auditStatus != null">
+        audit_status = #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="hot != null">
+        hot = #{hot,jdbcType=INTEGER},
+      </if>
+      <if test="province != null">
+        province = #{province,jdbcType=INTEGER},
+      </if>
+      <if test="city != null">
+        city = #{city,jdbcType=INTEGER},
+      </if>
+      <if test="releaseDate != null">
+        release_date = #{releaseDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="content != null">
+        content = #{content,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.Policy">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    update policy
+    set create_time = #{createTime,jdbcType=TIMESTAMP},
+      edit_time = #{editTime,jdbcType=TIMESTAMP},
+      title = #{title,jdbcType=VARCHAR},
+      title_img = #{titleImg,jdbcType=VARCHAR},
+      author = #{author,jdbcType=VARCHAR},
+      type = #{type,jdbcType=INTEGER},
+      source = #{source,jdbcType=VARCHAR},
+      source_url = #{sourceUrl,jdbcType=VARCHAR},
+      summary = #{summary,jdbcType=VARCHAR},
+      audit_status = #{auditStatus,jdbcType=INTEGER},
+      hot = #{hot,jdbcType=INTEGER},
+      province = #{province,jdbcType=INTEGER},
+      city = #{city,jdbcType=INTEGER},
+      release_date = #{releaseDate,jdbcType=TIMESTAMP},
+      content = #{content,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.Policy">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 16:23:43 CST 2018.
+    -->
+    update policy
+    set create_time = #{createTime,jdbcType=TIMESTAMP},
+      edit_time = #{editTime,jdbcType=TIMESTAMP},
+      title = #{title,jdbcType=VARCHAR},
+      title_img = #{titleImg,jdbcType=VARCHAR},
+      author = #{author,jdbcType=VARCHAR},
+      type = #{type,jdbcType=INTEGER},
+      source = #{source,jdbcType=VARCHAR},
+      source_url = #{sourceUrl,jdbcType=VARCHAR},
+      summary = #{summary,jdbcType=VARCHAR},
+      audit_status = #{auditStatus,jdbcType=INTEGER},
+      hot = #{hot,jdbcType=INTEGER},
+      province = #{province,jdbcType=INTEGER},
+      city = #{city,jdbcType=INTEGER},
+      release_date = #{releaseDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 373 - 0
src/main/java/com/goafanti/common/mapper/PolicyPublishMapper.xml

@@ -0,0 +1,373 @@
+<?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.goafanti.common.dao.PolicyPublishMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PolicyPublish">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="policy_id" jdbcType="VARCHAR" property="policyId" />
+    <result column="publish_platform" jdbcType="VARCHAR" property="publishPlatform" />
+    <result column="publish_client" jdbcType="INTEGER" property="publishClient" />
+    <result column="publish_page" jdbcType="VARCHAR" property="publishPage" />
+    <result column="if_top" jdbcType="INTEGER" property="ifTop" />
+    <result column="top_number" jdbcType="INTEGER" property="topNumber" />
+    <result column="show_number" jdbcType="INTEGER" property="showNumber" />
+    <result column="publisher" jdbcType="VARCHAR" property="publisher" />
+    <result column="publish_time" jdbcType="TIMESTAMP" property="publishTime" />
+  </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 Thu Jun 28 10:40:11 CST 2018.
+    -->
+    <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 Thu Jun 28 10:40:11 CST 2018.
+    -->
+    <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 Thu Jun 28 10:40:11 CST 2018.
+    -->
+    id, policy_id, publish_platform, publish_client, publish_page, if_top, top_number, 
+    show_number, publisher, publish_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.PolicyPublishExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from policy_publish
+    <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.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from policy_publish
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    delete from policy_publish
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PolicyPublishExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    delete from policy_publish
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PolicyPublish">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    insert into policy_publish (id, policy_id, publish_platform, 
+      publish_client, publish_page, if_top, 
+      top_number, show_number, publisher, 
+      publish_time)
+    values (#{id,jdbcType=VARCHAR}, #{policyId,jdbcType=VARCHAR}, #{publishPlatform,jdbcType=VARCHAR}, 
+      #{publishClient,jdbcType=INTEGER}, #{publishPage,jdbcType=VARCHAR}, #{ifTop,jdbcType=INTEGER}, 
+      #{topNumber,jdbcType=INTEGER}, #{showNumber,jdbcType=INTEGER}, #{publisher,jdbcType=VARCHAR}, 
+      #{publishTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PolicyPublish">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    insert into policy_publish
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="policyId != null">
+        policy_id,
+      </if>
+      <if test="publishPlatform != null">
+        publish_platform,
+      </if>
+      <if test="publishClient != null">
+        publish_client,
+      </if>
+      <if test="publishPage != null">
+        publish_page,
+      </if>
+      <if test="ifTop != null">
+        if_top,
+      </if>
+      <if test="topNumber != null">
+        top_number,
+      </if>
+      <if test="showNumber != null">
+        show_number,
+      </if>
+      <if test="publisher != null">
+        publisher,
+      </if>
+      <if test="publishTime != null">
+        publish_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="policyId != null">
+        #{policyId,jdbcType=VARCHAR},
+      </if>
+      <if test="publishPlatform != null">
+        #{publishPlatform,jdbcType=VARCHAR},
+      </if>
+      <if test="publishClient != null">
+        #{publishClient,jdbcType=INTEGER},
+      </if>
+      <if test="publishPage != null">
+        #{publishPage,jdbcType=VARCHAR},
+      </if>
+      <if test="ifTop != null">
+        #{ifTop,jdbcType=INTEGER},
+      </if>
+      <if test="topNumber != null">
+        #{topNumber,jdbcType=INTEGER},
+      </if>
+      <if test="showNumber != null">
+        #{showNumber,jdbcType=INTEGER},
+      </if>
+      <if test="publisher != null">
+        #{publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null">
+        #{publishTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.PolicyPublishExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    select count(*) from policy_publish
+    <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 Thu Jun 28 10:40:11 CST 2018.
+    -->
+    update policy_publish
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.policyId != null">
+        policy_id = #{record.policyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishPlatform != null">
+        publish_platform = #{record.publishPlatform,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishClient != null">
+        publish_client = #{record.publishClient,jdbcType=INTEGER},
+      </if>
+      <if test="record.publishPage != null">
+        publish_page = #{record.publishPage,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ifTop != null">
+        if_top = #{record.ifTop,jdbcType=INTEGER},
+      </if>
+      <if test="record.topNumber != null">
+        top_number = #{record.topNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.showNumber != null">
+        show_number = #{record.showNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.publisher != null">
+        publisher = #{record.publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishTime != null">
+        publish_time = #{record.publishTime,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 Thu Jun 28 10:40:11 CST 2018.
+    -->
+    update policy_publish
+    set id = #{record.id,jdbcType=VARCHAR},
+      policy_id = #{record.policyId,jdbcType=VARCHAR},
+      publish_platform = #{record.publishPlatform,jdbcType=VARCHAR},
+      publish_client = #{record.publishClient,jdbcType=INTEGER},
+      publish_page = #{record.publishPage,jdbcType=VARCHAR},
+      if_top = #{record.ifTop,jdbcType=INTEGER},
+      top_number = #{record.topNumber,jdbcType=INTEGER},
+      show_number = #{record.showNumber,jdbcType=INTEGER},
+      publisher = #{record.publisher,jdbcType=VARCHAR},
+      publish_time = #{record.publishTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PolicyPublish">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    update policy_publish
+    <set>
+      <if test="policyId != null">
+        policy_id = #{policyId,jdbcType=VARCHAR},
+      </if>
+      <if test="publishPlatform != null">
+        publish_platform = #{publishPlatform,jdbcType=VARCHAR},
+      </if>
+      <if test="publishClient != null">
+        publish_client = #{publishClient,jdbcType=INTEGER},
+      </if>
+      <if test="publishPage != null">
+        publish_page = #{publishPage,jdbcType=VARCHAR},
+      </if>
+      <if test="ifTop != null">
+        if_top = #{ifTop,jdbcType=INTEGER},
+      </if>
+      <if test="topNumber != null">
+        top_number = #{topNumber,jdbcType=INTEGER},
+      </if>
+      <if test="showNumber != null">
+        show_number = #{showNumber,jdbcType=INTEGER},
+      </if>
+      <if test="publisher != null">
+        publisher = #{publisher,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null">
+        publish_time = #{publishTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PolicyPublish">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 28 10:40:11 CST 2018.
+    -->
+    update policy_publish
+    set policy_id = #{policyId,jdbcType=VARCHAR},
+      publish_platform = #{publishPlatform,jdbcType=VARCHAR},
+      publish_client = #{publishClient,jdbcType=INTEGER},
+      publish_page = #{publishPage,jdbcType=VARCHAR},
+      if_top = #{ifTop,jdbcType=INTEGER},
+      top_number = #{topNumber,jdbcType=INTEGER},
+      show_number = #{showNumber,jdbcType=INTEGER},
+      publisher = #{publisher,jdbcType=VARCHAR},
+      publish_time = #{publishTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <delete id="deleteByPolicyId" parameterType="java.lang.Long">
+  delete from policy_publish where policy_id = #{0}
+  </delete>
+  
+  <select id="getPagesByPolicyId" parameterType="java.lang.Long" resultType="java.lang.String">
+  select pp.publish_page from policy_publish pp where pp.policy_id = #{0}
+  </select>
+</mapper> 

+ 20 - 0
src/main/java/com/goafanti/common/model/News.java

@@ -24,6 +24,7 @@ public class News {
 	 */
 	private String	CreateTimeS;
 	
+	private Date releaseDate;
 
 	/**
 	 * 修改时间
@@ -104,7 +105,17 @@ public class News {
 	 * 热门
 	 */
 	private Integer hotspot;
+	String publishPage;
 	
+	
+	public String getPublishPage() {
+		return publishPage;
+	}
+
+	public void setPublishPage(String publishPage) {
+		this.publishPage = publishPage;
+	}
+
 	@JsonFormat(shape = Shape.STRING)
 	public Long getId() {
 		return id;
@@ -121,6 +132,15 @@ public class News {
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
 	}
+	
+
+	public Date getReleaseDate() {
+		return releaseDate;
+	}
+
+	public void setReleaseDate(Date releaseDate) {
+		this.releaseDate = releaseDate;
+	}
 
 	public Integer getReleaseStatus() {
 		return releaseStatus;

+ 237 - 0
src/main/java/com/goafanti/common/model/NewsPublish.java

@@ -0,0 +1,237 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class NewsPublish {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_publish.id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_publish.news_id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private String newsId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_publish.publish_platform
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private String publishPlatform;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_publish.publish_client
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private Integer publishClient;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_publish.publish_page
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private String publishPage;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_publish.if_top
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private Integer ifTop;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_publish.top_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private Integer topNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_publish.show_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private Integer showNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_publish.publisher
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private String publisher;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_publish.publish_time
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private Date publishTime;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_publish.id
+	 * @return  the value of news_publish.id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_publish.id
+	 * @param id  the value for news_publish.id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_publish.news_id
+	 * @return  the value of news_publish.news_id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getNewsId() {
+		return newsId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_publish.news_id
+	 * @param newsId  the value for news_publish.news_id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setNewsId(String newsId) {
+		this.newsId = newsId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_publish.publish_platform
+	 * @return  the value of news_publish.publish_platform
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getPublishPlatform() {
+		return publishPlatform;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_publish.publish_platform
+	 * @param publishPlatform  the value for news_publish.publish_platform
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setPublishPlatform(String publishPlatform) {
+		this.publishPlatform = publishPlatform;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_publish.publish_client
+	 * @return  the value of news_publish.publish_client
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Integer getPublishClient() {
+		return publishClient;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_publish.publish_client
+	 * @param publishClient  the value for news_publish.publish_client
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setPublishClient(Integer publishClient) {
+		this.publishClient = publishClient;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_publish.publish_page
+	 * @return  the value of news_publish.publish_page
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getPublishPage() {
+		return publishPage;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_publish.publish_page
+	 * @param publishPage  the value for news_publish.publish_page
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setPublishPage(String publishPage) {
+		this.publishPage = publishPage;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_publish.if_top
+	 * @return  the value of news_publish.if_top
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Integer getIfTop() {
+		return ifTop;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_publish.if_top
+	 * @param ifTop  the value for news_publish.if_top
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setIfTop(Integer ifTop) {
+		this.ifTop = ifTop;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_publish.top_number
+	 * @return  the value of news_publish.top_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Integer getTopNumber() {
+		return topNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_publish.top_number
+	 * @param topNumber  the value for news_publish.top_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setTopNumber(Integer topNumber) {
+		this.topNumber = topNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_publish.show_number
+	 * @return  the value of news_publish.show_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Integer getShowNumber() {
+		return showNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_publish.show_number
+	 * @param showNumber  the value for news_publish.show_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setShowNumber(Integer showNumber) {
+		this.showNumber = showNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_publish.publisher
+	 * @return  the value of news_publish.publisher
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getPublisher() {
+		return publisher;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_publish.publisher
+	 * @param publisher  the value for news_publish.publisher
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	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_publish.publish_time
+	 * @return  the value of news_publish.publish_time
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Date getPublishTime() {
+		return publishTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_publish.publish_time
+	 * @param publishTime  the value for news_publish.publish_time
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setPublishTime(Date publishTime) {
+		this.publishTime = publishTime;
+	}
+}

+ 912 - 0
src/main/java/com/goafanti/common/model/NewsPublishExample.java

@@ -0,0 +1,912 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class NewsPublishExample {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public NewsPublishExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andIdIsNull() {
+			addCriterion("id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIsNotNull() {
+			addCriterion("id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdEqualTo(String value) {
+			addCriterion("id =", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotEqualTo(String value) {
+			addCriterion("id <>", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThan(String value) {
+			addCriterion("id >", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThanOrEqualTo(String value) {
+			addCriterion("id >=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThan(String value) {
+			addCriterion("id <", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThanOrEqualTo(String value) {
+			addCriterion("id <=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLike(String value) {
+			addCriterion("id like", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotLike(String value) {
+			addCriterion("id not like", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIn(List<String> values) {
+			addCriterion("id in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotIn(List<String> values) {
+			addCriterion("id not in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdBetween(String value1, String value2) {
+			addCriterion("id between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotBetween(String value1, String value2) {
+			addCriterion("id not between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdIsNull() {
+			addCriterion("news_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdIsNotNull() {
+			addCriterion("news_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdEqualTo(String value) {
+			addCriterion("news_id =", value, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdNotEqualTo(String value) {
+			addCriterion("news_id <>", value, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdGreaterThan(String value) {
+			addCriterion("news_id >", value, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdGreaterThanOrEqualTo(String value) {
+			addCriterion("news_id >=", value, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdLessThan(String value) {
+			addCriterion("news_id <", value, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdLessThanOrEqualTo(String value) {
+			addCriterion("news_id <=", value, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdLike(String value) {
+			addCriterion("news_id like", value, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdNotLike(String value) {
+			addCriterion("news_id not like", value, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdIn(List<String> values) {
+			addCriterion("news_id in", values, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdNotIn(List<String> values) {
+			addCriterion("news_id not in", values, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdBetween(String value1, String value2) {
+			addCriterion("news_id between", value1, value2, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andNewsIdNotBetween(String value1, String value2) {
+			addCriterion("news_id not between", value1, value2, "newsId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformIsNull() {
+			addCriterion("publish_platform is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformIsNotNull() {
+			addCriterion("publish_platform is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformEqualTo(String value) {
+			addCriterion("publish_platform =", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformNotEqualTo(String value) {
+			addCriterion("publish_platform <>", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformGreaterThan(String value) {
+			addCriterion("publish_platform >", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformGreaterThanOrEqualTo(String value) {
+			addCriterion("publish_platform >=", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformLessThan(String value) {
+			addCriterion("publish_platform <", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformLessThanOrEqualTo(String value) {
+			addCriterion("publish_platform <=", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformLike(String value) {
+			addCriterion("publish_platform like", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformNotLike(String value) {
+			addCriterion("publish_platform not like", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformIn(List<String> values) {
+			addCriterion("publish_platform in", values, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformNotIn(List<String> values) {
+			addCriterion("publish_platform not in", values, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformBetween(String value1, String value2) {
+			addCriterion("publish_platform between", value1, value2, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformNotBetween(String value1, String value2) {
+			addCriterion("publish_platform not between", value1, value2, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientIsNull() {
+			addCriterion("publish_client is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientIsNotNull() {
+			addCriterion("publish_client is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientEqualTo(Integer value) {
+			addCriterion("publish_client =", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientNotEqualTo(Integer value) {
+			addCriterion("publish_client <>", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientGreaterThan(Integer value) {
+			addCriterion("publish_client >", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientGreaterThanOrEqualTo(Integer value) {
+			addCriterion("publish_client >=", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientLessThan(Integer value) {
+			addCriterion("publish_client <", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientLessThanOrEqualTo(Integer value) {
+			addCriterion("publish_client <=", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientIn(List<Integer> values) {
+			addCriterion("publish_client in", values, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientNotIn(List<Integer> values) {
+			addCriterion("publish_client not in", values, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientBetween(Integer value1, Integer value2) {
+			addCriterion("publish_client between", value1, value2, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientNotBetween(Integer value1, Integer value2) {
+			addCriterion("publish_client not between", value1, value2, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageIsNull() {
+			addCriterion("publish_page is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageIsNotNull() {
+			addCriterion("publish_page is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageEqualTo(String value) {
+			addCriterion("publish_page =", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageNotEqualTo(String value) {
+			addCriterion("publish_page <>", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageGreaterThan(String value) {
+			addCriterion("publish_page >", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageGreaterThanOrEqualTo(String value) {
+			addCriterion("publish_page >=", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageLessThan(String value) {
+			addCriterion("publish_page <", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageLessThanOrEqualTo(String value) {
+			addCriterion("publish_page <=", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageLike(String value) {
+			addCriterion("publish_page like", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageNotLike(String value) {
+			addCriterion("publish_page not like", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageIn(List<String> values) {
+			addCriterion("publish_page in", values, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageNotIn(List<String> values) {
+			addCriterion("publish_page not in", values, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageBetween(String value1, String value2) {
+			addCriterion("publish_page between", value1, value2, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageNotBetween(String value1, String value2) {
+			addCriterion("publish_page not between", value1, value2, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopIsNull() {
+			addCriterion("if_top is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopIsNotNull() {
+			addCriterion("if_top is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopEqualTo(Integer value) {
+			addCriterion("if_top =", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopNotEqualTo(Integer value) {
+			addCriterion("if_top <>", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopGreaterThan(Integer value) {
+			addCriterion("if_top >", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopGreaterThanOrEqualTo(Integer value) {
+			addCriterion("if_top >=", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopLessThan(Integer value) {
+			addCriterion("if_top <", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopLessThanOrEqualTo(Integer value) {
+			addCriterion("if_top <=", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopIn(List<Integer> values) {
+			addCriterion("if_top in", values, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopNotIn(List<Integer> values) {
+			addCriterion("if_top not in", values, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopBetween(Integer value1, Integer value2) {
+			addCriterion("if_top between", value1, value2, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopNotBetween(Integer value1, Integer value2) {
+			addCriterion("if_top not between", value1, value2, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberIsNull() {
+			addCriterion("top_number is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberIsNotNull() {
+			addCriterion("top_number is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberEqualTo(Integer value) {
+			addCriterion("top_number =", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberNotEqualTo(Integer value) {
+			addCriterion("top_number <>", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberGreaterThan(Integer value) {
+			addCriterion("top_number >", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberGreaterThanOrEqualTo(Integer value) {
+			addCriterion("top_number >=", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberLessThan(Integer value) {
+			addCriterion("top_number <", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberLessThanOrEqualTo(Integer value) {
+			addCriterion("top_number <=", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberIn(List<Integer> values) {
+			addCriterion("top_number in", values, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberNotIn(List<Integer> values) {
+			addCriterion("top_number not in", values, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberBetween(Integer value1, Integer value2) {
+			addCriterion("top_number between", value1, value2, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberNotBetween(Integer value1, Integer value2) {
+			addCriterion("top_number not between", value1, value2, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberIsNull() {
+			addCriterion("show_number is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberIsNotNull() {
+			addCriterion("show_number is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberEqualTo(Integer value) {
+			addCriterion("show_number =", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberNotEqualTo(Integer value) {
+			addCriterion("show_number <>", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberGreaterThan(Integer value) {
+			addCriterion("show_number >", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberGreaterThanOrEqualTo(Integer value) {
+			addCriterion("show_number >=", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberLessThan(Integer value) {
+			addCriterion("show_number <", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberLessThanOrEqualTo(Integer value) {
+			addCriterion("show_number <=", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberIn(List<Integer> values) {
+			addCriterion("show_number in", values, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberNotIn(List<Integer> values) {
+			addCriterion("show_number not in", values, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberBetween(Integer value1, Integer value2) {
+			addCriterion("show_number between", value1, value2, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberNotBetween(Integer value1, Integer value2) {
+			addCriterion("show_number not between", value1, value2, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherIsNull() {
+			addCriterion("publisher is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherIsNotNull() {
+			addCriterion("publisher is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherEqualTo(String value) {
+			addCriterion("publisher =", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherNotEqualTo(String value) {
+			addCriterion("publisher <>", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherGreaterThan(String value) {
+			addCriterion("publisher >", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherGreaterThanOrEqualTo(String value) {
+			addCriterion("publisher >=", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherLessThan(String value) {
+			addCriterion("publisher <", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherLessThanOrEqualTo(String value) {
+			addCriterion("publisher <=", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherLike(String value) {
+			addCriterion("publisher like", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherNotLike(String value) {
+			addCriterion("publisher not like", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherIn(List<String> values) {
+			addCriterion("publisher in", values, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherNotIn(List<String> values) {
+			addCriterion("publisher not in", values, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherBetween(String value1, String value2) {
+			addCriterion("publisher between", value1, value2, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherNotBetween(String value1, String value2) {
+			addCriterion("publisher not between", value1, value2, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeIsNull() {
+			addCriterion("publish_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeIsNotNull() {
+			addCriterion("publish_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeEqualTo(Date value) {
+			addCriterion("publish_time =", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeNotEqualTo(Date value) {
+			addCriterion("publish_time <>", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeGreaterThan(Date value) {
+			addCriterion("publish_time >", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("publish_time >=", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeLessThan(Date value) {
+			addCriterion("publish_time <", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeLessThanOrEqualTo(Date value) {
+			addCriterion("publish_time <=", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeIn(List<Date> values) {
+			addCriterion("publish_time in", values, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeNotIn(List<Date> values) {
+			addCriterion("publish_time not in", values, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeBetween(Date value1, Date value2) {
+			addCriterion("publish_time between", value1, value2, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeNotBetween(Date value1, Date value2) {
+			addCriterion("publish_time not between", value1, value2, "publishTime");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table news_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table news_publish
+     *
+     * @mbg.generated do_not_delete_during_merge Thu Jun 28 10:39:13 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

+ 375 - 0
src/main/java/com/goafanti/common/model/Policy.java

@@ -0,0 +1,375 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class Policy {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.id
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private Long id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.create_time
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.edit_time
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private Date editTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.title
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private String title;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.title_img
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private String titleImg;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.author
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private String author;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.type
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private Integer type;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.source
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private String source;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.source_url
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private String sourceUrl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.summary
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private String summary;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.audit_status
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private Integer auditStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.hot
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private Integer hot;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.province
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private Integer province;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.city
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private Integer city;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.release_date
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private Date releaseDate;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy.content
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	private String content;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.id
+	 * @return  the value of policy.id
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public Long getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.id
+	 * @param id  the value for policy.id
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.create_time
+	 * @return  the value of policy.create_time
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.create_time
+	 * @param createTime  the value for policy.create_time
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.edit_time
+	 * @return  the value of policy.edit_time
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public Date getEditTime() {
+		return editTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.edit_time
+	 * @param editTime  the value for policy.edit_time
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.title
+	 * @return  the value of policy.title
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public String getTitle() {
+		return title;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.title
+	 * @param title  the value for policy.title
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.title_img
+	 * @return  the value of policy.title_img
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public String getTitleImg() {
+		return titleImg;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.title_img
+	 * @param titleImg  the value for policy.title_img
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setTitleImg(String titleImg) {
+		this.titleImg = titleImg;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.author
+	 * @return  the value of policy.author
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public String getAuthor() {
+		return author;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.author
+	 * @param author  the value for policy.author
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setAuthor(String author) {
+		this.author = author;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.type
+	 * @return  the value of policy.type
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.type
+	 * @param type  the value for policy.type
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.source
+	 * @return  the value of policy.source
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public String getSource() {
+		return source;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.source
+	 * @param source  the value for policy.source
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setSource(String source) {
+		this.source = source;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.source_url
+	 * @return  the value of policy.source_url
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public String getSourceUrl() {
+		return sourceUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.source_url
+	 * @param sourceUrl  the value for policy.source_url
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setSourceUrl(String sourceUrl) {
+		this.sourceUrl = sourceUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.summary
+	 * @return  the value of policy.summary
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public String getSummary() {
+		return summary;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.summary
+	 * @param summary  the value for policy.summary
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setSummary(String summary) {
+		this.summary = summary;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.audit_status
+	 * @return  the value of policy.audit_status
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public Integer getAuditStatus() {
+		return auditStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.audit_status
+	 * @param auditStatus  the value for policy.audit_status
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setAuditStatus(Integer auditStatus) {
+		this.auditStatus = auditStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.hot
+	 * @return  the value of policy.hot
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public Integer getHot() {
+		return hot;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.hot
+	 * @param hot  the value for policy.hot
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setHot(Integer hot) {
+		this.hot = hot;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.province
+	 * @return  the value of policy.province
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public Integer getProvince() {
+		return province;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.province
+	 * @param province  the value for policy.province
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setProvince(Integer province) {
+		this.province = province;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.city
+	 * @return  the value of policy.city
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public Integer getCity() {
+		return city;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.city
+	 * @param city  the value for policy.city
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setCity(Integer city) {
+		this.city = city;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.release_date
+	 * @return  the value of policy.release_date
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public Date getReleaseDate() {
+		return releaseDate;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.release_date
+	 * @param releaseDate  the value for policy.release_date
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setReleaseDate(Date releaseDate) {
+		this.releaseDate = releaseDate;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy.content
+	 * @return  the value of policy.content
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public String getContent() {
+		return content;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy.content
+	 * @param content  the value for policy.content
+	 * @mbg.generated  Thu Jun 28 16:23:43 CST 2018
+	 */
+	public void setContent(String content) {
+		this.content = content;
+	}
+}

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1222 - 0
src/main/java/com/goafanti/common/model/PolicyExample.java


+ 237 - 0
src/main/java/com/goafanti/common/model/PolicyPublish.java

@@ -0,0 +1,237 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class PolicyPublish {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy_publish.id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy_publish.policy_id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private String policyId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy_publish.publish_platform
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private String publishPlatform;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy_publish.publish_client
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private Integer publishClient;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy_publish.publish_page
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private String publishPage;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy_publish.if_top
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private Integer ifTop;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy_publish.top_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private Integer topNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy_publish.show_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private Integer showNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy_publish.publisher
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private String publisher;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column policy_publish.publish_time
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	private Date publishTime;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy_publish.id
+	 * @return  the value of policy_publish.id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy_publish.id
+	 * @param id  the value for policy_publish.id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy_publish.policy_id
+	 * @return  the value of policy_publish.policy_id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getPolicyId() {
+		return policyId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy_publish.policy_id
+	 * @param policyId  the value for policy_publish.policy_id
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setPolicyId(String policyId) {
+		this.policyId = policyId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy_publish.publish_platform
+	 * @return  the value of policy_publish.publish_platform
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getPublishPlatform() {
+		return publishPlatform;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy_publish.publish_platform
+	 * @param publishPlatform  the value for policy_publish.publish_platform
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setPublishPlatform(String publishPlatform) {
+		this.publishPlatform = publishPlatform;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy_publish.publish_client
+	 * @return  the value of policy_publish.publish_client
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Integer getPublishClient() {
+		return publishClient;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy_publish.publish_client
+	 * @param publishClient  the value for policy_publish.publish_client
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setPublishClient(Integer publishClient) {
+		this.publishClient = publishClient;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy_publish.publish_page
+	 * @return  the value of policy_publish.publish_page
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getPublishPage() {
+		return publishPage;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy_publish.publish_page
+	 * @param publishPage  the value for policy_publish.publish_page
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setPublishPage(String publishPage) {
+		this.publishPage = publishPage;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy_publish.if_top
+	 * @return  the value of policy_publish.if_top
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Integer getIfTop() {
+		return ifTop;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy_publish.if_top
+	 * @param ifTop  the value for policy_publish.if_top
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setIfTop(Integer ifTop) {
+		this.ifTop = ifTop;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy_publish.top_number
+	 * @return  the value of policy_publish.top_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Integer getTopNumber() {
+		return topNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy_publish.top_number
+	 * @param topNumber  the value for policy_publish.top_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setTopNumber(Integer topNumber) {
+		this.topNumber = topNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy_publish.show_number
+	 * @return  the value of policy_publish.show_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Integer getShowNumber() {
+		return showNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy_publish.show_number
+	 * @param showNumber  the value for policy_publish.show_number
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setShowNumber(Integer showNumber) {
+		this.showNumber = showNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy_publish.publisher
+	 * @return  the value of policy_publish.publisher
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getPublisher() {
+		return publisher;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy_publish.publisher
+	 * @param publisher  the value for policy_publish.publisher
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setPublisher(String publisher) {
+		this.publisher = publisher;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column policy_publish.publish_time
+	 * @return  the value of policy_publish.publish_time
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Date getPublishTime() {
+		return publishTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column policy_publish.publish_time
+	 * @param publishTime  the value for policy_publish.publish_time
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setPublishTime(Date publishTime) {
+		this.publishTime = publishTime;
+	}
+}

+ 912 - 0
src/main/java/com/goafanti/common/model/PolicyPublishExample.java

@@ -0,0 +1,912 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PolicyPublishExample {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public PolicyPublishExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andIdIsNull() {
+			addCriterion("id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIsNotNull() {
+			addCriterion("id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdEqualTo(String value) {
+			addCriterion("id =", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotEqualTo(String value) {
+			addCriterion("id <>", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThan(String value) {
+			addCriterion("id >", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThanOrEqualTo(String value) {
+			addCriterion("id >=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThan(String value) {
+			addCriterion("id <", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThanOrEqualTo(String value) {
+			addCriterion("id <=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLike(String value) {
+			addCriterion("id like", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotLike(String value) {
+			addCriterion("id not like", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIn(List<String> values) {
+			addCriterion("id in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotIn(List<String> values) {
+			addCriterion("id not in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdBetween(String value1, String value2) {
+			addCriterion("id between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotBetween(String value1, String value2) {
+			addCriterion("id not between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdIsNull() {
+			addCriterion("policy_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdIsNotNull() {
+			addCriterion("policy_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdEqualTo(String value) {
+			addCriterion("policy_id =", value, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdNotEqualTo(String value) {
+			addCriterion("policy_id <>", value, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdGreaterThan(String value) {
+			addCriterion("policy_id >", value, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdGreaterThanOrEqualTo(String value) {
+			addCriterion("policy_id >=", value, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdLessThan(String value) {
+			addCriterion("policy_id <", value, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdLessThanOrEqualTo(String value) {
+			addCriterion("policy_id <=", value, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdLike(String value) {
+			addCriterion("policy_id like", value, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdNotLike(String value) {
+			addCriterion("policy_id not like", value, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdIn(List<String> values) {
+			addCriterion("policy_id in", values, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdNotIn(List<String> values) {
+			addCriterion("policy_id not in", values, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdBetween(String value1, String value2) {
+			addCriterion("policy_id between", value1, value2, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPolicyIdNotBetween(String value1, String value2) {
+			addCriterion("policy_id not between", value1, value2, "policyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformIsNull() {
+			addCriterion("publish_platform is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformIsNotNull() {
+			addCriterion("publish_platform is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformEqualTo(String value) {
+			addCriterion("publish_platform =", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformNotEqualTo(String value) {
+			addCriterion("publish_platform <>", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformGreaterThan(String value) {
+			addCriterion("publish_platform >", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformGreaterThanOrEqualTo(String value) {
+			addCriterion("publish_platform >=", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformLessThan(String value) {
+			addCriterion("publish_platform <", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformLessThanOrEqualTo(String value) {
+			addCriterion("publish_platform <=", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformLike(String value) {
+			addCriterion("publish_platform like", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformNotLike(String value) {
+			addCriterion("publish_platform not like", value, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformIn(List<String> values) {
+			addCriterion("publish_platform in", values, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformNotIn(List<String> values) {
+			addCriterion("publish_platform not in", values, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformBetween(String value1, String value2) {
+			addCriterion("publish_platform between", value1, value2, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPlatformNotBetween(String value1, String value2) {
+			addCriterion("publish_platform not between", value1, value2, "publishPlatform");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientIsNull() {
+			addCriterion("publish_client is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientIsNotNull() {
+			addCriterion("publish_client is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientEqualTo(Integer value) {
+			addCriterion("publish_client =", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientNotEqualTo(Integer value) {
+			addCriterion("publish_client <>", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientGreaterThan(Integer value) {
+			addCriterion("publish_client >", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientGreaterThanOrEqualTo(Integer value) {
+			addCriterion("publish_client >=", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientLessThan(Integer value) {
+			addCriterion("publish_client <", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientLessThanOrEqualTo(Integer value) {
+			addCriterion("publish_client <=", value, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientIn(List<Integer> values) {
+			addCriterion("publish_client in", values, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientNotIn(List<Integer> values) {
+			addCriterion("publish_client not in", values, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientBetween(Integer value1, Integer value2) {
+			addCriterion("publish_client between", value1, value2, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishClientNotBetween(Integer value1, Integer value2) {
+			addCriterion("publish_client not between", value1, value2, "publishClient");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageIsNull() {
+			addCriterion("publish_page is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageIsNotNull() {
+			addCriterion("publish_page is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageEqualTo(String value) {
+			addCriterion("publish_page =", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageNotEqualTo(String value) {
+			addCriterion("publish_page <>", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageGreaterThan(String value) {
+			addCriterion("publish_page >", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageGreaterThanOrEqualTo(String value) {
+			addCriterion("publish_page >=", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageLessThan(String value) {
+			addCriterion("publish_page <", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageLessThanOrEqualTo(String value) {
+			addCriterion("publish_page <=", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageLike(String value) {
+			addCriterion("publish_page like", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageNotLike(String value) {
+			addCriterion("publish_page not like", value, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageIn(List<String> values) {
+			addCriterion("publish_page in", values, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageNotIn(List<String> values) {
+			addCriterion("publish_page not in", values, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageBetween(String value1, String value2) {
+			addCriterion("publish_page between", value1, value2, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishPageNotBetween(String value1, String value2) {
+			addCriterion("publish_page not between", value1, value2, "publishPage");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopIsNull() {
+			addCriterion("if_top is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopIsNotNull() {
+			addCriterion("if_top is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopEqualTo(Integer value) {
+			addCriterion("if_top =", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopNotEqualTo(Integer value) {
+			addCriterion("if_top <>", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopGreaterThan(Integer value) {
+			addCriterion("if_top >", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopGreaterThanOrEqualTo(Integer value) {
+			addCriterion("if_top >=", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopLessThan(Integer value) {
+			addCriterion("if_top <", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopLessThanOrEqualTo(Integer value) {
+			addCriterion("if_top <=", value, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopIn(List<Integer> values) {
+			addCriterion("if_top in", values, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopNotIn(List<Integer> values) {
+			addCriterion("if_top not in", values, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopBetween(Integer value1, Integer value2) {
+			addCriterion("if_top between", value1, value2, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andIfTopNotBetween(Integer value1, Integer value2) {
+			addCriterion("if_top not between", value1, value2, "ifTop");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberIsNull() {
+			addCriterion("top_number is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberIsNotNull() {
+			addCriterion("top_number is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberEqualTo(Integer value) {
+			addCriterion("top_number =", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberNotEqualTo(Integer value) {
+			addCriterion("top_number <>", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberGreaterThan(Integer value) {
+			addCriterion("top_number >", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberGreaterThanOrEqualTo(Integer value) {
+			addCriterion("top_number >=", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberLessThan(Integer value) {
+			addCriterion("top_number <", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberLessThanOrEqualTo(Integer value) {
+			addCriterion("top_number <=", value, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberIn(List<Integer> values) {
+			addCriterion("top_number in", values, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberNotIn(List<Integer> values) {
+			addCriterion("top_number not in", values, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberBetween(Integer value1, Integer value2) {
+			addCriterion("top_number between", value1, value2, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andTopNumberNotBetween(Integer value1, Integer value2) {
+			addCriterion("top_number not between", value1, value2, "topNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberIsNull() {
+			addCriterion("show_number is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberIsNotNull() {
+			addCriterion("show_number is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberEqualTo(Integer value) {
+			addCriterion("show_number =", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberNotEqualTo(Integer value) {
+			addCriterion("show_number <>", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberGreaterThan(Integer value) {
+			addCriterion("show_number >", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberGreaterThanOrEqualTo(Integer value) {
+			addCriterion("show_number >=", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberLessThan(Integer value) {
+			addCriterion("show_number <", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberLessThanOrEqualTo(Integer value) {
+			addCriterion("show_number <=", value, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberIn(List<Integer> values) {
+			addCriterion("show_number in", values, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberNotIn(List<Integer> values) {
+			addCriterion("show_number not in", values, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberBetween(Integer value1, Integer value2) {
+			addCriterion("show_number between", value1, value2, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andShowNumberNotBetween(Integer value1, Integer value2) {
+			addCriterion("show_number not between", value1, value2, "showNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherIsNull() {
+			addCriterion("publisher is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherIsNotNull() {
+			addCriterion("publisher is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherEqualTo(String value) {
+			addCriterion("publisher =", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherNotEqualTo(String value) {
+			addCriterion("publisher <>", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherGreaterThan(String value) {
+			addCriterion("publisher >", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherGreaterThanOrEqualTo(String value) {
+			addCriterion("publisher >=", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherLessThan(String value) {
+			addCriterion("publisher <", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherLessThanOrEqualTo(String value) {
+			addCriterion("publisher <=", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherLike(String value) {
+			addCriterion("publisher like", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherNotLike(String value) {
+			addCriterion("publisher not like", value, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherIn(List<String> values) {
+			addCriterion("publisher in", values, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherNotIn(List<String> values) {
+			addCriterion("publisher not in", values, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherBetween(String value1, String value2) {
+			addCriterion("publisher between", value1, value2, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublisherNotBetween(String value1, String value2) {
+			addCriterion("publisher not between", value1, value2, "publisher");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeIsNull() {
+			addCriterion("publish_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeIsNotNull() {
+			addCriterion("publish_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeEqualTo(Date value) {
+			addCriterion("publish_time =", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeNotEqualTo(Date value) {
+			addCriterion("publish_time <>", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeGreaterThan(Date value) {
+			addCriterion("publish_time >", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("publish_time >=", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeLessThan(Date value) {
+			addCriterion("publish_time <", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeLessThanOrEqualTo(Date value) {
+			addCriterion("publish_time <=", value, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeIn(List<Date> values) {
+			addCriterion("publish_time in", values, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeNotIn(List<Date> values) {
+			addCriterion("publish_time not in", values, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeBetween(Date value1, Date value2) {
+			addCriterion("publish_time between", value1, value2, "publishTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPublishTimeNotBetween(Date value1, Date value2) {
+			addCriterion("publish_time not between", value1, value2, "publishTime");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table policy_publish
+	 * @mbg.generated  Thu Jun 28 10:40:11 CST 2018
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table policy_publish
+     *
+     * @mbg.generated do_not_delete_during_merge Thu Jun 28 10:39:13 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

+ 22 - 0
src/main/java/com/goafanti/news/bo/InputNews.java

@@ -1,5 +1,7 @@
 package com.goafanti.news.bo;
 
+import java.util.Date;
+
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -10,6 +12,8 @@ public class InputNews {
 	
 	private Long	id;
 	
+	Date releaseDate;
+	Date createTime;
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	title;
 	
@@ -65,6 +69,16 @@ public class InputNews {
 	 * 热门
 	 */
 	private Integer hotspot;
+	
+	
+
+	public Date getReleaseDate() {
+		return releaseDate;
+	}
+
+	public void setReleaseDate(Date releaseDate) {
+		this.releaseDate = releaseDate;
+	}
 
 	public Integer getAuditStatus() {
 		return auditStatus;
@@ -74,6 +88,14 @@ public class InputNews {
 		this.auditStatus = auditStatus;
 	}
 
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
 	public Integer getReleaseStatus() {
 		return releaseStatus;
 	}

+ 19 - 0
src/main/java/com/goafanti/news/bo/NewsResult.java

@@ -0,0 +1,19 @@
+package com.goafanti.news.bo;
+
+import java.util.List;
+
+import com.goafanti.common.model.News;
+import com.goafanti.common.model.NewsPublish;
+
+public class NewsResult extends News {
+List<NewsPublish> newsPublishs;
+
+public List<NewsPublish> getNewsPublishs() {
+	return newsPublishs;
+}
+
+public void setNewsPublishs(List<NewsPublish> newsPublishs) {
+	this.newsPublishs = newsPublishs;
+}
+
+}

+ 18 - 0
src/main/java/com/goafanti/news/bo/PolicyResult.java

@@ -0,0 +1,18 @@
+package com.goafanti.news.bo;
+
+import java.util.List;
+
+import com.goafanti.common.model.Policy;
+
+public class PolicyResult extends Policy {
+List<String>publishPages;
+
+public List<String> getPublishPages() {
+	return publishPages;
+}
+
+public void setPublishPages(List<String> publishPages) {
+	this.publishPages = publishPages;
+}
+
+}

+ 143 - 9
src/main/java/com/goafanti/news/controller/AdminNewsApiController.java

@@ -1,8 +1,12 @@
 package com.goafanti.news.controller;
 
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.constant.PageConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.NewsCacheKey;
@@ -27,6 +32,7 @@ import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.news.bo.InputNews;
+
 import com.goafanti.news.enums.NewsFields;
 import com.goafanti.news.service.NewsService;
 
@@ -41,17 +47,18 @@ public class AdminNewsApiController extends BaseApiController {
 	@Autowired
 	private JDBCIdGenerator	idGenerator;
 
+	
 	/**
 	 * 新闻列表
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result list(Integer type, String title, String author, String startCreateTime, String endCreateTime,
-			String source, Integer hot, String pageSize, String pageNo,String auditStatus,String releaseStatus) {
+			String source, Integer hot, String pageSize, String pageNo,String auditStatus,String releaseStatus,String publishPage) {
 		Result res = new Result();
-		if (null == type) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新闻类型"));
-			return res;
-		}
+//		if (null == type) {
+//			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新闻类型"));  
+//			return res;
+//		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -60,7 +67,7 @@ public class AdminNewsApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(newsService.listNews(type, title, author, startCreateTime, endCreateTime, source, hot, pNo, pSize,auditStatus,releaseStatus));
+		res.setData(newsService.listNews(type, title, author, startCreateTime, endCreateTime, source, hot, pNo, pSize,auditStatus,releaseStatus,publishPage));
 		return res;
 	}
 
@@ -79,9 +86,119 @@ public class AdminNewsApiController extends BaseApiController {
 		if (!res.getError().isEmpty()) {
 			return res;
 		}
-		newsService.save(idGenerator.generateId(), (News) res.getData());
+		newsService.save(idGenerator.generateId(), (News) res.getData()); 
 		return res;
 	}
+	
+/*
+ * 新增
+ * 
+ * */
+	@RequestMapping(value="/apply",method=RequestMethod.POST)
+public Result apply(InputNews news,BindingResult bindingResult,String[] publishPages) {
+		Result result=new Result();
+		List<String>webPages=new ArrayList<>();
+		List<String>appPages=new ArrayList<>();
+		PageConstants.putNews(publishPages, webPages, appPages);
+		checkApplyParams(news,webPages,appPages,result);
+		if(result.getError().size()>0) {
+			return result;
+		}
+		news.setCreateTime(new Date());
+		if(news.getAuditStatus() == 2) {
+			news.setReleaseDate(new Date());
+		}
+		news.setId(idGenerator.generateId());
+		News news2=new News();
+		news.setType(0);
+		BeanUtils.copyProperties(news, news2);
+		result.setData(newsService.save( news2,webPages,appPages)); 
+		return result;
+	}
+	
+	/*
+	 * 修改
+	 * 
+	 * */
+		@RequestMapping(value="/updateNews",method=RequestMethod.POST)
+	public Result updateNews(InputNews news,BindingResult bindingResult,String[] publishPages) {
+			Result result=new Result();
+			
+			List<String>webPages=new ArrayList<>();
+			List<String>appPages=new ArrayList<>();
+			PageConstants.putNews(publishPages, webPages, appPages);
+			checkApplyParams(news,webPages,appPages,result);
+			if(result.getError().size()>0) {
+				return result;
+			}
+			news.setCreateTime(new Date());
+			if(news.getAuditStatus() == 2) {
+				news.setReleaseDate(new Date());
+			}
+			News news2=new News();
+			BeanUtils.copyProperties(news, news2);
+			result.setData(newsService.updateSelectively( news2,webPages,appPages)); 
+			//publishPages
+			return result;
+		}
+	
+
+	/*
+	 * 变更发布状态、发布时间
+	 * */
+		@RequestMapping(value="/updateStatus",method=RequestMethod.POST)
+		public Result updateStatus(Long id,Integer auditStatus,Integer refresh) {
+			Result result=new Result();
+			if(id==null) {
+				result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","未找到该新闻,"));
+				return result;
+			}
+			News news=newsService.findNewsDetail(id);
+			if(news==null) {
+				result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","未找到该新闻,"));
+				return result;
+			}
+			if(refresh!=null &&refresh==1)
+				{
+				if(auditStatus!=2 && news.getAuditStatus()!=2) {
+					result.getError().add(buildError("","","当前未发布"));
+					return result;
+				}
+				news.setReleaseDate(new Date());}
+			if(auditStatus!=null) {news.setAuditStatus(auditStatus); 
+			if(auditStatus ==2)news.setReleaseDate(new Date());}
+			
+			result.setData(newsService.updateSelectivelyWithoutPages(news));  
+			return result;
+			
+		}
+		
+		
+	private void checkApplyParams(InputNews news, List<String>webPages,List<String>appPages, Result result) {
+	if(webPages.size()<1 && appPages.size()<1)
+	{
+		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","发布位置"));
+		return;
+	}
+	if(news ==null || StringUtils.isBlank(news.getTitle())) {
+		result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","标题"));
+		return;
+	}
+	if(StringUtils.isBlank(news.getSource())) {
+		result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","来源"));
+		return;
+	}
+	if(StringUtils.isBlank(news.getContent())) {
+		result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","内容"));
+		return;
+	}
+	if(news.getHot() ==null)
+	{
+		result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","是否热门"));
+		return;
+	}
+	
+}
 
 	/**
 	 * 修改
@@ -118,7 +235,7 @@ public class AdminNewsApiController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新闻Id"));
 			return res;
 		}
-		res.setData(newsService.findNewsDetail(id));
+		res.setData(newsService.findNewsDetail(id));  
 		return res;
 	}
 
@@ -135,7 +252,19 @@ public class AdminNewsApiController extends BaseApiController {
 		}
 		return res;
 	}
-
+	/**
+	 * 删除
+	 */
+	@RequestMapping(value = "/deleteById", method = RequestMethod.POST)
+	public Result deleteById(Long id) {
+		Result res = new Result();
+		if (id == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+		} else {
+			res.setData(newsService.deleteByPrimaryKey(id)); 
+		}
+		return res;
+	}
 	/**
 	 * 新闻图片上传
 	 */
@@ -192,6 +321,11 @@ public class AdminNewsApiController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新闻类型"));
 			return res;
 		}
+		if(null == news.getSource())
+		{
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新闻来源"));
+			return res;
+		}
 
 		News n = new News();
 		BeanUtils.copyProperties(news, n);

+ 150 - 0
src/main/java/com/goafanti/news/controller/AdminPolicyApiController.java

@@ -0,0 +1,150 @@
+package com.goafanti.news.controller;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.constant.PageConstants;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.News;
+import com.goafanti.common.model.Policy;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.JDBCIdGenerator;
+import com.goafanti.news.bo.InputNews;
+import com.goafanti.news.service.PolicyService;
+
+
+@RestController
+@RequestMapping(value = "/open/api/admin/policy")
+public class AdminPolicyApiController extends BaseApiController {
+	
+	@Autowired
+	private JDBCIdGenerator	idGenerator;
+	@Resource
+	private PolicyService policyService;
+	/*
+	 * 新增
+	 * 
+	 * */
+		@RequestMapping(value="/apply",method=RequestMethod.POST)
+		public Result insertPolicy(Policy policy,String[]publishPages) {
+			Result result=new Result();
+			disposePolicyParams(policy,result);
+			if(result.getError().size()>0)return result;
+			if(publishPages==null || publishPages.length<1) {
+				result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","发布位置"));
+				return result;
+			}
+			List<String>webPages=new ArrayList<>();
+			List<String>appPages=new ArrayList<>();
+			PageConstants.putPolicy(publishPages,webPages,appPages);
+			if(webPages.size()<1 && appPages.size()<1) {
+				result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","发布位置"));
+				return result;
+			}
+			policy.setCreateTime(new Date());
+			policy.setId(idGenerator.generateId());
+			policy.setType(0);
+			if(policy.getAuditStatus()!=null &&policy.getAuditStatus() == 2) {
+				policy.setReleaseDate(new Date());
+			
+			}
+			result.setData(policyService.saveNewPolicy(policy, webPages, appPages));
+			return result;
+		}
+		
+
+		private void disposePolicyParams(Policy policy,Result result) {
+			if(StringUtils.isBlank(policy.getTitle())) {
+				result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","标题"));
+				return ;
+			}
+			if(StringUtils.isBlank(policy.getContent()))
+			{
+				result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","内容"));
+				return ;
+			}
+			if(StringUtils.isBlank(policy.getSource()))
+			{
+				result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","来源"));
+				return ;
+			}
+			if(policy.getAuditStatus() == null )
+			{
+				result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","审核状态"));
+				return ;
+			}
+		}
+		/*
+		 * 删除
+		 * 
+		 * */
+		
+		@RequestMapping(value="/delete",method=RequestMethod.POST)
+		public Result deleteById(Long id) {
+			Result result=new Result();
+			if(id ==null) {
+				result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","id不可为空,"));return result;
+			}
+			int res=policyService.deletePolicyById(id);
+			result.setData(res);
+			if(res==-1) {
+				result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","id不可为空"));
+			}
+			return result;
+		}
+		
+		/*
+		 * 详情
+		 * */
+		@RequestMapping(value="/detail",method=RequestMethod.GET)
+		public Result getDetailById(Long id) {
+			Result result=new Result();
+			if(id==null) {
+				result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","id不可为空,"));return result;
+			}
+			result.setData(policyService.getPolicyDetail(id));
+			return result;
+		}
+		
+		/*
+		 * 修改
+		 * 
+		 * */
+			@RequestMapping(value="/update",method=RequestMethod.POST)
+		public Result updateNews(Policy policy,BindingResult bindingResult,String[] publishPages) {
+				Result result=new Result();
+				
+				List<String>webPages=new ArrayList<>();
+				List<String>appPages=new ArrayList<>();
+				PageConstants.putPolicy(publishPages, webPages, appPages);
+					if(webPages.size()<1 && appPages.size()<1) {
+						result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","发布位置"));
+						return result;
+					}
+				disposePolicyParams(policy, result);
+				if(result.getError().size()>0) {
+					return result;
+				}
+				if(policy.getAuditStatus()!=null &&policy.getAuditStatus() == 2) {
+					policy.setReleaseDate(new Date());
+				}
+		
+				result.setData(policyService.updateSelectively( policy,webPages,appPages)); 
+	
+				return result;
+			}
+		
+		
+}

+ 103 - 3
src/main/java/com/goafanti/news/service/NewsService.java

@@ -1,10 +1,13 @@
 package com.goafanti.news.service;
 
 import java.text.ParseException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
+import org.apache.shiro.web.util.SavedRequest;
 import org.codehaus.groovy.classgen.ReturnAdder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,13 +22,17 @@ import org.springframework.transaction.annotation.Transactional;
 import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.NewsMapper;
+import com.goafanti.common.dao.NewsPublishMapper;
 import com.goafanti.common.model.News;
+import com.goafanti.common.model.NewsPublish;
+import com.goafanti.common.model.NewsPublishExample;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.news.bo.NewsPortalList;
+import com.goafanti.news.bo.NewsResult;
 import com.goafanti.news.bo.NewsSummary;
 
 @Service
@@ -33,6 +40,8 @@ import com.goafanti.news.bo.NewsSummary;
 public class NewsService extends BaseMybatisDao<NewsMapper> {
 	@Autowired
 	NewsMapper newsMapper;
+	@Autowired
+	NewsPublishMapper newsPublishMapper;
 	@Value("${spring.profiles.active}")
 	private String env;
 	private static final Logger logger = LoggerFactory.getLogger(NewsService.class);
@@ -88,17 +97,99 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		newsMapper.insert(news);
 		return news;
 	}
+	
+	public News save(News news,List<String>webPages,List<String>appPages) {
+		newsMapper.insert(news);
+		NewsPublish newsPublish=null;
+		if(webPages!=null && webPages.size()>0)
+		{
+			for(String s:webPages)
+			{
+			newsPublish=new NewsPublish();
+			newsPublish.setId(UUID.randomUUID().toString());
+			newsPublish.setPublishPage(s);
+			newsPublish.setNewsId(news.getId()+"");
+			newsPublish.setIfTop(0);
+			newsPublish.setPublishClient(0);
+			newsPublish.setPublisher("");
+			newsPublish.setPublishPlatform("");
+			newsPublish.setPublishTime(new Date());
+			newsPublishMapper.insert(newsPublish);
+			}
+		}
+		if(appPages!=null && appPages.size()>0)
+		{
+			for(String s:appPages)
+			{
+			newsPublish=new NewsPublish();
+			newsPublish.setId(UUID.randomUUID().toString());
+			newsPublish.setPublishPage(s);
+			newsPublish.setNewsId(news.getId()+"");
+			newsPublish.setIfTop(0);
+			newsPublish.setPublishClient(1);
+			newsPublish.setPublisher("");
+			newsPublish.setPublishPlatform("");
+			newsPublish.setPublishTime(new Date());
+			newsPublishMapper.insert(newsPublish);
+			}
+		}
+		return news;
+	}
 
 	@CachePut(value = "NewsCache", key = "'News:'+#id")
 	public News update(long id, News news) {
 		newsMapper.updateByPrimaryKeyWithBLOBs(news);
 		return news;
 	}
+	public int updateSelectivelyWithoutPages(News news)
+	{
+		return newsMapper.updateByPrimaryKeySelective(news);
+	}
+	public int updateSelectively(News news,List<String>webPages,List<String>appPages) {
+		newsPublishMapper.deleteByNewsId(news.getId());
+		NewsPublish newsPublish=null;
+		if(webPages!=null && webPages.size()>0)
+		{
+			for(String s:webPages)
+			{
+			newsPublish=new NewsPublish();
+			newsPublish.setId(UUID.randomUUID().toString());
+			newsPublish.setPublishPage(s);
+			newsPublish.setNewsId(news.getId()+"");
+			newsPublish.setIfTop(0);
+			newsPublish.setPublishClient(0);
+			newsPublish.setPublisher("");
+			newsPublish.setPublishPlatform("");
+			newsPublish.setPublishTime(new Date());
+			newsPublishMapper.insert(newsPublish);
+			}
+		}
+		if(appPages!=null && appPages.size()>0)
+		{
+			for(String s:appPages)
+			{
+			newsPublish=new NewsPublish();
+			newsPublish.setId(UUID.randomUUID().toString());
+			newsPublish.setPublishPage(s);
+			newsPublish.setNewsId(news.getId()+"");
+			newsPublish.setIfTop(0);
+			newsPublish.setPublishClient(1);
+			newsPublish.setPublisher("");
+			newsPublish.setPublishPlatform("");
+			newsPublish.setPublishTime(new Date());
+			newsPublishMapper.insert(newsPublish);
+			}
+		}
+		return newsMapper.updateByPrimaryKeySelective(news);
+	}
 
 	@SuppressWarnings("unchecked")
 	public Pagination<News> listNews(Integer type, String title, String author, String startCreateTime,
-			String endCreateTime, String source, Integer hot, Integer pNo, Integer pSize,String auditStatus,String releaseStatus) {
+			String endCreateTime, String source, Integer hot, Integer pNo, Integer pSize,String auditStatus,String releaseStatus,String publishPage) {
 		Map<String, Object> params = new HashMap<>();
+		if(null !=publishPage) {
+			params.put("publishPage", publishPage);
+		}
 		if (null != auditStatus) {
 			params.put("auditStatus", auditStatus);
 		}
@@ -151,11 +242,15 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		return (Pagination<News>) findPage("findNewsListByPage", "findNewsCount", params, pNo, pSize);
 	}
 
-	public News findNewsDetail(Long id) {
-		return newsMapper.selectByPrimaryKey(id);
+	public NewsResult findNewsDetail(Long id) {
+		NewsResult newsResult=newsMapper.selectByPrimaryKey(id);
+		List<NewsPublish> newsPublishs=newsPublishMapper.selectByNewsId(id);
+		newsResult.setNewsPublishs(newsPublishs);
+		return newsResult;
 	}
 
 	public int batchDeleteByPrimaryKey(List<String> id) {
+		
 		return newsMapper.batchDeleteByPrimaryKey(id);
 	}
 
@@ -219,6 +314,11 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		return (Pagination<NewsPortalList>) findPage("appNewsList", "appNewsCount", params, pNo, pSize);
 	}
 	
+	public int deleteByPrimaryKey(long id) {
+		newsPublishMapper.deleteByNewsId(id);
+		return newsMapper.deleteByPrimaryKey(id);
+	}
+	
 	public  List<News>getNewsList(int size){
 		List<News>  news=newsMapper.getNewsList(size);
 				return news;

+ 118 - 0
src/main/java/com/goafanti/news/service/PolicyService.java

@@ -0,0 +1,118 @@
+package com.goafanti.news.service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.IdGenerator;
+
+import com.goafanti.common.dao.PolicyMapper;
+import com.goafanti.common.dao.PolicyPublishMapper;
+import com.goafanti.common.model.Policy;
+import com.goafanti.common.model.PolicyPublish;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.news.bo.PolicyResult;
+
+@Service
+public class PolicyService extends BaseMybatisDao<PolicyMapper> {
+@Autowired
+PolicyMapper policyMapper;
+@Autowired
+PolicyPublishMapper policyPublishMapper;
+
+public Policy saveNewPolicy(Policy policy,List<String>webPages,List<String>appPages) {
+policyMapper.insertSelective(policy);
+PolicyPublish pp=null;
+if(webPages!=null)
+for(String s:webPages)
+{
+	pp=new PolicyPublish();
+	pp.setId(UUID.randomUUID().toString());
+	pp.setIfTop(0);
+	pp.setPolicyId(policy.getId()+"");
+	pp.setPublishClient(0);
+	pp.setPublisher("管理员");
+	pp.setPublishPage(s);
+	pp.setPublishPlatform("");
+	pp.setPublishTime(new Date());
+	pp.setShowNumber(1);
+	pp.setTopNumber(1);
+	policyPublishMapper.insert(pp);
+	}
+if(appPages!=null)
+	for(String s:appPages)
+	{pp=new PolicyPublish();
+		pp.setId(UUID.randomUUID().toString());
+		pp.setIfTop(0);
+		pp.setPolicyId(policy.getId()+"");
+		pp.setPublishClient(1);
+		pp.setPublisher("管理员");
+		pp.setPublishPage(s);
+		pp.setPublishPlatform("");
+		pp.setPublishTime(new Date());
+		pp.setShowNumber(1);
+		pp.setTopNumber(1);
+		policyPublishMapper.insert(pp);
+		}
+	return policy;
+}
+
+public int deletePolicyById(Long id) {
+	if(id!=null) {
+		policyPublishMapper.deleteByPolicyId(id);
+		return policyMapper.deleteByPrimaryKey(id);
+	}
+	else return -1;
+	
+}
+
+public PolicyResult getPolicyDetail(Long id) {
+	PolicyResult policyResult=policyMapper.selectByPrimaryKey(id);
+	List<String> publishPages=policyPublishMapper.getPagesByPolicyId(id); 
+	policyResult.setPublishPages(publishPages);
+	return policyResult;
+}
+
+public int updateSelectively(Policy policy, List<String> webPages, List<String> appPages) {
+	// TODO Auto-generated method stub
+	policyPublishMapper.deleteByPolicyId(policy.getId());
+	PolicyPublish pp=null;
+	if(webPages!=null)
+	for(String s:webPages)
+	{
+		pp=new PolicyPublish();
+		pp.setId(UUID.randomUUID().toString());
+		pp.setIfTop(0);
+		pp.setPolicyId(policy.getId()+"");
+		pp.setPublishClient(0);
+		pp.setPublisher("管理员");
+		pp.setPublishPage(s);
+		pp.setPublishPlatform("");
+		pp.setPublishTime(new Date());
+		pp.setShowNumber(1);
+		pp.setTopNumber(1);
+		policyPublishMapper.insert(pp);
+		}
+	if(appPages!=null)
+		for(String s:appPages)
+		{pp=new PolicyPublish();
+			pp.setId(UUID.randomUUID().toString());
+			pp.setIfTop(0);
+			pp.setPolicyId(policy.getId()+"");
+			pp.setPublishClient(1);
+			pp.setPublisher("管理员");
+			pp.setPublishPage(s);
+			pp.setPublishPlatform("");
+			pp.setPublishTime(new Date());
+			pp.setShowNumber(1);
+			pp.setTopNumber(1);
+			policyPublishMapper.insert(pp);
+			}
+	
+	return policyMapper.updateByPrimaryKeySelective(policy);
+}
+
+
+}

+ 4 - 8
src/main/webapp/WEB-INF/views/common.html

@@ -5,6 +5,7 @@
 
 <head th:fragment="header(title, link)">
   <meta charset="UTF-8">
+  <link rel="icon" th:href="${portalHost+'/img/ico_logo.ico'}" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title></title>
@@ -55,23 +56,18 @@
             <div class="nav">
                 <ul>
                     <li>
-                        <a th:href="@{/portal/service/serviceIndex}">科技服务</a>
+                        <a th:href="@{/portal/service/serviceIndex}">科技服务首页</a>
                         <img th:src="${portalHost+'/img/hot.png'}">
                        
                     </li>
                     <li>
-                        <a href="#">技术交易</a>
-                        <ol class="subnavigation">
-                            
-                            <li>
                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
                             </li>
                             <li>
                                 <a th:href="@{/portal/technologyTrading/demand}">技术需求</a>
                             </li>
-                          
-                        </ol>
-                    </li>
+                            
+                    
                     <li>
                         <a href="#">智库咨询</a>
                         <ol class="subnavigation">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -165,7 +165,7 @@
                     </div>
                 </li>
             </ul>
-        </div>
+        
         <div class="study" id="patentTitle">
                 <h4>专利技术
                     <a th:href="@{/portal/technologyTrading/achievementList}">查看更多 > </a>