Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

anderx 8 years ago
parent
commit
9771b34a31

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

@@ -1,20 +1,33 @@
 package com.goafanti.app.bo;
 
-import java.util.List;
-
 public class AdvertisingBo {
+	private String id;
 	private String picture;
-	private List<String> slogan;
+	private String slogan;
+	private String type;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
 	public String getPicture() {
 		return picture;
 	}
 	public void setPicture(String picture) {
 		this.picture = picture;
 	}
-	public List<String> getSlogan() {
+	public String getSlogan() {
 		return slogan;
 	}
-	public void setSlogan(List<String> slogan) {
+	public void setSlogan(String slogan) {
 		this.slogan = slogan;
 	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	
 }

+ 1 - 1
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -51,5 +51,5 @@ public interface UserIdentityService {
 
 	 consultantListBo consultantDetail(String id);
 	 
-	 AdvertisingBo advertising();
+	 List<AdvertisingBo> advertising();
 }

+ 23 - 6
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -404,12 +404,29 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	}
 
 	@Override
-	public AdvertisingBo advertising() {
-		AdvertisingBo advertising=new AdvertisingBo();
-		advertising.setPicture("/customer_sys_file/1/GG1.jpg");		
-		List<String> list=new ArrayList<>();
-		list.add("快速响应您的需求 只为助您成就一流企业");
-		advertising.setSlogan(list);
+	public List<AdvertisingBo> advertising() {
+		List<AdvertisingBo> advertising=new ArrayList<>();
+		AdvertisingBo one=new AdvertisingBo();
+		one.setId("000461d0-2120-4809-b709-3cb5f5acfbb3");
+		one.setPicture("/customer_sys_file/1/GG1.jpg");
+		one.setType("成果");
+		one.setSlogan("快速响应您的需求 只为助您成就一流企业");	
+		advertising.add(one);
+		
+		AdvertisingBo two=new AdvertisingBo();
+		two.setId("0037f99f-00aa-4bd4-95bd-c1d492743ad2");
+		two.setPicture("/customer_sys_file/1/GG2.jpg");
+		two.setType("需求");
+		two.setSlogan("快速响应您的需求 只为助您成就一流企业");	
+		advertising.add(two);
+		
+		AdvertisingBo three=new AdvertisingBo();
+		three.setId("ac08e6f6-6567-4a15-8573-3f08350b684d");
+		three.setPicture("/customer_sys_file/1/GG3.jpg");
+		three.setType("专家");
+		three.setSlogan("快速响应您的需求 只为助您成就一流企业");	
+		advertising.add(three);
+
 		return advertising;
 	}