Merge branch 'release' of 192.168.10.6:caosy/fun-golf-service into release

src/main/java/com/ctrip/fun/golf/api/adminUser/AdminUserController.java

@@ -3,6 +3,13 @@
  */
 package com.ctrip.fun.golf.api.adminUser;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -36,6 +43,26 @@ public class AdminUserController extends GenericController<AdminUserService, Adm
 		response.setBody(this.adminUserService.getAdminUserBean(userName));
 		return response;
 	}
+	
+
+    /**
+     * 获得会服人员列表
+     * @param request
+     * @return
+     * @author lyhuang
+     */
+    @ResponseBody
+    @RequestMapping(value = "/communeAdmUserList", method = RequestMethod.POST)
+    public Response<List<AdminUserBean>> getCommuneAdmUserList(@RequestBody Request<Integer> request) {
+    	Response<List<AdminUserBean>> response = new Response<List<AdminUserBean>>();
+    	List<AdminUserBean> admUserList = adminUserService.getCommuneAdmUserList();
+    	response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
+		response.setBody(admUserList);
+		return response;
+    	
+    	
+    }
+	
 
 	public AdminUserService getAdminUserService() {
 		return adminUserService;

src/main/java/com/ctrip/fun/golf/api/user/CommuneAdmController.java

+package com.ctrip.fun.golf.api.user;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+
+
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.ctrip.fun.common.vo.PagedResponseBean;
+import com.ctrip.fun.common.vo.Request;
+import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.ResponseStatusEnum;
+import com.ctrip.fun.common.vo.user.CommuneAdmBean;
+import com.ctrip.fun.common.vo.user.CommuneAdmQuery;
+import com.ctrip.fun.common.vo.user.CommuneLabelBean;
+import com.ctrip.fun.golf.service.user.CommuneAdmService;
+
+@Controller
+@RequestMapping(value = "/communeAdm")
+public class CommuneAdmController {
+
+	
+	
+
+    @Autowired
+    private CommuneAdmService communeAdmService;
+
+    
+    @ResponseBody
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Response<PagedResponseBean<CommuneAdmBean>> list(@RequestBody Request<CommuneAdmQuery> request) {
+        Response<PagedResponseBean<CommuneAdmBean>> response = new Response<PagedResponseBean<CommuneAdmBean>>();
+        CommuneAdmQuery query = request.getBody();
+        PagedResponseBean<CommuneAdmBean> admBean = communeAdmService.queryList(query);
+        response.setStatusEnum(ResponseStatusEnum.SUCCESS);
+        response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
+        response.setBody(admBean);
+        return response;
+    }
+    
+    @ResponseBody
+    @RequestMapping(value = "/myBindList", method = RequestMethod.POST)
+    public Response<PagedResponseBean<CommuneAdmBean>> myBindList(@RequestBody Request<CommuneAdmQuery> request) {
+        Response<PagedResponseBean<CommuneAdmBean>> response = new Response<PagedResponseBean<CommuneAdmBean>>();
+        CommuneAdmQuery query = request.getBody();
+        PagedResponseBean<CommuneAdmBean> admBean = communeAdmService.myBindList(query);
+        response.setStatusEnum(ResponseStatusEnum.SUCCESS);
+        response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
+        response.setBody(admBean);
+        return response;
+    }
+
+    
+    @ResponseBody
+    @RequestMapping(value = "/getByCommuneExtId", method = RequestMethod.POST)
+    public Response<CommuneAdmBean> getByCommuneExtId(@RequestBody Request<Integer> request) {
+    	CommuneAdmBean admBean = communeAdmService.getByCommuneExtId(request.getBody());
+    	Response<CommuneAdmBean> response = new Response<CommuneAdmBean>();
+    	response.setBody(admBean);
+    	
+    	return response;
+    }
+    
+    
+    
+    @ResponseBody
+    @RequestMapping(value = "/batchBind", method = RequestMethod.POST)
+    public Response<Integer> batchBind(@RequestBody Request<Map<String,Object>> request) {
+        Response<Integer> response = new Response<Integer>();
+        Map<String,Object> map = request.getBody();
+        Integer admBean = communeAdmService.batchBind(map);
+        response.setStatusEnum(ResponseStatusEnum.SUCCESS);
+        response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
+        response.setBody(admBean);
+        return response;
+    }
+    
+    @ResponseBody
+    @RequestMapping(value = "/batchUnbind", method = RequestMethod.POST)
+    public Response<Integer> batchUnbind(@RequestBody Request<Map<String,Object>> request) {
+        Response<Integer> response = new Response<Integer>();
+        Map<String,Object> map = request.getBody();
+        Integer admBean = communeAdmService.batchUnbind(map);
+        response.setStatusEnum(ResponseStatusEnum.SUCCESS);
+        response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
+        response.setBody(admBean);
+        return response;
+    }
+    
+    
+    @ResponseBody
+    @RequestMapping(value = "/updateLabels", method = RequestMethod.POST)
+    public Response<Integer> updateLabels(@RequestBody Request<CommuneAdmQuery> request) {
+        Response<Integer> response = new Response<Integer>();
+        CommuneAdmQuery labelBean = request.getBody();
+        Integer rlt=0;
+        if(labelBean.getCommuneExtId()!=null){
+        	rlt = communeAdmService.updateLabelsByCommuneExtId(labelBean.getCommuneExtId(),labelBean.getLabels());
+        }
+        response.setBody(rlt);
+        return response;
+    }
+    
+    
+
+    
+    @ResponseBody
+    @RequestMapping(value = "/findAllLabels", method = RequestMethod.POST)
+    public Response<List<CommuneLabelBean>> findAllLabels(@RequestBody Request<Integer> request) {
+    	List<CommuneLabelBean> admBean = communeAdmService.findAllLabels();
+    	Response<List<CommuneLabelBean>> response = new Response<List<CommuneLabelBean>>();
+    	response.setBody(admBean);
+    	
+    	return response;
+    }
+
+}

src/main/java/com/ctrip/fun/golf/dao/adminUser/AdminAuthorityDao.java

@@ -4,10 +4,15 @@
 package com.ctrip.fun.golf.dao.adminUser;
 
 import java.util.List;
+import java.util.Map;
 
 import org.hibernate.Criteria;
+import org.hibernate.Query;
 import org.hibernate.criterion.Restrictions;
+import org.hibernate.transform.Transformers;
+import org.hibernate.type.StandardBasicTypes;
 
+import com.ctrip.fun.common.vo.adminUser.AdminUserBean;
 import com.ctrip.fun.golf.dao.GenericHibernateDao;
 import com.ctrip.fun.golf.domain.adminUser.AdminAuthority;
 
@@ -29,4 +34,18 @@ public class AdminAuthorityDao extends GenericHibernateDao<AdminAuthority, Integ
         return criteria.list();
     }
 
