Skip to content

caosy / fun-golf-service

Go to a project
Commit 8351420b by chongli
Options

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

parents 7bc8634d b28ee9d5
Expand all
Inline Side-by-side
Showing with 185 additions and 48 deletions
src/main/java/com/ctrip/fun/golf/api/basic/SmsController.java
...@@ -2,6 +2,7 @@ package com.ctrip.fun.golf.api.basic; ...@@ -2,6 +2,7 @@ package com.ctrip.fun.golf.api.basic;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -10,12 +11,15 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -10,12 +11,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.alibaba.fastjson.JSONObject;
import com.ctrip.fun.common.vo.PagedResponseBean; import com.ctrip.fun.common.vo.PagedResponseBean;
import com.ctrip.fun.common.vo.Request; import com.ctrip.fun.common.vo.Request;
import com.ctrip.fun.common.vo.Response; import com.ctrip.fun.common.vo.Response;
import com.ctrip.fun.common.vo.ResponseStatusEnum; import com.ctrip.fun.common.vo.ResponseStatusEnum;
import com.ctrip.fun.common.vo.basic.SmsBean; import com.ctrip.fun.common.vo.basic.SmsBean;
import com.ctrip.fun.common.vo.basic.SmsQuery; import com.ctrip.fun.common.vo.basic.SmsQuery;
import com.ctrip.fun.common.vo.user.UserVerifyCodeBean;
import com.ctrip.fun.common.vo.user.VerifyCodeBean;
import com.ctrip.fun.golf.aspect.log.Log; import com.ctrip.fun.golf.aspect.log.Log;
import com.ctrip.fun.golf.service.basic.SmsService; import com.ctrip.fun.golf.service.basic.SmsService;
...@@ -60,6 +64,25 @@ public class SmsController { ...@@ -60,6 +64,25 @@ public class SmsController {
} }
/** /**
* 获取验证码短信列表
*
* PagedResponseBean<VerifyCodeBean> queryVerifyCodeList(String userId,
UserVerifyCodeQuery query) {
* @param request
* @return
*/
@ResponseBody
@RequestMapping(value = "/verifycode/list", method = RequestMethod.POST)
public Response<PagedResponseBean<UserVerifyCodeBean>> verifycodeList(@RequestBody Request<UserVerifyCodeBean> request) {
Response<PagedResponseBean<UserVerifyCodeBean>> response = new Response<PagedResponseBean<UserVerifyCodeBean>>();
response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
PagedResponseBean<UserVerifyCodeBean> pagedResponseBean = this.smsService.queryVerifycodeList(request.getBody());
response.setBody(pagedResponseBean);
return response;
}
/**
* 新增短信 * 新增短信
* *
* @param request * @param request
......
src/main/java/com/ctrip/fun/golf/api/user/CommuneAdmController.java
...@@ -59,7 +59,23 @@ public class CommuneAdmController { ...@@ -59,7 +59,23 @@ public class CommuneAdmController {
@RequestMapping(value = "/findBindedCommuneByMobilePhones", method = RequestMethod.POST) @RequestMapping(value = "/findBindedCommuneByMobilePhones", method = RequestMethod.POST)
public Response<List<CommuneAdmBean>> findBindedCommuneByMobilePhones(@RequestBody Request<String> request) { public Response<List<CommuneAdmBean>> findBindedCommuneByMobilePhones(@RequestBody Request<String> request) {
Response<List<CommuneAdmBean>> response = new Response<List<CommuneAdmBean>>(); Response<List<CommuneAdmBean>> response = new Response<List<CommuneAdmBean>>();
List<CommuneAdmBean> admBean = communeAdmService.findBindedCommuneByMobilePhones(request.getBody()); List<CommuneAdmBean> admBean = communeAdmService.findBindedCommuneByMobilePhones(request.getBody(),1);
response.setStatusEnum(ResponseStatusEnum.SUCCESS);
response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
response.setBody(admBean);
return response;
}
/**
* 查询一批手机号中的绑定的社员
* @param request
* @return
*/
@ResponseBody
@RequestMapping(value = "/findBinded2CommuneByMobilePhones", method = RequestMethod.POST)
public Response<List<CommuneAdmBean>> findBindedCommune2ByMobilePhones(@RequestBody Request<String> request) {
Response<List<CommuneAdmBean>> response = new Response<List<CommuneAdmBean>>();
List<CommuneAdmBean> admBean = communeAdmService.findBindedCommuneByMobilePhones(request.getBody(),2);
response.setStatusEnum(ResponseStatusEnum.SUCCESS); response.setStatusEnum(ResponseStatusEnum.SUCCESS);
response.setMessage(ResponseStatusEnum.SUCCESS.getMsg()); response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
response.setBody(admBean); response.setBody(admBean);
......
src/main/java/com/ctrip/fun/golf/dao/adminUser/AdminAuthorityDao.java
...@@ -38,9 +38,9 @@ public class AdminAuthorityDao extends GenericHibernateDao<AdminAuthority, Integ ...@@ -38,9 +38,9 @@ public class AdminAuthorityDao extends GenericHibernateDao<AdminAuthority, Integ
public List<AdminUserBean> getCommuneAdmUserList() { public List<AdminUserBean> getCommuneAdmUserList() {
StringBuffer sql = new StringBuffer(); StringBuffer sql = new StringBuffer();
sql.append(" SELECT DISTINCT a.id,a.username userName,a.nickName"); sql.append(" SELECT DISTINCT a.id,a.username userName,a.nickName");
sql.append(" FROM adm_users a JOIN adm_authorities b ON a.id = b.userId"); sql.append(" FROM adm_users a ");
sql.append(" WHERE 1=1 AND a.enable=1"); sql.append("JOIN adm_user_role b ON a.id = b.user_id JOIN adm_role c ON b.role_id = c.id ");
sql.append(" AND b.authority IN('ROLE_COMMUNE','ROLE_PROMOTION')"); sql.append("WHERE c.name = '销售' AND a.enable = 1 ORDER BY a.username");
Query q = this.getSession().createSQLQuery(sql.toString()).addScalar("id", StandardBasicTypes.INTEGER).addScalar("nickName", StandardBasicTypes.STRING).addScalar("userName", StandardBasicTypes.STRING).setResultTransformer(Transformers.aliasToBean(AdminUserBean.class)); Query q = this.getSession().createSQLQuery(sql.toString()).addScalar("id", StandardBasicTypes.INTEGER).addScalar("nickName", StandardBasicTypes.STRING).addScalar("userName", StandardBasicTypes.STRING).setResultTransformer(Transformers.aliasToBean(AdminUserBean.class));
List<AdminUserBean> queryResult = q.list(); List<AdminUserBean> queryResult = q.list();
......
src/main/java/com/ctrip/fun/golf/dao/basic/SmsDao.java
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
*/ */
package com.ctrip.fun.golf.dao.basic; package com.ctrip.fun.golf.dao.basic;
import java.math.BigInteger;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import org.hibernate.Criteria; import org.hibernate.Criteria;
import org.hibernate.Query; import org.hibernate.Query;
...@@ -12,6 +14,7 @@ import org.hibernate.criterion.MatchMode; ...@@ -12,6 +14,7 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order; import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections; import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Restrictions;
import org.hibernate.transform.Transformers;
import com.ctrip.fun.common.core.util.BeanConverter; import com.ctrip.fun.common.core.util.BeanConverter;
import com.ctrip.fun.common.core.util.StringUtils; import com.ctrip.fun.common.core.util.StringUtils;
...@@ -19,8 +22,10 @@ import com.ctrip.fun.common.vo.SortDirectionEnum; ...@@ -19,8 +22,10 @@ import com.ctrip.fun.common.vo.SortDirectionEnum;
import com.ctrip.fun.common.vo.basic.SmsBean; import com.ctrip.fun.common.vo.basic.SmsBean;
import com.ctrip.fun.common.vo.basic.SmsQuery; import com.ctrip.fun.common.vo.basic.SmsQuery;
import com.ctrip.fun.common.vo.basic.SmsType; import com.ctrip.fun.common.vo.basic.SmsType;
import com.ctrip.fun.common.vo.user.UserVerifyCodeBean;
import com.ctrip.fun.golf.dao.GenericHibernateDao; import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.basic.Sms; import com.ctrip.fun.golf.domain.basic.Sms;
import com.ctrip.fun.golf.domain.user.UserVerifyCode;
import com.ctrip.fun.golf.vo.PagedEntityBean; import com.ctrip.fun.golf.vo.PagedEntityBean;
/** /**
...@@ -172,6 +177,39 @@ public class SmsDao extends GenericHibernateDao<Sms, Integer> { ...@@ -172,6 +177,39 @@ public class SmsDao extends GenericHibernateDao<Sms, Integer> {
} }
/** /**
*
* @param queryBean
* @return
*/
@SuppressWarnings("unchecked")
public PagedEntityBean<UserVerifyCode> queryVerifycodeList(
UserVerifyCodeBean queryBean) {
StringBuffer hql = new StringBuffer("");
hql.append("FROM UserVerifyCode WHERE 1=1");
if(org.apache.commons.lang.StringUtils.isNotEmpty(queryBean.getPhoneOrEmail())){
hql.append(" and phoneOrEmail = '"+queryBean.getPhoneOrEmail()+"'");
}
String hqlCount = "select count(*) "+hql.toString();
Query queryCount = getSession().createQuery(hqlCount);
Long count = (Long) queryCount.iterate().next();
// List<BigInteger> countlist=queryCount.list();
// Long count = countlist.get(0).longValue();
hql.append(" ORDER BY id DESC ");
Query query = getSession().createQuery(""+hql.toString()).setFirstResult(queryBean.getPagerOffset()).setMaxResults(queryBean.getPagerPerPage());
// query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
List<UserVerifyCode> list = query.list();
PagedEntityBean<UserVerifyCode> pagedEntityBean = new PagedEntityBean<UserVerifyCode>();
pagedEntityBean.setCount(count);
pagedEntityBean.setResult(list);
return pagedEntityBean;
}
/**
* 短信数量 * 短信数量
* *
* @param smsQuery * @param smsQuery
......
src/main/java/com/ctrip/fun/golf/domain/user/UserVerifyCode.java
...@@ -15,6 +15,9 @@ import javax.persistence.Table; ...@@ -15,6 +15,9 @@ import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
/** /**
* UsrVerifycode generated by hbm2java * UsrVerifycode generated by hbm2java
*/ */
...@@ -72,6 +75,7 @@ public class UserVerifyCode implements java.io.Serializable { ...@@ -72,6 +75,7 @@ public class UserVerifyCode implements java.io.Serializable {
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name = "verifyTime", nullable = false, length = 19) @Column(name = "verifyTime", nullable = false, length = 19)
public Date getVerifyTime() { public Date getVerifyTime() {
return this.verifyTime; return this.verifyTime;
} }
......
src/main/java/com/ctrip/fun/golf/service/basic/SmsService.java
...@@ -23,6 +23,8 @@ import org.springframework.http.ResponseEntity; ...@@ -23,6 +23,8 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ctrip.fun.common.core.util.BeanConverter; import com.ctrip.fun.common.core.util.BeanConverter;
import com.ctrip.fun.common.vo.PagedResponseBean; import com.ctrip.fun.common.vo.PagedResponseBean;
import com.ctrip.fun.common.vo.Request; import com.ctrip.fun.common.vo.Request;
...@@ -31,9 +33,13 @@ import com.ctrip.fun.common.vo.ResponseStatusEnum; ...@@ -31,9 +33,13 @@ import com.ctrip.fun.common.vo.ResponseStatusEnum;
import com.ctrip.fun.common.vo.basic.SmsBean; import com.ctrip.fun.common.vo.basic.SmsBean;
import com.ctrip.fun.common.vo.basic.SmsQuery; import com.ctrip.fun.common.vo.basic.SmsQuery;
import com.ctrip.fun.common.vo.basic.SmsStatus; import com.ctrip.fun.common.vo.basic.SmsStatus;
import com.ctrip.fun.common.vo.user.UserVerifyCodeBean;
import com.ctrip.fun.common.vo.user.VerifyCodeBean;
import com.ctrip.fun.golf.dao.basic.SmsDao; import com.ctrip.fun.golf.dao.basic.SmsDao;
import com.ctrip.fun.golf.domain.basic.Sms; import com.ctrip.fun.golf.domain.basic.Sms;
import com.ctrip.fun.golf.domain.user.UserVerifyCode;
import com.ctrip.fun.golf.service.GenericService; import com.ctrip.fun.golf.service.GenericService;
import com.ctrip.fun.golf.utils.SystemUtils;
import com.ctrip.fun.golf.vo.PagedEntityBean; import com.ctrip.fun.golf.vo.PagedEntityBean;
/** /**
...@@ -127,6 +133,36 @@ public class SmsService extends GenericService<SmsDao, Sms, Integer, SmsBean> { ...@@ -127,6 +133,36 @@ public class SmsService extends GenericService<SmsDao, Sms, Integer, SmsBean> {
return pagedResponseBean; return pagedResponseBean;
} }
public PagedResponseBean<UserVerifyCodeBean> queryVerifycodeList(
UserVerifyCodeBean queryBean) {
PagedResponseBean<UserVerifyCodeBean> pagedResponseBean = new PagedResponseBean<UserVerifyCodeBean>();
Collection<UserVerifyCodeBean> result = new ArrayList<UserVerifyCodeBean>();
PagedEntityBean<UserVerifyCode> pagedEntityBean = this.getEntityDao().queryVerifycodeList(queryBean);
// BeanConverter.copyProperties(pagedResponseBean, pagedEntityBean);
if (pagedEntityBean != null && pagedEntityBean.getResult() != null) {
Collection<UserVerifyCode> collection = pagedEntityBean.getResult();
for (UserVerifyCode t : collection) {
UserVerifyCodeBean bean = new UserVerifyCodeBean();
bean.setExpireTime(t.getExpireTime());
bean.setPhoneOrEmail(t.getPhoneOrEmail());
bean.setCodeType(t.getCodeType());
bean.setVerifyCode(t.getVerifyCode());
bean.setVerifyTime(t.getVerifyTime());
bean.setVerifyTimes(t.getVerifyTimes());
bean.setId(t.getId());
result.add(bean);
}
}
pagedResponseBean.setResult(result);
// pagedResponseBean.setResult(result);
pagedResponseBean.setCount((int)pagedEntityBean.getCount());
return pagedResponseBean;
}
/** /**
* 查询待发送的短信 * 查询待发送的短信
* *
......
src/main/java/com/ctrip/fun/golf/service/user/CommuneAdmService.java
...@@ -47,8 +47,8 @@ public class CommuneAdmService { ...@@ -47,8 +47,8 @@ public class CommuneAdmService {
return pagedResponseBean; return pagedResponseBean;
} }
public List<CommuneAdmBean> findBindedCommuneByMobilePhones(String mobilePhones) { public List<CommuneAdmBean> findBindedCommuneByMobilePhones(String mobilePhones, int admType) {
return communeAdmDao.findBindedCommuneByMobilePhones(mobilePhones); return communeAdmDao.findBindedCommuneByMobilePhones(mobilePhones, admType);
} }
public List<CommuneAdmBean> findCommuneByMobilePhones(String mobilePhones) { public List<CommuneAdmBean> findCommuneByMobilePhones(String mobilePhones) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment