Browse Source

Merge remote-tracking branch 'origin/master' into test

anderx 8 years ago
parent
commit
64f5718b7f

+ 8 - 0
src/main/java/com/goafanti/achievement/bo/AchievementRecommended.java

@@ -13,6 +13,8 @@ public class AchievementRecommended {
 	private String fieldA;
 	/**应用领域2*/
 	private String fieldB;
+	/**是否精品*/
+	private String boutique;
 	public String getId() {
 		return id;
 	}
@@ -50,5 +52,11 @@ public class AchievementRecommended {
 	public void setTechnicalPictureUrl(String technicalPictureUrl) {
 		this.technicalPictureUrl = technicalPictureUrl;
 	}
+	public String getBoutique() {
+		return boutique;
+	}
+	public void setBoutique(String boutique) {
+		this.boutique = boutique;
+	}
 	
 }

+ 1 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementPublishServiceImpl.java

@@ -63,6 +63,7 @@ public class AchievementPublishServiceImpl extends BaseMybatisDao<AchievementPub
 		if (a1.getIfTop()!=a.getIfTop()&&a.getIfTop()==1) {
 			a.setTopNumber(9999999);
 		}
+		
 		return achievementPublishMapper.updateByPrimaryKeySelective(a);
 	}
 
@@ -96,7 +97,6 @@ public class AchievementPublishServiceImpl extends BaseMybatisDao<AchievementPub
 				if (a.getPublishPage().equals(b.getId())) {
 					a.setPublishPageName(b.getName());
 				}
-				
 			}
 		}
 		return p;

+ 0 - 33
src/main/java/com/goafanti/app/bo/AdvertisingBo.java

