Browse Source

APP轮播图跳转调用修改

anderx 7 years ago
parent
commit
f9b81da524

+ 18 - 5
src/main/java/com/goafanti/app/bo/HomeImages.java

@@ -3,7 +3,11 @@ package com.goafanti.app.bo;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 public class HomeImages {
+	
+
 	public String img1="/customer_sys_file/1/GGN1.jpg";
 	
 	public String img2="/customer_sys_file/1/GG2.jpg";
@@ -14,11 +18,20 @@ public class HomeImages {
 	
 	private List<HomeImgBo> imagers=new ArrayList<>();
 	
-	public  List<HomeImgBo> getImagers() {
-		imagers.add(new HomeImgBo("065de736-9b40-4678-93bc-e95f5e8c529b",img1,"成果"));
-		imagers.add(new HomeImgBo("739aed36-6ee6-406f-b03e-97d719b484b9",img2,"需求"));
-		imagers.add(new HomeImgBo("af430be8-7752-43ac-ad82-27f02be317e6",img3,"专家"));
-		imagers.add(new HomeImgBo(null,img4,null));
+	public  List<HomeImgBo> getImagers(HttpServletRequest request) {
+		String url=request.getServerName();
+		
+		if (url.contains("uat")) {
+			imagers.add(new HomeImgBo("14bd3573-7d09-4dcd-bfa0-10ad3285e3e9",img1,"成果"));
+			imagers.add(new HomeImgBo("e9c9577f-5b01-446a-b5f8-7667be957b4a",img2,"需求"));
+			imagers.add(new HomeImgBo("765633c6-9e2f-439b-8c2b-a4347e45acf6",img3,"专家"));
+			imagers.add(new HomeImgBo(null,img4,null));
+		}else {
+			imagers.add(new HomeImgBo("065de736-9b40-4678-93bc-e95f5e8c529b",img1,"成果"));
+			imagers.add(new HomeImgBo("739aed36-6ee6-406f-b03e-97d719b484b9",img2,"需求"));
+			imagers.add(new HomeImgBo("af430be8-7752-43ac-ad82-27f02be317e6",img3,"专家"));
+			imagers.add(new HomeImgBo(null,img4,null));
+		}
 		return imagers;
 	}
 	

+ 2 - 3
src/main/java/com/goafanti/app/controller/AppDiscoveryController.java

@@ -143,10 +143,9 @@ public class AppDiscoveryController extends BaseApiController {
 	 * 政策详情
 	 */
 	@RequestMapping(value = "/newsDetail", method = RequestMethod.GET)
-	public Result expertsDetail(long id) {
-		System.out.println("111111111111");
+	public Result newsDetail(long id) {
 		Result res = new Result();
-		res.setData(newsService.findNewsDetail( id));
+		res.setData(newsService.findNewsDetail(id));
 		return res;
 	}
 	

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

@@ -22,7 +22,7 @@ public class OpenAppHomeController extends BaseApiController{
 	@RequestMapping(value = "/getHomePageData", method = RequestMethod.GET)
 	public Result getHomePageData(HttpServletRequest  request){
 		Result res = new Result();
-		res.setData(appHomePageService.getAppHomePage());
+		res.setData(appHomePageService.getAppHomePage(request));
 		return res;
 	}
 	

+ 7 - 1
src/main/java/com/goafanti/app/service/AppHomePageService.java

@@ -5,6 +5,8 @@ package com.goafanti.app.service;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.stereotype.Service;
 import com.goafanti.app.bo.AppHomePage;
 
@@ -12,7 +14,11 @@ import com.goafanti.app.bo.AppHomePage;
 @Service
 public interface AppHomePageService {
 	
-	public AppHomePage getAppHomePage();
+	public AppHomePage getAppHomePage(HttpServletRequest request);
 
 	public List<?> getHomeRecommended(Integer type);
+
+	
+
+	
 }

+ 5 - 3
src/main/java/com/goafanti/app/service/impl/AppHomePageServiceImpl.java

@@ -2,6 +2,8 @@ package com.goafanti.app.service.impl;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goafanti.app.bo.AppHomePage;
@@ -14,7 +16,7 @@ import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.user.service.UserIdentityService;
 
 @Service
-public class AppHomePageServiceImpl implements AppHomePageService{
+public  class AppHomePageServiceImpl implements AppHomePageService{
 	@Autowired
 	AchievementMapper	achievementMapper;
 	@Autowired
@@ -26,9 +28,9 @@ public class AppHomePageServiceImpl implements AppHomePageService{
 	
 
 	@Override
-	public AppHomePage getAppHomePage() {
+	public AppHomePage getAppHomePage(HttpServletRequest request) {
 		AppHomePage ap=new AppHomePage();
-		ap.setHomeImg(new HomeImages().getImagers());
+		ap.setHomeImg(new HomeImages().getImagers(request));
 		ap.setAdvertising(userIdentityService.advertising());
 		List<HomeAchievemend> h=achievementMapper.getAppHomeAchievement();
 		for (HomeAchievemend ha : h) {

+ 4 - 1
src/main/java/com/goafanti/portal/controller/PortalNewsController.java

@@ -158,8 +158,11 @@ public class PortalNewsController extends BaseController {
 	@RequestMapping(value = "/portal/news/appCognizance", method = RequestMethod.GET)
 	public ModelAndView appCognizance(HttpServletRequest request, ModelAndView modelview,String id) {
 		ProjectDetailBo bo = businessProjectService.orgProject(id);
-		bo.setIntroduce(bo.getIntroduce().replace("\n", "</br>"));
+		if (StringUtils.isNotBlank(bo.getIntroduce())) 
+			bo.setIntroduce(bo.getIntroduce().replace("\n", "</br>"));
+		if (StringUtils.isNotBlank(bo.getValueEffect())) 
 		bo.setValueEffect(bo.getValueEffect().replace("\n", "</br>"));
+		if (StringUtils.isNotBlank(bo.getClientSize())) 
 		bo.setClientSize(bo.getClientSize().replace("\n", "</br>"));
 		modelview.addObject("bo", bo);
 		modelview.setViewName("/portal/news/appCognizance");