Skip to content

T
tcm-system
Commit b0c8246d authored by tangf's avatar tangf
Browse files
Options

修改实体

parent 85a1e5fb
Hide whitespace changes
Inline Side-by-side
Showing with 243 additions and 391 deletions
pom.xml
View file @ b0c8246d
......@@ -39,6 +39,10 @@
<groupId>com.yanzuoguang</groupId>
<artifactId>yzg-util-mq</artifactId>
</dependency>
<dependency>
<groupId>com.pangding.web</groupId>
<artifactId>pd-log-feign</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
src/main/java/com/pangding/web/authority/controller/AuthorityController.java
View file @ b0c8246d
......@@ -60,7 +60,7 @@ public class AuthorityController {
.notBlankCheck("authorityName",authorityVo.getName())
.notBlankCheck("type",authorityVo.getType())
.notBlankCheck("alias",authorityVo.getAlias())
.notBlankCheck("openMode",authorityVo.getOpenMode())
// .notBlankCheck("openMode",authorityVo.getOpenMode())
.notBlankCheck("remark",authorityVo.getRemark())
.notBlankCheck("sort",authorityVo.getSort())
.checkException();
......
src/main/java/com/pangding/web/authority/controller/RegisterController.java 0 → 100644
View file @ b0c8246d
package com.pangding.web.authority.controller;
import com.pangding.web.vo.system.req.authority.SaveUserReqVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author tf
* 注册controller
*/
@RestController
@RequestMapping(value = "/register")
@Api(value = "注册类", description = "注册用户，新增用户")
public class RegisterController {
@RequestMapping(value = "/saveUser")
public ResponseResult saveUser(@RequestBody SaveUserReqVo req){
CheckerHelper.newInstance().notBlankCheck("", req.getAccount())
.notBlankCheck("", req.getPassword())
.notBlankCheck("", req.getConfirmPassword())
.notBlankCheck("", req.getInvitationCode())
.notBlankCheck("", req.getCompanyType())
.checkException();
return ResponseResult.result("");
}
}
src/main/java/com/pangding/web/authority/controller/UserController.java
View file @ b0c8246d
package com.pangding.web.authority.controller;
import com.pangding.web.authority.util.RsaConstant;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.service.UserService;
import com.pangding.web.authority.vo.resvo.WebUserResVo;
import com.pangding.web.util.RSAUtils;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.PageSizeData;
......@@ -50,22 +53,34 @@ public class UserController {
*/
@RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> updateUser(@RequestBody WebUserReqVo webUserReqVo){
if(!StringHelper.isEmpty(webUserReqVo.getUpdateType()) && 1 == webUserReqVo.getUpdateType()){
// 修改密码
CheckerHelper.newInstance()
.notBlankCheck("id",webUserReqVo.getId())
.notBlankCheck("password",webUserReqVo.getPassword())
.checkPhoneNo("confirmPassword",webUserReqVo.getConfirmPassword())
.checkException();
}else{
CheckerHelper.newInstance()
.notBlankCheck("account",webUserReqVo.getAccount())
.notBlankCheck("password",webUserReqVo.getPassword())
.checkPhoneNo("phone",webUserReqVo.getPhone())
.notBlankCheck("companyId",webUserReqVo.getCompanyId())
.checkException();
try{
if(!StringHelper.isEmpty(webUserReqVo.getUpdateType()) && 1 == webUserReqVo.getUpdateType()){
// 修改密码
CheckerHelper.newInstance()
.notBlankCheck("id",webUserReqVo.getId())
.notBlankCheck("password",webUserReqVo.getPassword())
.notBlankCheck("confirmPassword",webUserReqVo.getConfirmPassword())
.checkException();
String password = RSAUtils.decryptionByPrivateKey(webUserReqVo.getPassword(), RsaConstant.privateKey);
String confirmPassword = RSAUtils.decryptionByPrivateKey(webUserReqVo.getConfirmPassword(),RsaConstant.privateKey);
if (!StringHelper.compare(password,confirmPassword)){
throw new CodeException("两次密码输入不一致");
}
webUserReqVo.setPassword(password);
webUserReqVo.setConfirmPassword(confirmPassword);
}else{
CheckerHelper.newInstance()
.notBlankCheck("account",webUserReqVo.getAccount())
.notBlankCheck("password",webUserReqVo.getPassword())
.checkPhoneNo("phone",webUserReqVo.getPhone())
.notBlankCheck("companyId",webUserReqVo.getCompanyId())
.checkException();
}
return ResponseResult.result(userServiceImpl.updateUser(webUserReqVo));
}catch (Exception e){
return ResponseResult.error("99", e.getMessage());
}
return ResponseResult.result(userServiceImpl.updateUser(webUserReqVo));
}
/**
......
src/main/java/com/pangding/web/authority/dao/UserDao.java
View file @ b0c8246d
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.UserVo;
import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
import com.pangding.web.authority.vo.reqvo.UserGetSuperAdminReqVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
/**
* @author zhangjinyao
*/
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java
View file @ b0c8246d
......@@ -21,7 +21,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
register(CompanyVo.class);
table.add(SELECT,"select * from pd_company where 1=1 ")
table.add(SELECT,"select * from pd_company where 1=1 {WHERE} order by create_time desc")
.add("companyName","and company_name = ? ")
.add("companyType","and company_type = ? ")
.add("companyAttribute","and company_attribute = ? ")
......
src/main/java/com/pangding/web/authority/dao/impl/RoleAuthorityDaoImpl.java
View file @ b0c8246d
......@@ -23,8 +23,7 @@ public class RoleAuthorityDaoImpl extends BaseDaoImpl implements RoleAuthorityDa
.add("userId", "AND b.user_id = @userId",
"{INNER}", "INNER JOIN pd_user_role AS b ON ra.role_id = b.role_id")
.add("role", " AND ra.role_id = @role")
.add("authority", " AND ra.authority_id = @authority")
;
.add("authority", " AND ra.authority_id = @authority");
}
......
src/main/java/com/pangding/web/authority/dao/impl/UserDaoImpl.java
View file @ b0c8246d
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.UserDao;
import com.pangding.web.authority.vo.UserVo;
import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
import com.pangding.web.authority.vo.reqvo.UserGetSuperAdminReqVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author zhangjinyao
*/
......
src/main/java/com/pangding/web/authority/service/RoleService.java
View file @ b0c8246d
package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.UserVo;
import com.pangding.web.authority.vo.reqvo.AddReqVo;
import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
......@@ -8,6 +7,7 @@ import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
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.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
......
src/main/java/com/pangding/web/authority/service/UserService.java
View file @ b0c8246d
......@@ -4,6 +4,7 @@ import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.resvo.WebUserResVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
......
src/main/java/com/pangding/web/authority/service/impl/AuthorityServiceImpl.java
View file @ b0c8246d
......@@ -12,6 +12,7 @@ import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
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.RoleAuthorityLoadResVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
......@@ -236,7 +237,7 @@ public class AuthorityServiceImpl implements AuthorityService {
authorityDao.remove(authorityVo);
RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
roleAuthorityGetReqVo.setAuthorityId(reqVo.getId());
roleAuthorityGetReqVo.setAuthority(reqVo.getId());
List<RoleAuthorityVo> roleAuthorityList = roleAuthorityDao.loadList(roleAuthorityGetReqVo, RoleAuthorityVo.class);
for (RoleAuthorityVo roleAuthority : roleAuthorityList) {
roleAuthorityDao.remove(roleAuthority);
......
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ b0c8246d
......@@ -19,6 +19,7 @@ import com.pangding.web.util.RSAUtils;
import com.pangding.web.vo.order.req.CapitalFlowReqVo;
import com.pangding.web.vo.product.pd.merchant.MerchantVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyDivideRuleVo;
import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
......
src/main/java/com/pangding/web/authority/service/impl/DataServiceImpl.java
View file @ b0c8246d
......@@ -6,6 +6,7 @@ import com.pangding.web.authority.util.CompanyConstant;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.FindResVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
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.CompanyVo;
......
src/main/java/com/pangding/web/authority/service/impl/PangdingPartnerServiceImpl.java
View file @ b0c8246d
......@@ -9,6 +9,7 @@ import com.pangding.web.authority.util.ShareCodeUtil;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.vo.system.pd.authority.UserVo;
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.CompanyVo;
......
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ b0c8246d
......@@ -15,6 +15,7 @@ import com.pangding.web.util.RSAUtils;
import com.pangding.web.vo.product.pd.merchant.MerchantVo;
import com.pangding.web.vo.system.pd.LoginTokenVo;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
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.CompanyVo;
......@@ -82,7 +83,7 @@ public class RegisterServiceImpl implements RegisterService {
public CompanyExtendVo checkInvitationCode(String invitationCode) {
CompanyExtendGetReqVo reqVo = new CompanyExtendGetReqVo();
reqVo.setInvitationCode(invitationCode);
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo,CompanyExtendVo.class);
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo, CompanyExtendVo.class);
return companyExtendVo;
}
......@@ -102,21 +103,21 @@ public class RegisterServiceImpl implements RegisterService {
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setAccount(registerUserReqVo.getAccount());
// 检查用户名是否存在
UserVo userVoCheck = userDaoImpl.load(userGetReqVo,UserVo.class);
if (null != userVoCheck){
throw new CodeException("用户名"+registerUserReqVo.getAccount()+"已存在");
UserVo userVoCheck = userDaoImpl.load(userGetReqVo, UserVo.class);
if (null != userVoCheck) {
throw new CodeException("用户名" + registerUserReqVo.getAccount() + "已存在");
}
/*通过私钥将rsa加密的密码解密*/
String password = RSAUtils.decryptionByPrivateKey(registerUserReqVo.getPassword(),RsaConstant.privateKey);
String confirmPassword = RSAUtils.decryptionByPrivateKey(registerUserReqVo.getConfirmPassword(),RsaConstant.privateKey);
String password = RSAUtils.decryptionByPrivateKey(registerUserReqVo.getPassword(), RsaConstant.privateKey);
String confirmPassword = RSAUtils.decryptionByPrivateKey(registerUserReqVo.getConfirmPassword(), RsaConstant.privateKey);
if (!StringHelper.compare(password,confirmPassword)){
if (!StringHelper.compare(password, confirmPassword)) {
throw new CodeException("确认密码错误");
}
CompanyExtendVo companyExtendVo = checkInvitationCode(registerUserReqVo.getInvitationCode());
if (null == companyExtendVo){
if (null == companyExtendVo) {
throw new CodeException("注册编码错误");
}
......@@ -144,9 +145,9 @@ public class RegisterServiceImpl implements RegisterService {
CompanyExtendVo extendVo = new CompanyExtendVo();
extendVo.setId(companyVo.getId());
String qrCode = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
.replace("-", "")
.replace(":", "")
.replace(" ", "");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.create(extendVo);
......@@ -171,36 +172,36 @@ public class RegisterServiceImpl implements RegisterService {
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getId());
CompanyVo company = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
CompanyVo company = companyDaoImpl.load(companyGetReqVo, CompanyVo.class);
CompanyReqVo companyReqVo = new CompanyReqVo();
ObjectHelper.writeWithFrom(companyReqVo,reqVo);
ObjectHelper.writeWithFrom(companyReqVo, reqVo);
companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
companyReqVo.setStatus(company.getStatus());
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
if (null == result || !"00".equals(result.getCode())){
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("保存商户失败，请重试");
}
CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
/*更新公司表*/
CompanyVo companyVo = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);
ObjectHelper.writeWithFrom(companyVo, resCompanyReqVo);
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo.setExamineStatus(0);
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
companyDaoImpl.update(companyVo);
System.out.println("companyAttribute:"+companyVo.getCompanyAttribute());
System.out.println("companyAttribute:" + companyVo.getCompanyAttribute());
/*跟新用户表添加联系方式*/
UserVo userReqVo = new UserVo();
userReqVo.setCompanyId(reqVo.getId());
UserVo userVo = userDaoImpl.load(userReqVo,UserVo.class);
UserVo userVo = userDaoImpl.load(userReqVo, UserVo.class);
userVo.setPhone(reqVo.getContactPhone());
userVo.setName(reqVo.getContactName());
userDaoImpl.update(userVo);
/*保存或更新商户表*/
MerchantCreateReqVo req=new MerchantCreateReqVo();
MerchantCreateReqVo req = new MerchantCreateReqVo();
req.setId(StringHelper.getNewID());
req.setName(reqVo.getCompanyName());
req.setAddress(reqVo.getAddress());
......@@ -212,16 +213,16 @@ public class RegisterServiceImpl implements RegisterService {
req.setPhone(reqVo.getContactPhone());
req.setCreateTime(DateHelper.getNow());
req.setProductCompanyName(reqVo.getCompanyName());
if (null == reqVo.getMerchantId() || "".equals(reqVo.getMerchantId())){
if (null == reqVo.getMerchantId() || "".equals(reqVo.getMerchantId())) {
req.setId(StringHelper.getNewID());
}else {
} else {
req.setId(reqVo.getMerchantId());
}
SaveCompanyResVo resVo = new SaveCompanyResVo();
ResponseResult result1 = storeFeign.merchantCreate(req);
if (result1.getCode().equals("00")){
if (result1.getCode().equals("00")) {
String merchantId = (String) result1.getData();
resVo.setMerchantId(merchantId);
}
......@@ -242,48 +243,42 @@ public class RegisterServiceImpl implements RegisterService {
@Override
public SaveCompanyResVo saveEnterprice(RegisterEnterpriceReqVo reqVo) {
// CompanyVo companyVo1 = new CompanyVo();
// companyVo1.setContactPhone(reqVo.getContactPhone());
// CompanyVo companyVo2 = companyDaoImpl.load(companyVo1,CompanyVo.class);
// if (null != companyVo2 && !reqVo.getId().equals(companyVo2.getId())){
// throw new CodeException("该号码已存在");
// }
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getId());
CompanyVo company = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
// 找到公司信息
CompanyVo company = companyDaoImpl.load(reqVo.getId(), CompanyVo.class);
// 初始化通联参数
CompanyReqVo companyReqVo = new CompanyReqVo();
ObjectHelper.writeWithFrom(companyReqVo,reqVo);
ObjectHelper.writeWithFrom(companyReqVo, reqVo);
companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
companyReqVo.setStatus(company.getStatus());
companyReqVo.setBankList(new ArrayList());
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
ObjectHelper.writeWithFrom(companyBankReqVo, reqVo);
companyBankReqVo.setId(StringHelper.getNewID());
companyReqVo.getBankList().add(companyBankReqVo);
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
if (null == result || !"00".equals(result.getCode())){
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("保存商户失败，请重试");
}
CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
/*更新公司表*/
CompanyVo companyVo = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);
ObjectHelper.writeWithFrom(companyVo, resCompanyReqVo);
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo.setExamineStatus(0);
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
System.out.println("companyAttribute:"+companyVo.getCompanyAttribute());
companyDaoImpl.update(companyVo);
List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();
if (null == bankList || bankList.isEmpty()){
if (null == bankList || bankList.isEmpty()) {
throw new CodeException("保存商户失败，请重试");
}
/*保存银行卡，并将其设置为默认银行卡*/
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo,bankList.get(0));
ObjectHelper.writeWithFrom(companyBankCardVo, bankList.get(0));
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
companyBankCardVo.setReservedPhone(reqVo.getContactPhone());
companyBankCardVo.setType(reqVo.getCompanyType());
......@@ -291,11 +286,12 @@ public class RegisterServiceImpl implements RegisterService {
companyBankCardVo.setIdCard(reqVo.getContactCode());
companyBankCardVo.setCompanyId(reqVo.getId());
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setCompanyId(reqVo.getId());
companyBankCardGetReqVo.setBankCardCode(companyBankCardVo.getBankCardCode());
CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
if (null == companyBankCardVo1){
CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
if (null == companyBankCardVo1) {
companyBankCardDaoImpl.create(companyBankCardVo);
}else {
} else {
companyBankCardVo.setId(companyBankCardVo1.getId());
companyBankCardDaoImpl.update(companyBankCardVo);
}
......@@ -305,9 +301,9 @@ public class RegisterServiceImpl implements RegisterService {
CompanyExtendVo extendVo = new CompanyExtendVo();
extendVo.setId(resCompanyReqVo.getId());
String qrCode = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
.replace("-", "")
.replace(":", "")
.replace(" ", "");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.save(extendVo);
......@@ -318,32 +314,32 @@ public class RegisterServiceImpl implements RegisterService {
/*更新用户信息，保存联系方式*/
UserVo userReqVo = new UserVo();
userReqVo.setCompanyId(reqVo.getId());
UserVo userVo = userDaoImpl.load(userReqVo,UserVo.class);
UserVo userVo = userDaoImpl.load(userReqVo, UserVo.class);
userVo.setPhone(reqVo.getContactPhone());
userVo.setName(reqVo.getContactName());
userDaoImpl.update(userVo);
/*保存或更新商户表*/
MerchantCreateReqVo req=new MerchantCreateReqVo();
MerchantCreateReqVo req = new MerchantCreateReqVo();
req.setReqId(StringHelper.getNewID());
req.setName(reqVo.getMerchantName());
req.setType(reqVo.getCompanyAttribute());
req.setProductCompanyId(reqVo.getId());
req.setUserId(userVo.getId());
req.setUsername(userVo.getAccount());
if (null == reqVo.getMerchantId() || "".equals(reqVo.getMerchantId())){
if (null == reqVo.getMerchantId() || "".equals(reqVo.getMerchantId())) {
req.setId(StringHelper.getNewID());
}else {
} else {
req.setId(reqVo.getMerchantId());
}
if (null == reqVo.getMerchantAddress() || reqVo.getMerchantAddress().isEmpty()){
if (null == reqVo.getMerchantAddress() || reqVo.getMerchantAddress().isEmpty()) {
req.setAddress(reqVo.getAddress());
}else{
} else {
req.setAddress(reqVo.getMerchantAddress());
}
ResponseResult result1 = storeFeign.merchantCreate(req);
if (result1.getCode().equals("00")){
if (result1.getCode().equals("00")) {
String merchantId = (String) result1.getData();
resVo.setMerchantId(merchantId);
}
......@@ -367,18 +363,18 @@ public class RegisterServiceImpl implements RegisterService {
public LoginResVo login(LoginReqVo reqVo) throws Exception {
String accountOrPhone = reqVo.getAccountOrPhone();
UserVo userVo;
if (userServiceImpl.isNumeric(accountOrPhone)){
if (userServiceImpl.isNumeric(accountOrPhone)) {
userVo = userServiceImpl.getUserByPhone(accountOrPhone);
}else {
} else {
userVo = userServiceImpl.getUserByAccount(accountOrPhone);
}
if (userVo == null){
if (userVo == null) {
throw new CodeException("用户名不存在");
}
/*通过私钥将rsa加密的密码解密*/
String password = RSAUtils.decryptionByPrivateKey(reqVo.getPassword(),RsaConstant.privateKey);
if (!(StringHelper.md5(password).equals(userVo.getPassword()))){
String password = RSAUtils.decryptionByPrivateKey(reqVo.getPassword(), RsaConstant.privateKey);
if (!(StringHelper.md5(password).equals(userVo.getPassword()))) {
throw new CodeException("用户名或密码错误");
}
String token = TokenUtil.createToken(reqVo.getAccountOrPhone());
......@@ -397,20 +393,24 @@ public class RegisterServiceImpl implements RegisterService {
loginVo.setData(JsonHelper.serialize(reqVo));
loginVo.setExpairTime(DateHelper.getNow());
tokenService.save(loginVo);
TokenHelper.write(token,loginVo);
// 输出结果
TokenHelper.write(token, loginVo);
if (StringHelper.isEmpty(userVo.getCompanyId())) {
throw new CodeException("用户信息有误，请联系管理员");
}
// 找到登录用户公司信息
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(userVo.getCompanyId());
CompanyVo companyVo = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
CompanyVo companyVo = companyDaoImpl.load(companyGetReqVo, CompanyVo.class);
// 判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面
if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && CompanyConstant.COMPANY_TYPE_PERSON==(companyVo.getCompanyType())){
if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && CompanyConstant.COMPANY_TYPE_PERSON == (companyVo.getCompanyType())) {
resVo.setCode("01");
resVo.setMsg("个人基本信息未完善，跳转个人完善页面");
return resVo;
}
// 判断基本信息是否完善，及状态是否为2，且为公司用户，若不完善则跳转个人完善页面
else if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && (CompanyConstant.COMPANY_TYPE_COMPANY==(companyVo.getCompanyType()))){
else if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && (CompanyConstant.COMPANY_TYPE_COMPANY == (companyVo.getCompanyType()))) {
resVo.setCode("02");
resVo.setMsg("公司基本信息未完善，跳转公司完善页面");
return resVo;
......@@ -440,8 +440,8 @@ public class RegisterServiceImpl implements RegisterService {
// 找到公司银行信息
CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
getReqVo.setCompanyId(companyVo.getId());
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo,CompanyBankCardVo.class);
if (companyBankCardVoList == null || companyBankCardVoList.isEmpty()){
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo, CompanyBankCardVo.class);
if (companyBankCardVoList == null || companyBankCardVoList.isEmpty()) {
/*该公司没有银行卡，需要跳转添加银行卡*/
resVo.setCode("03");
resVo.setMsg("还未添加银行卡，跳转添加银行卡页面");
......@@ -458,7 +458,7 @@ public class RegisterServiceImpl implements RegisterService {
ResponseResult result = new ResponseResult();
try {
result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
}catch (Exception e){
} catch (Exception e) {
resVo.setMerchant(null);
}
MerchantVo merchant = (MerchantVo) result.getData();
......@@ -467,89 +467,32 @@ public class RegisterServiceImpl implements RegisterService {
/*获取用户权限列表*/
RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
roleAuthorityGetReqVo.setUserId(userVo.getId());
List<AuthorityListByLevelResVo> roleAuthorityVoList = roleAuthorityDaoImpl.loadList(roleAuthorityGetReqVo,AuthorityListByLevelResVo.class);
List<AuthorityListByLevelResVo> roleAuthorityVoList = roleAuthorityDaoImpl.loadList(roleAuthorityGetReqVo, AuthorityListByLevelResVo.class);
resVo.setAuthorityListByLevel(AuthorityServiceImpl.getChildList(roleAuthorityVoList, false));
//
// UserRoleGetReqVo userRoleGetReqVo = new UserRoleGetReqVo();
// userRoleGetReqVo.setUserId(userVo.getId());
// List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(userRoleGetReqVo,UserRoleVo.class);
// if (null != userRoleVoList && !userRoleVoList.isEmpty()){
// List<String> roleIdList = new ArrayList();
// for (UserRoleVo userRoleVo:userRoleVoList) {
// roleIdList.add(userRoleVo.getRoleId());
// }
// Set authorityIdSet = new HashSet();
//
// for (String roleId:roleIdList) {
// RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
// roleAuthorityGetReqVo.setRoleId(roleId);
// List<RoleAuthorityVo> roleAuthorityVoList = roleAuthorityDaoImpl.loadList(roleAuthorityGetReqVo,RoleAuthorityVo.class);
// if (roleAuthorityVoList != null && !roleAuthorityVoList.isEmpty()){
// for (RoleAuthorityVo roleAuthorityVo:roleAuthorityVoList) {
// authorityIdSet.add(roleAuthorityVo.getAuthorityId());
// }
// }
// }
// List<String> authorityIdList = new ArrayList();
// Object[] objs = authorityIdSet.toArray();
// for (Object obj:objs) {
// authorityIdList.add((String) obj);
// }
// List<AuthorityVo> levelOneList = new ArrayList();
// for (int i = 0; i < authorityIdList.size(); i++) {
// AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
// authorityGetReqVo.setId(authorityIdList.get(i));
// AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class);
// if (!StringHelper.isEmpty(authorityVo) && StringHelper.isEmpty(authorityVo.getPid())){
// levelOneList.add(authorityVo);
// authorityIdList.set(i,"");
// }
// }
// List<String> authorityIds = new ArrayList<>();
// for (int i = 0; i < authorityIdList.size(); i++) {
// if (!"".equals(authorityIdList.get(i))){
// authorityIds.add(authorityIdList.get(i));
// }
// }
// Collections.sort(levelOneList);
// if (null == levelOneList || levelOneList.isEmpty()){
// throw new CodeException("该用户暂无权限，请添加");
// }
// List<AuthorityListByLevelResVo> authorityListByLevel = new ArrayList<>();
// for (AuthorityVo authorityVo:levelOneList) {
// AuthorityListByLevelResVo resVo1 = new AuthorityListByLevelResVo();
// ObjectHelper.writeWithFrom(resVo1,authorityVo);
// List<AuthorityListByLevelResVo> childList = getChildList(authorityVo,authorityIds);
// resVo1.setChildList(childList);
// authorityListByLevel.add(resVo1);
// }
// Collections.sort(authorityListByLevel);
// resVo.setAuthorityListByLevel(authorityListByLevel);
// }
resVo.setCode("00");
System.out.println(JsonHelper.serialize(resVo));
return resVo;
}
public List<AuthorityListByLevelResVo> getChildList(AuthorityVo authorityVo, List<String> authorityIds){
public List<AuthorityListByLevelResVo> getChildList(AuthorityVo authorityVo, List<String> authorityIds) {
List<AuthorityListByLevelResVo> resVoList = new ArrayList<>();
for (int i = 0;i<authorityIds.size();i++) {
for (int i = 0; i < authorityIds.size(); i++) {
AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
authorityGetReqVo.setId(authorityIds.get(i));
AuthorityVo authorityVo1 = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class);
if(!StringHelper.isEmpty(authorityVo1)){
if (authorityVo1.getPid().equals(authorityVo.getId())){
AuthorityVo authorityVo1 = authorityDaoImpl.load(authorityGetReqVo, AuthorityVo.class);
if (!StringHelper.isEmpty(authorityVo1)) {
if (authorityVo1.getPid().equals(authorityVo.getId())) {
List<String> authorityIdList = new ArrayList<>();
authorityIdList.addAll(authorityIds);
authorityIdList.remove(i);
AuthorityListByLevelResVo resVo = new AuthorityListByLevelResVo();
ObjectHelper.writeWithFrom(resVo,authorityVo1);
if (authorityIds.size()>0){
resVo.setChildList(getChildList(authorityVo1,authorityIdList));
ObjectHelper.writeWithFrom(resVo, authorityVo1);
if (authorityIds.size() > 0) {
resVo.setChildList(getChildList(authorityVo1, authorityIdList));
}
resVoList.add(resVo);
}
}else{
} else {
System.out.println("无该权限：" + authorityIds.get(i));
}
......@@ -560,14 +503,15 @@ public class RegisterServiceImpl implements RegisterService {
@Override
public LoginResVo verifyLogin(ComputerLoginReqVo reqVo, HttpSession session, HttpServletRequest request) throws Exception {
verifyCodeServiceImpl.validImage(reqVo.getVerifyCode(),session,request);
verifyCodeServiceImpl.validImage(reqVo.getVerifyCode(), session, request);
LoginReqVo reqVo1 = new LoginReqVo();
ObjectHelper.writeWithFrom(reqVo1,reqVo);
ObjectHelper.writeWithFrom(reqVo1, reqVo);
return this.login(reqVo1);
}
/**
* 将通过公司id获取到的公司信息和验证码传到第三方，并将返回的信息用于更新公司状态
*
* @param reqVo 封装了公司id和验证码的请求对象
* @return
*/
......@@ -575,21 +519,21 @@ public class RegisterServiceImpl implements RegisterService {
public String individualSubmit(IndividualSubmitReqVo reqVo) {
CompanyGetReqVo getReqVo = new CompanyGetReqVo();
getReqVo.setId(reqVo.getId());
CompanyVo companyVo = companyDaoImpl.load(getReqVo,CompanyVo.class);
CompanyVo companyVo = companyDaoImpl.load(getReqVo, CompanyVo.class);
/*此处应该将companyVo和verifyCode发送到第三方接口，返回的数据用于更新公司信息*/
CompanyReqVo companyReqVo = new CompanyReqVo();
ObjectHelper.writeWithFrom(companyReqVo,companyVo);
ObjectHelper.writeWithFrom(companyReqVo, companyVo);
companyReqVo.setValidateCode(reqVo.getVerifyCode());
companyReqVo.setCompanyAttribution(companyVo.getCompanyAttribute());
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
if (null == result || !"00".equals(result.getCode())){
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("保存商户失败，请重试");
}
CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
/*更新公司表*/
CompanyVo companyVo1 = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo1,resCompanyReqVo);
ObjectHelper.writeWithFrom(companyVo1, resCompanyReqVo);
companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
companyVo1.setExamineStatus(0);
......@@ -599,6 +543,7 @@ public class RegisterServiceImpl implements RegisterService {
/**
* 将通过公司id获取到的公司信息和验证码传到第三方，并将返回的信息用于更新公司状态
*
* @param reqVo 封装了公司id和验证码的请求对象
* @return
*/
......@@ -606,14 +551,14 @@ public class RegisterServiceImpl implements RegisterService {
public String enterpriceSubmit(EnterpriceSubmitReqVo reqVo) {
CompanyGetReqVo getReqVo = new CompanyGetReqVo();
getReqVo.setId(reqVo.getId());
CompanyVo companyVo = companyDaoImpl.load(getReqVo,CompanyVo.class);
CompanyVo companyVo = companyDaoImpl.load(getReqVo, CompanyVo.class);
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
CompanyReqVo companyReqVo = new CompanyReqVo();
ObjectHelper.writeWithFrom(companyReqVo,companyVo);
ObjectHelper.writeWithFrom(companyReqVo, companyVo);
companyReqVo.setValidateCode(reqVo.getVerifyCode());
companyReqVo.setCompanyAttribution(companyVo.getCompanyAttribute());
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
ObjectHelper.writeWithFrom(companyBankReqVo, reqVo);
companyBankReqVo.setType(reqVo.getCompanyType());
companyBankReqVo.setCompanyId(reqVo.getId());
companyBankReqVo.setName(reqVo.getContactName());
......@@ -621,7 +566,7 @@ public class RegisterServiceImpl implements RegisterService {
companyBankReqVo.setPhone(reqVo.getContactPhone());
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setBankCardCode(reqVo.getBankCardCode());
CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
companyBankReqVo.setStatus(companyBankCardVo1.getStatus());
companyBankReqVo.setId(StringHelper.getNewID());
companyBankReqVo.setValidateCode(reqVo.getVerifyCode());
......@@ -629,34 +574,34 @@ public class RegisterServiceImpl implements RegisterService {
companyReqVo.getBankList().add(companyBankReqVo);
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
if (null == result || !"00".equals(result.getCode())){
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("保存商户失败，请重试");
}
CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
/*更新公司表*/
CompanyVo companyVo1 = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo1,resCompanyReqVo);
ObjectHelper.writeWithFrom(companyVo1, resCompanyReqVo);
companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo1.setExamineStatus(0);
companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
companyDaoImpl.update(companyVo1);
List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();
if (null == bankList || bankList.isEmpty()){
if (null == bankList || bankList.isEmpty()) {
throw new CodeException("保存商户失败，请重试");
}
/*保存银行卡，并将其设置为默认银行卡*/
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo,bankList.get(0));
ObjectHelper.writeWithFrom(companyBankCardVo, bankList.get(0));
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
if (6 == companyReqVo.getStatus()){
if (6 == companyReqVo.getStatus()) {
companyBankCardVo.setStatus(1);
companyBankCardVo.setBindingTime(
DateHelper.getNow()
.substring(0,10)
.replace("-",""));
.substring(0, 10)
.replace("-", ""));
}
companyBankCardVo.setType(resCompanyReqVo.getCompanyType());
companyBankCardVo.setCompanyId(resCompanyReqVo.getId());
......@@ -665,10 +610,10 @@ public class RegisterServiceImpl implements RegisterService {
companyBankCardVo.setReservedPhone(resCompanyReqVo.getContactPhone());
CompanyBankCardGetReqVo companyBankCardGetReqVo1 = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo1.setBankCardCode(bankList.get(0).getBankCardCode());
CompanyBankCardVo companyBankCardVo2 = companyBankCardDaoImpl.load(companyBankCardGetReqVo1,CompanyBankCardVo.class);
if (null == companyBankCardVo2){
CompanyBankCardVo companyBankCardVo2 = companyBankCardDaoImpl.load(companyBankCardGetReqVo1, CompanyBankCardVo.class);
if (null == companyBankCardVo2) {
companyBankCardDaoImpl.create(companyBankCardVo);
}else {
} else {
companyBankCardVo.setId(companyBankCardVo2.getId());
companyBankCardDaoImpl.update(companyBankCardVo);
}
......@@ -687,8 +632,8 @@ public class RegisterServiceImpl implements RegisterService {
public void businesslicenseCode(BusinessLicenseCodeReqVo reqVo) {
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getCompanyId());
CompanyVo companyVo = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
if (null == companyVo){
CompanyVo companyVo = companyDaoImpl.load(companyGetReqVo, CompanyVo.class);
if (null == companyVo) {
throw new CodeException("未查询到该公司信息，请稍后重试");
}
companyVo.setUrl(reqVo.getUrl());
......
src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java
View file @ b0c8246d
......@@ -9,6 +9,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.RoleAuthorityVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.StringHelper;
......
src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java
View file @ b0c8246d
......@@ -10,6 +10,7 @@ import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.resvo.WebUserResVo;
import com.pangding.web.util.RSAUtils;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.StringHelper;
......@@ -47,7 +48,7 @@ public class UserServiceImpl implements UserService {
/*将RSA加密后的密码解密*/
String password = RSAUtils.decryptionByPrivateKey(webUserReqVo.getPassword(), RsaConstant.privateKey);
String confirmPassword = RSAUtils.decryptionByPrivateKey(webUserReqVo.getConfirmPassword(), RsaConstant.privateKey);
if (!StringHelper.compare(password,confirmPassword)){
if (!StringHelper.compare(password, confirmPassword)) {
throw new CodeException("确认密码错误");
}
......@@ -56,24 +57,24 @@ public class UserServiceImpl implements UserService {
webUserReqVo.setPassword(md5Password);
UserVo userVo = new UserVo();
if (null == webUserReqVo.getId() || webUserReqVo.getId().isEmpty()){
if (null == webUserReqVo.getId() || webUserReqVo.getId().isEmpty()) {
webUserReqVo.setId(StringHelper.getNewID());
ObjectHelper.writeWithFrom(userVo,webUserReqVo);
ObjectHelper.writeWithFrom(userVo, webUserReqVo);
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setCompanyId(webUserReqVo.getCompanyId());
userGetReqVo.setIsFirst(1);
UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
if (null != userVo1){
UserVo userVo1 = userDao.load(userGetReqVo, UserVo.class);
if (null != userVo1) {
userVo.setIsFirst(0);
}else {
} else {
userVo.setIsFirst(1);
}
userDao.create(userVo);
}else{
ObjectHelper.writeWithFrom(userVo,webUserReqVo);
} else {
ObjectHelper.writeWithFrom(userVo, webUserReqVo);
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setId(webUserReqVo.getId());
UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
UserVo userVo1 = userDao.load(userGetReqVo, UserVo.class);
userVo.setIsFirst(userVo1.getIsFirst());
userDao.update(userVo);
}
......@@ -83,8 +84,8 @@ public class UserServiceImpl implements UserService {
return userVo.getId();
}
private void saveUserRole(WebUserReqVo webUserReqVo){
if (webUserReqVo.getRoleIds()!=null && !webUserReqVo.getRoleIds().isEmpty()){
private void saveUserRole(WebUserReqVo webUserReqVo) {
if (webUserReqVo.getRoleIds() != null && !webUserReqVo.getRoleIds().isEmpty()) {
List<String> roleIds = webUserReqVo.getRoleIds();
/*删除该用户之前的角色*/
UserRoleVo reqVo = new UserRoleVo();
......@@ -104,24 +105,31 @@ public class UserServiceImpl implements UserService {
@Override
@Transactional(rollbackFor = Exception.class)
public String updateUser(WebUserReqVo webUserReqVo) {
this.isValid(webUserReqVo.getAccount());
this.checkAccount(webUserReqVo);
this.checkPhone(webUserReqVo);
webUserReqVo.setRemark(webUserReqVo.getPassword());
webUserReqVo.setPassword(this.passwordEncoder(webUserReqVo.getPassword()));
UserVo userVo = webUserReqVo;
com.pangding.web.vo.system.pd.authority.UserVo userVo = userDao.load(webUserReqVo.getId(), com.pangding.web.vo.system.pd.authority.UserVo.class);
if (StringHelper.isEmpty(userVo)) {
throw new CodeException("99", "没有找到用户信息");
}
if (1 != webUserReqVo.getUpdateType()) {
this.isValid(webUserReqVo.getAccount());
this.checkAccount(webUserReqVo);
this.checkPhone(webUserReqVo);
ObjectHelper.writeWithFrom(userVo, webUserReqVo);
}else{
userVo.setRemark(webUserReqVo.getPassword());
userVo.setPassword(this.passwordEncoder(webUserReqVo.getPassword()));
}
userDao.update(userVo);
if(StringHelper.isEmpty(webUserReqVo.getUpdateType())){
if (StringHelper.isEmpty(webUserReqVo.getUpdateType())) {
UserRoleGetReqVo reqVo = new UserRoleGetReqVo();
reqVo.setUserId(webUserReqVo.getId());
List<UserRoleVo> userRoleList = userRoleDao.getUserRoleList(reqVo);
if(userRoleList != null && !userRoleList.isEmpty()){
if (userRoleList != null && !userRoleList.isEmpty()) {
List<String> userRoleIdList = new ArrayList(userRoleList.size());
for (UserRoleVo userRole:userRoleList) {
for (UserRoleVo userRole : userRoleList) {
userRoleIdList.add(userRole.getId());
}
if (userRoleIdList != null && !userRoleIdList.isEmpty()){
for (String userRoleId:userRoleIdList){
if (userRoleIdList != null && !userRoleIdList.isEmpty()) {
for (String userRoleId : userRoleIdList) {
UserRoleRemoveReqVo userRole = new UserRoleRemoveReqVo();
userRole.setId(userRoleId);
userRoleDao.remove(userRole);
......@@ -137,10 +145,10 @@ public class UserServiceImpl implements UserService {
public void checkAccount(UserVo userVo) {
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setAccount(userVo.getAccount());
UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
UserVo userVo1 = userDao.load(userGetReqVo, UserVo.class);
if ((null != userVo1 && null == userVo.getId()) ||
(null != userVo1 && null != userVo.getId() && !userVo1.getId().equals(userVo.getId()))){
throw new CodeException("用户名"+userVo.getAccount()+"已存在");
(null != userVo1 && null != userVo.getId() && !userVo1.getId().equals(userVo.getId()))) {
throw new CodeException("用户名" + userVo.getAccount() + "已存在");
}
}
......@@ -148,33 +156,35 @@ public class UserServiceImpl implements UserService {
public void checkPhone(UserVo userVo) {
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setPhone(userVo.getPhone());
UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
UserVo userVo1 = userDao.load(userGetReqVo, UserVo.class);
if ((!StringHelper.isEmpty(userVo1) && StringHelper.isEmpty(userVo.getId())) ||
(!StringHelper.isEmpty(userVo1) && !StringHelper.isEmpty(userVo.getId()) && !userVo1.getId().equals(userVo.getId()))){
throw new CodeException("手机号"+userVo.getPhone()+"已存在");
(!StringHelper.isEmpty(userVo1) && !StringHelper.isEmpty(userVo.getId()) && !userVo1.getId().equals(userVo.getId()))) {
throw new CodeException("手机号" + userVo.getPhone() + "已存在");
}
}
@Override
public String passwordEncoder(String password) { return StringHelper.md5(password); }
public String passwordEncoder(String password) {
return StringHelper.md5(password);
}
@Override
public WebUserResVo makeResVo(UserVo userVo) {
WebUserResVo resVo = new WebUserResVo();
ObjectHelper.writeWithFrom(resVo,userVo);
ObjectHelper.writeWithFrom(resVo, userVo);
UserRoleGetReqVo reqVo = new UserRoleGetReqVo();
reqVo.setUserId(userVo.getId());
List<UserRoleVo> userRoleVoList = this.listUserRoleListByUserId(reqVo);
if (userRoleVoList != null && !userRoleVoList.isEmpty()){
if (userRoleVoList != null && !userRoleVoList.isEmpty()) {
List<RoleVo> roleList = new ArrayList(userRoleVoList.size());
for (UserRoleVo userRoleRelation:userRoleVoList) {
for (UserRoleVo userRoleRelation : userRoleVoList) {
String roleId = userRoleRelation.getRoleId();
RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
roleGetReqVo.setId(roleId);
RoleVo roleVo = roleDao.load(roleGetReqVo,RoleVo.class);
RoleVo roleVo = roleDao.load(roleGetReqVo, RoleVo.class);
roleList.add(roleVo);
}
resVo.setRoleList(roleList);
......@@ -188,7 +198,7 @@ public class UserServiceImpl implements UserService {
UserGetReqVo reqVo = new UserGetReqVo();
reqVo.setId(userId);
UserVo userVo = userDao.getUser(reqVo);
if (userVo == null){
if (userVo == null) {
throw new CodeException("该用户不存在");
}
WebUserResVo resVo = this.makeResVo(userVo);
......@@ -207,8 +217,8 @@ public class UserServiceImpl implements UserService {
@Override
public Boolean isNumeric(String account) {
for (int i = 0;i < account.length();i++){
if (!Character.isDigit(account.charAt(i))){
for (int i = 0; i < account.length(); i++) {
if (!Character.isDigit(account.charAt(i))) {
return false;
}
}
......@@ -219,16 +229,16 @@ public class UserServiceImpl implements UserService {
@Override
public void isValid(String account) {
String regex = "^(?!\\d+$)[\\da-zA-Z]+$";
if(!account.matches(regex)){
throw new CodeException("错误的用户名："+account+",用户名仅支持字母和数字的组合，且不能为纯数字");
if (!account.matches(regex)) {
throw new CodeException("错误的用户名：" + account + ",用户名仅支持字母和数字的组合，且不能为纯数字");
}
}
@Override
public void checkEmail(String email){
public void checkEmail(String email) {
String regex = "^\\s*\\w+(?:\\.{0,1}[\\w-]+)*@[a-zA-Z0-9]+(?:[-.][a-zA-Z0-9]+)*\\.[a-zA-Z]+\\s*$";
if (!email.matches(regex)){
throw new CodeException("错误的邮箱格式："+email);
if (!email.matches(regex)) {
throw new CodeException("错误的邮箱格式：" + email);
}
}
......@@ -236,7 +246,7 @@ public class UserServiceImpl implements UserService {
public UserVo getUserByPhone(String phone) {
UserGetReqVo reqVo = new UserGetReqVo();
reqVo.setPhone(phone);
return userDao.load(reqVo,UserVo.class);
return userDao.load(reqVo, UserVo.class);
}
@Override
......@@ -249,7 +259,7 @@ public class UserServiceImpl implements UserService {
@Override
public PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo) {
PageSizeData<UserVo> userVoPageSizeData = userDao.getUserVoList(reqVo);
if (userVoPageSizeData.getList() == null || userVoPageSizeData.getList().isEmpty()){
if (userVoPageSizeData.getList() == null || userVoPageSizeData.getList().isEmpty()) {
throw new CodeException("没有更多用户");
}
return userVoPageSizeData;
......@@ -261,11 +271,11 @@ public class UserServiceImpl implements UserService {
PageSizeData<WebUserResVo> webUserResVoPageSizeData = new PageSizeData();
List<UserVo> userVoList = userVoPageSizeData.getList();
List<WebUserResVo> webUserResVoList = new ArrayList(userVoList.size());
for (UserVo userVo:userVoList) {
for (UserVo userVo : userVoList) {
WebUserResVo resVo = new WebUserResVo();
List<RoleVo> roleVoList = this.getRoleListByUserId(userVo.getId());
ObjectHelper.writeWithFrom(resVo,userVo);
ObjectHelper.writeWithFrom(resVo, userVo);
webUserResVoList.add(resVo);
}
......@@ -282,12 +292,12 @@ public class UserServiceImpl implements UserService {
UserRoleGetReqVo reqVo = new UserRoleGetReqVo();
reqVo.setUserId(userId);
List<UserRoleVo> userRoleVoList = userRoleDao.getUserRoleList(reqVo);
if (userRoleVoList != null && !userRoleVoList.isEmpty()){
if (userRoleVoList != null && !userRoleVoList.isEmpty()) {
List<RoleVo> roleVoList = new ArrayList(userRoleVoList.size());
for (UserRoleVo userRoleVo:userRoleVoList) {
for (UserRoleVo userRoleVo : userRoleVoList) {
RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
roleGetReqVo.setId(userRoleVo.getRoleId());
RoleVo roleVo = roleDao.load(roleGetReqVo,RoleVo.class);
RoleVo roleVo = roleDao.load(roleGetReqVo, RoleVo.class);
roleVoList.add(roleVo);
}
return roleVoList;
......
src/main/java/com/pangding/web/authority/util/RsaConstant.java
View file @ b0c8246d
package com.pangding.web.authority.util;
import org.springframework.beans.factory.annotation.Value;
/**
* @Author zhangjinyao
......
src/main/java/com/pangding/web/authority/vo/UserVo.java deleted 100644 → 0
View file @ 85a1e5fb
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.BaseVo;
import com.yanzuoguang.util.vo.InitDao;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Date;
/**
* @author zhangjinyao
*/
@TableAnnotation("pd_user")
public class UserVo extends BaseVo implements InitDao {
private String id;
private String account;
private String password;
private String phone;
private Integer status;
private String remark;
@TableAnnotation("create_time")
private String createTime;
@TableAnnotation("create_id")
private String createId;
@TableAnnotation("create_name")
private String createName;
@TableAnnotation("company_id")
private String companyId;
private String name;
private String email;
@TableAnnotation("is_first")
private Integer isFirst;
public Integer getIsFirst() {
return isFirst;
}
public void setIsFirst(Integer isFirst) {
this.isFirst = isFirst;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getCreateId() {
return createId;
}
public void setCreateId(String createId) {
this.createId = createId;
}
public String getCreateName() {
return createName;
}
public void setCreateName(String createName) {
this.createName = createName;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
@Override
public void init() {
this.createTime = StringHelper.getFirst(this.createTime, DateHelper.getNow());
}
}
src/main/java/com/pangding/web/authority/vo/cloudvo/LoginResVo.java
View file @ b0c8246d
......@@ -4,6 +4,7 @@ import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
import com.pangding.web.vo.product.pd.merchant.MerchantVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import java.util.List;
......
src/main/java/com/pangding/web/authority/vo/reqvo/BatchUpdateReqVo.java
View file @ b0c8246d
package com.pangding.web.authority.vo.reqvo;
import com.pangding.web.authority.vo.UserVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import java.util.List;
......
src/main/java/com/pangding/web/authority/vo/reqvo/WebUserReqVo.java
View file @ b0c8246d
package com.pangding.web.authority.vo.reqvo;
import com.pangding.web.authority.vo.UserVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import java.util.List;
......
src/main/java/com/pangding/web/authority/vo/resvo/CompanyResVo.java
View file @ b0c8246d
......@@ -3,6 +3,7 @@ package com.pangding.web.authority.vo.resvo;
import com.pangding.web.authority.vo.*;
import com.pangding.web.vo.product.pd.merchant.MerchantVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
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.CompanyVo;
......
src/main/java/com/pangding/web/authority/vo/resvo/DetailResVo.java
View file @ b0c8246d
package com.pangding.web.authority.vo.resvo;
import com.pangding.web.authority.vo.UserVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import java.util.List;
......
src/main/java/com/pangding/web/authority/vo/resvo/ManagementResVo.java
View file @ b0c8246d
package com.pangding.web.authority.vo.resvo;
import com.pangding.web.authority.vo.UserVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
......
src/main/java/com/pangding/web/authority/vo/resvo/WebUserResVo.java
View file @ b0c8246d
package com.pangding.web.authority.vo.resvo;
import com.pangding.web.authority.vo.UserVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import java.util.List;
......
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