Skip to content

caosy / fun-golf-service

Go to a project
Commit 11ffb6a8 by chongli
Options

权限改造

parents 66f41f70 6dd1e31e
Inline Side-by-side
Showing with 810 additions and 23 deletions
src/main/java/com/ctrip/fun/golf/api/adminUser/AdminResourcesController.java 0 → 100644
/**
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.api.adminUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import com.ctrip.fun.common.vo.adminUser.AdminResourcesBean;
import com.ctrip.fun.common.vo.adminUser.AdminResourcesQuery;
import com.ctrip.fun.golf.api.GenericController;
import com.ctrip.fun.golf.service.adminUser.AdminResourcesService;
/**
* @author zgsong
* @version 1.0.0
*/
@Controller
@RequestMapping(value = "/adminResources")
public class AdminResourcesController extends GenericController<AdminResourcesService, AdminResourcesBean, Integer,AdminResourcesQuery> {
@Autowired
private AdminResourcesService adminResourcesService;
public AdminResourcesService getAdminResourcesService() {
return adminResourcesService;
}
public void setAdminResourcesService(AdminResourcesService adminResourcesService) {
this.adminResourcesService = adminResourcesService;
}
@Override
public AdminResourcesService getEntityService() {
return adminResourcesService;
}
}
src/main/java/com/ctrip/fun/golf/api/adminUser/AdminRoleController.java 0 → 100644
/**
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.api.adminUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import com.ctrip.fun.common.vo.adminUser.AdminRoleBean;
import com.ctrip.fun.golf.api.GenericController;
import com.ctrip.fun.golf.service.adminUser.AdminRoleService;
/**
* @author zgsong
* @version 1.0.0
*/
@Controller
@RequestMapping(value = "/adminRole")
public class AdminRoleController extends GenericController<AdminRoleService, AdminRoleBean, Integer, Object> {
@Autowired
private AdminRoleService adminRoleService;
public AdminRoleService getAdminRoleService() {
return adminRoleService;
}
public void setAdminRoleService(AdminRoleService adminRoleService) {
this.adminRoleService = adminRoleService;
}
@Override
public AdminRoleService getEntityService() {
return adminRoleService;
}
}
src/main/java/com/ctrip/fun/golf/api/adminUser/AdminUserController.java
......@@ -2,26 +2,21 @@
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.api.adminUser;
import java.util.ArrayList;
import java.util.HashMap;
import java.io.Serializable;
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;
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.Request;
import com.ctrip.fun.common.vo.Response;
import com.ctrip.fun.common.vo.ResponseStatusEnum;
import com.ctrip.fun.common.vo.adminUser.AdminUserBean;
import com.ctrip.fun.common.vo.adminUser.AdminUserQuery;
import com.ctrip.fun.golf.api.GenericController;
import com.ctrip.fun.golf.aspect.log.Log;
import com.ctrip.fun.golf.service.adminUser.AdminUserService;
/**
......@@ -30,10 +25,48 @@ import com.ctrip.fun.golf.service.adminUser.AdminUserService;
*/
@Controller
@RequestMapping(value = "/adminUser")
public class AdminUserController extends GenericController<AdminUserService, AdminUserBean, Integer, Object> {
public class AdminUserController extends GenericController<AdminUserService, AdminUserBean, Integer, AdminUserQuery> {
@Autowired
private AdminUserService adminUserService;
@ResponseBody
@RequestMapping(value = "/add", method = RequestMethod.POST)
@Log(parentLog=true,action="新增")
public Response<Serializable> add(@RequestBody Request<AdminUserBean> request) {
Serializable id = adminUserService.save(request.getBody());
Response<Serializable> response = new Response<Serializable>();
response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
response.setBody(id);
return response;
}
@ResponseBody
@RequestMapping(value = "/getAdminAll", method = RequestMethod.POST)
@Log(parentLog=true,action="新增")
public Response<AdminUserBean> getAdminAll(@RequestBody Request<Integer> request) {
AdminUserBean adminUserBean =adminUserService.getAdminAll(request.getBody());
Response<AdminUserBean> response = new Response<AdminUserBean>();
response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
response.setBody(adminUserBean);
return response;
}
@ResponseBody
@RequestMapping(value = "/updateAdminAll", method = RequestMethod.POST)
@Log(parentLog=true,action="新增")
public Response<Serializable> updateAdminAll(@RequestBody Request<AdminUserBean> request) {
adminUserService.updateAdminAll(request.getBody());
Response<Serializable> response = new Response<Serializable>();
response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
response.setBody("update success!");
return response;
}
@ResponseBody
@RequestMapping(value = "/userDetail", method = RequestMethod.POST)
public Response<AdminUserBean> userDetail(@RequestBody Request<String> request) {
......
src/main/java/com/ctrip/fun/golf/dao/adminUser/AdminResourcesDao.java 0 → 100644
/**
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.dao.adminUser;
import java.util.List;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import org.hibernate.transform.Transformers;
import com.ctrip.fun.common.vo.SortDirectionEnum;
import com.ctrip.fun.common.vo.adminUser.AdminResourcesQuery;
import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.adminUser.AdminResources;
import com.ctrip.fun.golf.vo.PagedEntityBean;
/**
* @author zgsong
* @version 1.0.0
*/
public class AdminResourcesDao extends GenericHibernateDao<AdminResources, Integer> {
public List<AdminResources> getUserResources(Integer userId){
StringBuffer sql = new StringBuffer();
sql.append(" SELECT id,name,resKey,type,resUrl,level,description");
sql.append(" FROM adm_resources WHERE id in(");
sql.append(" SELECT resc_id FROM adm_resources_role WHERE role_id in(");
sql.append(" SELECT role_id FROM adm_user_role WHERE user_id=:user_id))");
Query q = this.getSession().createSQLQuery(sql.toString()).setResultTransformer(Transformers.aliasToBean(AdminResources.class));
q.setParameter("user_id", userId);
List<AdminResources> queryResult = q.list();
return queryResult;
}
@Override
public PagedEntityBean<AdminResources> queryList(Object object) {
AdminResourcesQuery queryBean = (AdminResourcesQuery) object;
Criteria criteria = this.getCriteria();
if (null != queryBean.getName() && !"".equals(queryBean.getName())) {
criteria.add(Restrictions.like("name", queryBean.getName(), MatchMode.ANYWHERE));
}
criteria.setFirstResult(queryBean.getPagerOffset());
criteria.setMaxResults(queryBean.getPagerPerPage());
if (queryBean.getSortDirection().equals(SortDirectionEnum.ASC)) {
criteria.addOrder(Order.asc(queryBean.getSortField()));
} else {
criteria.addOrder(Order.desc(queryBean.getSortField()));
}
List<AdminResources> result = criteria.list();
criteria.setFirstResult(0);
Long count = (Long) criteria.setProjection(Projections.rowCount()).uniqueResult();
PagedEntityBean<AdminResources> pagedEntityBean = new PagedEntityBean<AdminResources>();
pagedEntityBean.setCount(count);
pagedEntityBean.setResult(result);
return pagedEntityBean;
}
}
src/main/java/com/ctrip/fun/golf/dao/adminUser/AdminRoleDao.java 0 → 100644
/**
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.dao.adminUser;
import java.util.List;
import org.hibernate.Query;
import org.hibernate.Session;
import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.adminUser.AdminRole;
/**
* @author zgsong
* @version 1.0.0
*/
public class AdminRoleDao extends GenericHibernateDao<AdminRole, Integer> {
@SuppressWarnings("unchecked")
public List<AdminRole> getUsersRole(Integer adminUserId){
StringBuilder sb = new StringBuilder("SELECT * from adm_role where id in (SELECT role_id from adm_user_role where user_id=:user_id)");
Session session = this.getSession();
Query query = session.createSQLQuery(sb.toString()).addEntity(AdminRole.class);
query.setParameter("user_id", adminUserId);
return query.list();
}
public int addUsersRole(Integer adminUserId,Integer roleId){
StringBuilder sb = new StringBuilder("INSERT INTO adm_user_role(user_id,role_id) VALUES ("+adminUserId+","+roleId+")");
Session session = this.getSession();
Query query = session.createSQLQuery(sb.toString());
return query.executeUpdate();
}
public int deleteUsersRole(Integer adminUserId){
StringBuilder sb = new StringBuilder("delete from adm_user_role where user_id=:user_id");
Session session = this.getSession();
Query query = session.createSQLQuery(sb.toString());
query.setParameter("user_id", adminUserId);
return query.executeUpdate();
}
}
src/main/java/com/ctrip/fun/golf/dao/adminUser/AdminUserDao.java
......@@ -2,12 +2,17 @@
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.dao.adminUser;
import java.util.List;
import org.hibernate.Criteria;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import com.ctrip.fun.common.vo.SortDirectionEnum;
import com.ctrip.fun.common.vo.adminUser.AdminUserQuery;
import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.adminUser.AdminUser;
import com.ctrip.fun.golf.vo.PagedEntityBean;
/**
* @author zgsong
......@@ -20,5 +25,36 @@ public class AdminUserDao extends GenericHibernateDao<AdminUser, Integer> {
criteria.add(Restrictions.eq("userName", userName));
return (AdminUser) criteria.uniqueResult();
}
@SuppressWarnings("unchecked")
public PagedEntityBean<AdminUser> queryList(Object query) {
AdminUserQuery queryBean = (AdminUserQuery) query;
Criteria criteria = this.getCriteria();
if (null != queryBean.getUserName() && !"".equals(queryBean.getUserName())) {
criteria.add(Restrictions.like("userName", queryBean.getUserName(), MatchMode.ANYWHERE));
}
if (null != queryBean.getNickName() && !"".equals(queryBean.getNickName())) {
criteria.add(Restrictions.like("nickName", queryBean.getNickName(), MatchMode.ANYWHERE));
}
if (null != queryBean.getId() && 0 != queryBean.getId()) {
criteria.add(Restrictions.eq("id", queryBean.getId()));
}
criteria.setFirstResult(queryBean.getPagerOffset());
criteria.setMaxResults(queryBean.getPagerPerPage());
if (queryBean.getSortDirection().equals(SortDirectionEnum.ASC)) {
criteria.addOrder(Order.asc(queryBean.getSortField()));
} else {
criteria.addOrder(Order.desc(queryBean.getSortField()));
}
List<AdminUser> result = criteria.list();
criteria.setFirstResult(0);
Long count = (Long) criteria.setProjection(Projections.rowCount()).uniqueResult();
PagedEntityBean<AdminUser> pagedEntityBean = new PagedEntityBean<AdminUser>();
pagedEntityBean.setCount(count==null?0:count);
pagedEntityBean.setResult(result);
return pagedEntityBean;
}
}
src/main/java/com/ctrip/fun/golf/domain/adminUser/AdminResources.java 0 → 100644
/**
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.domain.adminUser;
import static javax.persistence.GenerationType.IDENTITY;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* @author zgsong
* @version 1.0.0
*/
@Entity
@Table(name = "adm_resources")
public class AdminResources {
private Integer id;
/**
* 角色名称
*/
private String name;
/**
* 父级路径id
*/
private String parentId;
/**
* 角色KEY
*/
private String resKey;
/**
* 资源类型
*/
private String type;
/**
* 资源路径
*/
private String resUrl;
/**
* 资源级别
*/
private Integer level;
/**
* 角色描述
*/
private String description;
@Id
@GeneratedValue(strategy = IDENTITY)
@Column(name = "ID", unique = true)
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
@Column(name = "name")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Column(name = "parentId")
public String getParentId() {
return parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
@Column(name = "resKey")
public String getResKey() {
return resKey;
}
public void setResKey(String resKey) {
this.resKey = resKey;
}
@Column(name = "type")
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Column(name = "resUrl")
public String getResUrl() {
return resUrl;
}
public void setResUrl(String resUrl) {
this.resUrl = resUrl;
}
@Column(name = "level")
public Integer getLevel() {
return level;
}
public void setLevel(Integer level) {
this.level = level;
}
@Column(name = "description")
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
}
src/main/java/com/ctrip/fun/golf/domain/adminUser/AdminRole.java 0 → 100644
/**
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.domain.adminUser;
import static javax.persistence.GenerationType.IDENTITY;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* @author zgsong
* @version 1.0.0
*/
@Entity
@Table(name = "adm_role")
public class AdminRole {
private Integer id;
/**
* 角色名称
*/
private String name;
/**
* 角色KEY
*/
private String roleKey;
/**
* 角色描述
*/
private String description;
/**
* 是否可用
*/
private Integer enable;
@Id
@GeneratedValue(strategy = IDENTITY)
@Column(name = "ID", unique = true)
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
@Column(name = "name")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Column(name = "roleKey")
public String getRoleKey() {
return roleKey;
}
public void setRoleKey(String roleKey) {
this.roleKey = roleKey;
}
@Column(name = "description")
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
@Column(name = "enable")
public Integer getEnable() {
return enable;
}
public void setEnable(Integer enable) {
this.enable = enable;
}
}
src/main/java/com/ctrip/fun/golf/domain/adminUser/AdminUser.java
......@@ -25,6 +25,10 @@ public class AdminUser {
*/
private String userName;
/**
* 用户真实姓名
*/
private String nickName;
/**
* 密码
*/
private String password;
......@@ -37,6 +41,11 @@ public class AdminUser {
public String getUserName() {
return userName;
}
@Column(name = "nickName", unique = true)
public String getNickName() {
return nickName;
}
@Column(name = "password")
public String getPassword() {
......@@ -71,4 +80,11 @@ public class AdminUser {
this.id = id;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
}
src/main/java/com/ctrip/fun/golf/service/adminUser/AdminResourcesService.java 0 → 100644
/**
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.service.adminUser;
import com.ctrip.fun.common.vo.PagedResponseBean;
import com.ctrip.fun.common.vo.adminUser.AdminResourcesBean;
import com.ctrip.fun.golf.dao.adminUser.AdminResourcesDao;
import com.ctrip.fun.golf.domain.adminUser.AdminResources;
import com.ctrip.fun.golf.service.GenericService;
/**
* @author zgsong
* @version 1.0.0
*/
public class AdminResourcesService extends GenericService<AdminResourcesDao, AdminResources, Integer, AdminResourcesBean>{
private AdminResourcesDao adminResourcesDao;
public PagedResponseBean<AdminResourcesBean> queryList(Object queryBean) {
PagedResponseBean<AdminResourcesBean> pagedResponseBean = super.queryList(queryBean);
return pagedResponseBean;
}
@Override
public AdminResourcesDao getEntityDao() {
return adminResourcesDao;
}
public AdminResourcesDao getAdminResourcesDao() {
return adminResourcesDao;
}
public void setAdminResourcesDao(AdminResourcesDao adminResourcesDao) {
this.adminResourcesDao = adminResourcesDao;
}
}
src/main/java/com/ctrip/fun/golf/service/adminUser/AdminRoleService.java 0 → 100644
/**
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.service.adminUser;
import com.ctrip.fun.common.vo.adminUser.AdminRoleBean;
import com.ctrip.fun.golf.dao.adminUser.AdminRoleDao;
import com.ctrip.fun.golf.domain.adminUser.AdminRole;
import com.ctrip.fun.golf.service.GenericService;
/**
* @author zgsong
* @version 1.0.0
*/
public class AdminRoleService extends GenericService<AdminRoleDao, AdminRole, Integer, AdminRoleBean>{
private AdminRoleDao adminRoleDao;
@Override
public AdminRoleDao getEntityDao() {
return adminRoleDao;
}
public AdminRoleDao getAdminRoleDao() {
return adminRoleDao;
}
public void setAdminRoleDao(AdminRoleDao adminRoleDao) {
this.adminRoleDao = adminRoleDao;
}
}
src/main/java/com/ctrip/fun/golf/service/adminUser/AdminUserService.java
......@@ -3,19 +3,30 @@
*/
package com.ctrip.fun.golf.service.adminUser;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.ctrip.fun.common.vo.Response;
import org.springframework.beans.factory.annotation.Autowired;
import com.ctrip.fun.common.core.util.BeanConverter;
import com.ctrip.fun.common.core.util.EncryptUtil;
import com.ctrip.fun.common.vo.PagedResponseBean;
import com.ctrip.fun.common.vo.adminUser.AdminRoleBean;
import com.ctrip.fun.common.vo.adminUser.AdminUserBean;
import com.ctrip.fun.common.vo.tour.TourBasicBean;
import com.ctrip.fun.golf.dao.adminUser.AdminAuthorityDao;
import com.ctrip.fun.golf.dao.adminUser.AdminResourcesDao;
import com.ctrip.fun.golf.dao.adminUser.AdminRoleDao;
import com.ctrip.fun.golf.dao.adminUser.AdminUserDao;
import com.ctrip.fun.golf.domain.adminUser.AdminAuthority;
import com.ctrip.fun.golf.domain.adminUser.AdminResources;
import com.ctrip.fun.golf.domain.adminUser.AdminRole;
import com.ctrip.fun.golf.domain.adminUser.AdminUser;
import com.ctrip.fun.golf.exceptions.DaoException;
import com.ctrip.fun.golf.service.GenericService;
import com.ctrip.fun.golf.utils.GenericManager;
import com.ctrip.fun.golf.vo.PagedEntityBean;
/**
* @author zgsong
......@@ -26,28 +37,118 @@ public class AdminUserService extends GenericService<AdminUserDao, AdminUser, I
private AdminAuthorityDao adminAuthorityDao;
private AdminUserDao adminUserDao;
private AdminResourcesDao adminResourcesDao;
@Autowired
private AdminRoleDao adminRoleDao;
public AdminUserBean getAdminUserBean(String userName) {
AdminUser adminUser = this.adminUserDao.getAdminUserByName(userName);
if (adminUser == null) {
return null;
}
List<AdminAuthority> adminAuthorities = this.adminAuthorityDao.getAdminAuthorityByUserId(adminUser.getId());
List<AdminResources> resources = this.adminResourcesDao.getUserResources(adminUser.getId());
AdminUserBean adminUserBean = new AdminUserBean();
adminUserBean.setEnable(adminUser.isEnable());
adminUserBean.setPassword(adminUser.getPassword());
adminUserBean.setUserName(adminUser.getUserName());
adminUserBean.setId(adminUser.getId());
Set<String> authoritys = new HashSet<String>();
if (adminAuthorities != null) {
for (AdminAuthority adminAuthority : adminAuthorities) {
authoritys.add(adminAuthority.getAuthority());
if (resources != null) {
for (AdminResources resource : resources) {
authoritys.add(resource.getResKey());
}
adminUserBean.setAuthoritys(authoritys);
}
return adminUserBean;
}
public Integer save(AdminUserBean adminUserBean) {
AdminUser adminUser = new AdminUser();
BeanConverter.copyProperties(adminUser, adminUserBean);
adminUser.setPassword(EncryptUtil.getMD5Str("123456"));
adminUserDao.save(adminUser);
Integer[] roleIds = adminUserBean.getRoleIds();
if(roleIds!=null&&roleIds.length>0){
for(Integer roleId:roleIds){
adminRoleDao.addUsersRole(adminUser.getId(), roleId);
}
}
return null;
}
public void updateAdminAll(AdminUserBean adminUserBean) {
AdminUser adminUser_old = adminUserDao.findById(adminUserBean.getId());
adminUserBean.setPassword(adminUser_old.getPassword());
BeanConverter.copyProperties(adminUser_old, adminUserBean);
adminUserDao.update(adminUser_old);
adminRoleDao.deleteUsersRole(adminUserBean.getId());
Integer[] roleIds = adminUserBean.getRoleIds();
if(roleIds!=null&&roleIds.length>0){
for(Integer roleId:roleIds){
adminRoleDao.addUsersRole(adminUser_old.getId(), roleId);
}
}
}
public AdminUserBean getAdminAll(Integer id) {
AdminUser adminUser = adminUserDao.findById(id);
AdminUserBean bean = new AdminUserBean();
BeanConverter.copyProperties(bean, adminUser);
List<AdminRole> roles = adminRoleDao.getUsersRole(adminUser.getId());
Integer[] rolesArray = new Integer[roles.size()];
for(int i=0;i<roles.size();i++){
rolesArray[i]=roles.get(i).getId();
}
bean.setRoleIds(rolesArray);
return bean;
}
public <Q> PagedResponseBean<AdminUserBean> queryList(Q queryBean) {
PagedResponseBean<AdminUserBean> pagedResponseBean = new PagedResponseBean<AdminUserBean>();
Collection<AdminUserBean> result =new ArrayList<AdminUserBean>();
PagedEntityBean<AdminUser> pagedEntityBean = this.getEntityDao().queryList(queryBean);
BeanConverter.copyProperties(pagedResponseBean, pagedEntityBean);
if(pagedEntityBean!=null&&pagedEntityBean.getResult()!=null){
Collection<AdminUser> collection = pagedEntityBean.getResult();
for (AdminUser t : collection) {
try {
AdminUserBean vo = (AdminUserBean) GenericManager.getGeneric(getClass(), 4).newInstance();
BeanConverter.copyProperties(vo, t);
String roleDes = new String();
List<AdminRole> roleList = adminRoleDao.getUsersRole(vo.getId());
List<AdminRoleBean> rolesBeanList = new ArrayList<AdminRoleBean>();
if(roleList!=null){
for(AdminRole adminRole:roleList){
roleDes+=adminRole.getName();
roleDes+=",";
AdminRoleBean adminRoleBean = new AdminRoleBean();
BeanConverter.copyProperties(adminRoleBean, adminRole);
rolesBeanList.add(adminRoleBean);
}
if(roleList.size()>0){
roleDes = roleDes.substring(0, roleDes.length()-1);
}
}
vo.setRoleDesc(roleDes);
vo.setRoles(rolesBeanList);
result.add(vo);
} catch (Exception e) {
throw new DaoException("create instance fail", e);
}
}
}
pagedResponseBean.setResult(result);
return pagedResponseBean;
}
/**
*
......@@ -78,8 +179,17 @@ public class AdminUserService extends GenericService<AdminUserDao, AdminUser, I
@Override
public AdminUserDao getEntityDao() {
return adminUserDao;
}
public AdminResourcesDao getAdminResourcesDao() {
return adminResourcesDao;
}
public void setAdminResourcesDao(AdminResourcesDao adminResourcesDao) {
this.adminResourcesDao = adminResourcesDao;
}
}
src/main/resources/hibernate.cfg.xml
......@@ -141,6 +141,8 @@
<mapping class="com.ctrip.fun.golf.domain.adminUser.AdminUser" />
<mapping class="com.ctrip.fun.golf.domain.adminUser.AdminAuthority" />
<mapping class="com.ctrip.fun.golf.domain.adminUser.AdminRole" />
<mapping class="com.ctrip.fun.golf.domain.adminUser.AdminResources" />
<mapping class="com.ctrip.fun.golf.domain.tour.ExtralResource" />
<mapping class="com.ctrip.fun.golf.domain.tour.ExtralResourcePrice" />
......
src/main/resources/user.spring.xml
......@@ -129,11 +129,28 @@
name="adminAuthorityDao">
<property name="sessionFactory" ref="sessionFactory"></property>
</bean>
<bean class="com.ctrip.fun.golf.dao.adminUser.AdminResourcesDao"
name="adminResourcesDao">
<property name="sessionFactory" ref="sessionFactory"></property>
</bean>
<bean class="com.ctrip.fun.golf.dao.adminUser.AdminRoleDao"
name="adminRoleDao">
<property name="sessionFactory" ref="sessionFactory"></property>
</bean>
<bean class="com.ctrip.fun.golf.service.adminUser.AdminUserService"
name="adminUserService">
<property name="adminAuthorityDao" ref="adminAuthorityDao"></property>
<property name="adminUserDao" ref="adminUserDao"></property>
<property name="adminResourcesDao" ref="adminResourcesDao"></property>
</bean>
<bean class="com.ctrip.fun.golf.service.adminUser.AdminResourcesService"
name="adminResourcesService">
<property name="adminResourcesDao" ref="adminResourcesDao"></property>
</bean>
<bean class="com.ctrip.fun.golf.service.adminUser.AdminRoleService"
name="adminRoleService">
<property name="adminRoleDao" ref="adminRoleDao"></property>
</bean>
<bean class="com.ctrip.fun.golf.dao.user.UserInvoiceTitleDao"
......
src/test/java/com/ctrip/fun/golf/dao/statistics/user/UserOrderBehaviourStatisticsDaoTest.java
......@@ -2,20 +2,25 @@ package com.ctrip.fun.golf.dao.statistics.user;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.InputStreamReader;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.ctrip.fun.common.core.util.BeanConverter;
import com.ctrip.fun.common.core.util.DateUtil;
import com.ctrip.fun.common.vo.PagedResponseBean;
import com.ctrip.fun.common.vo.adminUser.AdminResourcesBean;
import com.ctrip.fun.common.vo.adminUser.AdminResourcesQuery;
import com.ctrip.fun.common.vo.adminUser.AdminUserBean;
import com.ctrip.fun.common.vo.adminUser.AdminUserQuery;
import com.ctrip.fun.common.vo.advert.AdvertiserQuery;
import com.ctrip.fun.common.vo.market.EventGameBean;
import com.ctrip.fun.common.vo.market.EventGameGroupBean;
import com.ctrip.fun.common.vo.market.EventGamePlayerBean;
<<<<<<< HEAD
import com.ctrip.fun.common.vo.order.BuyVoucherActivityBean;
import com.ctrip.fun.common.vo.order.EventCustomerInfoBean;
import com.ctrip.fun.common.vo.order.EventCustomerInfoQuery;
......@@ -38,6 +43,27 @@ import com.ctrip.fun.golf.service.market.EventGameService;
import com.ctrip.fun.golf.service.order.CommuneOrderService;
import com.ctrip.fun.golf.service.order.EventCustomerInfoService;
import com.ctrip.fun.golf.service.payment.EventActivityNotifyService;
=======
import com.ctrip.fun.common.vo.order.OrderStatusBitEnum;
import com.ctrip.fun.golf.dao.adminUser.AdminResourcesDao;
import com.ctrip.fun.golf.dao.adminUser.AdminRoleDao;
import com.ctrip.fun.golf.dao.adminUser.AdminUserDao;
import com.ctrip.fun.golf.dao.advert.AdvertiserDao;
import com.ctrip.fun.golf.domain.adminUser.AdminResources;
import com.ctrip.fun.golf.domain.adminUser.AdminUser;
import com.ctrip.fun.golf.domain.advert.Advertiser;
import com.ctrip.fun.golf.service.adminUser.AdminResourcesService;
import com.ctrip.fun.golf.service.adminUser.AdminUserService;
import com.ctrip.fun.golf.service.market.EventGameGroupService;
import com.ctrip.fun.golf.service.market.EventGamePlayerService;
import com.ctrip.fun.golf.service.market.EventGameService;
>>>>>>> roleRebuild
import com.ctrip.fun.golf.vo.PagedEntityBean;
import org.junit.Test;
......@@ -68,6 +94,21 @@ public class UserOrderBehaviourStatisticsDaoTest {
@Autowired
private AdminUserService adminUserService;
@Autowired
private AdminResourcesService adminResourcesService;
@Autowired
private AdminRoleDao adminRoleDao;
public static void main(String[] args) {
int[] status = new int[]{23,100,20,276824087,19,108,268446996,0,276824083,293601303,16777239,268446999,12,3,96,268444944,4,268444947,16,276824067,99,276831511,5395,293608727,268447076,276835607,276829459,5399,16784663};
for(int sta:status){
......@@ -89,6 +130,39 @@ public class UserOrderBehaviourStatisticsDaoTest {
@Test
public void testAdminRoleDao() throws Exception {
adminRoleDao.addUsersRole(1,1);
adminRoleDao.addUsersRole(1,2);
}
@Test
public void testAdminUserService() throws Exception {
AdminUserQuery query = new AdminUserQuery();
query.setPagerOffset(0);
query.setId(1);
query.setPagerPerPage(5);
query.setUserName("zgsong");
query.setSortField("id");
PagedResponseBean<AdminUserBean> page = adminUserService.queryList(query);
System.out.println(page.getResult());
}
@Test
public void testGetAdminUserBean() throws Exception {
AdminResourcesQuery query = new AdminResourcesQuery();
query.setPagerOffset(0);
query.setId(1);
query.setPagerPerPage(5);
query.setName("修改用户");
query.setSortField("id");
PagedResponseBean<AdminResourcesBean> page = adminResourcesService.queryList(query);
System.out.println(page.getResult());
}
@Test
public void testListOrderUser() throws Exception {
String[] filenames = {"美兰湖分组表_1170_2018-04-04","协和分组_1902_2018-04-01","协和分组_1902_2018-04-03","协和分组_1902_2018-04-08"};
for(String filename:filenames){
......
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