Kaynağa Gözat

服务列表,管理后台新增服务项目

liliang4869 7 yıl önce
ebeveyn
işleme
882f04deb2

+ 57 - 0
src/main/java/com/goafanti/business/controller/AdminJtBusinessController.java

@@ -0,0 +1,57 @@
+package com.goafanti.business.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.business.service.JtBusinessService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.model.JtBusinessCategory;
+
+@RestController
+@RequestMapping(value = "/api/admin/jtBusiness")
+public class AdminJtBusinessController extends CertifyApiController{
+	
+	@Resource 
+	private JtBusinessService jtBusinessService;
+	/*
+	 * 
+	 * 新增品類
+	 * 
+	 * */
+	@RequestMapping(value="/category/apply",method=RequestMethod.POST)
+	private Result insertCategory(JtBusinessCategory jtBusinessCategory) {
+		Result result=new Result();
+		disposeCateParam(result, jtBusinessCategory);
+		if(result.getError().size()>0)return result;
+		int rc=jtBusinessService.insertCategory(jtBusinessCategory);
+		if(rc==-1)result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","每层品类不可超过99个,"));
+		if(rc==-2)result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","父类Id与层数需要对应,"));
+		return result;
+	}
+	private void disposeCateParam(Result result,JtBusinessCategory jtBusinessCategory ) {
+		if(jtBusinessCategory.getName() == null) {
+			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "名称不可为空", "名称"));
+			return ;
+		}
+		if(jtBusinessCategory.getLayer() == null) {
+			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "层级不可为空", "层级"));
+			return ;
+		}
+		if(jtBusinessCategory.getLayer()>1 && jtBusinessCategory.getSuperId()==null)
+		{
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR, "父级品类不可为空", "父级品类"));
+			return ;
+		}
+	
+		
+		return ;
+	}
+}

+ 11 - 2
src/main/java/com/goafanti/business/controller/JtBusinessController.java

@@ -13,15 +13,24 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.CertifyApiController;
 
 @RestController
