Ver código fonte

Merge branch 'test' of jishutao/jitao-server into prod

liliang4869 7 anos atrás
pai
commit
da54e1c4fb

+ 1 - 0
src/main/java/com/goafanti/business/service/JtBusinessService.java

@@ -70,6 +70,7 @@ public interface JtBusinessService {
 	int updateProjectSetTop(String id);
 	int updateProjectSetTop(String id);
 	void addJtCollectSearch(JtBusinessProject jtBusinessProject);
 	void addJtCollectSearch(JtBusinessProject jtBusinessProject);
 	void updateJtCollectSearch(String id);
 	void updateJtCollectSearch(String id);
+	List<JtBusinessCategoryBo> getHomeIndex(Integer module, Integer isHome);
 	
 	
 	
 	
 	
 	

+ 7 - 0
src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java

@@ -236,6 +236,7 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 		category.setSummary(jtBusinessCategory.getSummary());
 		category.setSummary(jtBusinessCategory.getSummary());
 		category.setPcIndex(jtBusinessCategory.getPcIndex());
 		category.setPcIndex(jtBusinessCategory.getPcIndex());
 		category.setAppIndex(jtBusinessCategory.getAppIndex());
 		category.setAppIndex(jtBusinessCategory.getAppIndex());
+		category.setHomeIndex(jtBusinessCategory.getHomeIndex());
 		jtBusinessCategoryMapper.updateByPrimaryKeySelective(category);
 		jtBusinessCategoryMapper.updateByPrimaryKeySelective(category);
 		//是否修改了模块类别
 		//是否修改了模块类别
 		boolean moduleChange = null != jtBusinessCategory.getModule() ? !jtBusinessCategory.getModule().equals(jtBusinessCategory.getNextModule()) : false;
 		boolean moduleChange = null != jtBusinessCategory.getModule() ? !jtBusinessCategory.getModule().equals(jtBusinessCategory.getNextModule()) : false;
@@ -516,6 +517,12 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 		if(collectFlag)jtCollectSearchMapper.deleteByrowId(id);
 		if(collectFlag)jtCollectSearchMapper.deleteByrowId(id);
 		
 		
 	}
 	}
+
+	@Override
+	public List<JtBusinessCategoryBo> getHomeIndex(Integer module, Integer isHome) {
+		
+		return jtBusinessCategoryMapper.getHomeIndex(module,isHome);
+	}
 	
 	
 
 
 }
 }

+ 7 - 6
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -742,11 +742,11 @@ public class WebpageController extends BaseController {
 //		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 //		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		modelview.setViewName("/portal/index");
 		modelview.setViewName("/portal/index");
 
 
-		List<JtBusinessCategoryBo> patentCategory = jtBusinessService.getCategoryBoList(1);
-		patentCategory = patentCategory.subList(0, Math.min(3, patentCategory.size()));
+		List<JtBusinessCategoryBo> patentCategory = jtBusinessService.getHomeIndex(1,1);
+		patentCategory = patentCategory.subList(0, Math.min(6, patentCategory.size()));
 		modelview.addObject("patentCategory", patentCategory);
 		modelview.addObject("patentCategory", patentCategory);
 		List<JtBusinessProject> jtBusinessProjects = (List<JtBusinessProject>) jtBusinessService
 		List<JtBusinessProject> jtBusinessProjects = (List<JtBusinessProject>) jtBusinessService
-				.getProjects(null,null, null, null, 5, 1, 1, 2, null, 1, 0, 0, null).getList();
+				.getProjects(null,null, null, null, 8, 1, 1, 2, null, 1, 0, 0, null).getList();
 		for (JtBusinessProject project : jtBusinessProjects) {
 		for (JtBusinessProject project : jtBusinessProjects) {
 			if (project.getMaxImgUrl() != null && project.getMaxImgUrl().length() <= 0)
 			if (project.getMaxImgUrl() != null && project.getMaxImgUrl().length() <= 0)
 				project.setMaxImgUrl(null);
 				project.setMaxImgUrl(null);
@@ -759,7 +759,8 @@ public class WebpageController extends BaseController {
 			}
 			}
 				
 				
 			
 			
-		}
+		}
+		
 		modelview.addObject("projects", jtBusinessProjects);
 		modelview.addObject("projects", jtBusinessProjects);
 		List<PolicyResult> policies = (List<PolicyResult>) policyService
 		List<PolicyResult> policies = (List<PolicyResult>) policyService
 				.searchPolicy("", 2, null, null, "web_index", 1, 3, null).getList();
 				.searchPolicy("", 2, null, null, "web_index", 1, 3, null).getList();