+	@SuppressWarnings("unchecked")
+	public List<AdminUserBean> getCommuneAdmUserList() {
+		StringBuffer sql =  new StringBuffer();
+		sql.append(" SELECT DISTINCT a.id ,a.userName");
+		sql.append(" FROM adm_users a JOIN adm_authorities b ON a.id = b.userId");
+		sql.append(" WHERE 1=1  AND a.enable=1");
+		sql.append("  AND b.authority IN('ROLE_COMMUNE','ROLE_PROMOTION')");
+		
+		Query q = this.getSession().createSQLQuery(sql.toString()).addScalar("id", StandardBasicTypes.INTEGER).addScalar("userName", StandardBasicTypes.STRING).setResultTransformer(Transformers.aliasToBean(AdminUserBean.class));
+		List<AdminUserBean> queryResult = q.list();
+		
+		return queryResult;
+	}
+
 }

src/main/java/com/ctrip/fun/golf/dao/user/CommuneAdmDao.java

+package com.ctrip.fun.golf.dao.user;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.Query;
+import org.hibernate.criterion.CriteriaSpecification;
+
+import com.ctrip.fun.common.core.util.BeanConverter;
+import com.ctrip.fun.common.core.util.DateUtil;
+import com.ctrip.fun.common.vo.user.CommuneAdmBean;
+import com.ctrip.fun.common.vo.user.CommuneAdmQuery;
+import com.ctrip.fun.golf.dao.GenericHibernateDao;
+import com.ctrip.fun.golf.domain.user.CommuneAdm;
+import com.ctrip.fun.golf.vo.PagedEntityBean;
+
+public class CommuneAdmDao  extends GenericHibernateDao<CommuneAdm, Integer>{
+
+	/**
+	 * 查询会服绑定状况列表
+	 * @param obj
+	 * @return
+	 */
+    @SuppressWarnings("unchecked")
+	public  PagedEntityBean<CommuneAdmBean> queryAdmBeanList(Object obj) {
+    	CommuneAdmQuery query = (CommuneAdmQuery) obj;
+        StringBuffer sb = new StringBuffer();
+        sb.append("SELECT sql_calc_found_rows a.id,a.uid,a.id as communeExtId,a.drawer,a.mobilePhone,a.userName,a.birthday,c.vipGrade,c.communeAgainTime,d.username AS bindedAdm,b.bindTime,b.labels");
+        sb.append(" FROM usr_commune_ext a LEFT JOIN usr_commune_adm b ON a.id  = b.communeExtId");
+        sb.append(" LEFT JOIN bsc_userext c ON a.uid = c.uid");
+        sb.append(" LEFT JOIN adm_users d ON b.admUserId = d.id");
+        sb.append(" WHERE 1=1");
+        
+        if (StringUtils.isNotBlank(query.getUserName())) {
+            sb.append(" AND a.userName LIKE '%"+query.getUserName()+"%'");
+        }
+        if (StringUtils.isNotBlank(query.getMobilePhone())) {
+            sb.append(" AND a.mobilePhone LIKE '%"+query.getMobilePhone()+"%'");
+        }
+        if (StringUtils.isNotBlank(query.getUid())) {
+            sb.append(" AND a.uid = '"+query.getUid()+"'");
+        }
+        if (StringUtils.isNotBlank(query.getDrawer())) {
+            sb.append(" AND a.drawer = '"+query.getDrawer()+"'");
+        }
+        if (StringUtils.isNotBlank(query.getBindedAdm())) {
+            sb.append(" AND d.username LIKE '%"+query.getBindedAdm()+"%'");
+        }
+        if (StringUtils.isNotBlank(query.getLabels())) {
+        	String labels[] = query.getLabels().split(" ");
+        	for(String label : labels){
+        		sb.append(" AND b.labels REGEXP ' "+label+" ' ");
+        	}
+        }
+        if (query.getCommuneAgainTimeStart() != null) {
+            sb.append(" and c.communeAgainTime >= '"+DateUtil.getDateStr(query.getCommuneAgainTimeStart())+" 00:00:00'");
+        }
+        if (query.getCommuneAgainTimeEnd() != null) {
+            sb.append(" and c.communeAgainTime <= '"+DateUtil.getDateStr(query.getCommuneAgainTimeEnd())+" 23:59:59'");
+        }
+        sb.append(" ORDER BY c.communeAgainTime DESC");
+        
+        final  Query q = this.getSession().createSQLQuery(sb.toString());
+        q.setFirstResult(query.getPagerOffset());
+        q.setMaxResults(query.getPagerPerPage());
+         
+        q.setResultTransformer(CriteriaSpecification.ALIAS_TO_ENTITY_MAP);
+        List<Map<String,Object>> queryResult = q.list();
+        List<CommuneAdmBean> result = new ArrayList<CommuneAdmBean>();
+        for (Map<String, Object> map : queryResult) {
+        	CommuneAdmBean extBean = new CommuneAdmBean();
+            BeanConverter.populate(extBean, map);
+            result.add(extBean);
+        }
+
+        Query queryCount  = this.getSession().createSQLQuery(" SELECT FOUND_ROWS() ");
+        long count = ((BigInteger) queryCount.uniqueResult()).longValue();
+        
+        PagedEntityBean<CommuneAdmBean> pagedEntityBean = new PagedEntityBean<CommuneAdmBean>();
+        pagedEntityBean.setCount(count);
+        pagedEntityBean.setResult(result);
+
+        return pagedEntityBean;
+    }
+
+    /**
+     * 根据communeExtId作物理删除
+     * @param communeExtId
+     * @return
+     */
+	public int deleteByCommuneExtId(int communeExtId) {
+		String sql = " update  usr_commune_adm set unbindFlag=1,admUserId=NULL WHERE communeExtId="+communeExtId;
+		int rlt = this.getSession().createSQLQuery(sql).executeUpdate();
+		return rlt;
+	}
+
+	@SuppressWarnings("unchecked")
+	public CommuneAdm findByCommuneExtId(Integer communeExtId) {
+		String hql = " from CommuneAdm where communeExtId = "+communeExtId;
+		Query query =  this.getSession().createQuery(hql);
+		List<CommuneAdm> admList =  query.list();
+		if(admList.size()>0){
+			return admList.get(0);
+		}else{
+			return null;
+		}
+	}
+
+	public int rebind(Integer tmp_communeExtId, int admUserId) {
+		String sql = "update usr_commune_adm set admUserId = "+admUserId+",bindTime=now() where communeExtId = "+tmp_communeExtId ;
+		return this.getSession().createSQLQuery(sql).executeUpdate();
+	}
+
+	public int updateLabelsByCommuneExtId(Integer communeExtId, String labels) {
+		String sql = "update usr_commune_adm set labels = '"+labels+"' where communeExtId = "+communeExtId ;
+		return this.getSession().createSQLQuery(sql).executeUpdate();
+		
+	}
+    
+	
+}

