Browse Source

技淘BUG修复

anderx 7 years ago
parent
commit
181594856b

+ 1 - 6
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -572,11 +572,6 @@ public class AppUserController extends BaseApiController {
 	@ResponseBody
 	public Result resetPassword(String newPwd,String pwd) {
 		Result res=new Result();
-		if(null == TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE)){
-			res.getError().add(buildError(ErrorConstants.RESET_CODE_OVERTIME, "", "页面超时失效,请重新获取!"));
-			cleanCodeSession();
-			return res;
-		}		
 		if (StringUtils.isBlank(newPwd)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新密码"));
 			return res;
@@ -588,7 +583,7 @@ public class AppUserController extends BaseApiController {
 			u.setCreateTime(user.getCreateTime());
 			u.setPassword(newPwd);
 			u.setPassword(passwordUtil.getEncryptPwd(u));
-			if (!user.getPassword().equals(passwordUtil.getEncryptPwd(newPwd, user.getCreateTime()))) {
+			if (!user.getPassword().equals(passwordUtil.getEncryptPwd(pwd, user.getCreateTime()))) {
 				res.getError().add(buildError(ErrorConstants.PWD_NOT_MATCH_ERROR));
 			} else {
 				res.setData(userService.updateByPrimaryKeySelective(u));

+ 25 - 8
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -648,7 +648,7 @@ public class WebpageController extends BaseController {
 		List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, 1, 1, 3, "2", null, "web_index").getList();
 		modelview.addObject("news",newsList);
 //		
-		List<News> subscriptions=(List<News>) newsService.listNews(99, null, null, null, null, null, null, 1, 4, "2", null, "web_index").getList();
+		List<News> subscriptions=(List<News>) newsService.listNews(0, null, null, null, null, null, null, 1, 4, "2", null, "web_index").getList();
 		modelview.addObject("subscription",subscriptions);
 		
 		if(subscriptions!=null && subscriptions.size()>0 && subscriptions.get(0).getSourceUrl()!=null && subscriptions.get(0).getSourceUrl().contains(".")) {
@@ -875,26 +875,26 @@ public class WebpageController extends BaseController {
 		
 		//最新发布
 		List<JtBusinessProjectResult>recents=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(null, null, null, 4, 1, 
-				1, 2, 1, null, 0, 1,null).getList();
+				1, 2, 1, null, 0, 0,null).getList();
 		modelAndView.addObject("recent",recents);
 		
 		//专利服务-商标服务-版权服务
 		for(JtBusinessCategoryBo c:categoryBos) {
 			if("专利服务".equals(c.getTopLevel())){
 				List<JtBusinessProjectResult>res=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(c.getTopLevelId(), null,
-						null, 3, 1, 1, 2, 1, null, 0, 1,null).getList();
+						null, 3, 1, 1, 2, 1, null, 0, 0,null).getList();
 				modelAndView.addObject("patentService",res);
 				modelAndView.addObject("patentTopId",c.getTopLevelId());
 			}
 			else if("商标服务".equals(c.getTopLevel())){
 				List<JtBusinessProjectResult>res=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(c.getTopLevelId(), null,
-						null, 4, 1, 1, 2, 1, null, 0, 1,null).getList();
+						null, 4, 1, 1, 2, 1, null, 0, 0,null).getList();
 				modelAndView.addObject("branchService",res);
 				modelAndView.addObject("branchTopId",c.getTopLevelId());
 			}
 			else if("版权服务".equals(c.getTopLevel())){
 				List<JtBusinessProjectResult>res=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(c.getTopLevelId(), null,
-						null, 3, 1, 1, 2, 1, null, 0, 1,null).getList();
+						null, 3, 1, 1, 2, 1, null, 0, 0,null).getList();
 				modelAndView.addObject("copyrightService",res);
 				modelAndView.addObject("copyrightTopId",c.getTopLevelId());
 			}
@@ -914,7 +914,7 @@ public class WebpageController extends BaseController {
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/portal/technologyTrading/tradingIndex")
 	public ModelAndView patentTrading(HttpServletRequest request, ModelAndView modelAndView) {
-		String showLocation="web_achievement_main";
+		String showLocation="web_demand_trading_index";
 		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		modelAndView.setViewName("/portal/technologyTrading/tradingIndex");
 		//成果
@@ -922,7 +922,7 @@ public class WebpageController extends BaseController {
 		modelAndView.addObject("achievement",achievementObjects);
 		
 		//需求
-		List<DemandListBo>demandListBos=demandService.getHotDemand(2, url,"web_demand_main");
+		List<DemandListBo>demandListBos=demandService.getHotDemand(2, url,showLocation);
 		modelAndView.addObject("demand",demandListBos);
 		
 		//政策
@@ -1068,5 +1068,22 @@ public class WebpageController extends BaseController {
 					res.setData(newsService.portalNewsList(pSize, pNo, type, hot, provinceId, keyword,2));
 					return res;
 				}
-
+				/**
+				 * 政策列表
+				 */
+				@RequestMapping(value = "/portal/policy/list", method = RequestMethod.GET)
+				@ResponseBody
+				public Result policyList(Integer type, String pageSize, String pageNo, Integer hot, Integer provinceId,
+						String keyword) {
+					Result res = new Result();
+				Integer pNo = 1, pSize = 4;
+					if (StringUtils.isNumeric(pageNo)) {
+					pNo = Integer.parseInt(pageNo);
+					}
+					if (StringUtils.isNumeric(pageSize)) {
+						pSize = Integer.parseInt(pageSize);
+					}
+					res.setData(policyService.searchPolicy( keyword,2, null, null, "web_index", pNo, pSize));
+					return res;
+				}
 }

+ 3 - 0
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -493,6 +493,9 @@
       <if test="isHot!=null">
       is_hot=#{isHot,jdbcType=INTEGER}
       </if>
+      <if test="auditInfo!=null">
+      audit_info=#{auditInfo,jdbcType=VARCHAR}
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>

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

@@ -266,7 +266,7 @@
 			release_date as releaseDate
 		from news a
 		where 1=1
-		<!-- and (a.type = 0 or a.type = 99 or a.type =98) -->
+		 and (a.type = 0 or a.type = 99 or a.type =98) 
 		<if test="provinceId != null">
 			and a.province_id = #{provinceId,jdbcType=INTEGER}
 		</if>

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

@@ -69,6 +69,7 @@
   		n.audit_status as auditStatus,
   		n.release_status as releaseStatus,
   		n.top_number as topNumber,
+  		n.title_img as titleImg,
     	n.hotspot,
     	n.source_url as sourceUrl,
     	n.release_date as releaseDate

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


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


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