Skip to content

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

1

parents c9a6d7f4 b4c46c1b
Show whitespace changes
Inline Side-by-side
Showing with 1207 additions and 670 deletions
src/main/java/com/pangding/web/authority/cloudvo/ComputerRegisterUserReturnVo.java deleted 100644 → 0
View file @ c9a6d7f4
package com.pangding.web.authority.cloudvo;
/**
* @Author zhangjinyao
* @create 2019/5/14 17:48
*/
public class ComputerRegisterUserReturnVo {
private String companyId;
private String merchantId;
private int companyType;
public int getCompanyType() {
return companyType;
}
public void setCompanyType(int companyType) {
this.companyType = companyType;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getMerchantId() {
return merchantId;
}
public void setMerchantId(String merchantId) {
this.merchantId = merchantId;
}
}
src/main/java/com/pangding/web/authority/cloudvo/MobileRegisterUserReturnVo.java deleted 100644 → 0
View file @ c9a6d7f4
package com.pangding.web.authority.cloudvo;
/**
* @Author zhangjinyao
* @create 2019/5/13 16:15
*/
public class MobileRegisterUserReturnVo {
private String companyId;
private String merchantId;
private int companyType;
public int getCompanyType() {
return companyType;
}
public void setCompanyType(int companyType) {
this.companyType = companyType;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getMerchantId() {
return merchantId;
}
public void setMerchantId(String merchantId) {
this.merchantId = merchantId;
}
}
src/main/java/com/pangding/web/authority/controller/AuthorityController.java
View file @ 13d18c17
package com.pangding.web.authority.controller; package com.pangding.web.authority.controller;
import com.pangding.web.authority.currency.Result;
import com.pangding.web.authority.service.AuthorityService; import com.pangding.web.authority.service.AuthorityService;
import com.pangding.web.authority.vo.AuthorityVo; import com.pangding.web.authority.vo.AuthorityVo;
import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo; import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
import com.pangding.web.authority.vo.reqvo.WebAuthorityReqVo; import com.pangding.web.authority.vo.reqvo.WebAuthorityReqVo;
import com.pangding.web.authority.vo.reqvo.WebAuthorityResVo; import com.pangding.web.authority.vo.reqvo.WebAuthorityResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData; import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult; import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* @author zhangjinyao * @author zhangjinyao
...@@ -32,6 +31,16 @@ public class AuthorityController { ...@@ -32,6 +31,16 @@ public class AuthorityController {
*/ */
@RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult saveAuthority(@RequestBody AuthorityVo authorityVo){ public ResponseResult saveAuthority(@RequestBody AuthorityVo authorityVo){
CheckerHelper.newInstance()
.notBlankCheck("authority",authorityVo)
.checkException()
.notBlankCheck("authorityName",authorityVo.getName())
.notBlankCheck("authorityUrl",authorityVo.getUrl())
.notBlankCheck("type",authorityVo.getType())
.notBlankCheck("alias",authorityVo.getAlias())
.notBlankCheck("openMode",authorityVo.getOpenMode())
.notBlankCheck("remark",authorityVo.getRemark())
.checkException();
authorityServiceImpl.save(authorityVo); authorityServiceImpl.save(authorityVo);
return new ResponseResult(); return new ResponseResult();
} }
...@@ -43,6 +52,16 @@ public class AuthorityController { ...@@ -43,6 +52,16 @@ public class AuthorityController {
*/ */
@RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult updateAuthority(@RequestBody AuthorityVo authorityVo){ public ResponseResult updateAuthority(@RequestBody AuthorityVo authorityVo){
CheckerHelper.newInstance()
.notBlankCheck("authority",authorityVo)
.checkException()
.notBlankCheck("authorityName",authorityVo.getName())
.notBlankCheck("authorityUrl",authorityVo.getUrl())
.notBlankCheck("type",authorityVo.getType())
.notBlankCheck("alias",authorityVo.getAlias())
.notBlankCheck("openMode",authorityVo.getOpenMode())
.notBlankCheck("remark",authorityVo.getRemark())
.checkException();
authorityServiceImpl.update(authorityVo); authorityServiceImpl.update(authorityVo);
return new ResponseResult(); return new ResponseResult();
} }
...@@ -51,7 +70,7 @@ public class AuthorityController { ...@@ -51,7 +70,7 @@ public class AuthorityController {
* 查询权限列表 * 查询权限列表
* @return * @return
*/ */
@RequestMapping(value = "/list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<PageSizeData<WebAuthorityResVo>> listAuthoritys(ListAuthorityReqVo reqVo){ public ResponseResult<PageSizeData<WebAuthorityResVo>> listAuthoritys(ListAuthorityReqVo reqVo){
return ResponseResult.result(authorityServiceImpl.getWebAuthorityResVoList(reqVo)); return ResponseResult.result(authorityServiceImpl.getWebAuthorityResVoList(reqVo));
} }
...@@ -60,8 +79,9 @@ public class AuthorityController { ...@@ -60,8 +79,9 @@ public class AuthorityController {
* 查询一级权限 * 查询一级权限
* @return * @return
*/ */
@RequestMapping(value = "/firstLevel", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/firstLevel", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<PageSizeData<WebAuthorityResVo>> parentAuthoritys(ListAuthorityReqVo reqVo){ public ResponseResult<PageSizeData<WebAuthorityResVo>> parentAuthoritys(ListAuthorityReqVo reqVo){
reqVo.setLevelOne("one");
return ResponseResult.result(authorityServiceImpl.getWebAuthorityResVoList(reqVo)); return ResponseResult.result(authorityServiceImpl.getWebAuthorityResVoList(reqVo));
} }
...@@ -70,8 +90,13 @@ public class AuthorityController { ...@@ -70,8 +90,13 @@ public class AuthorityController {
* @param reqVo * @param reqVo
* @return * @return
*/ */
@RequestMapping(value = "/role", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/role", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<AuthorityVo> authority(@RequestBody WebAuthorityReqVo reqVo){ public ResponseResult<AuthorityVo> authority(@RequestBody WebAuthorityReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("reqVo",reqVo)
.checkException()
.notBlankCheck("anthorityId",reqVo.getId())
.checkException();
return ResponseResult.result(authorityServiceImpl.getAuthorityById(reqVo)); return ResponseResult.result(authorityServiceImpl.getAuthorityById(reqVo));
} }
...@@ -82,6 +107,11 @@ public class AuthorityController { ...@@ -82,6 +107,11 @@ public class AuthorityController {
*/ */
@RequestMapping(value = "/delete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult delete(@RequestBody WebAuthorityReqVo reqVo){ public ResponseResult delete(@RequestBody WebAuthorityReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("reqVo",reqVo)
.checkException()
.notBlankCheck("anthorityId",reqVo.getId())
.checkException();
authorityServiceImpl.deleteAuthorityById(reqVo); authorityServiceImpl.deleteAuthorityById(reqVo);
return new ResponseResult(); return new ResponseResult();
......
src/main/java/com/pangding/web/authority/controller/ComputerRegisterController.java
View file @ 13d18c17
package com.pangding.web.authority.controller; package com.pangding.web.authority.controller;
import com.pangding.web.authority.cloudvo.ComputerRegisterUserReturnVo; import com.pangding.web.authority.vo.reqvo.RegisterEnterpriceReqVo;
import com.pangding.web.authority.currency.Result; import com.pangding.web.authority.vo.reqvo.RegisterIndividualReqVo;
import com.pangding.web.authority.dto.RegisterEnterpriceDto; import com.pangding.web.authority.vo.reqvo.RegisterUserReqVo;
import com.pangding.web.authority.dto.RegisterIndividualDto; import com.pangding.web.authority.service.RegisterService;
import com.pangding.web.authority.dto.RegisterUserDto;
import com.pangding.web.authority.service.MobileRegisterService;
import com.pangding.web.authority.service.UserService; import com.pangding.web.authority.service.UserService;
import com.pangding.web.authority.vo.CompanyVo; import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.MobileLoginInfo; import com.pangding.web.authority.vo.reqvo.LoginReqVo;
import com.pangding.web.authority.vo.UserVo; import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.token.TokenHelper; import com.yanzuoguang.util.vo.ResponseResult;
import com.yanzuoguang.util.helper.StringHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -28,120 +25,94 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -28,120 +25,94 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping(value="/computer") @RequestMapping(value="/computer")
public class ComputerRegisterController { public class ComputerRegisterController {
@Autowired @Autowired
MobileRegisterService mobileRegisterServiceImpl; RegisterService registerServiceImpl;
@Autowired @Autowired
UserService userServiceImpl; UserService userServiceImpl;
/** /**
* 验证注册第一页数据的合法性并保存 * 验证注册第一页数据的合法性并保存
* *
* @param registerUserDto * @param registerUserReqVo
* @return * @return
*/ */
@RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Object saveUser(@RequestBody RegisterUserDto registerUserDto){ public ResponseResult<CompanyVo> saveUser(@RequestBody RegisterUserReqVo registerUserReqVo){
CheckerHelper.newInstance()
if (!userServiceImpl.isValid(registerUserDto.getAccount())){ .notBlankCheck("reqVo",registerUserReqVo)
return new Result(4001,"用户名由字母与数字组成，且不能为纯数字",registerUserDto); .checkException()
} .notBlankCheck("account",registerUserReqVo.getAccount())
.notBlankCheck("password",registerUserReqVo.getPassword())
UserVo userVo = new UserVo(); .notBlankCheck("confirmPassword",registerUserReqVo.getConfirmPassword())
userVo.setAccount(registerUserDto.getAccount()); .notBlankCheck("companyType",registerUserReqVo.getCompanyType())
userServiceImpl.checkAccount(userVo); .notBlankCheck("merchantId",registerUserReqVo.getMerchantId())
.checkException();
String merchantId = registerUserDto.getMerchantId(); return ResponseResult.result(registerServiceImpl.saveUser(registerUserReqVo));
if (!mobileRegisterServiceImpl.checkMerchantId(merchantId)){
return new Result(4001,"注册编码错误",registerUserDto);
}
String companyId = StringHelper.getNewID();
userVo.setPassword(Md5AndSalt.generate(registerUserDto.getPassword()));
userVo.setId(StringHelper.getNewID());
userVo.setRemark(registerUserDto.getPassword());
userVo.setCompanyId(companyId);
mobileRegisterServiceImpl.saveUser(userVo);
ComputerRegisterUserReturnVo returnVo = new ComputerRegisterUserReturnVo();
returnVo.setCompanyId(companyId);
returnVo.setMerchantId(merchantId);
returnVo.setCompanyType(registerUserDto.getCompanyType());
/*token内容暂时不能用，以后要改动，需要存入用户及企业信息*/
String token = StringHelper.getNewID();
TokenHelper.write(token,returnVo);
return new Result(0,"SUCCESS",null);
} }
/** /**
* 当用户类型选择为“个体”时进入此方法 * 当用户类型选择为“个体”时进入此方法
* 验证注册第二页数据的合法性并保存 * 验证注册第二页数据的合法性并保存
* *
* @param individualDto * @param reqVo
* @return * @return
*/ */
@RequestMapping(value="/individual", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value="/individual", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Object saveIndividual(@RequestBody RegisterIndividualDto individualDto){ public ResponseResult saveIndividual(@RequestBody RegisterIndividualReqVo reqVo){
CheckerHelper.newInstance()
mobileRegisterServiceImpl.checkPhone(individualDto.getContactPhone()); .notBlankCheck("reqVo",reqVo)
.checkException()
CompanyVo companyVo = new CompanyVo(); .notBlankCheck("contactName",reqVo.getContactName())
.notBlankCheck("contactCode",reqVo.getContactCode())
/*token内容暂时不能用，以后要改动*/ .checkIdCard("contactCode",reqVo.getContactCode())
ComputerRegisterUserReturnVo returnVo = TokenHelper.get(ComputerRegisterUserReturnVo.class); .notBlankCheck("companyAttribute",reqVo.getCompanyAttribute())
.notBlankCheck("extraChoseOne",reqVo.getExtraChoseOne())
companyVo.setId(returnVo.getCompanyId()); .notBlankCheck("extraChosetwo",reqVo.getExtraChoseTwo())
companyVo.setCompanyType(returnVo.getCompanyType()); .notBlankCheck("contactPhone",reqVo.getContactPhone())
companyVo.setMerchantId(returnVo.getMerchantId()); .checkPhoneNo("contactPhone",reqVo.getContactPhone())
companyVo.setContactName(individualDto.getContactName()); .checkException();
companyVo.setContactCode(individualDto.getContactCode()); registerServiceImpl.saveIndividual(reqVo);
companyVo.setCompanyAttribute(individualDto.getCompanyAttribute()); return new ResponseResult();
companyVo.setContactPhone(individualDto.getContactPhone());
if (individualDto.getCompanyAttribute().equals("5")){
companyVo.setCompanyName(individualDto.getExtraChoseOne());
companyVo.setBusinessLicenseCode(individualDto.getExtraChoseTwo());
}else{
companyVo.setCompanyName(individualDto.getExtraChoseOne());
companyVo.setAddress(individualDto.getExtraChoseTwo());
}
mobileRegisterServiceImpl.saveCompany(companyVo);
return new Result(0,"SUCCESS",null);
} }
@RequestMapping(value="/enterprise", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value="/enterprise", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Object saveEnterprise(@RequestBody RegisterEnterpriceDto enterpriceDto){ public ResponseResult saveEnterprise(@RequestBody RegisterEnterpriceReqVo reqVo){
CheckerHelper.newInstance()
mobileRegisterServiceImpl.checkPhone(enterpriceDto.getContactPhone()); .notBlankCheck("reqVo",reqVo)
.checkException()
/*token内容暂时不能用，以后要改动*/ .notBlankCheck("companyName",reqVo.getCompanyName())
ComputerRegisterUserReturnVo returnVo = TokenHelper.get(ComputerRegisterUserReturnVo.class); .notBlankCheck("companyAddress",reqVo.getCompanyAddress())
.notBlankCheck("businessLicenseCode",reqVo.getBusinessLicenseCode())
.notNumberCheck("businessLicenseCode",reqVo.getBusinessLicenseCode())
return null; .notBlankCheck("merchantName",reqVo.getMerchantName())
.notBlankCheck("companyAttribute",reqVo.getCompanyAttribute())
.notBlankCheck("contactName",reqVo.getContactName())
.notBlankCheck("contactCode",reqVo.getContactCode())
.checkIdCard("contactCode",reqVo.getContactCode())
.notBlankCheck("contactPhone",reqVo.getContactPhone())
.checkPhoneNo("contactPhone",reqVo.getContactPhone())
.notBlankCheck("bankName",reqVo.getBankName())
.notBlankCheck("bankCardCode",reqVo.getBankCardCode())
.notNumberCheck("bankCardCode",reqVo.getBankCardCode())
.notBlankCheck("bankAddress",reqVo.getBankAddress())
.notBlankCheck("bankCode",reqVo.getBankCode())
.notNumberCheck("bankCode",reqVo.getBankCode())
.notBlankCheck("reservedPhone",reqVo.getReservedPhone())
.checkPhoneNo("reservedPhone",reqVo.getReservedPhone())
.checkException();
registerServiceImpl.saveEnterprise(reqVo);
return new ResponseResult();
} }
@RequestMapping(value = "/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Object login(@RequestBody MobileLoginInfo info){ public ResponseResult login(@RequestBody LoginReqVo reqVo){
CheckerHelper.newInstance()
String accountOrPhone = info.getAccountOrPhone(); .notBlankCheck("reqVo",reqVo)
UserVo userVo; .checkException()
if (userServiceImpl.isNumeric(accountOrPhone)){ .notBlankCheck("account or phone",reqVo.getAccountOrPhone())
userVo = userServiceImpl.getUserByPhone(accountOrPhone); .notBlankCheck("pass",reqVo.getPassword())
}else { .checkException();
userVo = userServiceImpl.getUserByAccount(accountOrPhone); registerServiceImpl.login(reqVo);
} return new ResponseResult();
if (userVo == null){
return new Result(4001,"没有此用户",info);
}
if (!Md5AndSalt.verify(info.getPassword(),userVo.getPassword())){
return new Result(4001,"用户名或密码错误",info);
}
/*token内容暂时不能用，以后要改动*/
String token = StringHelper.getNewID();
TokenHelper.write(token,userVo);
return new Result(0,"SUCCESS",null);
} }
} }
src/main/java/com/pangding/web/authority/controller/MobileRegisterController.java
View file @ 13d18c17
package com.pangding.web.authority.controller; package com.pangding.web.authority.controller;
import com.pangding.web.authority.currency.Result; import com.pangding.web.authority.vo.reqvo.RegisterIndividualReqVo;
import com.pangding.web.authority.dto.RegisterIndividualDto; import com.pangding.web.authority.vo.reqvo.RegisterUserReqVo;
import com.pangding.web.authority.dto.RegisterUserDto; import com.pangding.web.authority.service.RegisterService;
import com.pangding.web.authority.cloudvo.MobileRegisterUserReturnVo;
import com.pangding.web.authority.service.MobileRegisterService;
import com.pangding.web.authority.service.UserService;
import com.pangding.web.authority.vo.CompanyVo; import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.MobileLoginInfo; import com.pangding.web.authority.vo.reqvo.LoginReqVo;
import com.pangding.web.authority.vo.UserVo; import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.token.TokenHelper; import com.yanzuoguang.util.vo.ResponseResult;
import com.yanzuoguang.util.helper.StringHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -27,114 +23,64 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -27,114 +23,64 @@ import org.springframework.web.bind.annotation.RestController;
public class MobileRegisterController { public class MobileRegisterController {
@Autowired @Autowired
MobileRegisterService mobileRegisterServiceImpl; RegisterService registerServiceImpl;
@Autowired
UserService userServiceImpl;
/** /**
* 验证注册第一页数据的合法性并保存 * 验证注册第一页数据的合法性并保存
* *
* @param registerUserDto * @param registerUserReqVo
* @return * @return
*/ */
@RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Object saveUser(@RequestBody RegisterUserDto registerUserDto){ public ResponseResult<CompanyVo> saveUser(@RequestBody RegisterUserReqVo registerUserReqVo){
CheckerHelper.newInstance()
if (registerUserDto.getCompanyType() != 0){ .notBlankCheck("reqVo",registerUserReqVo)
return new Result(4001,"目前仅支持个体用户",registerUserDto); .checkException()
} .notBlankCheck("account",registerUserReqVo.getAccount())
.notBlankCheck("password",registerUserReqVo.getPassword())
if (!userServiceImpl.isValid(registerUserDto.getAccount())){ .notBlankCheck("confirmPassword",registerUserReqVo.getConfirmPassword())
return new Result(4001,"用户名由字母与数字组成，且不能为纯数字",registerUserDto); .notBlankCheck("companyType",registerUserReqVo.getCompanyType())
} .notBlankCheck("merchantId",registerUserReqVo.getMerchantId())
.checkException();
UserVo userVo = new UserVo(); return ResponseResult.result(registerServiceImpl.saveUser(registerUserReqVo));
userVo.setAccount(registerUserDto.getAccount());
userServiceImpl.checkAccount(userVo);
String merchantId = registerUserDto.getMerchantId();
if (!mobileRegisterServiceImpl.checkMerchantId(merchantId)){
return new Result(4001,"注册编码错误",registerUserDto);
}
String companyId = StringHelper.getNewID();
userVo.setPassword(Md5AndSalt.generate(registerUserDto.getPassword()));
userVo.setId(StringHelper.getNewID());
userVo.setRemark(registerUserDto.getPassword());
userVo.setCompanyId(companyId);
mobileRegisterServiceImpl.saveUser(userVo);
MobileRegisterUserReturnVo returnVo = new MobileRegisterUserReturnVo();
returnVo.setCompanyId(companyId);
returnVo.setMerchantId(merchantId);
returnVo.setCompanyType(registerUserDto.getCompanyType());
/*token内容暂时不能用，以后要改动，需要存入用户及企业信息*/
String token = StringHelper.getNewID();
TokenHelper.write(token,returnVo);
return new Result(0,"SUCCESS",null);
} }
/** /**
* 验证注册第二页数据的合法性并保存 * 验证注册第二页数据的合法性并保存
* *
* @param individualDto * @param reqVo
* @return * @return
*/ */
@RequestMapping(value="/individual", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value="/individual", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Object saveIndividual(@RequestBody RegisterIndividualDto individualDto){ public ResponseResult saveIndividual(@RequestBody RegisterIndividualReqVo reqVo){
CheckerHelper.newInstance()
mobileRegisterServiceImpl.checkPhone(individualDto); .notBlankCheck("reqVo",reqVo)
.checkException()
CompanyVo companyVo = new CompanyVo(); .notBlankCheck("contactName",reqVo.getContactName())
.notBlankCheck("contactCode",reqVo.getContactCode())
/*token内容暂时不能用，以后要改动*/ .checkIdCard("contactCode",reqVo.getContactCode())
MobileRegisterUserReturnVo returnVo = TokenHelper.get(MobileRegisterUserReturnVo.class); .notBlankCheck("companyAttribute",reqVo.getCompanyAttribute())
.notBlankCheck("extraChoseOne",reqVo.getExtraChoseOne())
companyVo.setId(returnVo.getCompanyId()); .notBlankCheck("extraChosetwo",reqVo.getExtraChoseTwo())
companyVo.setCompanyType(returnVo.getCompanyType()); .notBlankCheck("contactPhone",reqVo.getContactPhone())
companyVo.setMerchantId(returnVo.getMerchantId()); .checkPhoneNo("contactPhone",reqVo.getContactPhone())
companyVo.setContactName(individualDto.getContactName()); .checkException();
companyVo.setContactCode(individualDto.getContactCode()); registerServiceImpl.saveIndividual(reqVo);
companyVo.setCompanyAttribute(individualDto.getCompanyAttribute()); return new ResponseResult();
companyVo.setContactPhone(individualDto.getContactPhone());
if (individualDto.getCompanyAttribute().equals("5")){
companyVo.setCompanyName(individualDto.getExtraChoseOne());
companyVo.setBusinessLicenseCode(individualDto.getExtraChoseTwo());
}else{
companyVo.setCompanyName(individualDto.getExtraChoseOne());
companyVo.setAddress(individualDto.getExtraChoseTwo());
}
mobileRegisterServiceImpl.saveCompany(companyVo);
return new Result(0,"SUCCESS",null);
} }
@RequestMapping(value = "/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Object login(@RequestBody MobileLoginInfo info){ public ResponseResult login(@RequestBody LoginReqVo reqVo){
CheckerHelper.newInstance()
String accountOrPhone = info.getAccountOrPhone(); .notBlankCheck("reqVo",reqVo)
UserVo userVo; .checkException()
if (userServiceImpl.isNumeric(accountOrPhone)){ .notBlankCheck("account or phone",reqVo.getAccountOrPhone())
userVo = userServiceImpl.getUserByPhone(accountOrPhone); .notBlankCheck("pass",reqVo.getPassword())
}else { .checkException();
userVo = userServiceImpl.getUserByAccount(accountOrPhone); registerServiceImpl.login(reqVo);
} return new ResponseResult();
if (userVo == null){
return new Result(4001,"没有此用户",info);
}
if (!Md5AndSalt.verify(info.getPassword(),userVo.getPassword())){
return new Result(4001,"用户名或密码错误",info);
}
/*token内容暂时不能用，以后要改动*/
String token = StringHelper.getNewID();
TokenHelper.write(token,userVo);
return new Result(0,"SUCCESS",null);
} }
} }
src/main/java/com/pangding/web/authority/controller/RegisterController.java 0 → 100644
View file @ 13d18c17
package com.pangding.web.authority.controller;
public class RegisterController {
}
src/main/java/com/pangding/web/authority/controller/RoleController.java
View file @ 13d18c17
...@@ -5,6 +5,7 @@ import com.pangding.web.authority.vo.reqvo.ListRoleReqVo; ...@@ -5,6 +5,7 @@ import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
import com.pangding.web.authority.vo.reqvo.WebRoleReqVo; import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
import com.pangding.web.authority.service.RoleService; import com.pangding.web.authority.service.RoleService;
import com.pangding.web.authority.vo.reqvo.WebRoleResVo; import com.pangding.web.authority.vo.reqvo.WebRoleResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData; import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult; import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -29,6 +30,12 @@ public class RoleController { ...@@ -29,6 +30,12 @@ public class RoleController {
*/ */
@RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult saveRole(@RequestBody WebRoleReqVo webRoleReqVo){ public ResponseResult saveRole(@RequestBody WebRoleReqVo webRoleReqVo){
CheckerHelper.newInstance()
.notBlankCheck("reqVo",webRoleReqVo)
.checkException()
.notBlankCheck("roleName",webRoleReqVo.getName())
.notBlankCheck("remark",webRoleReqVo.getRemark())
.checkException();
roleServiceImpl.saveRole(webRoleReqVo); roleServiceImpl.saveRole(webRoleReqVo);
return new ResponseResult(); return new ResponseResult();
} }
...@@ -40,6 +47,12 @@ public class RoleController { ...@@ -40,6 +47,12 @@ public class RoleController {
*/ */
@RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult updateRole(@RequestBody WebRoleReqVo webRoleReqVo){ public ResponseResult updateRole(@RequestBody WebRoleReqVo webRoleReqVo){
CheckerHelper.newInstance()
.notBlankCheck("reqVo",webRoleReqVo)
.checkException()
.notBlankCheck("roleName",webRoleReqVo.getName())
.notBlankCheck("remark",webRoleReqVo.getRemark())
.checkException();
roleServiceImpl.updateRole(webRoleReqVo); roleServiceImpl.updateRole(webRoleReqVo);
return new ResponseResult(); return new ResponseResult();
} }
...@@ -48,7 +61,7 @@ public class RoleController { ...@@ -48,7 +61,7 @@ public class RoleController {
* 查询角色列表 * 查询角色列表
* @return * @return
*/ */
@RequestMapping(value = "/list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<PageSizeData<WebRoleResVo>> listRoles(@RequestBody ListRoleReqVo req){ public ResponseResult<PageSizeData<WebRoleResVo>> listRoles(@RequestBody ListRoleReqVo req){
return ResponseResult.result(roleServiceImpl.getWebRoleResVoList(req)); return ResponseResult.result(roleServiceImpl.getWebRoleResVoList(req));
} }
...@@ -60,6 +73,11 @@ public class RoleController { ...@@ -60,6 +73,11 @@ public class RoleController {
*/ */
@RequestMapping(value = "/role", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/role", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<WebRoleResVo> getRoleById(@RequestBody WebRoleReqVo webRoleReqVo){ public ResponseResult<WebRoleResVo> getRoleById(@RequestBody WebRoleReqVo webRoleReqVo){
CheckerHelper.newInstance()
.notBlankCheck("reqVo",webRoleReqVo)
.checkException()
.notBlankCheck("roleId",webRoleReqVo.getId())
.checkException();
return ResponseResult.result(roleServiceImpl.getRoleById(webRoleReqVo)); return ResponseResult.result(roleServiceImpl.getRoleById(webRoleReqVo));
} }
...@@ -70,6 +88,11 @@ public class RoleController { ...@@ -70,6 +88,11 @@ public class RoleController {
*/ */
@RequestMapping(value = "/delete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult delete(@RequestBody WebRoleReqVo webRoleReqVo){ public ResponseResult delete(@RequestBody WebRoleReqVo webRoleReqVo){
CheckerHelper.newInstance()
.notBlankCheck("reqVo",webRoleReqVo)
.checkException()
.notBlankCheck("roleId",webRoleReqVo.getId())
.checkException();
roleServiceImpl.delete(webRoleReqVo); roleServiceImpl.delete(webRoleReqVo);
return new ResponseResult(); return new ResponseResult();
} }
......
src/main/java/com/pangding/web/authority/controller/UserController.java
View file @ 13d18c17
package com.pangding.web.authority.controller; package com.pangding.web.authority.controller;
import com.pangding.web.authority.currency.Result;
import com.pangding.web.authority.vo.reqvo.*; import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.service.UserService; import com.pangding.web.authority.service.UserService;
import com.pangding.web.authority.vo.*; import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.PageSizeData; import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult; import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/** /**
* @author zhangjinyao * @author zhangjinyao
...@@ -32,6 +28,15 @@ public class UserController { ...@@ -32,6 +28,15 @@ public class UserController {
*/ */
@RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult saveUser(@RequestBody WebUserReqVo webUserReqVo){ public ResponseResult saveUser(@RequestBody WebUserReqVo webUserReqVo){
CheckerHelper.newInstance()
.notBlankCheck("reqVo",webUserReqVo)
.checkException()
.notBlankCheck("account",webUserReqVo.getAccount())
.notBlankCheck("password",webUserReqVo.getPassword())
.checkPhoneNo("phone",webUserReqVo.getPhone())
.notBlankCheck("companyId",webUserReqVo.getCompanyId())
.notBlankCheck("status",webUserReqVo.getStatus())
.checkException();
userServiceImpl.saveUser(webUserReqVo); userServiceImpl.saveUser(webUserReqVo);
return new ResponseResult(); return new ResponseResult();
} }
...@@ -43,8 +48,15 @@ public class UserController { ...@@ -43,8 +48,15 @@ public class UserController {
*/ */
@RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult updateUser(@RequestBody WebUserReqVo webUserReqVo){ public ResponseResult updateUser(@RequestBody WebUserReqVo webUserReqVo){
CheckerHelper.newInstance()
.notBlankCheck("reqVo",webUserReqVo)
.checkException()
.notBlankCheck("account",webUserReqVo.getAccount())
.notBlankCheck("password",webUserReqVo.getPassword())
.checkPhoneNo("phone",webUserReqVo.getPhone())
.notBlankCheck("companyId",webUserReqVo.getCompanyId())
.notBlankCheck("status",webUserReqVo.getStatus())
.checkException();
userServiceImpl.updateUser(webUserReqVo); userServiceImpl.updateUser(webUserReqVo);
return new ResponseResult(); return new ResponseResult();
} }
...@@ -65,6 +77,11 @@ public class UserController { ...@@ -65,6 +77,11 @@ public class UserController {
*/ */
@RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<WebUserResVo> user(@RequestBody WebUserReqVo webUserReqVo){ public ResponseResult<WebUserResVo> user(@RequestBody WebUserReqVo webUserReqVo){
CheckerHelper.newInstance()
.notBlankCheck("req",webUserReqVo)
.checkException()
.notBlankCheck("userId",webUserReqVo.getId())
.checkException();
return ResponseResult.result(userServiceImpl.getUserById(webUserReqVo.getId())); return ResponseResult.result(userServiceImpl.getUserById(webUserReqVo.getId()));
} }
......
src/main/java/com/pangding/web/authority/currency/Result.java deleted 100644 → 0
View file @ c9a6d7f4
package com.pangding.web.authority.currency;
import java.io.Serializable;
/**
* @author Administrator
*/
public class Result implements Serializable {
private Integer code;
private String message;
private Object data;
public Result(Integer code, String message, Object data) {
this.code = code;
this.message = message;
this.data = data;
}
public Result() {}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public Object getData() {
return data;
}
public void setData(Object data) {
this.data = data;
}
}
src/main/java/com/pangding/web/authority/dao/AuthorityDao.java
View file @ 13d18c17
package com.pangding.web.authority.dao; package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.reqvo.AuthorityGetReqVo; import com.pangding.web.authority.vo.reqvo.AuthorityGetReqVo;
import com.pangding.web.authority.reqvo.ListLevel1ReqVo;
import com.pangding.web.authority.vo.AuthorityVo; import com.pangding.web.authority.vo.AuthorityVo;
import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo; import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
import com.yanzuoguang.dao.BaseDao; import com.yanzuoguang.dao.BaseDao;
...@@ -29,22 +28,20 @@ public interface AuthorityDao extends BaseDao { ...@@ -29,22 +28,20 @@ public interface AuthorityDao extends BaseDao {
*/ */
AuthorityVo getAuthority(AuthorityGetReqVo authorityGetReqVo); AuthorityVo getAuthority(AuthorityGetReqVo authorityGetReqVo);
PageSizeData<AuthorityVo> getAuthorityList(ListAuthorityReqVo reqVo);
List<AuthorityVo> getAuthoritys(AuthorityGetReqVo reqVo);
/** /**
* 获取authorityVo对象列表 * 获取权限分页对象
* *
* @return authorityVo对象列表 * @param reqVo
* @return 权限分页对象
*/ */
List<AuthorityVo> listAll(); PageSizeData<AuthorityVo> getAuthorityList(ListAuthorityReqVo reqVo);
/** /**
* 获取一级权限对象列表 * 获取权限列表
* *
* @param listLevel1ReqVo ListLevel1ReqVo对象，仅用于拼接sql语句查询条件，无实际意义 * @param reqVo
* @return 权限对象列表 * @return 权限列表
*/ */
List<AuthorityVo> listLevel1(ListLevel1ReqVo listLevel1ReqVo); List<AuthorityVo> getAuthoritys(AuthorityGetReqVo reqVo);
} }
src/main/java/com/pangding/web/authority/dao/ComputerRegisterDao.java → src/main/java/com/pangding/web/authority/dao/CompanyBankCardDao.java
View file @ 13d18c17
...@@ -4,7 +4,7 @@ import com.yanzuoguang.dao.BaseDao; ...@@ -4,7 +4,7 @@ import com.yanzuoguang.dao.BaseDao;
/** /**
* @Author zhangjinyao * @Author zhangjinyao
* @create 2019/5/14 16:32 * @create 2019/5/16 19:17
*/ */
public interface ComputerRegisterDao extends BaseDao { public interface CompanyBankCardDao extends BaseDao {
} }
src/main/java/com/pangding/web/authority/dao/CompanyDao.java
View file @ 13d18c17
package com.pangding.web.authority.dao; package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.CompanyVo;
import com.yanzuoguang.dao.BaseDao; import com.yanzuoguang.dao.BaseDao;
/**
* @Author zhangjinyao
* @create 2019/5/13 14:24
*/
public interface CompanyDao extends BaseDao { public interface CompanyDao extends BaseDao {
/**
* 检查电话号码是否已存在
*
* @param companyVo CompanyVo对象
*/
void checkPhone(CompanyVo companyVo);
} }
src/main/java/com/pangding/web/authority/dao/CompanyExtendDao.java 0 → 100644
View file @ 13d18c17
package com.pangding.web.authority.dao;
import com.yanzuoguang.dao.BaseDao;
/**
* @Author zhangjinyao
* @create 2019/5/16 17:20
*/
public interface CompanyExtendDao extends BaseDao {
}
src/main/java/com/pangding/web/authority/dao/MobileRegisterDao.java deleted 100644 → 0
View file @ c9a6d7f4
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.CompanyVo;
import com.yanzuoguang.dao.BaseDao;
/**
* @Author zhangjinyao
* @create 2019/5/13 14:24
*/
public interface MobileRegisterDao extends BaseDao {
/**
* 检查电话号码是否已存在
*
* @param companyVo CompanyVo对象
*/
void checkPhone(CompanyVo companyVo);
}
src/main/java/com/pangding/web/authority/dao/RoleDao.java
View file @ 13d18c17
...@@ -40,9 +40,10 @@ public interface RoleDao extends BaseDao { ...@@ -40,9 +40,10 @@ public interface RoleDao extends BaseDao {
void checkNameExist(RoleVo roleVo); void checkNameExist(RoleVo roleVo);
/** /**
* 获取RoleVo对象列表 * 获取角色分页对象
* *
* @return RoleVo对象列表 * @param req
* @return 角色分页对象
*/ */
PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req); PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req);
......
src/main/java/com/pangding/web/authority/dao/UserDao.java
View file @ 13d18c17
...@@ -46,5 +46,11 @@ public interface UserDao extends BaseDao { ...@@ -46,5 +46,11 @@ public interface UserDao extends BaseDao {
*/ */
UserVo getUserByCompanyId(UserGetReqVo companyId); UserVo getUserByCompanyId(UserGetReqVo companyId);
/**
* 获取用户分页对象
*
* @param reqVo
* @return 用户分页对象
*/
PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo); PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo);
} }
src/main/java/com/pangding/web/authority/dao/impl/AuthorityDaoImpl.java
View file @ 13d18c17
...@@ -2,7 +2,6 @@ package com.pangding.web.authority.dao.impl; ...@@ -2,7 +2,6 @@ package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.AuthorityDao; import com.pangding.web.authority.dao.AuthorityDao;
import com.pangding.web.authority.vo.reqvo.AuthorityGetReqVo; import com.pangding.web.authority.vo.reqvo.AuthorityGetReqVo;
import com.pangding.web.authority.reqvo.ListLevel1ReqVo;
import com.pangding.web.authority.vo.AuthorityVo; import com.pangding.web.authority.vo.AuthorityVo;
import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo; import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl; import com.yanzuoguang.dao.impl.BaseDaoImpl;
...@@ -26,10 +25,9 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao { ...@@ -26,10 +25,9 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
table.addExist(CHECK_VALID,"name","url"); table.addExist(CHECK_VALID,"name","url");
table.add(SELECT,"select * from pd_authority where 1=1") table.add(SELECT,"select * from pd_authority where 1=1")
.add("exist","and pid = '' ")
.add("id","and pid = ? ") .add("id","and pid = ? ")
.add("pid","and pid = ? ") .add("pid","and pid = ? ")
.add("exist","and pid ? ''"); .add("levelOne","and pid = ''");
} }
@Override @Override
...@@ -52,15 +50,4 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao { ...@@ -52,15 +50,4 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
return this.query(AuthorityVo.class,SELECT,reqVo); return this.query(AuthorityVo.class,SELECT,reqVo);
} }
@Override
public List<AuthorityVo> listAll() {
return this.query(AuthorityVo.class,SELECT,null);
}
@Override
public List<AuthorityVo> listLevel1(ListLevel1ReqVo listLevel1ReqVo) {
return this.query(AuthorityVo.class,SELECT,listLevel1ReqVo);
}
} }
src/main/java/com/pangding/web/authority/dao/impl/MobileRegisterDaoImpl.java → src/main/java/com/pangding/web/authority/dao/impl/CompanyBankCardDaoImpl.java
View file @ 13d18c17
package com.pangding.web.authority.dao.impl; package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.MobileRegisterDao; import com.pangding.web.authority.dao.CompanyBankCardDao;
import com.pangding.web.authority.vo.CompanyVo; import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl; import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
* @Author zhangjinyao * @Author zhangjinyao
* @create 2019/5/13 14:25 * @create 2019/5/16 19:17
*/ */
@Component @Component
public class MobileRegisterDaoImpl extends BaseDaoImpl implements MobileRegisterDao { public class CompanyBankCardDaoImpl extends BaseDaoImpl implements CompanyBankCardDao {
private static final String CHECK_PHONE = "CHECK_PHONE";
@Override @Override
protected void init() { protected void init() {
register(CompanyBankCardVo.class);
register(CompanyVo.class);
table.addExist(CHECK_PHONE,"contact_phone");
}
@Override
public void checkPhone(CompanyVo companyVo) {
this.checkExist(CHECK_PHONE,companyVo,"电话号码已存在");
} }
} }
src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java
View file @ 13d18c17
package com.pangding.web.authority.dao.impl; package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyDao; import com.pangding.web.authority.dao.CompanyDao;
import com.pangding.web.authority.vo.CompanyVo; import com.pangding.web.authority.vo.CompanyVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl; import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
* 公司数据库写入实现类 * @Author zhangjinyao
* @author 唐芳 * @create 2019/5/13 14:25
*/ */
@Component @Component
public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao{ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
private static final String CHECK_PHONE = "CHECK_PHONE";
/**
* 注册SQL语句
*/
@Override @Override
protected void init() { protected void init() {
// 根据实体生成增删改查语句
register(CompanyVo.class); register(CompanyVo.class);
table.addExist(CHECK_PHONE,"contact_phone");
}
@Override
public void checkPhone(CompanyVo companyVo) {
this.checkExist(CHECK_PHONE,companyVo,"电话号码已存在");
} }
} }
src/main/java/com/pangding/web/authority/dao/impl/ComputerRegisterDaoImpl.java → src/main/java/com/pangding/web/authority/dao/impl/CompanyExtendDaoImpl.java
View file @ 13d18c17
package com.pangding.web.authority.dao.impl; package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.ComputerRegisterDao; import com.pangding.web.authority.dao.CompanyExtendDao;
import com.pangding.web.authority.vo.CompanyExtendVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl; import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
/** /**
* @Author zhangjinyao * @Author zhangjinyao
* @create 2019/5/14 16:33 * @create 2019/5/16 17:22
*/ */
public class ComputerRegisterDaoImpl extends BaseDaoImpl implements ComputerRegisterDao { @Component
public class CompanyExtendDaoImpl extends BaseDaoImpl implements CompanyExtendDao {
@Override @Override
protected void init() { protected void init() {
register(CompanyExtendVo.class);
} }
} }
src/main/java/com/pangding/web/authority/dto/RegisterEnterpriceDto.java deleted 100644 → 0
View file @ c9a6d7f4
package com.pangding.web.authority.dto;
/**
* @Author zhangjinyao
* @create 2019/5/14 18:30
*/
public class RegisterEnterpriceDto {
private String enterpriceName;
private String enterpriceAddress;
private String businessLicenseCode;
private String merchantName;
private String companyAttribute;
private String enterpricePhone;
private String contactName;
private String contactCode;
private String contactPhone;
private String depositBank;
private String depositAccount;
private String depositAddress;
public String getEnterpriceName() {
return enterpriceName;
}
public void setEnterpriceName(String enterpriceName) {
this.enterpriceName = enterpriceName;
}
public String getCompanyAttribute() {
return companyAttribute;
}
public void setCompanyAttribute(String companyAttribute) {
this.companyAttribute = companyAttribute;
}
public String getExtraChoseOne() {
return extraChoseOne;
}
public void setExtraChoseOne(String extraChoseOne) {
this.extraChoseOne = extraChoseOne;
}
public String getExtraChoseTwo() {
return extraChoseTwo;
}
public void setExtraChoseTwo(String extraChoseTwo) {
this.extraChoseTwo = extraChoseTwo;
}
public String getEnterpricePhone() {
return enterpricePhone;
}
public void setEnterpricePhone(String enterpricePhone) {
this.enterpricePhone = enterpricePhone;
}
public String getContactName() {
return contactName;
}
public void setContactName(String contactName) {
this.contactName = contactName;
}
public String getContactCode() {
return contactCode;
}
public void setContactCode(String contactCode) {
this.contactCode = contactCode;
}
public String getContactPhone() {
return contactPhone;
}
public void setContactPhone(String contactPhone) {
this.contactPhone = contactPhone;
}
public String getDepositBank() {
return depositBank;
}
public void setDepositBank(String depositBank) {
this.depositBank = depositBank;
}
public String getDepositAccount() {
return depositAccount;
}
public void setDepositAccount(String depositAccount) {
this.depositAccount = depositAccount;
}
public String getDepositAddress() {
return depositAddress;
}
public void setDepositAddress(String depositAddress) {
this.depositAddress = depositAddress;
}
}
src/main/java/com/pangding/web/authority/reqvo/ListLevel1ReqVo.java deleted 100644 → 0
View file @ c9a6d7f4
package com.pangding.web.authority.reqvo;
/**
* @Author zhangjinyao
* @create 2019/5/11 16:34
*/
public class ListLevel1ReqVo {
private String exist;
public String getExist() {
return exist;
}
public void setExist(String exist) {
this.exist = exist;
}
}
src/main/java/com/pangding/web/authority/reqvo/RoleDaoCheckNameExistReqVo.java deleted 100644 → 0
View file @ c9a6d7f4
package com.pangding.web.authority.reqvo;
/**
* @Author zhangjinyao
* @create 2019/5/11 18:52
*/
public class RoleDaoCheckNameExistReqVo {
private String name;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
src/main/java/com/pangding/web/authority/service/AuthorityService.java
View file @ 13d18c17
...@@ -51,6 +51,12 @@ public interface AuthorityService { ...@@ -51,6 +51,12 @@ public interface AuthorityService {
void checkValid(AuthorityVo authorityVo); void checkValid(AuthorityVo authorityVo);
/**
* 获取权限返回信息分页对象
*
* @param reqVo
* @return 权限返回信息分页对象
*/
PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityReqVo reqVo); PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityReqVo reqVo);
} }
src/main/java/com/pangding/web/authority/service/ComputerRegisterService.java deleted 100644 → 0
View file @ c9a6d7f4
package com.pangding.web.authority.service;
/**
* @Author zhangjinyao
* @create 2019/5/14 16:30
*/
public interface ComputerRegisterService {
}
src/main/java/com/pangding/web/authority/service/MobileRegisterService.java → src/main/java/com/pangding/web/authority/service/RegisterService.java
View file @ 13d18c17
package com.pangding.web.authority.service; package com.pangding.web.authority.service;
import com.pangding.web.authority.dto.RegisterIndividualDto; import com.pangding.web.authority.vo.reqvo.LoginReqVo;
import com.pangding.web.authority.vo.reqvo.RegisterEnterpriceReqVo;
import com.pangding.web.authority.vo.reqvo.RegisterIndividualReqVo;
import com.pangding.web.authority.vo.reqvo.RegisterUserReqVo;
import com.pangding.web.authority.vo.CompanyVo; import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.UserVo;
/** /**
* @Author zhangjinyao * @Author zhangjinyao
* @create 2019/5/13 14:21 * @create 2019/5/13 14:21
*/ */
public interface MobileRegisterService { public interface RegisterService {
/** /**
* 判断注册编码是否正确 * 判断注册编码是否正确
...@@ -20,23 +22,38 @@ public interface MobileRegisterService { ...@@ -20,23 +22,38 @@ public interface MobileRegisterService {
Boolean checkMerchantId(String merchantId); Boolean checkMerchantId(String merchantId);
/** /**
* 保存用户信息 * 保存用户信息，并返回公司信息
* *
* @param userVo UserVo对象 * @param registerUserReqVo
* @return CompanyVo对象
*/ */
void saveUser(UserVo userVo); CompanyVo saveUser(RegisterUserReqVo registerUserReqVo);
/** /**
* 保存公司信息 * 检查电话号码是否已存在
* *
* @param companyVo CompanyVo对象 * @param contactPhone 联系电话
*/ */
void saveCompany(CompanyVo companyVo); void checkPhone(String contactPhone);
/** /**
* 检查电话号码是否已存在 * 保存个人注册的公司信息
* *
* @param contactPhone 联系电话 * @param reqVo
*/ */
void checkPhone(String contactPhone); void saveIndividual(RegisterIndividualReqVo reqVo);
/**
* 保存企业注册的公司信息
*
* @param reqVo
*/
void saveEnterprise(RegisterEnterpriceReqVo reqVo);
/**
* 登录
*
* @param reqVo
*/
void login(LoginReqVo reqVo);
} }
src/main/java/com/pangding/web/authority/service/RoleService.java
View file @ 13d18c17
...@@ -60,6 +60,12 @@ public interface RoleService { ...@@ -60,6 +60,12 @@ public interface RoleService {
*/ */
PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req); PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req);
/**
* 获取角色返回信息分页对象
*
* @param req
* @return 角色返回信息分页对象
*/
PageSizeData<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req); PageSizeData<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req);
/** /**
...@@ -94,6 +100,11 @@ public interface RoleService { ...@@ -94,6 +100,11 @@ public interface RoleService {
*/ */
void deleteRole(RoleVo roleVo); void deleteRole(RoleVo roleVo);
/**
* 删除角色信息
*
* @param webRoleReqVo
*/
void delete(WebRoleReqVo webRoleReqVo); void delete(WebRoleReqVo webRoleReqVo);
} }
src/main/java/com/pangding/web/authority/service/UserService.java
View file @ 13d18c17
...@@ -64,8 +64,20 @@ public interface UserService { ...@@ -64,8 +64,20 @@ public interface UserService {
*/ */
WebUserResVo getUserById(String userId); WebUserResVo getUserById(String userId);
/**
* 获取用户分页对象
*
* @param reqVo
* @return 用户分页对象
*/
PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo); PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo);
/**
* 获取用户返回信息分页对象
*
* @param reqVo
* @return 用户返回信息分页对象
*/
PageSizeData<WebUserResVo> getWebUserResVoList(ListUserReqVo reqVo); PageSizeData<WebUserResVo> getWebUserResVoList(ListUserReqVo reqVo);
/** /**
...@@ -116,5 +128,11 @@ public interface UserService { ...@@ -116,5 +128,11 @@ public interface UserService {
*/ */
UserVo getUserByAccount(String account); UserVo getUserByAccount(String account);
/**
* 根据用户id获取角色列表
*
* @param userId 用户id
* @return 角色列表
*/
List<RoleVo> getRoleListByUserId(String userId); List<RoleVo> getRoleListByUserId(String userId);
} }
src/main/java/com/pangding/web/authority/service/impl/AuthorityServiceImpl.java
View file @ 13d18c17
...@@ -3,7 +3,6 @@ package com.pangding.web.authority.service.impl; ...@@ -3,7 +3,6 @@ package com.pangding.web.authority.service.impl;
import com.pangding.web.authority.dao.RoleAuthorityDao; import com.pangding.web.authority.dao.RoleAuthorityDao;
import com.pangding.web.authority.dao.AuthorityDao; import com.pangding.web.authority.dao.AuthorityDao;
import com.pangding.web.authority.vo.reqvo.*; import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.reqvo.ListLevel1ReqVo;
import com.pangding.web.authority.service.AuthorityService; import com.pangding.web.authority.service.AuthorityService;
import com.pangding.web.authority.vo.*; import com.pangding.web.authority.vo.*;
import com.yanzuoguang.util.exception.CodeException; import com.yanzuoguang.util.exception.CodeException;
...@@ -86,7 +85,6 @@ public class AuthorityServiceImpl implements AuthorityService { ...@@ -86,7 +85,6 @@ public class AuthorityServiceImpl implements AuthorityService {
@Override @Override
public PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityReqVo reqVo) { public PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityReqVo reqVo) {
reqVo.setExist("exist");
PageSizeData<AuthorityVo> authorityVoPageSizeData = authorityDao.getAuthorityList(reqVo); PageSizeData<AuthorityVo> authorityVoPageSizeData = authorityDao.getAuthorityList(reqVo);
PageSizeData<WebAuthorityResVo> webAuthorityResVoPageSizeData = new PageSizeData(); PageSizeData<WebAuthorityResVo> webAuthorityResVoPageSizeData = new PageSizeData();
List<AuthorityVo> authorityVoList = authorityVoPageSizeData.getList(); List<AuthorityVo> authorityVoList = authorityVoPageSizeData.getList();
......
src/main/java/com/pangding/web/authority/service/impl/ComputerRegisterServiceImpl.java deleted 100644 → 0
View file @ c9a6d7f4
package com.pangding.web.authority.service.impl;
import com.pangding.web.authority.service.ComputerRegisterService;
import org.springframework.stereotype.Service;
/**
* @Author zhangjinyao
* @create 2019/5/14 16:31
*/
@Service
public class ComputerRegisterServiceImpl implements ComputerRegisterService {
}
src/main/java/com/pangding/web/authority/service/impl/MobileRegisterServiceImpl.java deleted 100644 → 0
View file @ c9a6d7f4
package com.pangding.web.authority.service.impl;
import com.pangding.web.authority.dao.MobileRegisterDao;
import com.pangding.web.authority.dao.UserDao;
import com.pangding.web.authority.reqvo.CheckMerchantIdReqVo;
import com.pangding.web.authority.service.MobileRegisterService;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.UserVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* @Author zhangjinyao
* @create 2019/5/13 14:23
*/
@Service
public class MobileRegisterServiceImpl implements MobileRegisterService {
@Autowired
MobileRegisterDao mobileRegisterDaoImpl;
@Autowired
UserDao userDaoImpl;
@Override
public Boolean checkMerchantId(String merchantId) {
CheckMerchantIdReqVo idReqVo = new CheckMerchantIdReqVo();
idReqVo.setId(merchantId);
CompanyVo companyVo = mobileRegisterDaoImpl.load(idReqVo,CompanyVo.class);
return companyVo == null ? false : true;
}
@Override
public void saveUser(UserVo userVo) {
userDaoImpl.create(userVo);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void saveCompany(CompanyVo companyVo) {
mobileRegisterDaoImpl.create(companyVo);
GetUserByCompanyIdReqVo companyId = new GetUserByCompanyIdReqVo();
companyId.setCompanyId(companyVo.getId());
UserVo userVo = userDaoImpl.getUserByCompanyId(companyId);
userVo.setPhone(companyVo.getContactPhone());
userDaoImpl.update(userVo);
}
@Override
public void checkPhone(String contactPhone) {
CompanyVo companyVo = new CompanyVo();
companyVo.setContactPhone(contactPhone);
mobileRegisterDaoImpl.checkPhone(companyVo);
}
}
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java 0 → 100644
View file @ 13d18c17
package com.pangding.web.authority.service.impl;
import com.pangding.web.authority.dao.*;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.cloudvo.LoginResVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.reqvo.CompanyGetReqVo;
import com.pangding.web.authority.service.RegisterService;
import com.pangding.web.authority.service.UserService;
/*import com.yanzuoguang.token.TokenHelper;*/
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.StringHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* @Author zhangjinyao
* @create 2019/5/13 14:23
*/
@Service
public class RegisterServiceImpl implements RegisterService {
@Autowired
CompanyDao companyDaoImpl;
@Autowired
UserDao userDaoImpl;
@Autowired
UserService userServiceImpl;
@Autowired
CompanyExtendDao companyExtendDaoImpl;
@Autowired
CompanyBankCardDao companyBankCardDaoImpl;
@Override
public Boolean checkMerchantId(String merchantId) {
CompanyGetReqVo reqVo = new CompanyGetReqVo();
reqVo.setId(merchantId);
CompanyVo companyVo = companyDaoImpl.load(reqVo,CompanyVo.class);
return companyVo == null ? false : true;
}
@Override
@Transactional(rollbackFor = Exception.class)
public CompanyVo saveUser(RegisterUserReqVo registerUserReqVo) {
if (registerUserReqVo.getCompanyType() != 0){
throw new CodeException("目前仅支持个体用户");
}
userServiceImpl.isValid(registerUserReqVo.getAccount());
UserVo userVo = new UserVo();
userVo.setAccount(registerUserReqVo.getAccount());
userServiceImpl.checkAccount(userVo);
if (!registerUserReqVo.getPassword().equals(registerUserReqVo.getConfirmPassword())){
throw new CodeException("确认密码错误");
}
String merchantId = registerUserReqVo.getMerchantId();
if (!this.checkMerchantId(merchantId)){
throw new CodeException("注册编码错误");
}
String companyId = StringHelper.getNewID();
userVo.setPassword(StringHelper.md5(registerUserReqVo.getPassword()));
userVo.setId(StringHelper.getNewID());
userVo.setRemark(registerUserReqVo.getPassword());
userVo.setCompanyId(companyId);
userDaoImpl.create(userVo);
CompanyVo companyVo = new CompanyVo();
companyVo.setId(companyId);
companyVo.setMerchantId(merchantId);
companyVo.setCompanyType(registerUserReqVo.getCompanyType());
return companyVo;
}
@Override
public void checkPhone(String contactPhone) {
CompanyVo companyVo = new CompanyVo();
companyVo.setContactPhone(contactPhone);
companyDaoImpl.checkPhone(companyVo);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void saveIndividual(RegisterIndividualReqVo reqVo) {
CompanyVo companyVo = new CompanyVo();
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
CompanyExtendVo extendVo = new CompanyExtendVo();
this.checkPhone(reqVo.getContactPhone());
companyVo.setId(reqVo.getId());
companyVo.setMerchantId(reqVo.getMerchantId());
companyVo.setCompanyType(reqVo.getCompanyType());
companyVo.setContactName(reqVo.getContactName());
companyVo.setContactCode(reqVo.getContactCode());
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
companyVo.setContactPhone(reqVo.getContactPhone());
companyVo.setCompanyName(reqVo.getExtraChoseOne());
extendVo.setId(reqVo.getId());
companyBankCardVo.setCompanyId(reqVo.getId());
companyBankCardVo.setId(StringHelper.getNewID());
int vehicle = 5;
if (reqVo.getCompanyAttribute() == vehicle){
companyVo.setBusinessLicenseCode(reqVo.getExtraChoseTwo());
}else {
companyVo.setAddress(reqVo.getExtraChoseTwo());
}
companyDaoImpl.create(companyVo);
companyExtendDaoImpl.create(extendVo);
companyBankCardDaoImpl.create(companyBankCardVo);
UserVo userReqVo = new UserVo();
userReqVo.setCompanyId(reqVo.getId());
UserVo userVo = userDaoImpl.load(userReqVo,UserVo.class);
userVo.setPhone(reqVo.getContactPhone());
userDaoImpl.update(userVo);
// 此处需要保存部分数据到merchant表中
}
@Override
@Transactional(rollbackFor = Exception.class)
public void saveEnterprise(RegisterEnterpriceReqVo reqVo) {
CompanyVo companyVo = new CompanyVo();
CompanyExtendVo extendVo = new CompanyExtendVo();
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
this.checkPhone(reqVo.getContactPhone());
companyVo.setId(reqVo.getId());
companyVo.setMerchantId(reqVo.getMerchantId());
companyVo.setCompanyType(reqVo.getCompanyType());
companyVo.setCompanyName(reqVo.getCompanyName());
companyVo.setAddress(reqVo.getCompanyAddress());
companyVo.setBusinessLicenseCode(reqVo.getBusinessLicenseCode());
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
companyVo.setContactName(reqVo.getContactName());
companyVo.setContactCode(reqVo.getContactCode());
companyVo.setContactPhone(reqVo.getContactPhone());
extendVo.setId(reqVo.getId());
companyBankCardVo.setId(StringHelper.getNewID());
companyBankCardVo.setCompanyId(reqVo.getId());
companyBankCardVo.setBankName(reqVo.getBankName());
companyBankCardVo.setBankCardCode(reqVo.getBankCardCode());
companyBankCardVo.setBankAddress(reqVo.getBankAddress());
companyBankCardVo.setBankCode(reqVo.getBankCode());
companyBankCardVo.setReservedPhone(reqVo.getReservedPhone());
companyDaoImpl.create(companyVo);
companyExtendDaoImpl.create(extendVo);
companyBankCardDaoImpl.create(companyBankCardVo);
UserVo userReqVo = new UserVo();
userReqVo.setCompanyId(reqVo.getId());
UserVo userVo = userDaoImpl.load(userReqVo,UserVo.class);
userVo.setPhone(reqVo.getContactPhone());
userDaoImpl.update(userVo);
// 此处需要保存部分数据到merchant表中
}
@Override
public void login(LoginReqVo reqVo) {
String accountOrPhone = reqVo.getAccountOrPhone();
UserVo userVo;
if (userServiceImpl.isNumeric(accountOrPhone)){
userVo = userServiceImpl.getUserByPhone(accountOrPhone);
}else {
userVo = userServiceImpl.getUserByAccount(accountOrPhone);
}
if (userVo == null){
throw new CodeException("没有此用户");
}
if (!StringHelper.md5(reqVo.getPassword()).equals(userVo.getPassword())){
throw new CodeException("用户名或密码错误");
}
CompanyVo companyReqVo = new CompanyVo();
CompanyBankCardVo companyBankCardReqVo = new CompanyBankCardVo();
CompanyExtendVo companyExtendReqVo = new CompanyExtendVo();
companyReqVo.setId(userVo.getCompanyId());
CompanyVo companyVo = companyDaoImpl.load(companyReqVo,CompanyVo.class);
companyBankCardReqVo.setCompanyId(userVo.getCompanyId());
CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(companyBankCardReqVo,CompanyBankCardVo.class);
companyExtendReqVo.setId(userVo.getCompanyId());
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendReqVo,CompanyExtendVo.class);
LoginResVo resVo = new LoginResVo();
resVo.setUserVo(userVo);
resVo.setCompanyVo(companyVo);
resVo.setCompanyBankCardVo(companyBankCardVo);
resVo.setCompanyExtendVo(companyExtendVo);
// 此处需要获取对应的merchant表数据
/*token内容暂时不能用，以后要改动*/
/*String token = StringHelper.getNewID();
TokenHelper.write(token,resVo);*/
}
}
src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java
View file @ 13d18c17
...@@ -172,13 +172,13 @@ public class RoleServiceImpl implements RoleService { ...@@ -172,13 +172,13 @@ public class RoleServiceImpl implements RoleService {
@Override @Override
public WebRoleResVo makeResVo(RoleVo roleVo, List<AuthorityVo> authorityList) { public WebRoleResVo makeResVo(RoleVo roleVo, List<AuthorityVo> authorityList) {
WebRoleResVo ResVo = new WebRoleResVo(); WebRoleResVo resVo = new WebRoleResVo();
ResVo.setId(roleVo.getId()); resVo.setId(roleVo.getId());
ResVo.setName(roleVo.getName()); resVo.setName(roleVo.getName());
ResVo.setPid(roleVo.getPid()); resVo.setPid(roleVo.getPid());
ResVo.setRemark(roleVo.getRemark()); resVo.setRemark(roleVo.getRemark());
ResVo.setAuthorityList(authorityList); resVo.setAuthorityList(authorityList);
return ResVo; return resVo;
} }
@Override @Override
......
src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java
View file @ 13d18c17
...@@ -82,6 +82,7 @@ public class UserServiceImpl implements UserService { ...@@ -82,6 +82,7 @@ public class UserServiceImpl implements UserService {
userRoleDao.remove(userRole); userRoleDao.remove(userRole);
} }
} }
}
if (webUserReqVo.getRoleIds()!=null && webUserReqVo.getRoleIds().size()!=0){ if (webUserReqVo.getRoleIds()!=null && webUserReqVo.getRoleIds().size()!=0){
List<String> roleIds = webUserReqVo.getRoleIds(); List<String> roleIds = webUserReqVo.getRoleIds();
for (String roleId : roleIds) { for (String roleId : roleIds) {
...@@ -93,7 +94,6 @@ public class UserServiceImpl implements UserService { ...@@ -93,7 +94,6 @@ public class UserServiceImpl implements UserService {
} }
} }
} }
}
@Override @Override
public void checkAccount(UserVo userVo) { public void checkAccount(UserVo userVo) {
......
src/main/java/com/pangding/web/authority/vo/AuthorityVo.java
View file @ 13d18c17
...@@ -34,7 +34,7 @@ public class AuthorityVo implements Serializable, InitDao { ...@@ -34,7 +34,7 @@ public class AuthorityVo implements Serializable, InitDao {
@TableAnnotation("create_time") @TableAnnotation("create_time")
private Timestamp createTime; private String createTime;
public String getId() { public String getId() {
return id; return id;
...@@ -100,17 +100,16 @@ public class AuthorityVo implements Serializable, InitDao { ...@@ -100,17 +100,16 @@ public class AuthorityVo implements Serializable, InitDao {
this.remark = remark; this.remark = remark;
} }
public Timestamp getCreateTime() { public String getCreateTime() {
return createTime; return createTime;
} }
public void setCreateTime(Timestamp createTime) { public void setCreateTime(String createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
@Override @Override
public void init() { public void init() {
String createTimeString = StringHelper.getFirst(DateHelper.getDateTimeString(this.createTime), DateHelper.getNow()); this.createTime = StringHelper.getFirst(this.createTime, DateHelper.getNow());
this.createTime = Timestamp.valueOf(createTimeString);
} }
} }
src/main/java/com/pangding/web/authority/vo/CompanyBankCardVo.java 0 → 100644
View file @ 13d18c17
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
import java.io.Serializable;
/**
* @Author zhangjinyao
* @create 2019/5/16 14:17
*/
@TableAnnotation("pd_company_bank_card")
public class CompanyBankCardVo implements Serializable {
private String id;
@TableAnnotation("bank_card_code")
private String bankCardCode;
@TableAnnotation("bank_name")
private String bankName;
@TableAnnotation("bank_address")
private String bankAddress;
@TableAnnotation("bank_code")
private String bankCode;
private int type;
@TableAnnotation("company_id")
private String companyId;
private String name;
@TableAnnotation("ID_card")
private String idCard;
@TableAnnotation("reserved_phone")
private String reservedPhone;
private String status;
@TableAnnotation("binding_code")
private String bindingCode;
@TableAnnotation("binding_time")
private String bindingTime;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getBankCardCode() {
return bankCardCode;
}
public void setBankCardCode(String bankCardCode) {
this.bankCardCode = bankCardCode;
}
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public String getBankAddress() {
return bankAddress;
}
public void setBankAddress(String bankAddress) {
this.bankAddress = bankAddress;
}
public String getBankCode() {
return bankCode;
}
public void setBankCode(String bankCode) {
this.bankCode = bankCode;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getIdCard() {
return idCard;
}
public void setIdCard(String idCard) {
this.idCard = idCard;
}
public String getReservedPhone() {
return reservedPhone;
}
public void setReservedPhone(String reservedPhone) {
this.reservedPhone = reservedPhone;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getBindingCode() {
return bindingCode;
}
public void setBindingCode(String bindingCode) {
this.bindingCode = bindingCode;
}
public String getBindingTime() {
return bindingTime;
}
public void setBindingTime(String bindingTime) {
this.bindingTime = bindingTime;
}
}
src/main/java/com/pangding/web/authority/vo/CompanyExtendVo.java 0 → 100644
View file @ 13d18c17
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
import java.io.Serializable;
/**
* @Author zhangjinyao
* @create 2019/5/16 15:35
*/
@TableAnnotation("pd_company_extend")
public class CompanyExtendVo implements Serializable {
private String id;
@TableAnnotation("QR_code")
private String qrCode;
@TableAnnotation("QR_code_type")
private String qrCodeType;
@TableAnnotation("QR_code_url")
private String qrCodeUrl;
private String money;
@TableAnnotation("is_sub_account")
private String isSubAccount;
@TableAnnotation("sub_account_rule")
private String subAccountRule;
@TableAnnotation("is_sub_profit")
private String isSubProfit;
@TableAnnotation("sub_profit_rule")
private String subProfitRule;
@TableAnnotation("is_withdraw")
private String isWithdraw;
@TableAnnotation("withdraw_rule")
private String withdrawRule;
@TableAnnotation("is_scan_code_pay")
private String isScanCodePay;
@TableAnnotation("pay_rule")
private String payRule;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getQrCode() {
return qrCode;
}
public void setQrCode(String qrCode) {
this.qrCode = qrCode;
}
public String getQrCodeType() {
return qrCodeType;
}
public void setQrCodeType(String qrCodeType) {
this.qrCodeType = qrCodeType;
}
public String getQrCodeUrl() {
return qrCodeUrl;
}
public void setQrCodeUrl(String qrCodeUrl) {
this.qrCodeUrl = qrCodeUrl;
}
public String getMoney() {
return money;
}
public void setMoney(String money) {
this.money = money;
}
public String getIsSubAccount() {
return isSubAccount;
}
public void setIsSubAccount(String isSubAccount) {
this.isSubAccount = isSubAccount;
}
public String getSubAccountRule() {
return subAccountRule;
}
public void setSubAccountRule(String subAccountRule) {
this.subAccountRule = subAccountRule;
}
public String getIsSubProfit() {
return isSubProfit;
}
public void setIsSubProfit(String isSubProfit) {
this.isSubProfit = isSubProfit;
}
public String getSubProfitRule() {
return subProfitRule;
}
public void setSubProfitRule(String subProfitRule) {
this.subProfitRule = subProfitRule;
}
public String getIsWithdraw() {
return isWithdraw;
}
public void setIsWithdraw(String isWithdraw) {
this.isWithdraw = isWithdraw;
}
public String getWithdrawRule() {
return withdrawRule;
}
public void setWithdrawRule(String withdrawRule) {
this.withdrawRule = withdrawRule;
}
public String getIsScanCodePay() {
return isScanCodePay;
}
public void setIsScanCodePay(String isScanCodePay) {
this.isScanCodePay = isScanCodePay;
}
public String getPayRule() {
return payRule;
}
public void setPayRule(String payRule) {
this.payRule = payRule;
}
}
src/main/java/com/pangding/web/authority/vo/CompanyVo.java
View file @ 13d18c17
...@@ -34,7 +34,7 @@ public class CompanyVo implements Serializable, InitDao { ...@@ -34,7 +34,7 @@ public class CompanyVo implements Serializable, InitDao {
private String address; private String address;
@TableAnnotation("company_attribute") @TableAnnotation("company_attribute")
private String companyAttribute; private int companyAttribute;
@TableAnnotation("contact_name") @TableAnnotation("contact_name")
private String contactName; private String contactName;
...@@ -54,10 +54,10 @@ public class CompanyVo implements Serializable, InitDao { ...@@ -54,10 +54,10 @@ public class CompanyVo implements Serializable, InitDao {
private String status; private String status;
@TableAnnotation("create_time") @TableAnnotation("create_time")
private Timestamp createTime; private String createTime;
@TableAnnotation("update_time") @TableAnnotation("update_time")
private Timestamp updateTime; private String updateTime;
private int nature; private int nature;
...@@ -117,11 +117,11 @@ public class CompanyVo implements Serializable, InitDao { ...@@ -117,11 +117,11 @@ public class CompanyVo implements Serializable, InitDao {
this.address = address; this.address = address;
} }
public String getCompanyAttribute() { public int getCompanyAttribute() {
return companyAttribute; return companyAttribute;
} }
public void setCompanyAttribute(String companyAttribute) { public void setCompanyAttribute(int companyAttribute) {
this.companyAttribute = companyAttribute; this.companyAttribute = companyAttribute;
} }
...@@ -173,19 +173,19 @@ public class CompanyVo implements Serializable, InitDao { ...@@ -173,19 +173,19 @@ public class CompanyVo implements Serializable, InitDao {
this.status = status; this.status = status;
} }
public Timestamp getCreateTime() { public String getCreateTime() {
return createTime; return createTime;
} }
public void setCreateTime(Timestamp createTime) { public void setCreateTime(String createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
public Timestamp getUpdateTime() { public String getUpdateTime() {
return updateTime; return updateTime;
} }
public void setUpdateTime(Timestamp updateTime) { public void setUpdateTime(String updateTime) {
this.updateTime = updateTime; this.updateTime = updateTime;
} }
...@@ -199,7 +199,6 @@ public class CompanyVo implements Serializable, InitDao { ...@@ -199,7 +199,6 @@ public class CompanyVo implements Serializable, InitDao {
@Override @Override
public void init() { public void init() {
String createTimeString = StringHelper.getFirst(DateHelper.getDateTimeString(this.createTime), DateHelper.getNow()); this.createTime = StringHelper.getFirst(this.createTime, DateHelper.getNow());
this.createTime = Timestamp.valueOf(createTimeString);
} }
} }
src/main/java/com/pangding/web/authority/vo/UserVo.java
View file @ 13d18c17
...@@ -28,7 +28,7 @@ public class UserVo implements Serializable, InitDao { ...@@ -28,7 +28,7 @@ public class UserVo implements Serializable, InitDao {
private String remark; private String remark;
@TableAnnotation("create_time") @TableAnnotation("create_time")
private Timestamp createTime; private String createTime;
private String creator; private String creator;
...@@ -83,11 +83,11 @@ public class UserVo implements Serializable, InitDao { ...@@ -83,11 +83,11 @@ public class UserVo implements Serializable, InitDao {
this.remark = remark; this.remark = remark;
} }
public Timestamp getCreateTime() { public String getCreateTime() {
return createTime; return createTime;
} }
public void setCreateTime(Timestamp createTime) { public void setCreateTime(String createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
...@@ -109,7 +109,6 @@ public class UserVo implements Serializable, InitDao { ...@@ -109,7 +109,6 @@ public class UserVo implements Serializable, InitDao {
@Override @Override
public void init() { public void init() {
String createTimeString = StringHelper.getFirst(DateHelper.getDateTimeString(this.createTime), DateHelper.getNow()); this.createTime = StringHelper.getFirst(this.createTime, DateHelper.getNow());
this.createTime = Timestamp.valueOf(createTimeString);
} }
} }
src/main/java/com/pangding/web/authority/vo/cloudvo/LoginResVo.java 0 → 100644
View file @ 13d18c17
package com.pangding.web.authority.vo.cloudvo;
import com.pangding.web.authority.vo.*;
/**
* @Author zhangjinyao
* @create 2019/5/16 17:50
*/
public class LoginResVo {
UserVo userVo;
CompanyVo companyVo;
CompanyBankCardVo companyBankCardVo;
CompanyExtendVo companyExtendVo;
public CompanyExtendVo getCompanyExtendVo() {
return companyExtendVo;
}
public void setCompanyExtendVo(CompanyExtendVo companyExtendVo) {
this.companyExtendVo = companyExtendVo;
}
public CompanyBankCardVo getCompanyBankCardVo() {
return companyBankCardVo;
}
public void setCompanyBankCardVo(CompanyBankCardVo companyBankCardVo) {
this.companyBankCardVo = companyBankCardVo;
}
public UserVo getUserVo() {
return userVo;
}
public void setUserVo(UserVo userVo) {
this.userVo = userVo;
}
public CompanyVo getCompanyVo() {
return companyVo;
}
public void setCompanyVo(CompanyVo companyVo) {
this.companyVo = companyVo;
}
}
src/main/java/com/pangding/web/authority/reqvo/CheckMerchantIdReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/CompanyGetReqVo.java
View file @ 13d18c17
package com.pangding.web.authority.reqvo; package com.pangding.web.authority.vo.reqvo;
/** /**
* @Author zhangjinyao * @Author zhangjinyao
* @create 2019/5/13 15:45 * @create 2019/5/13 15:45
*/ */
public class CheckMerchantIdReqVo { public class CompanyGetReqVo {
private String id; private String id;
public String getId() { public String getId() {
......
src/main/java/com/pangding/web/authority/vo/reqvo/ListAuthorityReqVo.java
View file @ 13d18c17
...@@ -7,13 +7,14 @@ import com.yanzuoguang.util.vo.PageSizeReqVo; ...@@ -7,13 +7,14 @@ import com.yanzuoguang.util.vo.PageSizeReqVo;
* @create 2019/5/15 20:03 * @create 2019/5/15 20:03
*/ */
public class ListAuthorityReqVo extends PageSizeReqVo { public class ListAuthorityReqVo extends PageSizeReqVo {
private String exist;
public String getExist() { private String levelOne;
return exist;
public String getLevelOne() {
return levelOne;
} }
public void setExist(String exist) { public void setLevelOne(String levelOne) {
this.exist = exist; this.levelOne = levelOne;
} }
} }
src/main/java/com/pangding/web/authority/vo/MobileLoginInfo.java → src/main/java/com/pangding/web/authority/vo/reqvo/LoginReqVo.java
View file @ 13d18c17
package com.pangding.web.authority.vo; package com.pangding.web.authority.vo.reqvo;
/** /**
* @Author zhangjinyao * @Author zhangjinyao
* @create 2019/5/14 11:46 * @create 2019/5/14 11:46
*/ */
public class MobileLoginInfo { public class LoginReqVo {
private String accountOrPhone; private String accountOrPhone;
......
src/main/java/com/pangding/web/authority/vo/reqvo/RegisterEnterpriceReqVo.java 0 → 100644
View file @ 13d18c17
package com.pangding.web.authority.vo.reqvo;
/**
* @Author zhangjinyao
* @create 2019/5/14 18:30
*/
public class RegisterEnterpriceReqVo {
private String id;
private String merchantId;
private int companyType;
private String companyName;
private String companyAddress;
private String businessLicenseCode;
private String merchantName;
private int companyAttribute;
private String contactName;
private String contactCode;
private String contactPhone;
private String bankName;
private String bankCardCode;
private String bankAddress;
private String bankCode;
private String reservedPhone;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getMerchantId() {
return merchantId;
}
public void setMerchantId(String merchantId) {
this.merchantId = merchantId;
}
public int getCompanyType() {
return companyType;
}
public void setCompanyType(int companyType) {
this.companyType = companyType;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getCompanyAddress() {
return companyAddress;
}
public void setCompanyAddress(String companyAddress) {
this.companyAddress = companyAddress;
}
public String getBusinessLicenseCode() {
return businessLicenseCode;
}
public void setBusinessLicenseCode(String businessLicenseCode) {
this.businessLicenseCode = businessLicenseCode;
}
public String getMerchantName() {
return merchantName;
}
public void setMerchantName(String merchantName) {
this.merchantName = merchantName;
}
public int getCompanyAttribute() {
return companyAttribute;
}
public void setCompanyAttribute(int companyAttribute) {
this.companyAttribute = companyAttribute;
}
public String getContactName() {
return contactName;
}
public void setContactName(String contactName) {
this.contactName = contactName;
}
public String getContactCode() {
return contactCode;
}
public void setContactCode(String contactCode) {
this.contactCode = contactCode;
}
public String getContactPhone() {
return contactPhone;
}
public void setContactPhone(String contactPhone) {
this.contactPhone = contactPhone;
}
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public String getBankCardCode() {
return bankCardCode;
}
public void setBankCardCode(String bankCardCode) {
this.bankCardCode = bankCardCode;
}
public String getBankAddress() {
return bankAddress;
}
public void setBankAddress(String bankAddress) {
this.bankAddress = bankAddress;
}
public String getBankCode() {
return bankCode;
}
public void setBankCode(String bankCode) {
this.bankCode = bankCode;
}
public String getReservedPhone() {
return reservedPhone;
}
public void setReservedPhone(String reservedPhone) {
this.reservedPhone = reservedPhone;
}
}
src/main/java/com/pangding/web/authority/dto/RegisterIndividualDto.java → src/main/java/com/pangding/web/authority/vo/reqvo/RegisterIndividualReqVo.java
View file @ 13d18c17
package com.pangding.web.authority.dto; package com.pangding.web.authority.vo.reqvo;
/** /**
* @Author zhangjinyao * @Author zhangjinyao
* @create 2019/5/13 17:32 * @create 2019/5/13 17:32
*/ */
public class RegisterIndividualDto { public class RegisterIndividualReqVo {
private String id;
private String merchantId;
private int companyType;
private String contactName; private String contactName;
private String contactCode; private String contactCode;
private String companyAttribute; private int companyAttribute;
private String contactPhone; private String contactPhone;
...@@ -18,6 +24,30 @@ public class RegisterIndividualDto { ...@@ -18,6 +24,30 @@ public class RegisterIndividualDto {
private String extraChoseTwo; private String extraChoseTwo;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getMerchantId() {
return merchantId;
}
public void setMerchantId(String merchantId) {
this.merchantId = merchantId;
}
public int getCompanyType() {
return companyType;
}
public void setCompanyType(int companyType) {
this.companyType = companyType;
}
public String getExtraChoseOne() { public String getExtraChoseOne() {
return extraChoseOne; return extraChoseOne;
} }
...@@ -50,11 +80,11 @@ public class RegisterIndividualDto { ...@@ -50,11 +80,11 @@ public class RegisterIndividualDto {
this.contactCode = contactCode; this.contactCode = contactCode;
} }
public String getCompanyAttribute() { public int getCompanyAttribute() {
return companyAttribute; return companyAttribute;
} }
public void setCompanyAttribute(String companyAttribute) { public void setCompanyAttribute(int companyAttribute) {
this.companyAttribute = companyAttribute; this.companyAttribute = companyAttribute;
} }
......
src/main/java/com/pangding/web/authority/dto/RegisterUserDto.java → src/main/java/com/pangding/web/authority/vo/reqvo/RegisterUserReqVo.java
View file @ 13d18c17
package com.pangding.web.authority.dto; package com.pangding.web.authority.vo.reqvo;
import com.pangding.web.authority.vo.UserVo; import com.pangding.web.authority.vo.UserVo;
...@@ -6,16 +6,26 @@ import com.pangding.web.authority.vo.UserVo; ...@@ -6,16 +6,26 @@ import com.pangding.web.authority.vo.UserVo;
* @Author zhangjinyao * @Author zhangjinyao
* @create 2019/5/13 15:17 * @create 2019/5/13 15:17
*/ */
public class RegisterUserDto { public class RegisterUserReqVo {
private String account; private String account;
private String password; private String password;
private String confirmPassword;
private int companyType; private int companyType;
private String merchantId; private String merchantId;
public String getConfirmPassword() {
return confirmPassword;
}
public void setConfirmPassword(String confirmPassword) {
this.confirmPassword = confirmPassword;
}
public String getAccount() { public String getAccount() {
return account; return account;
} }
......
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