update

src/com/w1hd/zzhnc/controller/wx/WxMiniController.java

@@ -273,15 +273,18 @@ public class WxMiniController extends BaseController {
 	
 	
 	@RequestMapping(value = "/second",method=RequestMethod.GET)
 	@RequestMapping(value = "/second",method=RequestMethod.GET)
 	@ResponseBody
 	@ResponseBody
-	public Object second(@RequestParam("openId") String openId,@RequestParam(value="key",defaultValue = "1",required=false)String key,@RequestParam(value="page",defaultValue = "1",required=false)Integer page,@RequestParam(value="size",defaultValue = "20",required=false)Integer size) {
+	public Object second(
+			@RequestParam(value="openId") String openId,
+			@RequestParam(value="key",defaultValue = "",required=false)String key,
+			@RequestParam(value="page",defaultValue = "1",required=false)Integer page,
+			@RequestParam(value="size",defaultValue = "20",required=false)Integer size) {
 		try {
 		try {
 			Map<String, Object> result = Maps.newHashMap();
 			Map<String, Object> result = Maps.newHashMap();
 			List<Banner> bannerList = bannerService.getAll();
 			List<Banner> bannerList = bannerService.getAll();
-			List<Articles> homeData = articleService.getHomeData();
 			 PageResults<Goods> seacrh = goodsService.seacrh(null, key, null, page, size);
 			 PageResults<Goods> seacrh = goodsService.seacrh(null, key, null, page, size);
 			 List<Goods> rows = seacrh.getRows();
 			 List<Goods> rows = seacrh.getRows();
 			result.put("banner", bannerList);
 			result.put("banner", bannerList);
-			List<MiniHomeVO> data = MiniHomeVO.getData(homeData, rows);
+			List<MiniHomeVO> data = MiniHomeVO.getData(null, rows);
 			result.put("data", data);
 			result.put("data", data);
 			return new Vo_msg(0, result);
 			return new Vo_msg(0, result);
 		} catch (Exception e) {
 		} catch (Exception e) {

src/com/w1hd/zzhnc/vo/MiniHomeVO.java

@@ -16,75 +16,91 @@ public class MiniHomeVO {
 	private String subTitle;
 	private String subTitle;
 	private String imageUrl;
 	private String imageUrl;
 	private Date createTime;
 	private Date createTime;
+
 	public Integer getId() {
 	public Integer getId() {
 		return id;
 		return id;
 	}
 	}
+
 	public void setId(Integer id) {
 	public void setId(Integer id) {
 		this.id = id;
 		this.id = id;
 	}
 	}
+
 	public Integer getType() {
 	public Integer getType() {
 		return type;
 		return type;
 	}
 	}
+
 	public void setType(Integer type) {
 	public void setType(Integer type) {
 		this.type = type;
 		this.type = type;
 	}
 	}
+
 	public String getTitle() {
 	public String getTitle() {
 		return title;
 		return title;
 	}
 	}
+
 	public void setTitle(String title) {
 	public void setTitle(String title) {
 		this.title = title;
 		this.title = title;
 	}
 	}
+
 	public String getSubTitle() {
 	public String getSubTitle() {
 		return subTitle;
 		return subTitle;
 	}
 	}
+
 	public void setSubTitle(String subTitle) {
 	public void setSubTitle(String subTitle) {
 		this.subTitle = subTitle;
 		this.subTitle = subTitle;
 	}
 	}
+
 	public String getImageUrl() {
 	public String getImageUrl() {
 		return imageUrl;
 		return imageUrl;
 	}
 	}
+
 	public void setImageUrl(String imageUrl) {
 	public void setImageUrl(String imageUrl) {
 		this.imageUrl = imageUrl;
 		this.imageUrl = imageUrl;
 	}
 	}
+
 	public Date getCreateTime() {
 	public Date getCreateTime() {
 		return createTime;
 		return createTime;
 	}
 	}
+
 	public void setCreateTime(Date createTime) {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 		this.createTime = createTime;
 	}
 	}
 
 
-	public static List<MiniHomeVO> getData(List<Articles> homeData,List<Goods> goodsList){
+	public static List<MiniHomeVO> getData(List<Articles> homeData, List<Goods> goodsList) {
 		MiniHomeVO item = null;
 		MiniHomeVO item = null;
 		List<MiniHomeVO> data = Lists.newArrayList();
 		List<MiniHomeVO> data = Lists.newArrayList();
-		for(Articles a:homeData) {
+		if (homeData != null && !homeData.isEmpty()) {
+			for (Articles a : homeData) {
 				item = new MiniHomeVO();
 				item = new MiniHomeVO();
 				item.setType(1);
 				item.setType(1);
 				item.setTitle(a.getTitle());
 				item.setTitle(a.getTitle());
 				item.setImageUrl(a.getImgurl());
 				item.setImageUrl(a.getImgurl());
 				item.setCreateTime(a.getCreatedtime());
 				item.setCreateTime(a.getCreatedtime());
 				String content = a.getContent();
 				String content = a.getContent();
-			if(Strings.isNullOrEmpty(content)) {
-				if(content.length()>20) {
-					item.setSubTitle(content.substring(0, 15)+"...");
+				if (Strings.isNullOrEmpty(content)) {
+					if (content.length() > 20) {
+						item.setSubTitle(content.substring(0, 15) + "...");
 					}
 					}
 				}
 				}
 				data.add(item);
 				data.add(item);
 			}
 			}
+		}
 
 
-		for(Goods g :goodsList) {
+		if (goodsList != null && !goodsList.isEmpty()) {
+			for (Goods g : goodsList) {
 				item = new MiniHomeVO();
 				item = new MiniHomeVO();
 				item.setType(2);
 				item.setType(2);
 				item.setTitle(g.getName());
 				item.setTitle(g.getName());
 				item.setImageUrl(g.getBannerUrl());
 				item.setImageUrl(g.getBannerUrl());
 				item.setCreateTime(g.getCreatetime());
 				item.setCreateTime(g.getCreatetime());
 				String content = g.getDescription();
 				String content = g.getDescription();
-			if(Strings.isNullOrEmpty(content)) {
-				if(content.length()>20) {
-					item.setSubTitle(content.substring(0, 15)+"...");
+				if (Strings.isNullOrEmpty(content)) {
+					if (content.length() > 20) {
+						item.setSubTitle(content.substring(0, 15) + "...");
 					}
 					}
 				}
 				}
 				data.add(item);
 				data.add(item);
 			}
 			}
+		}
 
 
 		return data;
 		return data;
 	}
 	}