@@ -1106,7 +1107,7 @@ public class WebpageController extends BaseController {
 		
 		
 		// 知产百科
 		// 知产百科
 		List<News> news = (List<News>) newsService
 		List<News> news = (List<News>) newsService
-				.listNews(98, null, null, null, null, null, null, 1, 4, 2 + "", null, "web_tech_service_index",null)
+				.listNews(98, null, null, null, null, null, null, 1, 4, 2 + "", null, null,null)
 				.getList();
 				.getList();
 		for (News n : news) {
 		for (News n : news) {
 			if (null != n.getTitleImg() && n.getTitleImg().contains(",")) {
 			if (null != n.getTitleImg() && n.getTitleImg().contains(",")) {
@@ -1175,7 +1176,7 @@ public class WebpageController extends BaseController {
 		OrgIdentityBo org = organizationIdentityService.selectOrgIdentityBoByUserId(uid);
 		OrgIdentityBo org = organizationIdentityService.selectOrgIdentityBoByUserId(uid);
 		modelAndView.addObject("org", org);
 		modelAndView.addObject("org", org);
 		List<JtBusinessProjectResult> projectResults = (List<JtBusinessProjectResult>) jtBusinessService
 		List<JtBusinessProjectResult> projectResults = (List<JtBusinessProjectResult>) jtBusinessService
-				.getProjects(null,null, null, null, 4, 1, 0, 2, null, null, 0, 0, uid).getList();
+				.getProjects(null,null, null, null, 12, 1, 0, 2, null, null, 0, 0, uid).getList();
 		modelAndView.addObject("jtProjects", projectResults);
 		modelAndView.addObject("jtProjects", projectResults);
 		String honor = org.getHonorPicture();
 		String honor = org.getHonorPicture();
 		if (honor != null && honor.contains(".")) {
 		if (honor != null && honor.contains(".")) {

+ 2 - 0
src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java

@@ -101,5 +101,7 @@ public interface JtBusinessCategoryMapper {
 	
 	
 	List<JtBusinessCategory> getCategoryByName(JtBusinessCategory category);
 	List<JtBusinessCategory> getCategoryByName(JtBusinessCategory category);
 	List<JtBusinessCategory> getCategoryByModel(JtBusinessCategory category);
 	List<JtBusinessCategory> getCategoryByModel(JtBusinessCategory category);
+
+	List<JtBusinessCategoryBo> getHomeIndex(Integer module, Integer isHome);
     
     
 }
 }

+ 25 - 1
src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml

@@ -19,6 +19,7 @@
     <result column="module" jdbcType="INTEGER" property="module" />
     <result column="module" jdbcType="INTEGER" property="module" />
     <result column="pc_index" jdbcType="INTEGER" property="pcIndex" />
     <result column="pc_index" jdbcType="INTEGER" property="pcIndex" />
     <result column="app_index" jdbcType="INTEGER" property="appIndex" />
     <result column="app_index" jdbcType="INTEGER" property="appIndex" />
+    <result column="home_index" jdbcType="INTEGER" property="homeIndex" />
   </resultMap>
   </resultMap>
   <sql id="Example_Where_Clause">
   <sql id="Example_Where_Clause">
     <!--
     <!--
@@ -94,7 +95,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 17 09:14:43 CST 2018.
       This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     -->
-    id, name, summary, number, create_time, super_id, img_url, layer, sort, module, pc_index, app_index
+    id, name, summary, number, create_time, super_id, img_url, layer, sort, module, pc_index, app_index,home_index
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultMap="BaseResultMap">
     <!--
     <!--
@@ -205,6 +206,9 @@
       <if test="appIndex != null">
       <if test="appIndex != null">
         app_index,
         app_index,
       </if>
       </if>
+      <if test="homeIndex != null">
+        home_index,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
       <if test="id != null">
@@ -243,6 +247,9 @@
       <if test="appIndex != null">
       <if test="appIndex != null">
         #{appIndex,jdbcType=INTEGER},
         #{appIndex,jdbcType=INTEGER},
       </if>
       </if>
+      <if test="homeIndex != null">
+        #{homeIndex,jdbcType=INTEGER},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultType="java.lang.Long">
   <select id="countByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultType="java.lang.Long">
@@ -369,6 +376,9 @@
       <if test="appIndex != null">
       <if test="appIndex != null">
         app_index = #{appIndex,jdbcType=INTEGER},
         app_index = #{appIndex,jdbcType=INTEGER},
       </if>
       </if>
+      <if test="homeIndex != null">
+        home_index = #{homeIndex,jdbcType=INTEGER},
+      </if>
     </set>
     </set>
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   </update>
@@ -607,4 +617,18 @@ and layer=#{0}
     limit #{sort,jdbcType=INTEGER} 
     limit #{sort,jdbcType=INTEGER} 
     </if>
     </if>
   </select>
   </select>
+  <select id="getHomeIndex" resultType="com.goafanti.business.bo.JtBusinessCategoryBo">
+  	  select 
+    name as topLevel,
+    id as topLevelId,
+    img_url as topImg,
+    summary
+    from jt_business_category
+    where layer=2
+    and module=#{0}
+    and home_index=#{1}
+    order by sort
+  </select>
+  
+  
 </mapper>
 </mapper>

+ 21 - 6
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -31,6 +31,7 @@
     <result column="release_date" jdbcType="TIMESTAMP" property="releaseDate" />
     <result column="release_date" jdbcType="TIMESTAMP" property="releaseDate" />
     <result column="advertisement" jdbcType="VARCHAR" property="advertisement" />
     <result column="advertisement" jdbcType="VARCHAR" property="advertisement" />
     <result column="keyword" jdbcType="VARCHAR" property="keyword" />
     <result column="keyword" jdbcType="VARCHAR" property="keyword" />
+    <result column="summary" jdbcType="VARCHAR" property="summary" />
   </resultMap>
   </resultMap>
   <sql id="Example_Where_Clause">
   <sql id="Example_Where_Clause">
     <!--
     <!--
@@ -108,7 +109,7 @@
     -->
     -->
     id, name, category_id, number, price, activity_price, member_price, offset, activity_flag, 
     id, name, category_id, number, price, activity_price, member_price, offset, activity_flag, 
     introduce, province, city, create_time, min_img_url, max_img_url, value, apply_conditions, 
     introduce, province, city, create_time, min_img_url, max_img_url, value, apply_conditions, 
-    owner_id, is_hot, audit_status, audit_info, release_date, advertisement,keyword
+    owner_id, is_hot, audit_status, audit_info, release_date, advertisement,keyword,summary
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultMap="BaseResultMap">
     <!--
     <!--
@@ -173,7 +174,7 @@
       create_time, min_img_url, max_img_url, 
       create_time, min_img_url, max_img_url, 
       value, apply_conditions, owner_id, 
       value, apply_conditions, owner_id, 
       is_hot, audit_status, audit_info, 
       is_hot, audit_status, audit_info, 
-      release_date, advertisement,keyword)
+      release_date, advertisement,keyword,summary)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR}, 
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR}, 
       #{number,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{activityPrice,jdbcType=DECIMAL}, 
       #{number,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{activityPrice,jdbcType=DECIMAL}, 
       #{memberPrice,jdbcType=DECIMAL}, #{offset,jdbcType=REAL}, #{activityFlag,jdbcType=INTEGER}, 
       #{memberPrice,jdbcType=DECIMAL}, #{offset,jdbcType=REAL}, #{activityFlag,jdbcType=INTEGER}, 
@@ -181,7 +182,7 @@
       #{createTime,jdbcType=TIMESTAMP}, #{minImgUrl,jdbcType=VARCHAR}, #{maxImgUrl,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{minImgUrl,jdbcType=VARCHAR}, #{maxImgUrl,jdbcType=VARCHAR}, 
       #{value,jdbcType=VARCHAR}, #{applyConditions,jdbcType=VARCHAR}, #{ownerId,jdbcType=VARCHAR}, 
       #{value,jdbcType=VARCHAR}, #{applyConditions,jdbcType=VARCHAR}, #{ownerId,jdbcType=VARCHAR}, 
       #{isHot,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER}, #{auditInfo,jdbcType=VARCHAR}, 
       #{isHot,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER}, #{auditInfo,jdbcType=VARCHAR}, 
-      #{releaseDate,jdbcType=TIMESTAMP}, #{advertisement,jdbcType=VARCHAR},#{keyword,jdbcType=VARCHAR})
+      #{releaseDate,jdbcType=TIMESTAMP}, #{advertisement,jdbcType=VARCHAR},#{keyword,jdbcType=VARCHAR},#{summary,jdbcType=VARCHAR})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.JtBusinessProject">
   <insert id="insertSelective" parameterType="com.goafanti.common.model.JtBusinessProject">
     <!--
     <!--
@@ -263,6 +264,9 @@
       <if test="keyword != null">
       <if test="keyword != null">
       keyword,
       keyword,
       </if>
       </if>
+      <if test="summary != null">
+      summary,
+       </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
       <if test="id != null">
@@ -337,6 +341,9 @@
        <if test="keyword != null">
        <if test="keyword != null">
       #{keyword,jdbcType=VARCHAR},
       #{keyword,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="summary != null">
+      #{summary,jdbcType=VARCHAR}
+       </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultType="java.lang.Long">
   <select id="countByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultType="java.lang.Long">
@@ -430,6 +437,9 @@
       <if test="keyword !=null">
       <if test="keyword !=null">
       keyword =#{keyword,jdbcType=VARCHAR},
       keyword =#{keyword,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="summary != null">
+      summary =#{summary,jdbcType=VARCHAR},
+       </if>
     </set>
     </set>
     <if test="_parameter != null">
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
       <include refid="Update_By_Example_Where_Clause" />
@@ -465,7 +475,7 @@
       audit_info = #{record.auditInfo,jdbcType=VARCHAR},
       audit_info = #{record.auditInfo,jdbcType=VARCHAR},
       release_date = #{record.releaseDate,jdbcType=TIMESTAMP},
       release_date = #{record.releaseDate,jdbcType=TIMESTAMP},
       advertisement = #{record.advertisement,jdbcType=VARCHAR},
       advertisement = #{record.advertisement,jdbcType=VARCHAR},
-      keyword = #{keyword,jdbcType=VARCHAR}
+      keyword = #{keyword,jdbcType=VARCHAR},#{summary,jdbcType=VARCHAR}
     <if test="_parameter != null">
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
       <include refid="Update_By_Example_Where_Clause" />
     </if>
     </if>
@@ -547,6 +557,9 @@
       <if test="keyword != null">
       <if test="keyword != null">
       	keyword = #{keyword,jdbcType=VARCHAR},
       	keyword = #{keyword,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="summary != null">
+      summary = #{summary,jdbcType=VARCHAR},
+       </if>
     </set>
     </set>
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   </update>
@@ -579,13 +592,14 @@
       audit_info = #{auditInfo,jdbcType=VARCHAR},
       audit_info = #{auditInfo,jdbcType=VARCHAR},
       release_date = #{releaseDate,jdbcType=TIMESTAMP},
       release_date = #{releaseDate,jdbcType=TIMESTAMP},
       advertisement = #{advertisement,jdbcType=VARCHAR},
       advertisement = #{advertisement,jdbcType=VARCHAR},
-      keyword = #{keyword,jdbcType=VARCHAR}
+      keyword = #{keyword,jdbcType=VARCHAR},
+      summary =#{summary,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   </update>
   <select id="selectByPrimaryKeyWithModule" resultType="com.goafanti.business.bo.JtBusinessProjectResult">
   <select id="selectByPrimaryKeyWithModule" resultType="com.goafanti.business.bo.JtBusinessProjectResult">
     select 
     select 
         jtbp.id, jtbp.name, jtbp.category_id as categoryId, jtbp.number, jtbp.price, jtbp.activity_price as activityPrice, jtbp.member_price as memberPrice, jtbp.offset, 
         jtbp.id, jtbp.name, jtbp.category_id as categoryId, jtbp.number, jtbp.price, jtbp.activity_price as activityPrice, jtbp.member_price as memberPrice, jtbp.offset, 
-        jtbp.activity_flag as activityFlag, u.nickname as ownerName,ifnull(p.count,0) as interestCount,if(isnull(x.project_id),0,1) as interested,jtbp.keyword,
+        jtbp.activity_flag as activityFlag, u.nickname as ownerName,ifnull(p.count,0) as interestCount,if(isnull(x.project_id),0,1) as interested,jtbp.keyword,jtbp.summary,
     jtbp.introduce, jtbp.province, jtbp.city, jtbp.create_time as createTime, jtbp.min_img_url as minImgUrl, jtbp.max_img_url as maxImgUrl, jtbp.value, jtbp.apply_conditions as applyConditions, 
     jtbp.introduce, jtbp.province, jtbp.city, jtbp.create_time as createTime, jtbp.min_img_url as minImgUrl, jtbp.max_img_url as maxImgUrl, jtbp.value, jtbp.apply_conditions as applyConditions, 
     jtbp.owner_id as ownerId, jtbp.is_hot as isHot, jtbp.audit_status as auditStatus, jtbp.audit_info as auditInfo, jtbp.release_date as releaseDate,jtbc.module as module,jtbp.advertisement
     jtbp.owner_id as ownerId, jtbp.is_hot as isHot, jtbp.audit_status as auditStatus, jtbp.audit_info as auditInfo, jtbp.release_date as releaseDate,jtbc.module as module,jtbp.advertisement
     from jt_business_project jtbp left join `user` u on jtbp.owner_id=u.id
     from jt_business_project jtbp left join `user` u on jtbp.owner_id=u.id
@@ -636,6 +650,7 @@
 	  jtbp.audit_status as auditStatus,
 	  jtbp.audit_status as auditStatus,
 	  jtbp.release_Date as releaseDate,
 	  jtbp.release_Date as releaseDate,
 	  jtbp.advertisement,
 	  jtbp.advertisement,
+	  jtbp.summary,
 	  ifnull(dct.dealCount,0) as dealCount,
 	  ifnull(dct.dealCount,0) as dealCount,
 	  ifnull(x.count,0) as interestCount,
 	  ifnull(x.count,0) as interestCount,
 	  u.nickname as companyName,u.id as companyId
 	  u.nickname as companyName,u.id as companyId

+ 15 - 4
src/main/java/com/goafanti/common/model/JtBusinessCategory.java

@@ -54,6 +54,11 @@ public class JtBusinessCategory {
 	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
 	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
 	 */
 	 */
 	private Integer module;
 	private Integer module;
+	private String oldSuperId; //修改前的上级id
+	private Integer nextModule; //修改后的模块
+	private Integer pcIndex;// 模块发布到pc首页
+	private Integer appIndex;// 模块发布到app首页
+	private Integer homeIndex;// 模块发布到app首页
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.id
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.id
@@ -235,8 +240,7 @@ public class JtBusinessCategory {
 		this.module = module;
 		this.module = module;
 	}
 	}
 	
 	
-	private String oldSuperId; //修改前的上级id
-	private Integer nextModule; //修改后的模块
+
 
 
 	public String getOldSuperId() {
 	public String getOldSuperId() {
 		return oldSuperId;
 		return oldSuperId;
@@ -254,8 +258,7 @@ public class JtBusinessCategory {
 		this.nextModule = nextModule;
 		this.nextModule = nextModule;
 	}
 	}
 	
 	
-    private Integer pcIndex;// 模块发布到pc首页
-    private Integer appIndex;// 模块发布到app首页
+  
 
 
 	public Integer getPcIndex() {
 	public Integer getPcIndex() {
 		return pcIndex;
 		return pcIndex;
@@ -272,4 +275,12 @@ public class JtBusinessCategory {
 	public void setAppIndex(Integer appIndex) {
 	public void setAppIndex(Integer appIndex) {
 		this.appIndex = appIndex;
 		this.appIndex = appIndex;
 	}
 	}
+
+	public Integer getHomeIndex() {
+		return homeIndex;
+	}
+
+	public void setHomeIndex(Integer homeIndex) {
+		this.homeIndex = homeIndex;
+	}
 }
 }

+ 11 - 0
src/main/java/com/goafanti/common/model/JtBusinessProject.java

@@ -124,6 +124,9 @@ public class JtBusinessProject {
 	private String tag;
 	private String tag;
 	
 	
 	private String keyword;
 	private String keyword;
+	
+	
+	private String summary;
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_project.id
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_project.id
@@ -554,4 +557,12 @@ public class JtBusinessProject {
 	public void setKeyword(String keyword) {
 	public void setKeyword(String keyword) {
 		this.keyword = keyword;
 		this.keyword = keyword;
 	}
 	}
+
+	public String getSummary() {
+		return summary;
+	}
+
+	public void setSummary(String summary) {
+		this.summary = summary;
+	}
 }
 }

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

@@ -185,11 +185,11 @@ public Result apply(InputNews news,BindingResult bindingResult,String[] publishP
 		
 		
 		
 		
 	private void checkApplyParams(InputNews news, List<String>webPages,List<String>appPages, Result result) {
 	private void checkApplyParams(InputNews news, List<String>webPages,List<String>appPages, Result result) {
-	if(webPages.size()<1 && appPages.size()<1)
+	/*if(webPages.size()<1 && appPages.size()<1)
 	{
 	{
 		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","发布位置"));
 		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","发布位置"));
 		return;
 		return;
-	}
+	}*/
 	if(news ==null || StringUtils.isBlank(news.getTitle())) {
 	if(news ==null || StringUtils.isBlank(news.getTitle())) {
 		result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","标题"));
 		result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","标题"));
 		return;
 		return;

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -57,7 +57,7 @@ app.mobile.website=http://muat.jishutao.com
 template.cacheable=false
 template.cacheable=false
 
 
 static.host=//statics.jishutao.com/client/1.0.0
 static.host=//statics.jishutao.com/client/1.0.0
-portal.host=//statics.jishutao.com/portal/1.0.0
+portal.host=//statics.jishutao.com/portal/1.0.1
 avatar.host=//statics.jishutao.com
 avatar.host=//statics.jishutao.com
 avatar.upload.host=//statics.jishutao.com/upload
 avatar.upload.host=//statics.jishutao.com/upload
 
 

+ 22 - 2
src/main/webapp/WEB-INF/views/common.html

@@ -18,6 +18,7 @@
 
 
 <body>
 <body>
 	<th:block th:fragment="nav(mainM,subM)">
 	<th:block th:fragment="nav(mainM,subM)">
+	
 	<div class="topFixHeight">
 	<div class="topFixHeight">
         <div class="topNav">
         <div class="topNav">
 	
 	
@@ -50,6 +51,22 @@
 					</li>
 					</li>
 				</ul>
 				</ul>
 			</div>
 			</div>
+			<div class="APP">
+				<img th:src="${portalHost+'/img/indedImg/inded30.png'}" alt="" />
+				<a>APP下载
+					<span class="webkitDown"></span>
+				</a>
+				<div class="xialaewm">
+					<div class="cont_rightapps" id="iPhone">
+						<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt="">
+						<p>iPhone版</p>
+					</div>
+					<div class="cont_rights android" id="Android">
+						<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt="">
+						<p>Android版</p>
+					</div>
+				</div>
+			</div>
 		</div>
 		</div>
 		<div class="navWrapper webkitHover">
 		<div class="navWrapper webkitHover">
 			<ol>
 			<ol>
@@ -524,7 +541,7 @@
 	</th:block>
 	</th:block>
 
 
 	<th:block th:fragment="footer(scripts)">
 	<th:block th:fragment="footer(scripts)">
-	 	<script src="https://s22.cnzz.com/z_stat.php?id=1274334487&web_id=1274334487" language="JavaScript"></script>
+		<script src="https://s22.cnzz.com/z_stat.php?id=1274334487&web_id=1274334487" language="JavaScript"></script>
 		<script>
 		<script>
 			var _hmt = _hmt || [];
 			var _hmt = _hmt || [];
 			(function() {
 			(function() {
@@ -534,7 +551,7 @@
 				s.parentNode.insertBefore(hm, s);
 				s.parentNode.insertBefore(hm, s);
 			})();
 			})();
 		</script>
 		</script>
-		 <script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script> 
+		  
 		<script th:inline="javascript">
 		<script th:inline="javascript">
 			/*<![CDATA[*/
 			/*<![CDATA[*/
 			window.globalConfig = {};
 			window.globalConfig = {};
@@ -593,8 +610,11 @@
 				lvl : /*[[${userData == null} ? null : ${userData.lvl}]]*/''
 				lvl : /*[[${userData == null} ? null : ${userData.lvl}]]*/''
 			}
 			}
 			/*]]>*/
 			/*]]>*/
+			
 		</script>
 		</script>
 		<th:block th:replace="${scripts}" />
 		<th:block th:replace="${scripts}" />
+		<script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script>
+		
 	</th:block>
 	</th:block>
 
 
 </body>
 </body>

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

@@ -18,7 +18,7 @@
         <div class="indexSearch">
         <div class="indexSearch">
             <div class="search-inp">
             <div class="search-inp">
                 <div class="input-group">
                 <div class="input-group">
-                    <input type="text" class="form-control demandSearch" placeholder="搜索您要找的顾问。。">
+                    <input type="text" class="form-control demandSearch" placeholder="搜索您要找的顾问">
                     <span class="input-group-btn">
                     <span class="input-group-btn">
                         <button class="btn btn-default searchBtn" type="button">
                         <button class="btn btn-default searchBtn" type="button">
                             <img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt=""> 搜索
                             <img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt=""> 搜索

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/companyProfile.html


+ 100 - 133
src/main/webapp/WEB-INF/views/portal/index.html

@@ -59,167 +59,128 @@
 				<li>项目</li>
 				<li>项目</li>
 			</ul> -->
 			</ul> -->
 			<div class="search-inp">
 			<div class="search-inp">
-				<div class="input-group">
+				<div class="input-group searchDiv">
 					<input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
 					<input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
-					<span class="input-group-btn">
-						<button class="btn btn-default searchBtn" type="button">
-							<img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt=""> 搜索
-						</button>
-					</span>
+					<img th:src="${portalHost+'/img/newMenu/searchImg.png'}" alt="" class="searchImg">
+				
 				</div>
 				</div>
-				<a th:href="@{/portal/evaluation/evaluate}" href="/portal/evaluation/evaluate">高企自评</a>
+				 <a  th:href="@{/portal/technologyTrading/tradingIndex#sytz}" class="zaixian">在线评估</a>
+				 
+				
+				<a th:href="@{/portal/evaluation/evaluate}" href="/portal/evaluation/evaluate" class="gaoqi">高企自评</a>
 			</div>
 			</div>
-			<!-- <span class="apply head_login">申请会员</span> -->
-		</div>
-
-	<!-- 主体内容区域 -->
-	<div class="container">
-		<!-- <div class="indexNav">
-			<ul>
+			<ul class="jump">
 				<li>
 				<li>
-				<a th:href="@{/portal/service/patent}">
-					<img th:src="${portalHost+'/img/index/index_icon1.png'}" alt="">
-					<p>知识产权申请</p></a>
+					<a href="/portal/thinkTank/policyList?type=1">政策</a>
 				</li>
 				</li>
 				<li>
 				<li>
-				<a th:href="@{/portal/service/serviceIndex}">
-					<img th:src="${portalHost+'/img/index/index_icon2.png'}" alt="">
-					<p>知识产权运用</p></a>
+					<a href="/portal/thinkTank/policyList?type=0">资讯</a>
 				</li>
 				</li>
 				<li>
 				<li>
-				<a th:href="@{/portal/technologyTrading/tradingIndex}">
-					<img th:src="${portalHost+'/img/index/index_icon3.png'}" alt="">
-					<p>知识产权交易</p></a>
+					<a href="/portal/thinkTank/policyList?type=99">技淘观点</a>
 				</li>
 				</li>
 				<li>
 				<li>
-				<a th:href="@{/portal/service/serviceIndex}">
-					<img th:src="${portalHost+'/img/index/index_icon4.png'}" alt="">
-					<p>知识产权维权</p></a>
+					<a href="/portal/thinkTank/policyList?type=98">知产百科</a>
 				</li>
 				</li>
 			</ul>
 			</ul>
-		</div> -->
-		<h3 class="title">热门申请</h3>
-		<div>
-			<img th:src="${portalHost+'/img/index/index_hotBj.png'}" alt="">
+			<!-- <span class="apply head_login">申请会员</span> -->
 		</div>
 		</div>
-		<div class="handle">
-			<ul>
+
+	<!-- 主体内容区域 -->
+	<div id="terrace">
+			<div class="terrace_title">
 			
 			
-				<li th:each="pc,pcStatus:${patentCategory}">
-					<div class="handleBox">
-						<img th:src="${pc.topImg}==null?${portalHost+'/img/index/index_handleI.jpg'}:${avatarUploadHost+pc.topImg}" alt="">
-						<div class="handleMask">
-							<div class="maskTxt">
-								<img th:src="${portalHost+'/img/index/index_handleIcon'+(pcStatus.index+1)+'.png'}" alt="">
-								<p th:text="${pc.topLevel}">版权登记</p>
-								<span></span>
-								<div class="contentTxt">
-									<p th:text="${pc.summary}==null?'暂无简介':${#strings.abbreviate(pc.summary,30)}"></p>
-								</div>
-								
-							</div>
-						</div>
-					</div>
-					<a th:href="@{/portal/service/patentList(topId=${pc.topLevelId})}">立即办理</a>
-				</li>
-			</ul>
-			<a href="/portal/service/patentList" class="more">MORE
-				<span></span>
-			</a>
-		</div>
-		<!-- 热门推荐 -->
-		<div class="RecommendTitle">
-			<h2>热门推荐</h2>
-			<span></span>
-		</div>
-		<div class="RecommendBody">
-			<div class="RecommendTxt" th:each="p,pStatus:${projects}" th:if="${pStatus.index}==0">
-				<div class="RecommendTxtImg">
-					<img th:src="${p.maxImgUrl}==null?${portalHost+'/img/allproduct_img.png'}:${avatarUploadHost+p.maxImgUrl}" alt="">
-					<div class="txts">
-						<p th:text="${p.introduce}==null?'暂无简介':${#strings.abbreviate(p.introduce,30)}"></p>
-					</div>
-				</div>
-				<div class="RecommendTxtBottom">
-					<p th:text="${p.name}">高新认定</p>
-					<a th:href="@{/portal/service/serviceDetail(id=${p.id})}">立即办理</a>
-				</div>
+				<img th:src="${portalHost+'/img/indedImg/inded12.png'}" alt="" />
 			</div>
 			</div>
-			<div class="RecommendImg">
-				<div class="RecommendRemask" th:each="p1,pStatus:${projects}" th:if="${pStatus.index}==1">
-					<img th:src="${p1.maxImgUrl}==null?${portalHost+'/img/index/index_handleI.jpg'}:${avatarUploadHost+p1.maxImgUrl}" alt="">
-					<div class="remaskImg">
-						<div>
-							<p th:text="${p1.name}">高新认定</p>
-						<a th:href="@{/portal/service/serviceDetail(id=${p1.id})}">立即办理</a>
-						</div>
+			<div class="terrace_cont">
+				<div>
+					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
+					<div class="terraceH">
+						<h4>智慧</h4>
+						<p>海量智力成果认知您的需求</p>
 					</div>
 					</div>
 				</div>
 				</div>
-				<div class="imgGrounp">
-					<div class="RecommendRemask"  th:each="p,pStatus:${projects}" th:if="${pStatus.index}==2 or ${pStatus.index}==3">
-							<img th:src="${p.maxImgUrl}==null?${portalHost+'/img/index/index_handleI.jpg'}:${avatarUploadHost+p.maxImgUrl}" alt="">
-						<div class="remaskImg">
-							<div>
-								<p th:text="${p.name}">高新认定</p>
-							<a th:href="@{/portal/service/serviceDetail(id=${p.id})}">立即办理</a>
-							</div>
-						</div>
+				<div>
+					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
+					<div class="terraceH">
+						<h4>合伙</h4>
+						<p>秉承十七载荣赢数万客户</p>
+					</div>
+				</div><div>
+					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
+					<div class="terraceH">
+						<h4>社区</h4>
+						<p>严选数千位专家顾问答疑解惑</p>
 					</div>
 					</div>
 				</div>
 				</div>
 			</div>
 			</div>
-			<div class="RecommendTxt" th:each="p,pStatus:${projects}" th:if="${pStatus.index}==4">	
-				<div class="RecommendTxtImg">
-					<img th:src="${p.maxImgUrl}==null?${portalHost+'/img/index/index_handleI.jpg'}:${avatarUploadHost+p.maxImgUrl}" alt="">
-					<div class="txts">
-						<p th:text="${p.introduce}==null?'暂无简介':${#strings.abbreviate(p.introduce,30)}"></p>
+		</div>
+		<div id="apply">
+			<div class="apply">
+				<div class="apply_left">
+					<a >
+						<img th:src="${portalHost+'/img/indedImg/inded15.jpg'}" alt="" />
+					</a>
+				</div>
+				<div class="apply_right">
+					<div th:each="p0,pcStatus:${patentCategory}">
+						<a th:href="'/portal/service/patentList?secondId='+${p0.topLevelId}">
+							<img th:src="${portalHost+'/img/indedImg/inded20.jpg'}" alt="" th:if="${pcStatus.index}==0"/>
+							<img th:src="${portalHost+'/img/indedImg/inded21.jpg'}" alt="" th:if="${pcStatus.index}==1"/>
+							<img th:src="${portalHost+'/img/indedImg/inded22.jpg'}" alt="" th:if="${pcStatus.index}==2"/>
+							<img th:src="${portalHost+'/img/indedImg/inded23.jpg'}" alt="" th:if="${pcStatus.index}==3"/>
+							<img th:src="${portalHost+'/img/indedImg/inded24.jpg'}" alt="" th:if="${pcStatus.index}==4"/>
+							<img th:src="${portalHost+'/img/indedImg/inded25.jpg'}" alt="" th:if="${pcStatus.index}==5"/>
+							<h4 th:text="${p0.topLevel}"> 发明专利</h4>
+						</a>
 					</div>
 					</div>
 				</div>
 				</div>
-				<div class="RecommendTxtBottom">
-					<p th:text="${#strings.abbreviate(p.name,15)}">高新认定</p>
-					<a th:href="@{/portal/service/serviceDetail(id=${p.id})}">立即办理</a>
-				</div>	
 			</div>
 			</div>
+			
 		</div>
 		</div>
-		<!-- 品牌建设 -->
-		<div class="RecommendTitle">
-			<h2>企业品牌建设</h2>
-			<span></span>
+		<div id="wield">
+			<div class="terrace_title">
+				<img th:src="${portalHost+'/img/indedImg/inded4.png'}" alt="" />
+			</div>
+			<div class="wield_cont">
+				<img th:src="${portalHost+'/img/indedImg/inded5.png'}" alt="" />
+			</div>
 		</div>
 		</div>
-	</div>
-	<div class="brand">
-		<div class="brandBody container">
-			<div class="brandLeft">
-				<div class="writeBj">
-					<img th:src="${portalHost+'/img/index/index_brand1.jpg'}" alt="">
-					<p>基础品牌建设</p>
-				</div>
-				<div class="writeBj">
-					<img th:src="${portalHost+'/img/index/index_brand2.jpg'}" alt="">
-					<p>产品质量提升</p>
-				</div>
+		<div class="brands">
+			<img th:src="${portalHost+'/img/indedImg/inded6.png'}" alt="" />
+		</div>
+		<div class="brands">
+			<img th:src="${portalHost+'/img/indedImg/inded7.png'}" alt="" />
+			<div class="brandsDiv">
+				<img th:src="${portalHost+'/img/indedImg/inded31.jpg'}" alt="" class="active"/>
+				<img th:src="${portalHost+'/img/indedImg/inded32.jpg'}" alt="" />
+				<img th:src="${portalHost+'/img/indedImg/inded33.jpg'}" alt="" />
 			</div>
 			</div>
-			<div class="brandMid">
-				<img th:src="${portalHost+'/img/index/index_brand3.jpg'}" alt="">
-				<h4>企业品牌提升</h4>
-				<div>
-				 <p>培育品牌内功</p>
-                        <p>落地管理标准</p>
-                        <p>取得权威认证</p>
-				</div>
-<!-- 				<a href="#"></a> -->
+		</div>
+		<div class="brands">
+			<img th:src="${portalHost+'/img/indedImg/inded8.png'}" alt="" />
+		</div>
+		<div class="brands">
+			<img th:src="${portalHost+'/img/indedImg/inded9.png'}" alt="" />
+			<div>
+				<img th:src="${portalHost+'/img/indedImg/inded34.jpg'}" alt="" class="active"/>
+				<img th:src="${portalHost+'/img/indedImg/inded35.jpg'}" alt="" />
+				<img th:src="${portalHost+'/img/indedImg/inded36.jpg'}" alt="" />
 			</div>
 			</div>
-			<div class="brandLeft">
-				<div class="writeBj">
-					<img th:src="${portalHost+'/img/index/index_brand4.jpg'}" alt="">
-					<p>行业限制许可办理</p>
-				</div>
-				<div class="writeBj">
-					<img th:src="${portalHost+'/img/index/index_brand5.jpg'}" alt="">
-					<p>企业品牌升级奖励</p>
+		</div>
+		<div id="hotProject">
+			<div class="terrace_title">
+				<img th:src="${portalHost+'/img/indedImg/inded10.png'}" alt="" />
+			</div>
+			<div class="hotProject_cont" >
+				<div th:each="p,pStatus:${projects}">
+					<img th:src="${p.maxImgUrl}==null?${portalHost+'/img/indedImg/inded11.png'}:${avatarUploadHost+p.maxImgUrl}" alt="">
+					<h3 th:text="${p.name}">高新认定</h3>
+					<p th:text="${p.advertisement}==null?'暂无简介':${#strings.abbreviate(p.advertisement,30)}"></p>
+					<a th:href="@{/portal/service/serviceDetail(id=${p.id})}">立即办理</a>
 				</div>
 				</div>
 			</div>
 			</div>
 		</div>
 		</div>
-	</div>
 	<div class="container">
 	<div class="container">
 		<div class="RecommendTitle">
 		<div class="RecommendTitle">
 			<h2>政策资讯</h2>
 			<h2>政策资讯</h2>
@@ -260,8 +221,8 @@
 								<span th:text="${#dates.format(n.releaseDate,'yyyy')}">2018</span>
 								<span th:text="${#dates.format(n.releaseDate,'yyyy')}">2018</span>
 							</div>
 							</div>
 							<div class="newTxt">
 							<div class="newTxt">
-								<h5 th:text="${n.title}">加奖金哦违法爱按金额积分经济积分经济积分经济if啊积分经济交往和居委会看看哇卡哇卡...</h5>
-								<p th:text="${n.summary}">哈哈哈哈海鸥科技打飞机附近的啊我的㘝技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的酒店设计大姐姐 但是大家觉得结算单基督教圣诞节ajd...</p>
+								<h5 th:text="${n.title}"></h5>
+								<p th:text="${n.summary}"></p>
 							</div>
 							</div>
 						</a>
 						</a>
 					</li>
 					</li>
@@ -272,6 +233,11 @@
 			<h2>技淘观点精选</h2>
 			<h2>技淘观点精选</h2>
 			<span></span>
 			<span></span>
 		</div>
 		</div>
+		<div class="view">
+			<h4>观点
+				<a th:href="@{/portal/thinkTank/policyList?type=99}"><span class="line"></span><span>></span></a>
+			</h4>
+		</div>
 		<div class="publicNumber">
 		<div class="publicNumber">
 			<div class="video" >
 			<div class="video" >
 				<iframe frameborder="0" width="565" height="320" th:src="${videoUrl}==null?'https://v.qq.com/iframe/player.html?vid=y0721rsmr4r&tiny=0&auto=0':${videoUrl}" allowfullscreen></iframe>
 				<iframe frameborder="0" width="565" height="320" th:src="${videoUrl}==null?'https://v.qq.com/iframe/player.html?vid=y0721rsmr4r&tiny=0&auto=0':${videoUrl}" allowfullscreen></iframe>
@@ -289,6 +255,7 @@
 				</li>
 				</li>
 			</ul>
 			</ul>
 		</div>
 		</div>
+		
 	</div>
 	</div>
 	<footer>
 	<footer>
 			<div th:replace="common::copyright"></div>
 			<div th:replace="common::copyright"></div>

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html