Browse Source

Merge remote-tracking branch 'origin/master' into prod

wanghui 8 years ago
parent
commit
25b0c4186e

+ 10 - 0
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -11,6 +11,7 @@ import com.goafanti.portal.bo.AchievementDetailBo;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
 import com.goafanti.portal.bo.InternationalListBo;
+import com.goafanti.residentIntegration.bo.ResidentIntegrationBo;
 
 public interface AchievementMapper {
 	int deleteByPrimaryKey(String id);
@@ -55,4 +56,13 @@ public interface AchievementMapper {
 	
 	/** 查询国际化技术 **/
 	List<InternationalListBo> selectInternationalAchievement();
+	
+	/** 查询军民融合成果 **/
+	List<ResidentIntegrationBo> selectJmrhAchievement();
+	
+	/** 查询军民融合技术 **/
+	List<ResidentIntegrationBo> selectJmrTechnology();
+	
+	/** 查询军民融合项目 **/
+	List<ResidentIntegrationBo> selectJmrProject();
 }

+ 49 - 5
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -56,6 +56,7 @@
     <result column="tech_broker_id" jdbcType="VARCHAR" property="techBrokerId" />
     <result column="country_name_zh" jdbcType="VARCHAR" property="countryNameZh" />
     <result column="international_flag" jdbcType="INTEGER" property="internationalFlag" />
+    <result column="jmrh_flag" jdbcType="INTEGER" property="jmrhFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     id, serial_number, data_category, name, keyword, category, summary, introduction, 
@@ -66,7 +67,7 @@
     team_des, parameter, tech_plan_url, business_plan_url, org_id, org_name, org_address, 
     org_email, org_contacts, org_contacts_mobile, contacts, manager_id, salesman_id, 
     status, create_time, release_status, release_date, deleted_sign, audit_status, tech_broker_id,
-    country_name_zh,international_flag
+    country_name_zh,international_flag,jmrh_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -96,7 +97,7 @@
       manager_id, salesman_id, status, 
       create_time, release_status, release_date, 
       deleted_sign, audit_status, tech_broker_id,
-      country_name_zh,international_flag)
+      country_name_zh,international_flag,jmrh_flag)
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{category,jdbcType=INTEGER}, 
       #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR}, 
@@ -114,7 +115,7 @@
       #{managerId,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, 
       #{deletedSign,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER}, #{techBrokerId,jdbcType=VARCHAR},
-      #{countryNameZh,jdbcType=VARCHAR}, #{internationalFlag,jdbcType=INTEGER})
+      #{countryNameZh,jdbcType=VARCHAR}, #{internationalFlag,jdbcType=INTEGER},#{jmrhFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Achievement">
     insert into achievement
@@ -281,6 +282,9 @@
       <if test="internationalFlag != null">
       	international_flag,
       </if>
+       <if test="jmrhFlag != null">
+      	jmrh_flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -442,9 +446,12 @@
       <if test="countryNameZh != null">
       	#{countryNameZh,jdbcType=VARCHAR},
       </if>
-       <if test="internationalFlag != null">
+      <if test="internationalFlag != null">
       	#{internationalFlag,jdbcType=INTEGER},
       </if>
+      <if test="jmrhFlag != null">
+      	#{jmrhFlag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Achievement">
@@ -609,6 +616,9 @@
        <if test="internationalFlag != null">
       	international_flag = #{internationalFlag,jdbcType=INTEGER},
       </if>
+     <if test="jmrhFlag != null">
+      	jmrh_flag = #{jmrhFlag,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -666,7 +676,8 @@
       audit_status = #{auditStatus,jdbcType=INTEGER},
       tech_broker_id = #{techBrokerId,jdbcType=VARCHAR},
       country_name_zh = #{countryNameZh,jdbcType=VARCHAR},
-      international_flag = #{internationalFlag,jdbcType=INTEGER}
+      international_flag = #{internationalFlag,jdbcType=INTEGER},
+      jmrh_flag = #{jmrhFlag,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -1376,4 +1387,37 @@
 		a.release_date desc
 	limit 0,5
   </select>
+  <select id="selectJmrhAchievement" resultType="com.goafanti.residentIntegration.bo.ResidentIntegrationBo">
+  	select 
+  		id, name
+	from 
+		achievement t 
+	where 
+		jmrh_flag = 0 and data_category = 0
+	limit 5;
+  </select>
+  <select id="selectJmrTechnology" resultType="com.goafanti.residentIntegration.bo.ResidentIntegrationBo">
+  	select 
+  		id, name, maturity
+	from 
+		achievement t 
+	where 
+		jmrh_flag = 0 and data_category = 1
+	limit 5;
+  </select>
+  <select id="selectJmrProject" resultType="com.goafanti.residentIntegration.bo.ResidentIntegrationBo">
+  	select 
+  		a.id, a.name, c.residence_city as residenceCity,d.name as industry
+	from 
+		achievement a 
+	left join 
+		user b on a.owner_id = b.id
+	left join 
+		user_info c on b.id = c.uid
+	left join 
+		field_glossory d on a.field_a = d.id
+	where 
+		jmrh_flag = 0 and data_category = 2
+	limit 5;
+  </select>
 </mapper>

