Browse Source

Merge branch 'test' of ssh://git@git.jishutao.com:55555/jishutao/jitao-server.git into test

limin 7 years ago
parent
commit
fd8adbc827

+ 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);
 		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);
 		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) {
 			if (project.getMaxImgUrl() != null && project.getMaxImgUrl().length() <= 0)
 				project.setMaxImgUrl(null);
@@ -759,7 +759,8 @@ public class WebpageController extends BaseController {
 			}
 				
 			
-		}
+		}
+		
 		modelview.addObject("projects", jtBusinessProjects);
 		List<PolicyResult> policies = (List<PolicyResult>) policyService
 				.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
-				.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();
 		for (News n : news) {
 			if (null != n.getTitleImg() && n.getTitleImg().contains(",")) {
@@ -1175,7 +1176,7 @@ public class WebpageController extends BaseController {
 		OrgIdentityBo org = organizationIdentityService.selectOrgIdentityBoByUserId(uid);
 		modelAndView.addObject("org", org);
 		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);
 		String honor = org.getHonorPicture();
 		if (honor != null && honor.contains(".")) {

+ 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="advertisement" jdbcType="VARCHAR" property="advertisement" />
     <result column="keyword" jdbcType="VARCHAR" property="keyword" />
+    <result column="summary" jdbcType="VARCHAR" property="summary" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -108,7 +109,7 @@
     -->
     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, 
-    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>
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultMap="BaseResultMap">
     <!--
@@ -173,7 +174,7 @@
       create_time, min_img_url, max_img_url, 
       value, apply_conditions, owner_id, 
       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}, 
       #{number,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{activityPrice,jdbcType=DECIMAL}, 
       #{memberPrice,jdbcType=DECIMAL}, #{offset,jdbcType=REAL}, #{activityFlag,jdbcType=INTEGER}, 
@@ -181,7 +182,7 @@
       #{createTime,jdbcType=TIMESTAMP}, #{minImgUrl,jdbcType=VARCHAR}, #{maxImgUrl,jdbcType=VARCHAR}, 
       #{value,jdbcType=VARCHAR}, #{applyConditions,jdbcType=VARCHAR}, #{ownerId,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 id="insertSelective" parameterType="com.goafanti.common.model.JtBusinessProject">
     <!--
@@ -263,6 +264,9 @@
       <if test="keyword != null">
       keyword,
       </if>
+      <if test="summary != null">
+      summary,
+       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -337,6 +341,9 @@
        <if test="keyword != null">
       #{keyword,jdbcType=VARCHAR},
       </if>
+      <if test="summary != null">
+      #{summary,jdbcType=VARCHAR}
+       </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultType="java.lang.Long">
@@ -430,6 +437,9 @@
       <if test="keyword !=null">
       keyword =#{keyword,jdbcType=VARCHAR},
       </if>
+      <if test="summary != null">
+      summary =#{summary,jdbcType=VARCHAR},
+       </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -465,7 +475,7 @@
       audit_info = #{record.auditInfo,jdbcType=VARCHAR},
       release_date = #{record.releaseDate,jdbcType=TIMESTAMP},
       advertisement = #{record.advertisement,jdbcType=VARCHAR},
-      keyword = #{keyword,jdbcType=VARCHAR}
+      keyword = #{keyword,jdbcType=VARCHAR},#{summary,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -547,6 +557,9 @@
       <if test="keyword != null">
       	keyword = #{keyword,jdbcType=VARCHAR},
       </if>
+      <if test="summary != null">
+      summary = #{summary,jdbcType=VARCHAR},
+       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -579,13 +592,14 @@
       audit_info = #{auditInfo,jdbcType=VARCHAR},
       release_date = #{releaseDate,jdbcType=TIMESTAMP},
       advertisement = #{advertisement,jdbcType=VARCHAR},
-      keyword = #{keyword,jdbcType=VARCHAR}
+      keyword = #{keyword,jdbcType=VARCHAR},
+      summary =#{summary,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKeyWithModule" resultType="com.goafanti.business.bo.JtBusinessProjectResult">
     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.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.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
@@ -636,6 +650,7 @@
 	  jtbp.audit_status as auditStatus,
 	  jtbp.release_Date as releaseDate,
 	  jtbp.advertisement,
+	  jtbp.summary,
 	  ifnull(dct.dealCount,0) as dealCount,
 	  ifnull(x.count,0) as interestCount,
 	  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
 	 */
 	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
@@ -235,8 +240,7 @@ public class JtBusinessCategory {
 		this.module = module;
 	}
 	
-	private String oldSuperId; //修改前的上级id
-	private Integer nextModule; //修改后的模块
+
 
 	public String getOldSuperId() {
 		return oldSuperId;
@@ -254,8 +258,7 @@ public class JtBusinessCategory {
 		this.nextModule = nextModule;
 	}
 	
-    private Integer pcIndex;// 模块发布到pc首页
-    private Integer appIndex;// 模块发布到app首页
+  
 
 	public Integer getPcIndex() {
 		return pcIndex;
@@ -272,4 +275,12 @@ public class JtBusinessCategory {
 	public void setAppIndex(Integer 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 keyword;
+	
+	
+	private String summary;
 
 	/**
 	 * 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) {
 		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) {
-	if(webPages.size()<1 && appPages.size()<1)
+	/*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;

+ 0 - 3
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -138,9 +138,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			createAuditorNotice(user);
 		}
-
 		return userIdentityMapper.updateByPrimaryKeySelective(u);
-
 	}
 
 	@Override
@@ -262,7 +260,6 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 				n.setId(UUID.randomUUID().toString());
 				n.setCreateTime(now.getTime());
 				n.setReaded(NoticeReadStatus.UNREAD.getCode());
-
 				if (null != u) {
 					n.setPid(u.getAid());
 				}

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

@@ -57,7 +57,7 @@ app.mobile.website=http://muat.jishutao.com
 template.cacheable=false
 
 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.upload.host=//statics.jishutao.com/upload
 

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

@@ -18,6 +18,7 @@
 
 <body>
 	<th:block th:fragment="nav(mainM,subM)">
+	
 	<div class="topFixHeight">
         <div class="topNav">
 	
@@ -50,6 +51,22 @@
 					</li>
 				</ul>
 			</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 class="navWrapper webkitHover">
 			<ol>
@@ -524,7 +541,7 @@
 	</th:block>
 
 	<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>
 			var _hmt = _hmt || [];
 			(function() {
@@ -534,7 +551,7 @@
 				s.parentNode.insertBefore(hm, s);
 			})();
 		</script>
-		 <script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script> 
+		  
 		<script th:inline="javascript">
 			/*<![CDATA[*/
 			window.globalConfig = {};
@@ -593,8 +610,11 @@
 				lvl : /*[[${userData == null} ? null : ${userData.lvl}]]*/''
 			}
 			/*]]>*/
+			
 		</script>
 		<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>
 
 </body>

File diff suppressed because it is too large
+ 4 - 3
src/main/webapp/WEB-INF/views/portal/adviser/adviserDetail.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/companyProfile.html