Skip to content

T
tcm-system
Commit b4c46c1b authored by zjy's avatar zjy
Browse files
Options

user/role/tright 5.17 

需要增加Token
完成
parent 8aafa038
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 343 deletions
src/main/java/com/pangding/web/authority/controller/AuthorityController.java
View file @ b4c46c1b
......@@ -36,6 +36,10 @@ public class AuthorityController {
.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);
return new ResponseResult();
......@@ -53,6 +57,10 @@ public class AuthorityController {
.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);
return new ResponseResult();
......@@ -62,7 +70,7 @@ public class AuthorityController {
* 查询权限列表
* @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){
return ResponseResult.result(authorityServiceImpl.getWebAuthorityResVoList(reqVo));
}
......@@ -71,8 +79,9 @@ public class AuthorityController {
* 查询一级权限
* @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){
reqVo.setLevelOne("one");
return ResponseResult.result(authorityServiceImpl.getWebAuthorityResVoList(reqVo));
}
......@@ -81,7 +90,7 @@ public class AuthorityController {
* @param reqVo
* @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){
CheckerHelper.newInstance()
.notBlankCheck("reqVo",reqVo)
......
src/main/java/com/pangding/web/authority/controller/RoleController.java
View file @ b4c46c1b
......@@ -34,6 +34,7 @@ public class RoleController {
.notBlankCheck("reqVo",webRoleReqVo)
.checkException()
.notBlankCheck("roleName",webRoleReqVo.getName())
.notBlankCheck("remark",webRoleReqVo.getRemark())
.checkException();
roleServiceImpl.saveRole(webRoleReqVo);
return new ResponseResult();
......@@ -50,6 +51,7 @@ public class RoleController {
.notBlankCheck("reqVo",webRoleReqVo)
.checkException()
.notBlankCheck("roleName",webRoleReqVo.getName())
.notBlankCheck("remark",webRoleReqVo.getRemark())
.checkException();
roleServiceImpl.updateRole(webRoleReqVo);
return new ResponseResult();
......@@ -59,7 +61,7 @@ public class RoleController {
* 查询角色列表
* @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){
return ResponseResult.result(roleServiceImpl.getWebRoleResVoList(req));
}
......
src/main/java/com/pangding/web/authority/controller/UserController.java
View file @ b4c46c1b
......@@ -35,6 +35,7 @@ public class UserController {
.notBlankCheck("password",webUserReqVo.getPassword())
.checkPhoneNo("phone",webUserReqVo.getPhone())
.notBlankCheck("companyId",webUserReqVo.getCompanyId())
.notBlankCheck("status",webUserReqVo.getStatus())
.checkException();
userServiceImpl.saveUser(webUserReqVo);
return new ResponseResult();
......@@ -54,6 +55,7 @@ public class UserController {
.notBlankCheck("password",webUserReqVo.getPassword())
.checkPhoneNo("phone",webUserReqVo.getPhone())
.notBlankCheck("companyId",webUserReqVo.getCompanyId())
.notBlankCheck("status",webUserReqVo.getStatus())
.checkException();
userServiceImpl.updateUser(webUserReqVo);
return new ResponseResult();
......
src/main/java/com/pangding/web/authority/dao/AuthorityDao.java
View file @ b4c46c1b
......@@ -28,8 +28,20 @@ public interface AuthorityDao extends BaseDao {
*/
AuthorityVo getAuthority(AuthorityGetReqVo authorityGetReqVo);
/**
* 获取权限分页对象
*
* @param reqVo
* @return 权限分页对象
*/
PageSizeData<AuthorityVo> getAuthorityList(ListAuthorityReqVo reqVo);
/**
* 获取权限列表
*
* @param reqVo
* @return 权限列表
*/
List<AuthorityVo> getAuthoritys(AuthorityGetReqVo reqVo);
}
src/main/java/com/pangding/web/authority/dao/MerchantDao.java deleted 100644 → 0
View file @ 8aafa038
package com.pangding.web.authority.dao;
import com.yanzuoguang.dao.BaseDao;
/**
* @Author zhangjinyao
* @create 2019/5/16 17:17
*/
public interface MerchantDao extends BaseDao {
}
src/main/java/com/pangding/web/authority/dao/RoleDao.java
View file @ b4c46c1b
......@@ -40,9 +40,10 @@ public interface RoleDao extends BaseDao {
void checkNameExist(RoleVo roleVo);
/**
* 获取RoleVo对象列表
* 获取角色分页对象
*
* @return RoleVo对象列表
* @param req
* @return 角色分页对象
*/
PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req);
......
src/main/java/com/pangding/web/authority/dao/UserDao.java
View file @ b4c46c1b
......@@ -46,5 +46,11 @@ public interface UserDao extends BaseDao {
*/
UserVo getUserByCompanyId(UserGetReqVo companyId);
/**
* 获取用户分页对象
*
* @param reqVo
* @return 用户分页对象
*/
PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo);
}
src/main/java/com/pangding/web/authority/dao/impl/AuthorityDaoImpl.java
View file @ b4c46c1b
......@@ -25,10 +25,9 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
table.addExist(CHECK_VALID,"name","url");
table.add(SELECT,"select * from pd_authority where 1=1")
.add("exist","and pid = '' ")
.add("id","and pid = ? ")
.add("pid","and pid = ? ")
.add("exist","and pid ? ''");
.add("levelOne","and pid = ''");
}
@Override
......
src/main/java/com/pangding/web/authority/dao/impl/MerchantDaoImpl.java deleted 100644 → 0
View file @ 8aafa038
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.MerchantDao;
import com.pangding.web.authority.vo.MerchantVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
/**
* @Author zhangjinyao
* @create 2019/5/16 17:20
*/
@Component
public class MerchantDaoImpl extends BaseDaoImpl implements MerchantDao {
@Override
protected void init() {
register(MerchantVo.class);
}
}
src/main/java/com/pangding/web/authority/service/AuthorityService.java
View file @ b4c46c1b
......@@ -51,6 +51,12 @@ public interface AuthorityService {
void checkValid(AuthorityVo authorityVo);
/**
* 获取权限返回信息分页对象
*
* @param reqVo
* @return 权限返回信息分页对象
*/
PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityReqVo reqVo);
}
src/main/java/com/pangding/web/authority/service/RegisterService.java
View file @ b4c46c1b
......@@ -22,9 +22,10 @@ public interface RegisterService {
Boolean checkMerchantId(String merchantId);
/**
* 保存用户信息
* 保存用户信息，并返回公司信息
*
* @param registerUserReqVo UserVo对象
* @param registerUserReqVo
* @return CompanyVo对象
*/
CompanyVo saveUser(RegisterUserReqVo registerUserReqVo);
......@@ -35,9 +36,24 @@ public interface RegisterService {
*/
void checkPhone(String contactPhone);
/**
* 保存个人注册的公司信息
*
* @param reqVo
*/
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 @ b4c46c1b
......@@ -60,6 +60,12 @@ public interface RoleService {
*/
PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req);
/**
* 获取角色返回信息分页对象
*
* @param req
* @return 角色返回信息分页对象
*/
PageSizeData<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req);
/**
......@@ -94,6 +100,11 @@ public interface RoleService {
*/
void deleteRole(RoleVo roleVo);
/**
* 删除角色信息
*
* @param webRoleReqVo
*/
void delete(WebRoleReqVo webRoleReqVo);
}
src/main/java/com/pangding/web/authority/service/UserService.java
View file @ b4c46c1b
......@@ -64,8 +64,20 @@ public interface UserService {
*/
WebUserResVo getUserById(String userId);
/**
* 获取用户分页对象
*
* @param reqVo
* @return 用户分页对象
*/
PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo);
/**
* 获取用户返回信息分页对象
*
* @param reqVo
* @return 用户返回信息分页对象
*/
PageSizeData<WebUserResVo> getWebUserResVoList(ListUserReqVo reqVo);
/**
......@@ -116,5 +128,11 @@ public interface UserService {
*/
UserVo getUserByAccount(String account);
/**
* 根据用户id获取角色列表
*
* @param userId 用户id
* @return 角色列表
*/
List<RoleVo> getRoleListByUserId(String userId);
}
src/main/java/com/pangding/web/authority/service/impl/AuthorityServiceImpl.java
View file @ b4c46c1b
......@@ -85,7 +85,6 @@ public class AuthorityServiceImpl implements AuthorityService {
@Override
public PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityReqVo reqVo) {
reqVo.setExist("exist");
PageSizeData<AuthorityVo> authorityVoPageSizeData = authorityDao.getAuthorityList(reqVo);
PageSizeData<WebAuthorityResVo> webAuthorityResVoPageSizeData = new PageSizeData();
List<AuthorityVo> authorityVoList = authorityVoPageSizeData.getList();
......
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ b4c46c1b
......@@ -2,12 +2,12 @@ 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.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.token.TokenHelper;*/
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.StringHelper;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -29,17 +29,15 @@ public class RegisterServiceImpl implements RegisterService {
@Autowired
UserService userServiceImpl;
@Autowired
MerchantDao merchantDaoImpl;
@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);
CompanyGetReqVo reqVo = new CompanyGetReqVo();
reqVo.setId(merchantId);
CompanyVo companyVo = companyDaoImpl.load(reqVo,CompanyVo.class);
return companyVo == null ? false : true;
}
......@@ -76,8 +74,6 @@ public class RegisterServiceImpl implements RegisterService {
companyVo.setMerchantId(merchantId);
companyVo.setCompanyType(registerUserReqVo.getCompanyType());
companyDaoImpl.create(companyVo);
return companyVo;
}
......@@ -92,7 +88,7 @@ public class RegisterServiceImpl implements RegisterService {
@Transactional(rollbackFor = Exception.class)
public void saveIndividual(RegisterIndividualReqVo reqVo) {
CompanyVo companyVo = new CompanyVo();
MerchantVo merchantVo = new MerchantVo();
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
CompanyExtendVo extendVo = new CompanyExtendVo();
this.checkPhone(reqVo.getContactPhone());
......@@ -105,32 +101,34 @@ public class RegisterServiceImpl implements RegisterService {
companyVo.setContactPhone(reqVo.getContactPhone());
companyVo.setCompanyName(reqVo.getExtraChoseOne());
merchantVo.setId(StringHelper.getNewID());
merchantVo.setName(reqVo.getExtraChoseOne());
merchantVo.setAttribute(reqVo.getCompanyAttribute());
merchantVo.setTheProvider(reqVo.getId());
merchantVo.setPhone(reqVo.getContactPhone());
extendVo.setId(reqVo.getId());
if (reqVo.getCompanyAttribute() == 5){
companyBankCardVo.setCompanyId(reqVo.getId());
companyBankCardVo.setId(StringHelper.getNewID());
int vehicle = 5;
if (reqVo.getCompanyAttribute() == vehicle){
companyVo.setBusinessLicenseCode(reqVo.getExtraChoseTwo());
}else {
companyVo.setAddress(reqVo.getExtraChoseTwo());
merchantVo.setAddress(reqVo.getExtraChoseTwo());
}
companyDaoImpl.update(companyVo);
merchantDaoImpl.create(merchantVo);
companyExtendDaoImpl.create(merchantVo);
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();
MerchantVo merchantVo = new MerchantVo();
CompanyExtendVo extendVo = new CompanyExtendVo();
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
this.checkPhone(reqVo.getContactPhone());
......@@ -146,25 +144,26 @@ public class RegisterServiceImpl implements RegisterService {
companyVo.setContactCode(reqVo.getContactCode());
companyVo.setContactPhone(reqVo.getContactPhone());
merchantVo.setId(StringHelper.getNewID());
merchantVo.setName(reqVo.getMerchantName());
merchantVo.setTheProvider(reqVo.getId());
merchantVo.setAttribute(reqVo.getCompanyAttribute());
merchantVo.setPhone(reqVo.getContactPhone());
extendVo.setId(reqVo.getId());
companyBankCardVo.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.update(companyVo);
merchantDaoImpl.create(merchantVo);
companyExtendDaoImpl.create(merchantVo);
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
......@@ -186,14 +185,25 @@ public class RegisterServiceImpl implements RegisterService {
}
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);
/*String token = StringHelper.getNewID();
TokenHelper.write(token,resVo);*/
}
}
src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java
View file @ b4c46c1b
......@@ -172,13 +172,13 @@ public class RoleServiceImpl implements RoleService {
@Override
public WebRoleResVo makeResVo(RoleVo roleVo, List<AuthorityVo> authorityList) {
WebRoleResVo ResVo = new WebRoleResVo();
ResVo.setId(roleVo.getId());
ResVo.setName(roleVo.getName());
ResVo.setPid(roleVo.getPid());
ResVo.setRemark(roleVo.getRemark());
ResVo.setAuthorityList(authorityList);
return ResVo;
WebRoleResVo resVo = new WebRoleResVo();
resVo.setId(roleVo.getId());
resVo.setName(roleVo.getName());
resVo.setPid(roleVo.getPid());
resVo.setRemark(roleVo.getRemark());
resVo.setAuthorityList(authorityList);
return resVo;
}
@Override
......
src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java
View file @ b4c46c1b
......@@ -82,15 +82,15 @@ public class UserServiceImpl implements UserService {
userRoleDao.remove(userRole);
}
}
if (webUserReqVo.getRoleIds()!=null && webUserReqVo.getRoleIds().size()!=0){
List<String> roleIds = webUserReqVo.getRoleIds();
for (String roleId : roleIds) {
UserRoleVo userRoleRelation = new UserRoleVo();
userRoleRelation.setRoleId(roleId);
userRoleRelation.setUserId(webUserReqVo.getId());
userRoleRelation.setId(StringHelper.getNewID());
userRoleDao.create(userRoleRelation);
}
}
if (webUserReqVo.getRoleIds()!=null && webUserReqVo.getRoleIds().size()!=0){
List<String> roleIds = webUserReqVo.getRoleIds();
for (String roleId : roleIds) {
UserRoleVo userRoleRelation = new UserRoleVo();
userRoleRelation.setRoleId(roleId);
userRoleRelation.setUserId(webUserReqVo.getId());
userRoleRelation.setId(StringHelper.getNewID());
userRoleDao.create(userRoleRelation);
}
}
}
......
src/main/java/com/pangding/web/authority/vo/CompanyBankCardVo.java
View file @ b4c46c1b
......@@ -32,7 +32,7 @@ public class CompanyBankCardVo implements Serializable {
private String name;
@TableAnnotation("ID_card")
private String IDCard;
private String idCard;
@TableAnnotation("reserved_phone")
private String reservedPhone;
......@@ -109,12 +109,12 @@ public class CompanyBankCardVo implements Serializable {
this.name = name;
}
public String getIDCard() {
return IDCard;
public String getIdCard() {
return idCard;
}
public void setIDCard(String IDCard) {
this.IDCard = IDCard;
public void setIdCard(String idCard) {
this.idCard = idCard;
}
public String getReservedPhone() {
......
src/main/java/com/pangding/web/authority/vo/CompanyExtendVo.java
View file @ b4c46c1b
......@@ -13,13 +13,13 @@ public class CompanyExtendVo implements Serializable {
private String id;
@TableAnnotation("QR_code")
private String QRCode;
private String qrCode;
@TableAnnotation("QR_code_type")
private String QRCodeType;
private String qrCodeType;
@TableAnnotation("QR_code_url")
private String QRCodeUrl;
private String qrCodeUrl;
private String money;
......@@ -55,28 +55,28 @@ public class CompanyExtendVo implements Serializable {
this.id = id;
}
public String getQRCode() {
return QRCode;
public String getQrCode() {
return qrCode;
}
public void setQRCode(String QRCode) {
this.QRCode = QRCode;
public void setQrCode(String qrCode) {
this.qrCode = qrCode;
}
public String getQRCodeType() {
return QRCodeType;
public String getQrCodeType() {
return qrCodeType;
}
public void setQRCodeType(String QRCodeType) {
this.QRCodeType = QRCodeType;
public void setQrCodeType(String qrCodeType) {
this.qrCodeType = qrCodeType;
}
public String getQRCodeUrl() {
return QRCodeUrl;
public String getQrCodeUrl() {
return qrCodeUrl;
}
public void setQRCodeUrl(String QRCodeUrl) {
this.QRCodeUrl = QRCodeUrl;
public void setQrCodeUrl(String qrCodeUrl) {
this.qrCodeUrl = qrCodeUrl;
}
public String getMoney() {
......
src/main/java/com/pangding/web/authority/vo/MerchantVo.java deleted 100644 → 0
View file @ 8aafa038
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.InitDao;
import java.io.Serializable;
/**
* @Author zhangjinyao
* @create 2019/5/16 14:35
*/
@TableAnnotation("pd_merchant")
public class MerchantVo implements Serializable, InitDao {
private String id;
private String code;
private String name;
private String longitude;
private String latitude;
private String score;
@TableAnnotation("area_code")
private String areaCode;
@TableAnnotation("area_name")
private String areaName;
private String address;
private int attribute;
private String tag;
private String level;
private int status;
@TableAnnotation("time_spent")
private String timeSpent;
private String phone;
@TableAnnotation("the_provider")
private String theProvider;
@TableAnnotation("the_interface")
private String theInterface;
@TableAnnotation("business_start")
private String businessStart;
@TableAnnotation("business_end")
private String businessEnd;
@TableAnnotation("create_time")
private String createTime;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public String getScore() {
return score;
}
public void setScore(String score) {
this.score = score;
}
public String getAreaCode() {
return areaCode;
}
public void setAreaCode(String areaCode) {
this.areaCode = areaCode;
}
public String getAreaName() {
return areaName;
}
public void setAreaName(String areaName) {
this.areaName = areaName;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public int getAttribute() {
return attribute;
}
public void setAttribute(int attribute) {
this.attribute = attribute;
}
public String getTag() {
return tag;
}
public void setTag(String tag) {
this.tag = tag;
}
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public String getTimeSpent() {
return timeSpent;
}
public void setTimeSpent(String timeSpent) {
this.timeSpent = timeSpent;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getTheProvider() {
return theProvider;
}
public void setTheProvider(String theProvider) {
this.theProvider = theProvider;
}
public String getTheInterface() {
return theInterface;
}
public void setTheInterface(String theInterface) {
this.theInterface = theInterface;
}
public String getBusinessStart() {
return businessStart;
}
public void setBusinessStart(String businessStart) {
this.businessStart = businessStart;
}
public String getBusinessEnd() {
return businessEnd;
}
public void setBusinessEnd(String businessEnd) {
this.businessEnd = businessEnd;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
@Override
public void init() {
this.createTime = StringHelper.getFirst(this.createTime, DateHelper.getNow());
}
}
src/main/java/com/pangding/web/authority/vo/cloudVo/LoginResVo.java → src/main/java/com/pangding/web/authority/vo/cloudvo/LoginResVo.java
View file @ b4c46c1b
package com.pangding.web.authority.vo.cloudVo;
package com.pangding.web.authority.vo.cloudvo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.UserVo;
import com.pangding.web.authority.vo.*;
/**
* @Author zhangjinyao
......@@ -12,6 +11,26 @@ public class LoginResVo {
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;
}
......
src/main/java/com/pangding/web/authority/vo/reqvo/ListAuthorityReqVo.java
View file @ b4c46c1b
......@@ -7,13 +7,14 @@ import com.yanzuoguang.util.vo.PageSizeReqVo;
* @create 2019/5/15 20:03
*/
public class ListAuthorityReqVo extends PageSizeReqVo {
private String exist;
public String getExist() {
return exist;
private String levelOne;
public String getLevelOne() {
return levelOne;
}
public void setExist(String exist) {
this.exist = exist;
public void setLevelOne(String levelOne) {
this.levelOne = levelOne;
}
}
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