+ 10 - 5
src/main/java/com/goafanti/common/model/Achievement.java

@@ -36,7 +36,7 @@ public class Achievement {
 	private String		keyword;
 
 	/**
-	 * 类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
+	 * 类型(0--专利, 1--软著, 2--项目, 3--版权, 4--工业设计, 5--配方, 6--非标)
 	 */
 	private Integer		category;
 
@@ -276,10 +276,15 @@ public class Achievement {
     private String 	countryNameZh;
 
     /**
-     *  是否国际化  0 - 否    1 - 是
+     *  是否国际化  0 - 否    , 1 - 是
      */
-    private String internationalFlag;
+    private Integer internationalFlag;
 
+    /**
+     *  是否属于军民融合成果 0 - 否	, 1 - 是
+     */
+    private Integer jmrhFlagp;
+    
 	public String getId() {
 		return id;
 	}
@@ -725,11 +730,11 @@ public class Achievement {
 		this.countryNameZh = countryNameZh;
 	}
 
-	public String getInternationalFlag() {
+	public Integer getInternationalFlag() {
 		return internationalFlag;
 	}
 
-	public void setInternationalFlag(String internationalFlag) {
+	public void setInternationalFlag(Integer internationalFlag) {
 		this.internationalFlag = internationalFlag;
 	}
 

+ 31 - 0
src/main/java/com/goafanti/portal/controller/PoralResidentIntegrationController.java

@@ -0,0 +1,31 @@
+package com.goafanti.portal.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.residentIntegration.bo.ResidentIntegrationBo;
+import com.goafanti.residentIntegration.service.ResidentIntegrationService;
+
+@Controller
+public class PoralResidentIntegrationController extends BaseController{
+	@Resource
+	private ResidentIntegrationService residentIntegrationService;
+	
+	@RequestMapping(value="/portal/residentIntegration/index")
+	public ModelAndView residentIntegrationIndex(ModelAndView mv){
+		List<ResidentIntegrationBo> jmrhAchievementList = residentIntegrationService.selectJmrhAchievement();
+		List<ResidentIntegrationBo> jmrhTechnologyList = residentIntegrationService.selectJmrTechnology();
+		List<ResidentIntegrationBo> jmrhProjectList = residentIntegrationService.selectJmrProject();
+		mv.addObject("jmrhAchievementList", jmrhAchievementList);
+		mv.addObject("jmrhTechnologyList",jmrhTechnologyList);
+		mv.addObject("jmrhProjectList",jmrhProjectList);
+		mv.setViewName("/portal/residentIntegration/index");
+		return mv;
+	}
+}

+ 40 - 0
src/main/java/com/goafanti/residentIntegration/bo/ResidentIntegrationBo.java

@@ -0,0 +1,40 @@
+package com.goafanti.residentIntegration.bo;
+
+public class ResidentIntegrationBo {
+	private String id;/** 成果编号 **/
+	private String name;/** 成果名字 **/
+	private String maturity;/** 成熟度 **/
+	private String industry;/** 行业 **/
+	private String residenceCity;/** 所属城市 **/
+	
+	public String getName() {
+		return name;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getMaturity() {
+		return maturity;
+	}
+	public void setMaturity(String maturity) {
+		this.maturity = maturity;
+	}
+	public String getIndustry() {
+		return industry;
+	}
+	public void setIndustry(String industry) {
+		this.industry = industry;
+	}
+	public String getResidenceCity() {
+		return residenceCity;
+	}
+	public void setResidenceCity(String residenceCity) {
+		this.residenceCity = residenceCity;
+	}
+}

+ 17 - 0
src/main/java/com/goafanti/residentIntegration/service/ResidentIntegrationService.java

@@ -0,0 +1,17 @@
+package com.goafanti.residentIntegration.service;
+
+import java.util.List;
+
+import com.goafanti.residentIntegration.bo.ResidentIntegrationBo;
+
+public interface ResidentIntegrationService {
+	
+	/** 查询军民融合成果 **/
+	List<ResidentIntegrationBo> selectJmrhAchievement();
+	
+	/** 查询军民融合技术 **/
+	List<ResidentIntegrationBo> selectJmrTechnology();
+	
+	/** 查询军民融合项目 **/
+	List<ResidentIntegrationBo> selectJmrProject();
+}

+ 33 - 0
src/main/java/com/goafanti/residentIntegration/service/impl/ResidentIntegrationServiceImpl.java

@@ -0,0 +1,33 @@
+package com.goafanti.residentIntegration.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.AchievementMapper;
+import com.goafanti.residentIntegration.bo.ResidentIntegrationBo;
+import com.goafanti.residentIntegration.service.ResidentIntegrationService;
+@Service
+public class ResidentIntegrationServiceImpl implements ResidentIntegrationService {
+	@Autowired
+	private AchievementMapper achievementMapper;
+	@Override
+	public List<ResidentIntegrationBo> selectJmrhAchievement() {
+		// TODO Auto-generated method stub
+		return achievementMapper.selectJmrhAchievement();
+	}
+
+	@Override
+	public List<ResidentIntegrationBo> selectJmrTechnology() {
+		// TODO Auto-generated method stub
+		return achievementMapper.selectJmrTechnology();
+	}
+
+	@Override
+	public List<ResidentIntegrationBo> selectJmrProject() {
+		// TODO Auto-generated method stub
+		return achievementMapper.selectJmrProject();
+	}
+
+}

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.35
+static.host=//sb.jishutao.com/1.0.39
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc
@@ -61,7 +61,7 @@ upload.private.path=/Users/xiaolong/Sites/doc
 accessKey=LTAIqTgQLLwz252Z
 accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
 
-avatar.host=//aftts.hnzhiming.com
+avatar.host=//sf.jishutao.com
 
 aesSecretKey=aft1234567890123
 
@@ -69,8 +69,8 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//aftts.hnzhiming.com/portal/1.0.8
+portal.host=//sf.jishutao.com/portal/1.0.9
 
 patentTemplate=SMS_72005286
 
-avatar.upload.host=//aftts.hnzhiming.com/upload
+avatar.upload.host=//sf.jishutao.com/upload

+ 3 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -122,6 +122,9 @@
 					<li th:classappend="${subM=='financial'}? 'active'"><a th:href="${basePath + '/portal/financial/financialIndex.html'}">金融街</a></li>
 				</ul>
 			</li>
+			<li th:classappend="${mainM=='residentIntegration'}? 'active'">
+				<a th:href="${basePath + '/portal/residentIntegration/index.html'}">军民融合</a>
+			</li>
 		</ul>
 	</th:block>
 	

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

@@ -53,8 +53,9 @@
 			</div>
 		</div>
 	</div>
-	<div class="index_nav"
+	<div class="index_nav"  id="index_nav"
 		th:style="@{(${banner} != null ? 'background:url('+${staticDomain +'/upload'+ banner.imgurl}+') no-repeat center;' : '')}">
+		<canvas id="canvas"></canvas>
 		<div class="container">
 			<div class="top_nav">
 				<ul>
@@ -97,6 +98,9 @@
 							<li><a
 								th:href="${basePath + '/portal/websiteBuild/websiteBuildIndex.html#event_planning'}">活动筹划</a></li>
 						</ol></li>
+	 				<li>
+                    	<a th:href="${basePath + '/portal/residentIntegration/index.html'}">军民融合</a>
+                    </li>
 				</ul>
 			</div>
 			<div style="clear: both"></div>
@@ -152,6 +156,7 @@
 			</div>
 		</div>
 	</div>
+	<div class="con-box">
 	<div class="container statistics">
 		<ul>
 			<!--<li>
@@ -207,6 +212,7 @@
 			<a class="customer-service" href="javascript:;">成为专家</a>
 		</div>
 	</div>
+	</div>
 	<div class="container news">
 		<div class="communication">
 			<div class="news_title">

File diff suppressed because it is too large
+ 314 - 0
src/main/webapp/WEB-INF/views/portal/residentIntegration/index.html


+ 2 - 0
src/main/webapp/WEB-INF/views/portal/search/achievement.html

@@ -69,9 +69,11 @@
         <ul class='detail_interest_sub clearfix' id="achievementList">
           <li>
             <div class="interest_list_title">
+              <i class="demand_sup"></i>
               <p title='跨媒体计算理论与方法'>跨媒体计算理论与方法</p>
             </div>
             <div class="interest_list_name">
+             <i class="demand_sup"></i>
               <p>浙江大学</p>
               <div class="interest_list_confirm"> <span>身份已验证</span> <i class="certify"></i> </div>
             </div>

+ 1 - 1
src/main/webapp/WEB-INF/views/user/msignIn.html

@@ -83,7 +83,7 @@
 			    <div class="form-group">		
 			         <div class="checkbox col-xs-9 col-xs-push-3">
 			            <label for="aft" class="op"></label>
-			            <input type="checkbox" id="aft" checked="checked"><a href="javascript:;">阿凡提会员服务协议条款</a>			            
+			            <input type="checkbox" id="aft" checked="checked"><a href="javascript:;">技术淘会员服务协议条款</a>			            
 			         </div>		     
 			    </div>
 			    <div class="form-group">