-@RequestMapping(value = "/open")
+@RequestMapping(value = "/portal/service")
 public class JtBusinessController extends CertifyApiController {
 	@Resource 
 	private JtBusinessService jtBusinessService;
 	
 	@RequestMapping(value = "/jtBusiness/getCategoryList" , method = RequestMethod.GET)
-	public Result getList() {
+	public Result getCategoryList() {
 		Result result=new Result();
 result.setData(jtBusinessService.getCategoryBoList());
 		return result;
 	}
+	
+	
+	@RequestMapping(value="/jtProject/list", method=RequestMethod.GET)
+	public Result getProjectList(String topId,String secondId,String name,Integer pageSize,Integer pageNo) {
+		Result result=new Result();
+		result.setData(jtBusinessService.getProjects(topId,secondId,name,pageSize,pageNo));
+		return result;
+	}
+	
 }

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

@@ -6,6 +6,7 @@ import com.goafanti.business.bo.JtBusinessCategoryBo;
 import com.goafanti.business.bo.JtBusinessCategoryTree;
 import com.goafanti.common.model.JtBusinessCategory;
 import com.goafanti.common.model.JtBusinessProject;
+import com.goafanti.core.mybatis.page.Pagination;
 
 public interface JtBusinessService {
 JtBusinessCategory getBusinessCategoryByLayerAndName(Integer layer,String name);
@@ -13,5 +14,7 @@ List<JtBusinessCategory> getBusinessCategoryBySuperId(String id,Integer size);
 List<JtBusinessProject>getBusinessProjectByCategoryId(String id,Integer size);
 JtBusinessProject getBusinessProjectDetail(String id);
 JtBusinessCategoryTree getCategoryTree(String id);
-public List<JtBusinessCategoryBo>getCategoryBoList();
+List<JtBusinessCategoryBo>getCategoryBoList();
+Pagination<JtBusinessProject>getProjects(String topId,String secondId,String name,Integer pageSize,Integer pageNo); 
+int insertCategory(JtBusinessCategory jtBusinessCategory);
 }

+ 74 - 1
src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java

@@ -1,6 +1,10 @@
 package com.goafanti.business.service.impl;
 
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,9 +16,12 @@ import com.goafanti.common.dao.JtBusinessCategoryMapper;
 import com.goafanti.common.dao.JtBusinessProjectMapper;
 import com.goafanti.common.model.JtBusinessCategory;
 import com.goafanti.common.model.JtBusinessProject;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 
 @Service
-public class JtBusinessServiceImpl implements JtBusinessService{
+public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapper> implements JtBusinessService{
 	@Autowired
 	JtBusinessCategoryMapper jtBusinessCategoryMapper;
 	@Autowired
@@ -53,4 +60,70 @@ public class JtBusinessServiceImpl implements JtBusinessService{
 		return jtBusinessCategoryMapper.getCategoryBoList();
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<JtBusinessProject> getProjects(String topId, String secondId, String name, Integer pageSize,
+			Integer pageNo) {
+		// TODO Auto-generated method stub
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0 ) {
+			pageSize = 10;
+		} 
+		
+		return (Pagination<JtBusinessProject>)findPage("findJtBusinessProjectByPage","findJtBusinessCountByPage",disposeParams(topId, secondId, name),pageNo,pageSize);
+	}
+	private Map<String, Object> disposeParams(String topId, String secondId,  String name) {
+		Map<String, Object> params = new HashMap<>();
+
+		if (StringUtils.isNotBlank(topId)) {
+			params.put("topId", topId);
+		}
+
+		if (StringUtils.isNotBlank(secondId)) {
+			params.put("secondId", secondId);
+		}
+
+	
+		if (StringUtils.isNotBlank(name)) {
+			params.put("name", name);
+		}
+
+		
+		return params;
+	}
+
+	@Override
+	public int insertCategory(JtBusinessCategory jtBusinessCategory) {
+		// TODO Auto-generated method stub
+//		jtBusinessCategoryMapper.autoIncreaseSort(jtBusinessCategory.getLayer(),jtBusinessCategory.getSort()); 
+		if(jtBusinessCategory.getSuperId()!=null && jtBusinessCategory.getLayer().intValue()==1)return -2;
+		String number="BC";
+		if(jtBusinessCategory.getLayer().intValue()==2) {
+			JtBusinessCategory sp=jtBusinessCategoryMapper.selectByPrimaryKey(jtBusinessCategory.getSuperId());
+			if(sp==null || sp.getLayer()!=1) {
+				return -2;
+			}
+			//加前前层
+			int size1=sp.getSort();
+			if(size1>99)return -size1;
+			if(size1<10)number+="0";
+			number+=size1;
+		}
+		//加前层
+		List<JtBusinessCategory>businessCategories =jtBusinessCategoryMapper.getBusinessCategoryBySuperId(jtBusinessCategory.getSuperId(), null);
+		int size2=businessCategories.size()+1;
+		if(size2>99)return -1;
+		if(size2<10)number+="0";
+		number+=size2;
+		jtBusinessCategory.setNumber(number);
+		if(businessCategories==null )jtBusinessCategory.setSort(1);
+		else jtBusinessCategory.setSort(businessCategories.size()+1);
+		jtBusinessCategory.setCreateTime(new Date());
+		jtBusinessCategory.setId(UUID.randomUUID().toString());
+		return jtBusinessCategoryMapper.insertSelective(jtBusinessCategory);
+	}
+	
 }

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

@@ -6,6 +6,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
@@ -322,6 +323,11 @@ public class WebpageController extends BaseController {
 	}
 	
 	
+	@RequestMapping(value="/portal/service/serviceList",method=RequestMethod.GET)
+	public ModelAndView serviceList(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/service/serviceList");
+		return modelview;
+	}
 
 	/**
 	 * 知识产权

+ 5 - 1
src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java

@@ -100,10 +100,14 @@ public interface JtBusinessCategoryMapper {
     
     JtBusinessCategory getBusinessCategoryByLayerAndName(Integer layer, String name);
     
-    List<JtBusinessCategory> getBusinessCategoryBySuperId(String id,Integer size);
+    List<JtBusinessCategory> getBusinessCategoryBySuperId(@Param("superId")String superId,@Param("size")Integer size);
     
     JtBusinessCategoryTree getCategoryTree(String id);
     
     List<JtBusinessCategoryBo>getCategoryBoList();
     
+    int insertCategory(JtBusinessCategory jtBusinessCategory);
+    
+    int autoIncreaseSort(Integer layer,Integer sort);
+    
 }

+ 4 - 0
src/main/java/com/goafanti/common/dao/JtBusinessProjectMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.JtBusinessProject;
 import com.goafanti.common.model.JtBusinessProjectExample;
+import com.goafanti.core.mybatis.page.Pagination;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +97,6 @@ public interface JtBusinessProjectMapper {
     int updateByPrimaryKey(JtBusinessProject record);
     
      List<JtBusinessProject> getBusinessProjectByCategoryId(String id,Integer size);
+     
+  
 }

+ 1 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1140,6 +1140,7 @@ select
 	a.id,
 	a.name,
 	a.technical_picture_url as technicalPictureUrl,
+	a.is_hot as isHot,
 	a.category,
 	release_date as releaseDate,
 	a.data_category as dataCategory,

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

@@ -364,13 +364,23 @@ where
   select
 	id,
 	name,
-	super_id as superId
+	super_id as superId,
+	sort
 from
 	jt_business_category
 where
-	super_id = #{0}
-	order by create_time
-	limit #{1}
+
+<if test="superId!=null">
+	super_id = #{superId,jdbcType=VARCHAR}
+	</if>
+	<if  test="superId==null" >
+	layer=1
+	</if>
+
+	order by sort
+	<if test="size!=null">
+	limit #{size,jdbcType=Integer}
+	</if>
   </select>
   
  <select id="getCategoryTree" resultType="com.goafanti.business.bo.JtBusinessCategoryTree">
@@ -390,12 +400,13 @@ where
   select
 	id,
 	name,
-	super_id as superId
+	super_id as superId,
+	sort
 from
 	jt_business_category
 where
 	super_id = #{0}
-	order by create_time
+	order by sort
   </select>
   <resultMap type="com.goafanti.business.bo.JtBusinessCategoryBo" id="JtBusinessCategoryBoResult">  
         <id column="name" property="topLevel"/>  
@@ -410,5 +421,13 @@ where
     id as topLevelId
     from jt_business_category
     where layer=1
+    order by sort
     </select>
+    
+  <update id="autoIncreaseSort">
+update jt_business_category set 
+sort=sort+1 
+where sort > #{1}
+and layer=#{0}
+  </update>
 </mapper>

+ 44 - 0
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -484,4 +484,48 @@
   	category_id=#{0}
   	limit #{1}
   </select>
+  
+  <select id="findJtBusinessProjectByPage" resultType="com.goafanti.common.model.JtBusinessProject">
+  select 
+  jtbp.id,
+  jtbp.name,
+  jtbp.max_img_url as maxImgUrl,
+  jtbp.introduce 
+  from jt_business_project jtbp
+  <if test="topId!=null">
+  left join jt_business_category jtbc on jtbc.super_id =#{topId,jdbcType=VARCHAR}
+  </if>
+  where 1=1
+  <if test="secondId!=null">
+  and jtbp.category_id=#{secondId,jdbcType=VARCHAR}
+  </if>
+  <if test="name!=null">
+  and jtbp.name like concat("%",#{name,jdbcType=VARCHAR},"%")
+  </if>
+  <if test="topId!=null">
+ and jtbc.id=jtbp.category_id
+  </if>
+  
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+    <select id="findJtBusinessCountByPage" resultType="java.lang.Integer">
+  select 
+ count(0)
+ from jt_business_project jtbp
+  <if test="topId!=null">
+  left join jt_business_category jtbc on jtbc.super_id =#{topId,jdbcType=VARCHAR}
+  </if>
+  where 1=1
+  <if test="secondId!=null">
+  and jtbp.category_id=#{secondId,jdbcType=VARCHAR}
+  </if>
+  <if test="name!=null">
+  and jtbp.name like concat("%",#{name,jdbcType=VARCHAR},"%")
+  </if>
+  <if test="topId!=null">
+ and jtbc.id=jtbp.category_id
+  </if>
+  </select>
 </mapper>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


+ 17 - 309
src/main/webapp/WEB-INF/views/portal/service/serviceList.html

@@ -7,7 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>技术服务列表</title>
    
-<link href="http://192.168.1.166/portal/2.0.6/vendors.css" rel="stylesheet"><link href="http://192.168.1.166/portal/2.0.6/newMenu/serviceList.css" rel="stylesheet"></head>
+<link th:href="${portalHost+'/vendors.css'}" rel="stylesheet"><link th:href="${portalHost+'/newMenu/serviceList.css'}" rel="stylesheet"></head>
 
 <body>
     <div class="header">
@@ -44,7 +44,7 @@
         <div class="navHeader">
             <div class="logo">
                 <a href="#">
-                    <img src="http://192.168.1.166/portal/2.0.6/img/Logo111.png" alt="" title="技淘">
+                    <img th:src="${portalHost+'/img/Logo111.png'}" alt="" title="技淘">
                 </a>
             </div>
             <div class="logo_right"></div>
@@ -52,7 +52,7 @@
                 <ul>
                     <li>
                         <a href="#">科技服务</a>
-                        <img src="http://192.168.1.166/portal/2.0.6/img/hot.png">
+                        <img th:src="${portalHost+'/img/hot.png'}">
                         <ol class="subnavigation">
                             <li>
                                 <a href="#">高企认定</a>
@@ -102,7 +102,7 @@
                 </ul>
             </div>
             <div class="nav_right">
-                <img src="http://192.168.1.166/portal/2.0.6/img/newMenu/navImg.jpg" alt="">
+                <img th:src="${portalHost+'/img/newMenu/navImg.jpg'}" alt="">
                 <span>国家技术转移示范机构</span>
             </div>
         </div>
@@ -112,81 +112,14 @@
             <p>业务分类</p>
             <div class="industryList">
                 <ul>
-                    <li value="464" class="active">
-                        <span>教育休闲</span>
-                    </li>
-                    <li value="463" class="">
-                        <span>包装印刷</span>
-                    </li>
-                    <li value="462">
-                        <span>电气自动化</span>
-                    </li>
-                    <li value="461">
-                        <span>采矿冶金</span>
-                    </li>
-                    <li value="460">
-                        <span>航空航天</span>
-                    </li>
-                    <li value="459">
-                        <span>海洋开发</span>
-                    </li>
-                    <li value="458">
-                        <span>农林牧业</span>
-                    </li>
-                    <li value="457">
-                        <span>医药与医疗</span>
-                    </li>
-                    <li value="456">
-                        <span>电子信息</span>
-                    </li>
-                    <li value="375">
-                        <span>新型材料</span>
-                    </li>
-                    <li value="31">
-                        <span>仪器仪表</span>
-                    </li>
-                    <li value="26">
-                        <span>橡胶塑料</span>
-                    </li>
-                    <li value="25">
-                        <span>交通运输</span>
-                    </li>
-                    <li value="20">
-                        <span>安全防护</span>
-                    </li>
-                    <li value="19">
-                        <span>环保和资源</span>
-                    </li>
-                    <li value="18">
-                        <span>机械</span>
-                    </li>
-                    <li value="17">
-                        <span>新能源</span>
-                    </li>
-                    <li value="15">
-                        <span>化学化工</span>
-                    </li>
-                    <li value="7">
-                        <span>轻工纺织</span>
-                    </li>
-                    <li value="5">
-                        <span>家居用品</span>
-                    </li>
-                    <li value="4">
-                        <span>建筑建材</span>
-                    </li>
-                    <li value="2">
-                        <span>食品饮料</span>
-                    </li>
+                  
                 </ul>
             </div>
         </div>
         <div class="productionType">
             <p>业务项目</p>
             <ol>
-                <li value="1">技术专利1</li>
-                <li value="2">技术专利2</li>
-                <li value="3">技术专利3</li>
+              
             </ol>
         </div>
         <div class="onSelect">
@@ -216,7 +149,7 @@
                     <input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
                     <span class="input-group-btn">
                         <button class="btn btn-default searchBtn" type="button">
-                            <img src="http://192.168.1.166/portal/2.0.6/img/newMenu/search-icon.jpg" alt=""> 搜索
+                            <img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt=""> 搜索
                         </button>
                     </span>
                 </div>
@@ -225,21 +158,7 @@
         <div class="achievementList">
             <div class="achievementHot">
                 <ul class="hotList">
-                    <!-- <li>
-                        <div class="img">
-                            <img src="http://192.168.1.166/portal/2.0.6/img/newMenu/achievmentDetail_3.jpg" alt="">
-                            <span></span>
-                        </div>
-                        <div class="txtIntroduce">
-                            <div class="txts">
-                                <h5>高压电极加热技术哈...</h5>
-                            </div>
-                            <div class="hr"></div>
-                            <div class="btnTxt">
-                                <p></p>
-                            </div>
-                        </div>
-                    </li> -->
+                   
                 </ul>
                 <div class="pagination_box">
                     <nav aria-label="Page navigation" class="clearfix">
@@ -265,226 +184,15 @@
             </div>
         </div>
     </div>
-    <footer>
-        <div id="bottom">
-            <div class="bottom">
-                <div class="bottom_text">
-                    <div class="text_top">
-                        <a href="/portal/aboutUs.html">关于公司</a>
-                        <a href="/portal/contactUs.html">联系我们</a>
-                        <p>Copyright © 2016-2017 科德 版权所有 湘ICP备15019731号 -2 技术支持:湖南阿凡提科技有限公司
-                        </p>
-                    </div>
-                    <div class="text_center" id="qrCode">
-                        <div class="cont_left">
-                            <img src="http://192.168.1.166/portal/2.0.6/img/dizhi.jpg" alt="">
-                            <p>湖南省长沙市营盘东路19号金山大厦八楼</p>
-                        </div>
-                        <div class="cont_center">
-                            <img src="http://192.168.1.166/portal/2.0.6/img/dianhua.jpg" alt="">
-                            <p>合作电话:400-8800-962</p>
-                        </div>
-                        <div class="cont_guanli">
-                            <a href="/admin/login">
-                                <img src="http://192.168.1.166/portal/2.0.6/img/guanli.png" alt="">
-                                <p>管理员入口</p>
-                            </a>
-                        </div>
-                        <div class="cont_rightapp">
-                            <img src="http://192.168.1.166/portal/2.0.6/img/erweima_iphone.png" alt="">
-                            <p>iPhone版</p>
-                        </div>
-                        <div class="cont_right android">
-                            <img src="http://192.168.1.166/portal/2.0.6/img/erweima_android.jpg" alt="">
-                            <p>Android版</p>
-                        </div>
-                        <div class="cont_right">
-                            <img src="http://192.168.1.166/portal/2.0.6/img/erweima.jpg" alt="">
-                            <p>微信公众号</p>
-                        </div>
-                    </div>
-                    <div class="text_bottom">
-                        <p>友情链接</p>
-                        <a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅/</a>
-                        <a href="http://www.cssti.cn/" target="_blank">长沙市科技局/</a>
-                        <a href="http://www.cast.org.cn/" target="_blank">中国科学技术协会/</a>
-                        <a href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a>
-                        <a href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办/</a>
-                        <a href="http://www.nast.org.cn/" target="_blank">国家科技成果网/</a>
-                        <a href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会/</a>
-                        <a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a>
-                        <a href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会/</a>
-                        <a href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院/</a>
-                        <a href="http://www.gxst.gov.cn/gxkjt/" target="_blank">广西省科技厅/</a>
-                        <a href="http://www.nmkjt.gov.cn/" target="_blank">内蒙古自治区科技厅/</a>
-                        <a href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a>
-                        <a href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a>
-                        <a href="http://www.cnic.cn/front/index.html#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
-                        <a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a>
-                        <a href="http://www.cast.org.cn/" target="_blank">中国科协创新创业服务中心/</a>
-                        <a href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅/</a>
-                        <a href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅/</a>
-                        <a href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅/</a>
-                        <a href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div onclick="_MEIQIA('showPanel')" id="lxkf" style="display:none"></div>
-        <div class="pub_fix">
-            <span class="index_blur"></span>
-            <ul class="ret_top">
-                <li class="head_login">
-                    <a href="javascript:;">
-                        <img src="http://192.168.1.166/portal/2.0.6/img/index_fix0.png" alt="">
-                        <p>申请会员</p>
-                    </a>
-                </li>
-                <li>
-                    <a onclick="_MEIQIA('showPanel')">
-                        <img src="http://192.168.1.166/portal/2.0.6/img/index_fix3.png" alt="">
-                        <p>联系客服</p>
-                    </a>
-                </li>
-                <li>
-                    <a href="" class="pendent_box">
-                        <img src="http://192.168.1.166/portal/2.0.6/img/index_fix4.png" alt="">
-                        <p>返回顶部</p>
-                    </a>
-                </li>
-            </ul>
-            <span class="index_orange"></span>
-        </div>
-        <div class="message">
-            <span></span>
-        </div>
-        <div class="login">
-            <div class="login_mian">
-                <div class="login_left">
-                    <div class="login_ewm">
-                        <img src="http://192.168.1.166/portal/2.0.6/img/Android.jpg" alt="二维码" />
-                        <p>Android版</p>
-                        <p>客户端</p>
-                    </div>
-                    <div class="login_ewm">
-                        <img src="http://192.168.1.166/portal/2.0.6/img/iPhone.jpg" alt="二维码" />
-                        <p>iPhone版</p>
-                        <p>客户端</p>
-                    </div>
-                </div>
-                <div class="login_right">
-                    <h5>用户登陆
-                        <a href="">免费注册有好礼呦!!</a>
-                    </h5>
-                    <form id="form_login">
-                        <div class="login_uesr">
-                            <label for="uesname">
-                                <img src="http://192.168.1.166/portal/2.0.6/img/login_use.png" />
-                            </label>
-                            <input type="text" name="uesname" id="Lo_user" placeholder="用户名" />
-                            <img src="http://192.168.1.166/portal/2.0.6/img/login_del.png" class="log_del" />
-                        </div>
-                        <div class="login_pass">
-                            <label for="pass">
-                                <img src="http://192.168.1.166/portal/2.0.6/img/login_password.png" />
-                            </label>
-                            <input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
-                        </div>
-                        <div class="login_check">
-                            <a href="">忘记密码?</a>
-                        </div>
-                        <input type="submit" value="登 陆" class="login_submit" />
-                    </form>
-                    <img src="http://192.168.1.166/portal/2.0.6/img/login_hua.png" alt="" class="login_hua" />
-                    <img src="http://192.168.1.166/portal/2.0.6/img/login_shadow.png" alt="阴影效果" class="login_shadow" />
-                    <img src="http://192.168.1.166/portal/2.0.6/img/login_close.png" alt="" class="login_close" />
-                </div>
-            </div>
-        </div>
-        <div id="forget">
-            <div class="forget">
-                <form id="forget_form">
-                    <div class="forget_top">
-                        <a href="">忘记密码?</a>
-                        <div class="login_check">
-                            <label for="forget_checks" class="lab_check">
-                                <input type="checkbox" name="type" id="forget_checks" />专家登录
-                            </label>
-                            <label for="forget_checkst" class="lab_checkno">
-                                <input type="checkbox" name="type" id="forget_checkst" />企业登录
-                            </label>
-                        </div>
-                    </div>
-                    <div class="forget_center">
-                        <div class="phone">
-                            <label for="forget_phone">
-                                手机号码:
-                                <input type="text" name="type" id="forget_phone" placeholder="请输入您的手机号码..." />
-                            </label>
-                        </div>
-                        <div class="yanzheng">
-                            <label for="forget_yanzheng">
-                                图形验证码:
-                                <input type="text" name="type" id="forget_yanzheng" />
-                            </label>
-                            <div class="yanzhengma_cont_">
-                                <img th:src="${basePath+'/open/getVCode'}" />
-                            </div>
-                        </div>
-                        <div class="cellcode_">
-                            <div>
-                                验证码:
-                                <input type="text" name="cellCode" placeholder="手机验证码" id="photo_n" />
-                            </div>
-                            <input type="button" id="photo_m" value="获取验证码" disabled/>
-                        </div>
-                        <div class="fastener">
-                            <input type="submit" class="forget_sub" value="确认" />
-                            <div class="fastener_right">
-                                取消
-                            </div>
-                        </div>
-                    </div>
-                </form>
-                <img src="http://192.168.1.166/portal/2.0.6/img/login_close.png" alt="" class="login_close" />
-            </div>
-        </div>
-        <div id="new_password">
-            <div class="new_password">
-                <form id="new_password_form">
-                    <div class="password_top">
-                        <h4>设置新密码</h4>
-                        <span>密码长度为6-20个字符,区分大小写</span>
-                    </div>
-                    <div class="password_center">
-                        <div>
-                            <label for="new_pass">
-                                新密码:
-                                <input type="text" name="type" id="new_pass" placeholder="请输入您的新密码..." />
-                            </label>
-                        </div>
-                        <div>
-                            <label for="new_pass_again">
-                                确认密码:
-                                <input type="text" name="type" id="new_pass_again" placeholder="请确认您的密码..." />
-                            </label>
-                        </div>
-                        <div class="fastener">
-                            <input type="submit" class="new_password_sub" value="确认" />
-                            <div class="fastener_right">
-                                取消
-                            </div>
-                        </div>
-                    </div>
-                </form>
-                <img src="http://192.168.1.166/portal/2.0.6/img/login_close.png" alt="" class="login_close" />
-            </div>
-        </div>
-        <div class="smg">
-            <input type="text" name="msg" value="111" id="msg" />
-        </div>
-    </footer>
-<script type="text/javascript" src="http://192.168.1.166/portal/2.0.6/vendors.js"></script><script type="text/javascript" src="http://192.168.1.166/portal/2.0.6/newMenu/serviceList.js"></script></body>
+   <footer>
+		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+	</footer>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost+'/newMenu/serviceList.js'}"></script>
+		</div>
+		</body>
 
 
 </html>

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

@@ -341,7 +341,7 @@
                                 <div class="txts">
                                     <h5 th:text="${pt.name}"></h5>
                                     <p><span th:text="${pt.dataCategoryS}"></span>
-                                    <span th:text="${pt.transferModeS}==null?'未知类型':${pt.transferModeS}"></span><span class="hotImg"></span></p>
+                                    <span th:text="${pt.transferModeS}==null?'未知类型':${pt.transferModeS}"></span><span  th:if="${pt.isHot}==1" class="hotImg"></span></p>
                                 </div>
                                 <div class="hr"></div>
                                 <div class="btnTxt">
@@ -661,10 +661,5 @@
         </div>
     </footer>
 <script type="text/javascript" th:src="${portalHost+'/vendors.js'}"></script><script type="text/javascript" th:src="${portalHost+'/newMenu/achievement.js'}"></script></body>
-<!-- <script th:src="../../th:src/js/jquery-2.1.0.js"></script>
-<script th:src="../../th:src/js/public.js"></script>
-<script th:src="../../th:src//js/newMenu/demand.js"></script>
-<script th:src="../../th:src//js/newMenu/achievement.js"></script>
-<script th:src="http://libs.baidu.com/bootstrap/3.0.3/js/bootstrap.min.js"></script> -->
 
 </html>