@@ -1,33 +0,0 @@
-package com.goafanti.app.bo;
-
-public class AdvertisingBo {
-	private String id;
-	private String picture;
-	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 String getSlogan() {
-		return slogan;
-	}
-	public void setSlogan(String slogan) {
-		this.slogan = slogan;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-}

+ 8 - 15
src/main/java/com/goafanti/app/bo/AppHomePage.java

@@ -1,40 +1,33 @@
 package com.goafanti.app.bo;
 
 import java.util.List;
-import java.util.Map;
+
+import com.goafanti.user.bo.Advertisings;
 
 public class AppHomePage {
 	/** 首页轮播图 **/
-	private List<String> homeImg;
-	/** 标题 **/
-	private  List<TitleBo>  title ;
+	private List<HomeImgBo> homeImg;
 	/** 知产 **/
 	private  List<HomeAchievemend>  achievemend ;
 	/** 广告**/
-	private List<AdvertisingBo> advertising;
+	private List<Advertisings> advertising;
 	
-	public List<String> getHomeImg() {
+	public List<HomeImgBo> getHomeImg() {
 		return homeImg;
 	}
-	public void setHomeImg(List<String> homeImg) {
+	public void setHomeImg(List<HomeImgBo> homeImg) {
 		this.homeImg = homeImg;
 	}
-	public  List<TitleBo> getTitle() {
-		return title;
-	}
-	public void setTitle( List<TitleBo> title) {
-		this.title = title;
-	}
 	public List<HomeAchievemend> getAchievemend() {
 		return achievemend;
 	}
 	public void setAchievemend(List<HomeAchievemend> achievemend) {
 		this.achievemend = achievemend;
 	}
-	public List<AdvertisingBo> getAdvertising() {
+	public List<Advertisings> getAdvertising() {
 		return advertising;
 	}
-	public void setAdvertising(List<AdvertisingBo> advertising) {
+	public void setAdvertising(List<Advertisings> advertising) {
 		this.advertising = advertising;
 	}
 	

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

@@ -4,18 +4,18 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class HomeImages {
-	public String imager1="/tmp/1.png";
+	public String img1="/customer_sys_file/1/GGN1.jpg";
 	
-	public String imager2="/tmp/2.png";
+	public String img2="/customer_sys_file/1/GG2.jpg";
 	
-	public String imager3="/tmp/3.png";
+	public String img3="/customer_sys_file/1/GG3.jpg";
 	
-	private List<String> imagers=new ArrayList<>();
+	private List<HomeImgBo> imagers=new ArrayList<>();
 	
-	public  List<String> getImagers() {
-		imagers.add(imager1);
-		imagers.add(imager2);
-		imagers.add(imager3);
+	public  List<HomeImgBo> getImagers() {
+		imagers.add(new HomeImgBo("065de736-9b40-4678-93bc-e95f5e8c529b",img1));
+		imagers.add(new HomeImgBo("739aed36-6ee6-406f-b03e-97d719b484b9",img1));
+		imagers.add(new HomeImgBo("af430be8-7752-43ac-ad82-27f02be317e6",img1));
 		return imagers;
 	}
 	

+ 26 - 0
src/main/java/com/goafanti/app/bo/HomeImgBo.java

@@ -0,0 +1,26 @@
+package com.goafanti.app.bo;
+
+public class HomeImgBo {
+	/**跳转ID*/
+	private String id;
+	/**轮播图片*/
+	private String imgUrl;
+	
+	HomeImgBo(String id,String imgUrl){
+		this.id = id;
+		this.imgUrl = imgUrl;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getImgUrl() {
+		return imgUrl;
+	}
+	public void setImgUrl(String imgUrl) {
+		this.imgUrl = imgUrl;
+	}
+	
+	}

+ 0 - 16
src/main/java/com/goafanti/app/bo/Title.java

@@ -1,16 +0,0 @@
-package com.goafanti.app.bo;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Title {
-	private List<TitleBo> list=new ArrayList<TitleBo>();
-		
-	public  List<TitleBo> getTitle() {
-		list.add(new TitleBo("买成果","www.baidu.com"));
-		list.add(new TitleBo("买需求","www.baidu.com"));
-		list.add(new TitleBo("找专家","www.baidu.com"));
-		return list;
-	}
-}

+ 0 - 27
src/main/java/com/goafanti/app/bo/TitleBo.java

@@ -1,27 +0,0 @@
-package com.goafanti.app.bo;
-
-public class TitleBo {
-	/**标题名字*/
-	private String titlename;
-	/**标题图片*/
-	private String titleUrl;
-	
-	TitleBo(String titlename,String titleUrl){
-		this.titlename=titlename;
-		this.titleUrl=titleUrl;
-	}
-	
-	public String getTitlename() {
-		return titlename;
-	}
-	public void setTitlename(String titlename) {
-		this.titlename = titlename;
-	}
-	public String getTitleUrl() {
-		return titleUrl;
-	}
-	public void setTitleUrl(String titleUrl) {
-		this.titleUrl = titleUrl;
-	}
-	
-}

+ 0 - 2
src/main/java/com/goafanti/app/controller/OpenAppDiscoveryController.java

@@ -2,7 +2,6 @@ package com.goafanti.app.controller;
 
 import javax.annotation.Resource;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -11,7 +10,6 @@ import com.goafanti.achievement.service.AchievementInterestService;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.dao.AppConfigMapper;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.user.service.UserIdentityService;

+ 0 - 2
src/main/java/com/goafanti/app/service/impl/AppHomePageServiceImpl.java

@@ -7,7 +7,6 @@ import org.springframework.stereotype.Service;
 import com.goafanti.app.bo.AppHomePage;
 import com.goafanti.app.bo.HomeAchievemend;
 import com.goafanti.app.bo.HomeImages;
-import com.goafanti.app.bo.Title;
 import com.goafanti.app.service.AppHomePageService;
 import com.goafanti.common.dao.AchievementMapper;
 import com.goafanti.common.dao.DemandMapper;
@@ -30,7 +29,6 @@ public class AppHomePageServiceImpl implements AppHomePageService{
 	public AppHomePage getAppHomePage() {
 		AppHomePage ap=new AppHomePage();
 		ap.setHomeImg(new HomeImages().getImagers());
-		ap.setTitle(new Title().getTitle());
 		ap.setAdvertising(userIdentityService.advertising());
 		List<HomeAchievemend> h=achievementMapper.getAppHomeAchievement();
 		for (HomeAchievemend ha : h) {

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

@@ -2145,7 +2145,7 @@
   </select>
  <select id="getAppHomeRecommended" resultType="com.goafanti.achievement.bo.AchievementRecommended">
  	select ap.achievement_id as id,a.name,a.introduction,a.technical_picture_url as technicalpictureUrl,
-	a.field_a,a.field_b,f1.name as fieldA,f2.name as fieldB
+	a.field_a,a.field_b,f1.name as fieldA,f2.name as fieldB,a.boutique
 	from achievement_publish ap 
 	left join achievement a on ap.achievement_id = a.id
 	left join field_glossory f1 on a.field_a=f1.id

+ 5 - 2
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -2086,10 +2086,13 @@
 	</if>
   </select>
   <select id="getAppHomeRecommended" resultType="com.goafanti.demand.bo.DemandRecommended">
-	  		select dp.demand_id as id,d.name,d.problem_des as introduction,d.picture_url as pictureUrl,
-		d.urgent_days as urgentDays,d.urgent_money as urgentMoney
+	  	select dp.demand_id as id,d.name,d.problem_des as introduction,d.picture_url as pictureUrl,
+		d.urgent_days as urgentDays,d.urgent_money as urgentMoney,d.industry_category_a as industryCategoryA,
+		d.industry_category_b as industryCategoryB,f1.name as fieldA,f2.name as fieldB,d.boutique
 		from demand_publish dp 
 		left join demand d on dp.demand_id = d.id
+		left join field_glossory f1 on d.industry_category_a=f1.id
+		left join field_glossory f2 on d.industry_category_b=f2.id
 	where
 		dp.publish_client = '1'
 		and dp.publish_page = 'W01'

+ 5 - 2
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -1105,12 +1105,15 @@
   	and t.uid = #{uid,jdbcType=VARCHAR}
   </select>
   <select id="getAppHomeRecommended" resultType="com.goafanti.user.bo.UserIdentityRecommended">
-  select
+  	 select
 	ep.expert_id as id, u.identify_name as name, ui.work_unit as workUnit, u.introduction as introduction,
-	u.head_portrait_url as headPortraitUrl
+	u.head_portrait_url as headPortraitUrl,ifnull(o.x,0) as reservationCount
 from expert_publish ep
 	left join user_identity ui on ep.expert_id = ui.uid
 	left join user u on ep.expert_id = u.id
+	left join (select count(0) as x,seller_id from t_order
+				where order_status != 4
+				group by  seller_id ) o on ep.expert_id=o.seller_id
 where
 	ep.publish_client = '1'
 	and ep.publish_page = 'W01'

+ 25 - 0
src/main/java/com/goafanti/demand/bo/DemandRecommended.java

@@ -13,6 +13,13 @@ public class DemandRecommended {
 	private String urgentMoney;
 	/**加急天数*/
 	private String urgentDays;
+	/**应用领域1*/
+	private String fieldA;
+	/**应用领域2*/
+	private String fieldB;
+	/**是否精品*/
+	private String boutique;
+	
 	
 	public String getId() {
 		return id;
@@ -50,5 +57,23 @@ public class DemandRecommended {
 	public void setPictureUrl(String pictureUrl) {
 		this.pictureUrl = pictureUrl;
 	}
+	public String getFieldA() {
+		return fieldA;
+	}
+	public void setFieldA(String fieldA) {
+		this.fieldA = fieldA;
+	}
+	public String getFieldB() {
+		return fieldB;
+	}
+	public void setFieldB(String fieldB) {
+		this.fieldB = fieldB;
+	}
+	public String getBoutique() {
+		return boutique;
+	}
+	public void setBoutique(String boutique) {
+		this.boutique = boutique;
+	}
 	
 }

+ 28 - 0
src/main/java/com/goafanti/user/bo/Advertisings.java

@@ -0,0 +1,28 @@
+package com.goafanti.user.bo;
+
+import java.util.List;
+
+public class Advertisings {
+	private List<String> ads;
+	
+	 public Advertisings(List<String> ads){
+		 this.ads = ads;
+	}
+	
+
+	public List<String> getAds() {
+		return ads;
+	}
+
+	public void setAds(List<String> ads) {
+		this.ads = ads;
+	}
+
+
+	@Override
+	public String toString() {
+		return "Advertisings [ads=" + ads + "]";
+	}
+	
+	
+}

+ 8 - 0
src/main/java/com/goafanti/user/bo/UserIdentityRecommended.java

@@ -11,6 +11,8 @@ public class UserIdentityRecommended {
 	private String introduction;
 	/**专家图片*/
 	private String headPortraitUrl;
+	/**预约次数*/
+	private String reservationCount;
 	public String getId() {
 		return id;
 	}
@@ -41,6 +43,12 @@ public class UserIdentityRecommended {
 	public void setHeadPortraitUrl(String headPortraitUrl) {
 		this.headPortraitUrl = headPortraitUrl;
 	}
+	public String getReservationCount() {
+		return reservationCount;
+	}
+	public void setReservationCount(String reservationCount) {
+		this.reservationCount = reservationCount;
+	}
 	
 	
 	

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

@@ -1,14 +1,13 @@
 package com.goafanti.user.service;
 
 import java.util.List;
-
-import com.goafanti.app.bo.AdvertisingBo;
 import com.goafanti.app.bo.consultantListBo;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.fieldGlossoryBo;
 import com.goafanti.common.model.UserIdentity;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.portal.bo.UserSubscriberListBo;
+import com.goafanti.user.bo.Advertisings;
 import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserIdentityDetailAdminBo;
@@ -51,7 +50,7 @@ public interface UserIdentityService {
 
 	 consultantListBo consultantDetail(String id);
 	 
-	 List<AdvertisingBo> advertising();
+	 List<Advertisings> advertising();
 
 	 Pagination<consultantListBo> portalConsultantList(Integer pNo, Integer pSize);
 	

+ 24 - 25
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
-import com.goafanti.app.bo.AdvertisingBo;
+
 import com.goafanti.app.bo.consultantListBo;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.fieldGlossoryBo;
@@ -40,10 +40,10 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.portal.bo.UserSubscriberListBo;
+import com.goafanti.user.bo.Advertisings;
 import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserIdentityDetailAdminBo;
-
 import com.goafanti.user.service.UserIdentityService;
 
 @Service
@@ -404,32 +404,31 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	}
 
 	@Override
-	public List<AdvertisingBo> advertising() {
-		List<AdvertisingBo> advertising=new ArrayList<>();
-		AdvertisingBo one=new AdvertisingBo();
-		one.setId("065de736-9b40-4678-93bc-e95f5e8c529b");
-		one.setPicture("/customer_sys_file/1/GGN1.jpg");
-		one.setType("成果");
-		one.setSlogan("快速响应您的需求 只为助您成就一流企业");	
-		advertising.add(one);
-		
-		AdvertisingBo two=new AdvertisingBo();
-		two.setId("739aed36-6ee6-406f-b03e-97d719b484b9");
-		two.setPicture("/customer_sys_file/1/GG2.jpg");
-		two.setType("需求");
-		two.setSlogan("快速响应您的需求 只为助您成就一流企业");	
-		advertising.add(two);
+	public List<Advertisings> advertising() {
+		List<String> a=new ArrayList<>();
+		a.add("关于开展2018年度高新技术企业认定专项审计机构申报工作的通知");
+		a.add("转发四川省经济和信息化委员会关于开展2017年上市补助申报通知的通知");
+		a.add("关于组织企业参加第十三届中国重庆高新技术成果交易会暨第九届中国国际军民两用技术博览会的通知");
+		a.add("关于组织参加第十三届中国重庆高新技术交易会暨第九届中国国际军民两用技术博览会的通知");
+		List<Advertisings> ads=new ArrayList<>();
+		int i=0;
+		List<String> l=new ArrayList<>();
+		for (String s : a) {
+			i++;
+			l.add(s);
+			if (i%2==0) {
+			ads.add(new Advertisings(l));
+			l=new ArrayList<>();
+			}
+		}
 		
-		AdvertisingBo three=new AdvertisingBo();
-		three.setId("af430be8-7752-43ac-ad82-27f02be317e6");
-		three.setPicture("/customer_sys_file/1/GG3.jpg");
-		three.setType("专家");
-		three.setSlogan("快速响应您的需求 只为助您成就一流企业");	
-		advertising.add(three);
-
-		return advertising;
+		return ads;
 	}
 
+	
+
+	
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<consultantListBo> portalConsultantList(Integer pNo, Integer pSize) {