ender 8 years ago
parent
commit
45f1dd3bb6

+ 77 - 0
src/main/java/com/goafanti/admin/bo/BusinessBo.java

@@ -0,0 +1,77 @@
+package com.goafanti.admin.bo;
+
+import java.util.Date;
+
+public class BusinessBo {
+	private Integer id;
+	private String create_id;
+	private Date create_time;
+	private Date update_time;
+	private Integer deleteSign;
+	private String cid;
+	private String cname;
+	private Integer super_id;
+	private Integer layer;
+	private Integer status;
+	
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getCreate_id() {
+		return create_id;
+	}
+	public void setCreate_id(String create_id) {
+		this.create_id = create_id;
+	}
+	public Date getCreate_time() {
+		return create_time;
+	}
+	public void setCreate_time(Date create_time) {
+		this.create_time = create_time;
+	}
+	public Date getUpdate_time() {
+		return update_time;
+	}
+	public void setUpdate_time(Date update_time) {
+		this.update_time = update_time;
+	}
+	public Integer getDeleteSign() {
+		return deleteSign;
+	}
+	public void setDeleteSign(Integer deleteSign) {
+		this.deleteSign = deleteSign;
+	}
+	public String getCid() {
+		return cid;
+	}
+	public void setCid(String cid) {
+		this.cid = cid;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	public Integer getSuper_id() {
+		return super_id;
+	}
+	public void setSuper_id(Integer super_id) {
+		this.super_id = super_id;
+	}
+	public Integer getLayer() {
+		return layer;
+	}
+	public void setLayer(Integer layer) {
+		this.layer = layer;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+}

+ 49 - 0
src/main/java/com/goafanti/admin/controller/AdminBusinessApiController.java

@@ -0,0 +1,49 @@
+package com.goafanti.admin.controller;
+
+import javax.annotation.Resource;
+
+import org.junit.runner.Request;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.admin.service.BusinessService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.utils.StringUtils;
+
+@RestController
+@RequestMapping(value="/api/admin/business")
+public class AdminBusinessApiController extends CertifyApiController{
+	@Resource
+	private BusinessService businessService; 
+	/**
+	 * 品种列表
+	 * @return
+	 */
+	@RequestMapping(value="/list" , method=RequestMethod.GET)
+	private Result varietiesList(String cname,Integer super_id,Integer layer,
+								Integer status,String pageNo,
+					            String pageSize,Integer hot) {
+		Result res=new Result();
+		Integer pNo=1;
+		Integer pSize=10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize= Integer.parseInt(pageSize);
+		}
+		if(StringUtils.isNumeric(pageNo)) {
+			pNo=Integer.parseInt(pageNo);
+		}
+		res.setData(businessService.listBusiness(cname,super_id,layer,status,pNo,pSize,hot));
+		return res;
+		
+	}
+	/**
+	 * 品种名列表
+	 * @return
+	 */
+	@RequestMapping(value="/namelist",method=RequestMethod.GET)
+	private Result varietiesNamelist(String cname) {
+		return null;
+	}
+}

+ 11 - 0
src/main/java/com/goafanti/admin/service/BusinessService.java

@@ -0,0 +1,11 @@
+package com.goafanti.admin.service;
+
+
+
+import com.goafanti.admin.bo.BusinessBo;
+import com.goafanti.core.mybatis.page.Pagination;
+
+public interface BusinessService {
+	Pagination<BusinessBo> listBusiness(String cname,Integer super_id,Integer layer,
+			Integer status,Integer pNo,Integer pSize,Integer hot);
+}

+ 57 - 0
src/main/java/com/goafanti/admin/service/impl/BusinessServiceImpl.java

@@ -0,0 +1,57 @@
+package com.goafanti.admin.service.impl;
+
+import java.util.HashMap;
+
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+
+import com.goafanti.admin.bo.BusinessBo;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.admin.service.BusinessService;
+import com.goafanti.common.dao.AchievementMapper;
+@Service
+public class BusinessServiceImpl extends BaseMybatisDao<AchievementMapper> implements BusinessService {
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<BusinessBo> listBusiness(String cname, Integer super_id, Integer layer, Integer status, Integer pNo,
+			Integer pSize,Integer hot) {
+		Map<String, Object> params=disposeParams(cname,super_id,layer,status,hot);
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		return (Pagination<BusinessBo>) findPage("findBusinessVarietiesListByPage",
+				"findBusinessVarietiesCount",params,
+				pNo, pSize);
+	};
+	
+
+	private Map<String, Object> disposeParams(String cname, Integer super_id, Integer layer, Integer status,Integer hot) {
+		Map<String, Object> params = new HashMap<>();
+		if (null!=cname) {
+			params.put("cname", cname);
+		}
+		if (null!=super_id) {
+			params.put("super_id", super_id);
+		}
+		if (null!=layer) {
+			params.put("layer", layer);
+		}
+		if (null!=status) {
+			params.put("status", status);
+		}
+		if (null!=hot) {
+			params.put("hot", hot);
+		}
+		return params;
+	}
+
+
+}

+ 7 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -80,8 +80,11 @@ public class WebpageController extends BaseController {
 				MarketingPage.mainAchievement.getPageUrl(), MarketingPage.mainAchievement.getBoothType());
 		List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(
 				MarketingPage.mainDemand.getPageUrl(), MarketingPage.mainDemand.getBoothType());
+		List<MarketingManagementBo> speciaList = marketingManagementService.selectMarketList(
+				MarketingPage.specialist.getPageUrl(), MarketingPage.specialist.getBoothType());
 		modelview.addObject("achievementList", achievementList);
 		modelview.addObject("demandList", demandList);
+		modelview.addObject("speciaList", speciaList);
 		return modelview;
 	}
 