src/main/java/com/ctrip/fun/golf/dao/user/CommuneLabelDao.java

+package com.ctrip.fun.golf.dao.user;
+
+import java.util.List;
+
+
+
+
+
+
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.Query;
+
+import com.ctrip.fun.common.vo.user.CommuneLabelBean;
+import com.ctrip.fun.golf.dao.GenericHibernateDao;
+import com.ctrip.fun.golf.domain.user.CommuneLabel;
+
+
+public class CommuneLabelDao  extends GenericHibernateDao<CommuneLabel, Integer>{
+
+	@SuppressWarnings("unchecked")
+	public List<CommuneLabel> getByIds(String labels) {
+		StringBuffer hql = new StringBuffer(" From CommuneLabel where 1=1 ");
+		if(StringUtils.isNotBlank(labels)){
+			labels = labels.trim().replace(" ",",");
+			 hql.append(" and id in("+labels+")" );
+		}else{
+			hql.append(" and id =-1 ");
+		}
+		Query query = this.getSession().createQuery(hql.toString());
+		List<CommuneLabel>  list = query.list();
+		return list;
+	}
+
+	
+	/*
+	@SuppressWarnings("unchecked")
+	public CommuneAdm findByCommuneExtId(Integer communeExtId) {
+		String hql = " from CommuneAdm where communeExtId = "+communeExtId;
+		Query query =  this.getSession().createQuery(hql);
+		List<CommuneAdm> admList =  query.list();
+		if(admList.size()>0){
+			return admList.get(0);
+		}else{
+			return null;
+		}
+	}
+
+	public int rebind(Integer tmp_communeExtId, int admUserId) {
+		String sql = "update usr_commune_adm set admUserId = "+admUserId+",bindTime=now() where communeExtId = "+tmp_communeExtId ;
+		return this.getSession().createSQLQuery(sql).executeUpdate();
+	}
+*/    
+	
+}

