Skip to content

T
tcm-system
Commit eb1d5500 authored by tangfang's avatar tangfang
Browse files
Options

修改用户二维码生成

parent c68731bc
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 69 deletions
src/main/java/com/pangding/web/authority/controller/RoleController.java
View file @ eb1d5500
......@@ -7,7 +7,9 @@ import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
import com.pangding.web.authority.service.RoleService;
import com.pangding.web.authority.vo.resvo.WebRoleResVo;
import com.pangding.web.vo.system.res.authority.RoleResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
......@@ -24,7 +26,17 @@ import java.util.List;
public class RoleController {
@Autowired
RoleService roleServiceImpl;
private RoleService roleService;
@RequestMapping(value = "/queryList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<PageSizeData<RoleResVo>> queryList(@RequestBody ListRoleReqVo req){
CheckerHelper.newInstance()
.notBlankCheck("companyId",req.getCompanyId())
.checkException();
return ResponseResult.result(roleService.queryList(req));
}
/**
* 新增角色
......@@ -39,7 +51,7 @@ public class RoleController {
.notBlankCheck("remark",webRoleReqVo.getRemark())
.notBlankCheck("companyId",webRoleReqVo.getCompanyId())
.checkException();
return ResponseResult.result(roleServiceImpl.saveRole(webRoleReqVo));
return ResponseResult.result(roleService.saveRole(webRoleReqVo));
}
/**
......@@ -54,7 +66,7 @@ public class RoleController {
.notBlankCheck("roleName",webRoleReqVo.getName())
.notBlankCheck("remark",webRoleReqVo.getRemark())
.checkException();
return ResponseResult.result(roleServiceImpl.updateRole(webRoleReqVo));
return ResponseResult.result(roleService.updateRole(webRoleReqVo));
}
/**
......@@ -62,11 +74,11 @@ public class RoleController {
* @return
*/
@RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<List<WebRoleResVo>> listRoles(@RequestBody ListRoleReqVo req){
public ResponseResult<PageSizeData<WebRoleResVo>> listRoles(@RequestBody ListRoleReqVo req){
CheckerHelper.newInstance()
.notBlankCheck("companyId",req.getCompanyId())
.checkException();
return ResponseResult.result(roleServiceImpl.getWebRoleResVoList(req));
return ResponseResult.result(roleService.getWebRoleResVoList(req));
}
/**
......@@ -80,7 +92,7 @@ public class RoleController {
.notBlankCheck("roleId",reqVo.getRoleId())
.notBlankCheck("companyId",reqVo.getCompanyId())
.checkException();
return ResponseResult.result(roleServiceImpl.countByRole(reqVo));
return ResponseResult.result(roleService.countByRole(reqVo));
}
/**
......@@ -93,7 +105,7 @@ public class RoleController {
CheckerHelper.newInstance()
.notBlankCheck("roleId",webRoleReqVo.getId())
.checkException();
return ResponseResult.result(roleServiceImpl.getRoleById(webRoleReqVo));
return ResponseResult.result(roleService.getRoleById(webRoleReqVo));
}
/**
......@@ -106,7 +118,7 @@ public class RoleController {
CheckerHelper.newInstance()
.notBlankCheck("roleId",webRoleReqVo.getId())
.checkException();
roleServiceImpl.delete(webRoleReqVo);
roleService.delete(webRoleReqVo);
return new ResponseResult();
}
......@@ -121,7 +133,7 @@ public class RoleController {
.notBlankCheck("roleId",reqVo.getRoleId())
.notBlankCheck("authorityId",reqVo.getAuthorityId())
.checkException();
roleServiceImpl.add(reqVo);
roleService.add(reqVo);
return new ResponseResult();
}
}
src/main/java/com/pangding/web/authority/dao/RoleDao.java
View file @ eb1d5500
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.reqvo.GetEmptyRolesReqVo;
import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
import com.pangding.web.authority.vo.reqvo.RoleGetReqVo;
import com.pangding.web.authority.vo.resvo.WebRoleResVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.res.authority.RoleResVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
......@@ -12,6 +16,10 @@ import java.util.List;
*/
public interface RoleDao extends BaseDao {
PageSizeData<RoleResVo> queryList(ListRoleReqVo req);
PageSizeData<RoleVo> query(ListRoleReqVo req);
/**
* 通过主键id获取RoleVo对象
*
......
src/main/java/com/pangding/web/authority/dao/UserDao.java
View file @ eb1d5500
......@@ -47,4 +47,12 @@ public interface UserDao extends BaseDao {
* @return 用户列表
*/
PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo);
/**
* 获取某角色下的用户数
* @param req
* @return
*/
UserResVo countUserByRole(CountByRoleReqVo req);
}
src/main/java/com/pangding/web/authority/dao/impl/RoleDaoImpl.java
View file @ eb1d5500
......@@ -2,9 +2,15 @@ package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.RoleDao;
import com.pangding.web.authority.vo.reqvo.GetEmptyRolesReqVo;
import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
import com.pangding.web.authority.vo.reqvo.RoleGetReqVo;
import com.pangding.web.authority.vo.resvo.WebRoleResVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.pd.company.CompanyMoneyVo;
import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
import com.pangding.web.vo.system.res.authority.RoleResVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
import java.util.List;
......@@ -15,7 +21,7 @@ import java.util.List;
@Component
public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
private static final String QUERY_LIST = "QUERY_LIST";
private static final String CHECK_NAME_EXIST = "CHECK_NAME_EXIST";
private static final String SELECT = "SELECT";
private static final String GET_EMPTY_ROLES = "GET_EMPTY_ROLES";
......@@ -24,17 +30,38 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
protected void init() {
register(RoleVo.class);
table.addExist(CHECK_NAME_EXIST,"name");
table.addExist(CHECK_NAME_EXIST, "name");
table.add(SELECT, "select * from pd_role where 1=1 ")
.add("id", " and pid = ? ")
.add("roleName", " and name LIKE concat(?,'%') ")
.add("roleRemark", " and remark LIKE concat(?,'%') ");
table.add(GET_EMPTY_ROLES, "select * from pd_role where 1=1 ");
table.add(QUERY_LIST, "select COUNT(a.id) as userNum,a.* from pd_role a " +
" LEFT JOIN pd_user_role b on a.id = b.role_id where 1=1 {WHERE}" +
"GROUP BY a.id")
.add("id", " and a.id = ? ")
.add("roleName", " and (a.name LIKE concat(?,'%') OR a.remark LIKE concat(?,'%') )");
table.add(SELECT,"select * from pd_role where 1=1 ")
.add("id","and pid = ?");
table.add(GET_EMPTY_ROLES,"select * from pd_role where 1=1 ");
}
@Override
public PageSizeData<RoleVo> query(ListRoleReqVo req) {
return this.queryPage(RoleVo.class, req, SELECT, req);
}
@Override
public PageSizeData<RoleResVo> queryList(ListRoleReqVo req) {
return this.queryPage(RoleResVo.class, req, QUERY_LIST, req);
}
@Override
public RoleVo getRoleById(RoleGetReqVo roleGetReqVo) {
return this.load(roleGetReqVo,RoleVo.class);
return this.load(roleGetReqVo, RoleVo.class);
}
@Override
......@@ -43,17 +70,17 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
}
@Override
public void checkNameExist(RoleVo roleVo){
this.checkExist(CHECK_NAME_EXIST,roleVo,"角色名已存在");
public void checkNameExist(RoleVo roleVo) {
this.checkExist(CHECK_NAME_EXIST, roleVo, "角色名已存在");
}
@Override
public List<RoleVo> getChild(RoleGetReqVo roleGetReqVo) {
return this.query(RoleVo.class,SELECT, roleGetReqVo);
return this.query(RoleVo.class, SELECT, roleGetReqVo);
}
@Override
public List<RoleVo> getEmptyRoles(GetEmptyRolesReqVo getEmptyRolesReqVo) {
return this.query(RoleVo.class,GET_EMPTY_ROLES,getEmptyRolesReqVo);
return this.query(RoleVo.class, GET_EMPTY_ROLES, getEmptyRolesReqVo);
}
}
src/main/java/com/pangding/web/authority/dao/impl/UserDaoImpl.java
View file @ eb1d5500
......@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
public class UserDaoImpl extends BaseDaoImpl implements UserDao {
private static final String QUERY_USER = "QUERY_USER";
private static final String QUERY_COUNT = "QUERY_COUNT";
private static final String CHECK_ACCOUNT = "CHECK_ACCOUNT";
private static final String GET_ADMIN = "GET_ADMIN";
private static final String COUNT_BY_ROLE = "COUNT_BY_ROLE";
......@@ -43,6 +44,12 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
.add("roleId","and ur.role_id = ? ")
.add("query","and u.name = ? or u.account = ? or phone = ?");
table.add(QUERY_COUNT,"select count(u.id) as userNum" +
" from pd_user u,pd_user_role ur WHERE u.id = ur.user_id")
.add("companyId","and u.company_id = ? ")
.add("roleId","and ur.role_id = ? ")
.add("query","and u.name = ? or u.account = ? or phone = ?");
}
@Override
......@@ -69,4 +76,8 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
public PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo) {
return this.queryPage(UserVo.class,reqVo,COUNT_BY_ROLE,reqVo);
}
public UserResVo countUserByRole(CountByRoleReqVo req) {
return this.queryFirst(UserResVo.class, QUERY_COUNT, req);
}
}
src/main/java/com/pangding/web/authority/service/RoleService.java
View file @ eb1d5500
......@@ -8,6 +8,7 @@ import com.pangding.web.authority.vo.resvo.WebRoleResVo;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import com.pangding.web.vo.system.res.authority.RoleResVo;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
......@@ -17,6 +18,15 @@ import java.util.List;
*/
public interface RoleService {
/**
* 分页查询角色列表 V2
* @param req
* @return
*/
PageSizeData<RoleResVo> queryList(ListRoleReqVo req);
/**
* 保存RoleVo对象,并保存角色权限的对应关系
*
......@@ -54,14 +64,8 @@ public interface RoleService {
* @param req
* @return 角色返回信息
*/
List<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req);
PageSizeData<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req);
/**
* 获取该公司该角色已分配的角色列表
* @param reqVo 封装了公司id和权限id的请求对象
* @return 用户列表
*/
List<UserVo> count(CountByRoleReqVo reqVo);
/**
* 通过角色id查询该角色权限id列表
......
src/main/java/com/pangding/web/authority/service/impl/FinanceServiceImpl.java
View file @ eb1d5500
......@@ -20,6 +20,7 @@ import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
import com.pangding.web.vo.system.pd.company.CompanyMoneyVo;
import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
import com.pangding.web.vo.system.req.company.CompanyRuleReqVo;
import com.pangding.web.vo.system.req.company.UpdateCompanyMoneyReqVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
......@@ -73,7 +74,10 @@ public class FinanceServiceImpl implements FinanceService {
resVo.setWithdrawTotalCash(extendVo.getWithdrawTotalCash());
resVo.setCompanyExtend(extendVo);
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDao.loadList(reqVo, CompanyBankCardVo.class);
CompanyBankCardReqVo companyBankCardReqVo = new CompanyBankCardReqVo();
companyBankCardReqVo.setCompanyId(reqVo.getCompanyId());
companyBankCardReqVo.setIsDefault(1);
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDao.loadList(companyBankCardReqVo, CompanyBankCardVo.class);
if (null == companyBankCardVoList || companyBankCardVoList.isEmpty()) {
throw new CodeException("该公司暂无银行卡信息，请添加");
}
......
src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java
View file @ eb1d5500
......@@ -6,6 +6,8 @@ import com.pangding.web.authority.service.RoleService;
import com.pangding.web.authority.vo.resvo.WebRoleResVo;
import com.pangding.web.constant.CompanyConstant;
import com.pangding.web.vo.system.pd.authority.*;
import com.pangding.web.vo.system.res.authority.RoleResVo;
import com.pangding.web.vo.system.res.authority.UserResVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.StringHelper;
......@@ -38,6 +40,17 @@ public class RoleServiceImpl implements RoleService {
@Autowired
UserDao userDaoImpl;
public PageSizeData<RoleResVo> queryList(ListRoleReqVo req) {
if ("10001".equals(req.getCompanyId())) {
req.setCompanyId("");
}
PageSizeData<RoleResVo> roleVoPageSizeData = roleDao.queryList(req);
return roleVoPageSizeData;
}
/**
* 保存RoleVo对象,并保存角色权限的对应关系
*
......@@ -179,64 +192,37 @@ public class RoleServiceImpl implements RoleService {
* @return 角色返回信息分页对象
*/
@Override
public List<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req) {
public PageSizeData<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req) {
if ("10001".equals(req.getCompanyId())) {
req.setCompanyId("");
}
List<RoleVo> roleVoList = roleDao.loadList(req, RoleVo.class);
PageSizeData<RoleVo> roleVoPageSizeData = roleDao.query(req);
List<RoleVo> roleVoList = roleVoPageSizeData.getList();
List<WebRoleResVo> webRoleResVoList = new ArrayList();
for (RoleVo roleVo : roleVoList) {
WebRoleResVo resVo = new WebRoleResVo();
ObjectHelper.writeWithFrom(resVo, roleVo);
// List<AuthorityVo> authorityVoList = this.getAuthorityListByRoleId(roleVo.getId());
// resVo.setAuthorityList(authorityVoList);
CountByRoleReqVo countByRoleReqVo = new CountByRoleReqVo();
countByRoleReqVo.setCompanyId(req.getCompanyId());
countByRoleReqVo.setRoleId(roleVo.getId());
List<UserVo> userVoList = count(countByRoleReqVo);
if (null == userVoList || userVoList.isEmpty()) {
UserResVo userResVo = userDaoImpl.countUserByRole(countByRoleReqVo);
if(!StringHelper.isEmpty(userResVo)){
resVo.setCount(userResVo.getUserNum());
}else{
resVo.setCount(0);
}
resVo.setCount(userVoList.size());
webRoleResVoList.add(resVo);
}
PageSizeData<WebRoleResVo> webRoleResVoPageSizeData = new PageSizeData<>();
webRoleResVoPageSizeData.setPageSize(roleVoPageSizeData.getPageSize());
webRoleResVoPageSizeData.setPageIndex(roleVoPageSizeData.getPageIndex());
webRoleResVoPageSizeData.setPageTotal(roleVoPageSizeData.getPageTotal());
webRoleResVoPageSizeData.setList(webRoleResVoList);
return webRoleResVoList;
return webRoleResVoPageSizeData;
}
/**
* 获取该公司该角色已分配的角色列表
*
* @param reqVo 封装了公司id和权限id的请求对象
* @return 用户列表
*/
@Override
public List<UserVo> count(CountByRoleReqVo reqVo) {
UserRoleGetReqVo getReqVo = new UserRoleGetReqVo();
getReqVo.setRoleId(reqVo.getRoleId());
List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(getReqVo, UserRoleVo.class);
List<String> userIdList = new ArrayList<>();
for (UserRoleVo userRoleVo : userRoleVoList) {
userIdList.add(userRoleVo.getUserId());
}
String companyId = reqVo.getCompanyId();
List<UserVo> userVoList = new ArrayList<>();
for (String userId : userIdList) {
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setId(userId);
UserVo userVo = userDaoImpl.load(userGetReqVo, UserVo.class);
if (null != userVo && companyId.equals(userVo.getCompanyId())) {
userVo.setPassword("");
userVo.setRemark("");
userVoList.add(userVo);
}
}
return userVoList;
}
/**
* 通过角色id查询该角色权限id列表
......
src/main/java/com/pangding/web/authority/vo/reqvo/ListRoleReqVo.java
View file @ eb1d5500
package com.pangding.web.authority.vo.reqvo;
import com.yanzuoguang.util.vo.PageSizeReqVo;
/**
* @Author zhangjinyao
* @create 2019/5/15 17:54
*/
public class ListRoleReqVo {
public class ListRoleReqVo extends PageSizeReqVo {
private String reqId;
private String companyId;
private String roleName;
public String getCompanyId() {
return companyId;
}
......@@ -25,4 +29,12 @@ public class ListRoleReqVo {
public void setReqId(String reqId) {
this.reqId = reqId;
}
public String getRoleName() {
return roleName;
}
public void setRoleName(String roleName) {
this.roleName = roleName;
}
}
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 to comment