@@ -201,11 +204,13 @@ public class WebpageController extends BaseController {
 		/* 查询相关智者信息 */
 		List<UserPartnerDetailBo> userPartner = userService.findUserPartner();
 		List<UserPartnerDetailBo> reuserPartner = new ArrayList<UserPartnerDetailBo>();
-		if (userPartner != null && userPartner.size() >= 4) {
-			int index = (int) new Random().nextInt(userPartner.size() - 3);
+		if (userPartner != null && userPartner.size() >= 6) {
+			int index = (int) new Random().nextInt(userPartner.size() - 5);
 			reuserPartner.add(userPartner.get(index));
 			reuserPartner.add(userPartner.get(index + 1));
 			reuserPartner.add(userPartner.get(index + 2));
+			reuserPartner.add(userPartner.get(index + 3));
+			reuserPartner.add(userPartner.get(index + 4));
 		} else {
 			reuserPartner.addAll(userPartner);
 		}

+ 3 - 3
src/main/java/com/goafanti/common/enums/MarketingPage.java

@@ -2,9 +2,9 @@ package com.goafanti.common.enums;
 
 public enum MarketingPage {
 	mainAchievement("/index",1,5), //首页成果
-	mainDemand("/index",2,5),	// 首页需求
-	mainPolicy("/index",6,3); //首页政策
-	
+	mainDemand("/index",2,8),	// 首页需求
+	mainPolicy("/index",6,3), //首页政策
+	specialist("/index",7,6);//智者专家
 	MarketingPage(String pageUrl,Integer boothType,Integer boothSize){
 		this.boothSize = boothSize;
 		this.pageUrl = pageUrl;

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

@@ -1649,6 +1649,50 @@
         </if>
   	    order by a.release_date desc limit 0,4
   </select>
+  <select id="findBusinessVarietiesListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.BusinessBo">
+  	select 
+  		b.id,b.create_id,b.create_time,b.update_time,b.delete_sign,b.cid,
+  		b.cname,b.super_id,b.super_id,b.layer,b.status,b2.cname
+  	from  business_varieties b
+  	LEFT JOIN business_varieties b2 on b.super_id = b2.id
+  	where b.deleted_sign= 1	
+  	<if test="cname != null">
+  		and  b.cname= #{cname,jdbcType=VARCHAR}
+  	</if>
+  	<if test="super_id != null">
+  		and  b.super_id= #{super_id,jdbcType=INTEGER}
+  	</if>
+  	<if test="layer != null">
+  		and  layer= #{layer,jdbcType=VARCHAR}
+  	</if>
+  	<if test="status != null">
+  		and  status= #{status,jdbcType=VARCHAR}
+  	</if>
+	order by b.id desc
+	<if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
   
+    <select id="findBusinessVarietiesListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.BusinessBo">
+  	select 
+  		count(distinct(c.id))
+  	from  business_varieties b
+  	LEFT JOIN business_varieties b2 on b.super_id = b2.id
+  	where b.deleted_sign= 1	
+  	<if test="cname != null">
+  		and  b.cname= #{cname,jdbcType=VARCHAR}
+  	</if>
+  	<if test="super_id != null">
+  		and  b.super_id= #{super_id,jdbcType=INTEGER}
+  	</if>
+  	<if test="layer != null">
+  		and  layer= #{layer,jdbcType=VARCHAR}
+  	</if>
+  	<if test="status != null">
+  		and  status= #{status,jdbcType=VARCHAR}
+  	</if>
+	
+  </select>
   
 </mapper>