src/main/java/com/ctrip/fun/golf/domain/user/CommuneAdm.java

+package com.ctrip.fun.golf.domain.user;
+
+import static javax.persistence.GenerationType.IDENTITY;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * 公社会员扩展表
+ * 
+ * @author gaoc
+ * 
+ */
+@Entity
+@Table(name = "usr_commune_adm")
+public class CommuneAdm implements java.io.Serializable {
+
+
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1343155497488398413L;
+
+	/**
+     * 用户扩展ID
+     */
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    @Column(name = "ID", unique = true, nullable = false)
+    private Integer id;
+
+    /**
+     * 社员id
+     */
+    @Column(name = "communeExtId")
+    private Integer communeExtId;
+
+    /**
+     * uid 
+     */
+    @Column(name = "uid")
+    private String uid;
+
+    /**
+     * 绑定的会服id
+     */
+    @Column(name = "admUserId")
+    private Integer admUserId;
+
+
+    /**
+     * 绑定时间
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "bindTime", length = 20)
+    private Date bindTime;
+
+    /**
+     * 微信备注
+     */
+    @Column(name = "wechatRemark")
+    private String wechatRemark;
+    
+    /**
+     * 微信备注
+     */
+    @Temporal(TemporalType.DATE)
+    @Column(name = "wechatRemarkTime", length = 20)
+    private Date wechatRemarkTime;
+
+    /**
+     * 标签集合
+     */
+    @Column(name = "labels")
+    private String labels;
+    /**
+     * 是否解綁
+     */
+    @Column(name = "unbindFlag")
+    private Integer	unbindFlag;
+    
+
+	public Integer getId() {
+		return id;
+	}
+
+	public Integer getCommuneExtId() {
+		return communeExtId;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public Integer getAdmUserId() {
+		return admUserId;
+	}
+
+	public String getWechatRemark() {
+		return wechatRemark;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public void setCommuneExtId(Integer communeExtId) {
+		this.communeExtId = communeExtId;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public void setAdmUserId(Integer admUserId) {
+		this.admUserId = admUserId;
+	}
+
+	public void setWechatRemark(String wechatRemark) {
+		this.wechatRemark = wechatRemark;
+	}
+
+	public Date getBindTime() {
+		return bindTime;
+	}
+
+	public Date getWechatRemarkTime() {
+		return wechatRemarkTime;
+	}
+
+	public void setBindTime(Date bindTime) {
+		this.bindTime = bindTime;
+	}
+
+	public void setWechatRemarkTime(Date wechatRemarkTime) {
+		this.wechatRemarkTime = wechatRemarkTime;
+	}
+
+	public String getLabels() {
+		return labels;
+	}
+
+	public void setLabels(String labels) {
+		this.labels = labels;
+	}
+
+	public Integer getUnbindFlag() {
+		return unbindFlag;
+	}
+
+	public void setUnbindFlag(Integer unbindFlag) {
+		this.unbindFlag = unbindFlag;
+	}
+    
+
+}

src/main/java/com/ctrip/fun/golf/domain/user/CommuneLabel.java

+package com.ctrip.fun.golf.domain.user;
+
+import static javax.persistence.GenerationType.IDENTITY;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@Table(name = "usr_commune_label", catalog = "fundb")
+public class CommuneLabel implements java.io.Serializable {
+
+	private static final long serialVersionUID = 7231847160658669540L;
+
+	@Id
+	@GeneratedValue(strategy = IDENTITY)
+	@Column(name = "id", unique = true, nullable = false)
+	private Integer id;
+
+	@Column(name = "labelName")
+	private String labelName;
+
+	@Column(name = "createUser")
+	private String createUser;
+
+	@org.hibernate.annotations.Generated(org.hibernate.annotations.GenerationTime.ALWAYS)
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name = "createTime", nullable = false, length = 19)
+	private Date createTime;
+
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getLabelName() {
+		return labelName;
+	}
+
+	public void setLabelName(String labelName) {
+		this.labelName = labelName;
+	}
+
+	public String getCreateUser() {
+		return createUser;
+	}
+
+	public void setCreateUser(String createUser) {
+		this.createUser = createUser;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+}

src/main/java/com/ctrip/fun/golf/service/adminUser/AdminUserService.java

@@ -5,8 +5,10 @@ package com.ctrip.fun.golf.service.adminUser;
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
+import com.ctrip.fun.common.vo.Response;
 import com.ctrip.fun.common.vo.adminUser.AdminUserBean;
 import com.ctrip.fun.common.vo.tour.TourBasicBean;
 import com.ctrip.fun.golf.dao.adminUser.AdminAuthorityDao;
@@ -46,6 +48,17 @@ public class AdminUserService extends  GenericService<AdminUserDao, AdminUser, I
         }
         return adminUserBean;
     }
+
+    /**
+     * 
+     * @return
+     */
+	public List<AdminUserBean> getCommuneAdmUserList() {
+		List<AdminUserBean> admUserList =  this.adminAuthorityDao.getCommuneAdmUserList();
+		return admUserList;
+	}
+    
+    
     
     public AdminAuthorityDao getAdminAuthorityDao() {
         return adminAuthorityDao;

src/main/java/com/ctrip/fun/golf/service/user/CommuneAdmService.java

+package com.ctrip.fun.golf.service.user;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.ctrip.fun.common.core.util.BeanConverter;
+import com.ctrip.fun.common.vo.PagedResponseBean;
+import com.ctrip.fun.common.vo.user.CommuneAdmBean;
+import com.ctrip.fun.common.vo.user.CommuneLabelBean;
+import com.ctrip.fun.golf.dao.user.CommuneAdmDao;
+import com.ctrip.fun.golf.dao.user.CommuneLabelDao;
+import com.ctrip.fun.golf.domain.user.CommuneAdm;
+import com.ctrip.fun.golf.domain.user.CommuneLabel;
+import com.ctrip.fun.golf.vo.PagedEntityBean;
+import com.ctrip.fun.common.vo.user.CommuneAdmQuery;
+
+
+public class CommuneAdmService {
+	
+    private CommuneAdmDao communeAdmDao;
+	
+    private CommuneLabelDao communeLabelDao;
+    
+    public PagedResponseBean<CommuneAdmBean> queryList(CommuneAdmQuery queryBean) {
+        PagedResponseBean<CommuneAdmBean> pagedResponseBean = new PagedResponseBean<CommuneAdmBean>();
+        PagedEntityBean<CommuneAdmBean> pagedEntityBean = communeAdmDao.queryAdmBeanList(queryBean);
+        List<CommuneAdmBean> beanList = (List<CommuneAdmBean>) pagedEntityBean.getResult();
+        for(CommuneAdmBean bean : beanList){
+        	String labels = bean.getLabels();        	
+        	bean.setLabels(transLabelNames(labels));
+        }
+        BeanConverter.copyProperties(pagedResponseBean, pagedEntityBean);
+        return pagedResponseBean;
+    }
+
+
+	private String transLabelNames(String labels) {
+		String labelNames = "";
+		List<CommuneLabel> labelList = communeLabelDao.getByIds(labels);
+		for(CommuneLabel communeLabel : labelList){
+			labelNames+=communeLabel.getLabelName()+" ";
+		}
+		return labelNames.trim();
+	}
+
+
+	public PagedResponseBean<CommuneAdmBean> myBindList(CommuneAdmQuery query) {
+        return this.queryList(query);
+	}
+
+
+	public CommuneAdmBean getByCommuneExtId(Integer communeExtId) {
+		CommuneAdm adm = communeAdmDao.findByCommuneExtId(communeExtId);
+		CommuneAdmBean bean = new CommuneAdmBean();
+		if(adm==null){
+			bean.setLabels("");
+		}else
+			bean.setLabels(adm.getLabels());
+		return bean;
+	}
+
+
+	
+	public List<CommuneLabelBean> findAllLabels() {
+		List<CommuneLabelBean> beanList = new ArrayList<CommuneLabelBean>();
+		List<CommuneLabel> labelList = communeLabelDao.loadAll();
+		for(CommuneLabel label : labelList ){
+			CommuneLabelBean bean = new CommuneLabelBean();
+			BeanConverter.copyProperties(bean, label);
+			beanList.add(bean);
+		}
+		return beanList;
+	}
+
+    
+    /**
+     * 批量绑定
+     * @param map
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+	public int batchBind(Map<String,Object> map){
+    	List<Object> communeExtIds = (ArrayList<Object>) map.get("communeExtIds");
+    	int returnNum = 0;
+    	for(Object communeExtId : communeExtIds){
+    		Integer tmp_communeExtId = Integer.parseInt((String) communeExtId);
+    		CommuneAdm communeAdmed = communeAdmDao.findByCommuneExtId(tmp_communeExtId);
+    		if(communeAdmed!=null){
+    			returnNum += communeAdmDao.rebind(tmp_communeExtId,(int) map.get("admUserId"));
+    		}else{
+	    		CommuneAdm  communeAdm = new CommuneAdm();
+	    		communeAdm.setCommuneExtId(tmp_communeExtId);
+	    		communeAdm.setBindTime(new Date());
+	    		communeAdm.setAdmUserId((int) map.get("admUserId"));
+	    		returnNum += communeAdmDao.save(communeAdm);
+    		}
+    	}
+    	
+    	return returnNum;
+    }
+
+    
+    /**
+     * 批量解绑
+     * 根据社员id删除绑定表的数据
+     * @param map
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+	public int batchUnbind(Map<String,Object> map){
+    	List<Object> communeExtIds = (ArrayList<Object>) map.get("communeExtIds");
+    	int returnNum = 0;
+    	for(Object communeExtId : communeExtIds){
+    		returnNum += communeAdmDao.deleteByCommuneExtId(Integer.parseInt((String) communeExtId));
+    	}
+    	return returnNum;
+    }
+
+
+	public Integer updateLabelsByCommuneExtId(Integer communeExtId, String labels) {
+		CommuneAdm bean = communeAdmDao.findByCommuneExtId(communeExtId);
+		Integer rlt = 0;
+		if(bean!=null){
+			rlt=communeAdmDao.updateLabelsByCommuneExtId(communeExtId, labels);
+		}else{
+			CommuneAdm adm = new CommuneAdm();
+			adm.setCommuneExtId(communeExtId);
+			adm.setLabels(labels);
+			rlt=communeAdmDao.save(adm);
+		}
+		
+		return rlt;
+	}
+    
+    
+
+	public CommuneAdmDao getCommuneAdmDao() {
+		return communeAdmDao;
+	}
+
+
+	public void setCommuneAdmDao(CommuneAdmDao communeAdmDao) {
+		this.communeAdmDao = communeAdmDao;
+	}
+
+
+	public CommuneLabelDao getCommuneLabelDao() {
+		return communeLabelDao;
+	}
+
+
+	public void setCommuneLabelDao(CommuneLabelDao communeLabelDao) {
+		this.communeLabelDao = communeLabelDao;
+	}
+    
+    
+    
+
+}

src/main/resources/hibernate.cfg.xml

@@ -117,7 +117,8 @@
 		<mapping class="com.ctrip.fun.golf.domain.game.GamePlayerReward" />
 		<mapping class="com.ctrip.fun.golf.domain.game.GameRanking" />
 
-		<mapping class="com.ctrip.fun.golf.domain.user.UserAddress" />
+		<mapping class="com.ctrip.fun.golf.domain.user.CommuneAdm" />
+		<mapping class="com.ctrip.fun.golf.domain.user.CommuneLabel" />
 
 		<mapping class="com.ctrip.fun.golf.domain.finance.CourseBalanceTxn" />
         <mapping class="com.ctrip.fun.golf.domain.finance.TourBalanceTxn" />

src/main/resources/user.spring.xml

@@ -154,4 +154,21 @@
 		<property name="operationMessageService" ref="operationMessageService"></property>
 		<property name="userExtDao" ref="userExtDao"></property>
 	</bean>
+	
+	
+
+	<bean class="com.ctrip.fun.golf.dao.user.CommuneAdmDao"
+		name="communeAdmDao">
+		<property name="sessionFactory" ref="sessionFactory"></property>
+	</bean>
+	<bean class="com.ctrip.fun.golf.dao.user.CommuneLabelDao"
+		name="communeLabelDao">
+		<property name="sessionFactory" ref="sessionFactory"></property>
+	</bean>
+
+	<bean class="com.ctrip.fun.golf.service.user.CommuneAdmService"
+		name="communeAdmService" >
+		<property name="communeAdmDao" ref="communeAdmDao"></property>
+		<property name="communeLabelDao" ref="communeLabelDao"></property>
+	</bean>
 </beans>