Merge remote-tracking branch 'origin/ww'

# Conflicts:
#	pom.xml
cert
wangwei 2 years ago
commit 92dd92d3d3

@ -366,11 +366,10 @@
<version>2.0.9</version>
</dependency>
<!--rabbitmq-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
<version>1.68</version>
</dependency>
</dependencies>

@ -7,12 +7,15 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.purchase.SupCertEntity;
import com.glxp.api.entity.sup.UserCertEntity;
import com.glxp.api.entity.sup.UserCertSetEntity;
import com.glxp.api.req.purchase.FilterImageRequest;
import com.glxp.api.req.purchase.FilterSupCertRequest;
import com.glxp.api.req.purchase.certRequest;
import com.glxp.api.req.system.DeleteCompanyFileRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.registComPerResponse;
import com.glxp.api.service.sup.UserCertService;
import com.glxp.api.service.sup.UserCertSetService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
@ -40,6 +43,9 @@ public class SupCertController {
private UserCertService userCertService;
@Value("${file_path}")
private String filePath;
@Resource
private UserCertSetService userCertSetService;
@GetMapping("/sup/company/cert/filterList")
@ -62,7 +68,8 @@ public class SupCertController {
public BaseResponse isertCert(@RequestBody UserCertEntity userCert){
userCert.setCreateTime(new Date());
userCert.setUpdateTime(new Date());
userCert.setStatus(0+"");
userCert.setStatus(1+"");
userCert.setCheckStatus(0+"");
userCert.setId(IdUtil.getSnowflakeNextId());
userCertService.insertCert(userCert);
return ResultVOUtils.success("成功");
@ -91,6 +98,17 @@ public class SupCertController {
}
userCertService.updateCert(userCert);
if("key".equals(userCert.getKey())){
//插入记录表中
UserCertSetEntity userCertSetEntity = new UserCertSetEntity();
userCertSetEntity.setId(IdUtil.getSnowflakeNextId());
userCertSetEntity.setCreateTime(new Date());
userCertSetEntity.setCreateUser(userCert.getCreateUser());
userCertSetEntity.setName(userCert.getName());
userCertSetService.insert(userCertSetEntity);
}
return ResultVOUtils.success("修改成功");
}

@ -0,0 +1,105 @@
package com.glxp.api.controller.purchase;
import cn.hutool.core.util.IdUtil;
import cn.hutool.crypto.SmUtil;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.SM2;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.sup.UserCertEntity;
import com.glxp.api.entity.sup.UserCertSetEntity;
import com.glxp.api.entity.sup.UserPersonEntity;
import com.glxp.api.req.auth.UserPersonFilterRequest;
import com.glxp.api.req.purchase.FilterImageRequest;
import com.glxp.api.req.purchase.certRequest;
import com.glxp.api.req.system.DeleteCompanyFileRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.sup.UserCertService;
import com.glxp.api.service.sup.UserCertSetService;
import com.glxp.api.service.sup.UserPersonService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* @author : zhangsan
* @date : 2023/5/18 9:38
* @modyified By :
*/
@RestController
public class userPersonController {
@Resource
private UserPersonService userPersonService;
@GetMapping("/sup/company/person/filterList")
public BaseResponse filterCompanyCert(UserPersonFilterRequest userPersonFilterRequest , BindingResult bindingResult){
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if(userPersonFilterRequest.getName() == null){
userPersonFilterRequest.setName("");
}
QueryWrapper<UserPersonEntity> and = new QueryWrapper<UserPersonEntity>().like("name", userPersonFilterRequest.getName()).and(i -> i.eq("companyId", userPersonFilterRequest.getCompanyId()));
List<UserPersonEntity> list = userPersonService.list(and);
PageInfo<UserPersonEntity> pageInfo;
pageInfo = new PageInfo<>(list);
PageSimpleResponse<UserPersonEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(list);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/sup/company/person/updatePerSon")
public BaseResponse updatePerSon(@RequestBody UserPersonFilterRequest userPersonFilterRequest ,BindingResult bindingResult ){
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
UserPersonEntity userPerson = new UserPersonEntity();
BeanUtils.copyProperties(userPersonFilterRequest,userPerson);
userPersonService.update(userPerson);
return ResultVOUtils.success();
}
@PostMapping("/sup/company/person/daletePerSon")
public BaseResponse daletePerSon(@RequestBody UserPersonFilterRequest userPersonFilterRequest ,BindingResult bindingResult ){
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
UserPersonEntity userPerson = new UserPersonEntity();
BeanUtils.copyProperties(userPersonFilterRequest,userPerson);
userPersonService.delete(userPerson);
return ResultVOUtils.success();
}
}

@ -1,12 +1,15 @@
package com.glxp.api.controller.sup;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.sup.UserCompanyEntity;
import com.glxp.api.req.auth.FilterUserComapanyRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.registComPerResponse;
import com.glxp.api.service.sup.UserCompanyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
@ -33,9 +36,19 @@ public class UserComanyController extends BaseController {
@GetMapping("udi/auth/user/comapny/search")
public BaseResponse search(FilterUserComapanyRequest filterUserComapanyRequest) {
//获取部门id
if(filterUserComapanyRequest.getSearchKey() == null){
filterUserComapanyRequest.setSearchKey("");
}
List<UserCompanyEntity> userCompanyEntities = userCompanyService.list(new QueryWrapper<UserCompanyEntity>().like("companyName", filterUserComapanyRequest.getSearchKey())
.or().like("creditNum", filterUserComapanyRequest.getSearchKey()));
return ResultVOUtils.success(userCompanyEntities);
}
PageInfo<UserCompanyEntity> pageInfo;
pageInfo = new PageInfo<>(userCompanyEntities);
PageSimpleResponse<UserCompanyEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(userCompanyEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -8,10 +8,20 @@ import javax.validation.Valid;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import com.glxp.api.entity.sup.UserCompanyEntity;
import cn.hutool.crypto.SmUtil;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.SM2;
import cn.hutool.crypto.symmetric.AES;
import com.github.pagehelper.PageInfo;
import com.glxp.api.entity.sup.*;
import com.glxp.api.req.auth.MobileCaptchaRequest;
import com.glxp.api.req.auth.UserRegisterFilterRequest;
import com.glxp.api.req.auth.loginmobileRequest;
import com.glxp.api.req.purchase.certRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.registComPerResponse;
import com.glxp.api.service.sup.UserCompanyService;
import com.glxp.api.service.sup.*;
import com.glxp.api.util.UuidUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -28,12 +38,6 @@ import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.sup.UserCertEntity;
import com.glxp.api.entity.sup.UserPersonEntity;
import com.glxp.api.entity.sup.UserRegisterEntity;
import com.glxp.api.service.sup.UserCertService;
import com.glxp.api.service.sup.UserPersonService;
import com.glxp.api.service.sup.UserRegisterService;
import com.glxp.api.util.CaptchaUtils;
import cn.hutool.core.util.ReUtil;
@ -55,6 +59,13 @@ public class UserRegisterController extends BaseController {
private UserCompanyService userCompanyService;
@Resource
private UserCertService userCertService;
@Resource
private UserCheckService userCheckService;
@Resource
private UserCertSetService userCertSetService;
@PostMapping("/admin/auth/register/getCheckcode")
public BaseResponse getCheckcode(@RequestBody loginmobileRequest params, HttpSession httpSession) {
return CaptchaUtils.getCheckcode(params,httpSession);
@ -125,13 +136,7 @@ public class UserRegisterController extends BaseController {
return ResultVOUtils.success();
}
@GetMapping("/admin/auth/register/list")
public BaseResponse list(@RequestBody Map<String,Object> params, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
return ResultVOUtils.success(userRegisterService.list(new QueryWrapper<UserRegisterEntity>().allEq(params)));
}
//第一次完善信息 插入默认数据
@GetMapping("/admin/auth/register/insertInitial")
@ -143,7 +148,7 @@ public class UserRegisterController extends BaseController {
//插入初始数据
UserRegisterEntity userRegisterEntity = new UserRegisterEntity();
UserCompanyEntity userCompanyEntity = new UserCompanyEntity();
UserPersonEntity userPersonEntity = new UserPersonEntity();
// UserPersonEntity userPersonEntity = new UserPersonEntity();
userCompanyEntity.setId(IdUtil.getSnowflakeNextId());
userCompanyEntity.setCheckStatus(0+"");
@ -152,6 +157,7 @@ public class UserRegisterController extends BaseController {
userRegisterEntity.setId(IdUtil.getSnowflakeNextId());
userRegisterEntity.setCompanyId(userCompanyEntity.getId());
userRegisterEntity.setMobile(mobile);
userRegisterEntity.setCheckStatus(0+"");
userRegisterEntity.setRegisterTime(new Date());
@ -171,7 +177,10 @@ public class UserRegisterController extends BaseController {
}
return ResultVOUtils.error(500,"添加失败");
}else{
registComPerResponse registComPerResponse = userRegisterService.selectAllInfo(userRegister.getCompanyId()+"");
UserRegisterFilterRequest userRegisterFilterRequest = new UserRegisterFilterRequest();
userRegisterFilterRequest.setCompanyId(userRegister.getCompanyId()+"");
registComPerResponse registComPerResponse = userRegisterService.selectAllInfo(userRegisterFilterRequest);
map.put("registComPerResponse",registComPerResponse);
return ResultVOUtils.success(map);
}
@ -189,11 +198,14 @@ public class UserRegisterController extends BaseController {
// BeanUtils.copyProperties(registComPerResponse,userPersonEntity);
BeanUtils.copyProperties(registComPerResponse,userCompanyEntity);
userRegisterEntity.setId(Long.valueOf(registComPerResponse.getUrId()));
// userPersonEntity.setId(Long.valueOf(registComPerResponse.getUpId()));
userCompanyEntity.setId(Long.valueOf(registComPerResponse.getUcId()));
userCompanyEntity.setContactWay(registComPerResponse.getFmobile());
if("key".equals(registComPerResponse.getKey())){
//提交审核
userCompanyEntity.setCheckStatus(3+"");
userRegisterEntity.setCheckStatus(3+"");
}
//插入资质证书
for (UserCertEntity userCertEntity : registComPerResponse.getList()) {
@ -211,7 +223,119 @@ public class UserRegisterController extends BaseController {
}
@PostMapping("/admin/auth/register/list")
public BaseResponse selectReslist(@RequestBody UserRegisterFilterRequest userRegisterFilterRequest, BindingResult bindingResult){
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<registComPerResponse> selectlist = userRegisterService.selectlist(userRegisterFilterRequest);
PageInfo<registComPerResponse> pageInfo;
pageInfo = new PageInfo<>(selectlist);
PageSimpleResponse<registComPerResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(selectlist);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/admin/auth/register/NotApproved")
public BaseResponse NotApproved(@RequestBody registComPerResponse registComPerResponse,BindingResult bindingResult){
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
UserRegisterEntity userRegisterEntity = new UserRegisterEntity();
UserCompanyEntity userCompanyEntity = new UserCompanyEntity();
UserCheckEntity userCheckEntity = new UserCheckEntity();
// UserCertSetEntity userCertSetEntity = new UserCertSetEntity();
if("isPass".equals(registComPerResponse.getIsPass())){
//审核通过
//资质证书全部通过才能审核 审核通过
certRequest certRequest = new certRequest();
certRequest.setBusinessId(Long.valueOf(registComPerResponse.getUcId()));
List<UserCertEntity> userCertEntities = userCertService.selectBybId(certRequest);
for (UserCertEntity userCertEntity : userCertEntities) {
if(!"1".equals(userCertEntity.getCheckStatus())){
return ResultVOUtils.error(500,"证书未全部通过,不能通过");
}
}
//通过之后 修改注册状态 和企业状态 将注册信息插入到系统负责人表中 生成用户名密码
userCheckEntity.setCheckResult(1+"");
//生成账号密码
String userName = "YY"+UuidUtils.getShortUuid(4);
String password = "123456";
UserRegisterEntity id = userRegisterService.getOne(new QueryWrapper<UserRegisterEntity>().eq("id", registComPerResponse.getId()));
UserPersonEntity userPersonEntity = new UserPersonEntity();
BeanUtils.copyProperties(id,userPersonEntity);
userPersonEntity.setId(IdUtil.getSnowflakeNextId());
userPersonEntity.setEmail(id.getXemail());
userPersonEntity.setUserName(userName);
userPersonEntity.setPassword(password);
userPersonEntity.setCreateTime(new Date());
userPersonEntity.setRegisterId(Long.valueOf(registComPerResponse.getId()));
userPersonService.insert(userPersonEntity);
}
//修改注册表中的状态 企业状态 操作表中插入记录
userCheckEntity.setId(IdUtil.getSnowflakeNextId());
userCheckEntity.setBusinessId(Long.valueOf(registComPerResponse.getUcId()));
userCheckEntity.setCreateUser(registComPerResponse.getReviewer());
userCheckEntity.setCheckResult(0+"");
userCheckEntity.setResultExplain(registComPerResponse.getReason());
userCheckEntity.setCreateTime(new Date());
// userCertSetEntity.setId(IdUtil.getSnowflakeNextId());
// userCertSetEntity.setName(registComPerResponse.getName());
// userCertSetEntity.setCreateUser(registComPerResponse.getReviewer());
// userCertSetEntity.setCreateTime(new Date());
userRegisterEntity.setId(Long.valueOf(registComPerResponse.getId()));
userRegisterEntity.setCheckStatus(registComPerResponse.getCheckStatus());
userCompanyEntity.setId(Long.valueOf(registComPerResponse.getUcId()));
userCompanyEntity.setCheckStatus(registComPerResponse.getCheckStatus());
userCompanyEntity.setReason(registComPerResponse.getReason());
userRegisterService.updateById(userRegisterEntity);
userCompanyService.updateById(userCompanyEntity);
userCheckService.insert(userCheckEntity);
// userCertSetService.insert(userCertSetEntity);
return ResultVOUtils.success();
}
//对手机 验证码进行加密/解密
@PostMapping("/admin/auth/register/encrypt")
public BaseResponse encrypt(@RequestBody MobileCaptchaRequest mobileCaptchaRequest){
if(mobileCaptchaRequest == null){
return ResultVOUtils.error(500,"");
}
MobileCaptchaRequest mobileCaptchaRequest1 = new MobileCaptchaRequest();
String mobile;
String captcha;
AES aes = new AES("CBC", "PKCS7Padding",
// 密钥,可以自定义
"0123456789ABHAEQ".getBytes(),
// iv加盐按照实际需求添加
"DYgjCEIMVrj2W9xN".getBytes());
if("key".equals(mobileCaptchaRequest.getKey())){
// 加密
mobile = aes.encryptHex(mobileCaptchaRequest.getMobile());
captcha = aes.encryptHex(mobileCaptchaRequest.getCaptcha());
}else{
mobile = aes.decryptStr(mobileCaptchaRequest.getMobile());
captcha = aes.decryptStr(mobileCaptchaRequest.getCaptcha());
}
mobileCaptchaRequest1.setMobile(mobile);
mobileCaptchaRequest1.setCaptcha(captcha);
return ResultVOUtils.success(mobileCaptchaRequest1);
}

@ -2,12 +2,17 @@ package com.glxp.api.dao.sup;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.sup.UserRegisterEntity;
import com.glxp.api.req.auth.UserRegisterFilterRequest;
import com.glxp.api.res.auth.registComPerResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface UserRegisterMapper extends BaseMapper<UserRegisterEntity> {
registComPerResponse selectAllInfo(String companyId);
registComPerResponse selectAllInfo(UserRegisterFilterRequest userRegisterFilterRequest);
List<registComPerResponse> selectResList(UserRegisterFilterRequest userRegisterFilterRequest);
}

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
/**
@ -42,12 +44,14 @@ public class UserCertEntity implements Serializable {
*
*/
@TableField(value = "validDate")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date validDate;
/**
*
*/
@TableField(value = "expireDate")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date expireDate;
/**
@ -84,6 +88,7 @@ public class UserCertEntity implements Serializable {
*
*/
@TableField(value = "createTime")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
/**
@ -96,7 +101,11 @@ public class UserCertEntity implements Serializable {
*
*/
@TableField(value = "updateTime")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@TableField(exist = false)
private String key;
private static final long serialVersionUID = 1L;
}

@ -1,9 +1,7 @@
package com.glxp.api.entity.sup;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;

@ -82,5 +82,11 @@ public class UserCompanyEntity implements Serializable {
@TableField(value = "`status`")
private String status;
/**
*
*/
@TableField(value = "`reason`")
private String reason;
private static final long serialVersionUID = 1L;
}

@ -112,5 +112,28 @@ public class UserRegisterEntity implements Serializable {
@TableField(value = "checkTime")
private Date checkTime;
@TableField(value = "name")
private String name;
@TableField(value = "tel")
private String tel;
@TableField(value = "qq")
private String qq;
@TableField(value = "weChat")
private String weChat;
@TableField(value = "xemail")
private String xemail;
@TableField(value = "fmobile")
private String fmobile;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,16 @@
package com.glxp.api.req.auth;
import lombok.Data;
/**
* @author : zhangsan
* @date : 2023/5/23 10:12
* @modyified By :
*/
@Data
public class MobileCaptchaRequest {
private String mobile;
private String captcha;
private String key;
}

@ -7,13 +7,16 @@ import lombok.Data;
@Data
public class UserPersonFilterRequest extends ListPageRequest {
private Long id;
private String registerId;
private String companyId;
private String userName;
private String passsword;
private String name;
private String tel;
private String qq;
private String weChat;
private String companyName;
private String creditNum;
private String mobile;
private String bussinessStatus;
private String checkStatus;
private String registerTime;
private String checkTime;
}

@ -10,6 +10,8 @@ public class UserRegisterFilterRequest extends ListPageRequest {
private String id;
private String registerId;
private String companyId;
private String companyName;
private String checkStatus;
private String name;
private String tel;
private String mobile;

@ -39,7 +39,13 @@ public class registComPerResponse {
private String checkStatus;
private String ucstatus;
private String xemail;
private String reason;
private String reason; //企业说明
private String fmobile;
private String reviewer; //审核人
private String checkComment;//资质审核说明
private String isPass;
private String certName;
private String registerTime;

@ -2,7 +2,9 @@ package com.glxp.api.service.sup;
import com.glxp.api.entity.sup.UserCertSetEntity;
import com.baomidou.mybatisplus.extension.service.IService;
public interface UserCertSetService extends IService<UserCertSetEntity>{
import com.glxp.api.entity.sup.UserCheckEntity;
public interface UserCertSetService extends IService<UserCertSetEntity>{
boolean insert(UserCertSetEntity userCertSetEntity);
}

@ -4,5 +4,7 @@ import com.glxp.api.entity.sup.UserCheckEntity;
import com.baomidou.mybatisplus.extension.service.IService;
public interface UserCheckService extends IService<UserCheckEntity>{
boolean insert(UserCheckEntity userCheckEntity);
}

@ -8,4 +8,6 @@ public interface UserPersonService extends IService<UserPersonEntity>{
boolean update(UserPersonEntity userPerson);
boolean delete(UserPersonEntity userPerson);
}

@ -2,15 +2,20 @@ package com.glxp.api.service.sup;
import com.glxp.api.entity.sup.UserRegisterEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.req.auth.UserRegisterFilterRequest;
import com.glxp.api.res.auth.registComPerResponse;
import java.util.List;
public interface UserRegisterService extends IService<UserRegisterEntity>{
int insert(UserRegisterEntity userRegister);
registComPerResponse selectAllInfo(String companyId);
registComPerResponse selectAllInfo(UserRegisterFilterRequest userRegisterFilterRequest);
boolean update( UserRegisterEntity userRegisterEntity);
List<registComPerResponse> selectlist(UserRegisterFilterRequest userRegisterFilterRequest);
}

@ -6,7 +6,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.sup.UserCertSetEntity;
import com.glxp.api.dao.sup.UserCertSetMapper;
import javax.annotation.Resource;
@Service
public class UserCertSetServiceImpl extends ServiceImpl<UserCertSetMapper, UserCertSetEntity> implements UserCertSetService {
@Resource
UserCertSetMapper userCertSetMapper;
@Override
public boolean insert(UserCertSetEntity userCertSetEntity) {
return userCertSetMapper.insert(userCertSetEntity)>0;
}
}

@ -6,7 +6,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.sup.UserCheckEntity;
import com.glxp.api.dao.sup.UserCheckMapper;
import javax.annotation.Resource;
@Service
public class UserCheckServiceImpl extends ServiceImpl<UserCheckMapper, UserCheckEntity> implements UserCheckService {
@Resource
UserCheckMapper userCheckMapper;
@Override
public boolean insert(UserCheckEntity userCheckEntity) {
return userCheckMapper.insert(userCheckEntity)>0;
}
}

@ -23,4 +23,9 @@ public class UserPersonServiceImpl extends ServiceImpl<UserPersonMapper, UserPer
public boolean update(UserPersonEntity userPerson) {
return userPersonMapper.updateById(userPerson)>0;
}
@Override
public boolean delete(UserPersonEntity userPerson) {
return userPersonMapper.deleteById(userPerson)>0;
}
}

@ -1,5 +1,6 @@
package com.glxp.api.service.sup.impl;
import com.glxp.api.req.auth.UserRegisterFilterRequest;
import com.glxp.api.res.auth.registComPerResponse;
import com.glxp.api.service.sup.UserRegisterService;
import org.springframework.stereotype.Service;
@ -8,6 +9,7 @@ import com.glxp.api.entity.sup.UserRegisterEntity;
import com.glxp.api.dao.sup.UserRegisterMapper;
import javax.annotation.Resource;
import java.util.List;
@Service
public class UserRegisterServiceImpl extends ServiceImpl<UserRegisterMapper, UserRegisterEntity> implements UserRegisterService {
@ -22,12 +24,17 @@ public class UserRegisterServiceImpl extends ServiceImpl<UserRegisterMapper, Use
}
@Override
public registComPerResponse selectAllInfo(String companyId) {
return userRegisterMapper.selectAllInfo(companyId);
public registComPerResponse selectAllInfo(UserRegisterFilterRequest userRegisterFilterRequest) {
return userRegisterMapper.selectAllInfo(userRegisterFilterRequest);
}
@Override
public boolean update(UserRegisterEntity userRegisterEntity) {
return userRegisterMapper.updateById(userRegisterEntity)>0;
}
@Override
public List<registComPerResponse> selectlist(UserRegisterFilterRequest userRegisterFilterRequest) {
return userRegisterMapper.selectResList(userRegisterFilterRequest);
}
}

@ -54,8 +54,8 @@ public class CaptchaUtils {
}
public static BaseResponse getCheckcode(loginmobileRequest params, HttpSession httpSession) {
RestTemplate restTemplate = new RestTemplate();
// int mobile_code = (int) ((Math.random() * 9 + 1) * 100000);
int mobile_code = 123456;
int mobile_code = (int) ((Math.random() * 9 + 1) * 100000);
MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
int time = 5;
String content = new String("您正在进行手机验证,验证码是" + mobile_code + "" + time + "分钟内有效。");
@ -65,19 +65,19 @@ public class CaptchaUtils {
postParameters.add("content", content);
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/x-www-form-urlencoded;charset=GBK");
// HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(postParameters, headers);
// String response = restTemplate.postForObject(Url, httpEntity, String.class);
// if (response.contains("提交成功")) {
HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(postParameters, headers);
String response = restTemplate.postForObject(Url, httpEntity, String.class);
if (response.contains("提交成功")) {
JSONObject json = new JSONObject();
json.put("memPhone", params.getMobile());
json.put("code", mobile_code);
json.put("createTime", System.currentTimeMillis());
//验证码存入redis中
redisUtil.set(Constant.CAPTCHAS + params.getMobile(), json, 300L);
return ResultVOUtils.success("发送成功");
// } else {
// return ResultVOUtils.error(500, "验证码发送失败");
// }
return ResultVOUtils.success(mobile_code);
} else {
return ResultVOUtils.error(500, "验证码发送失败");
}
}
}

@ -28,12 +28,9 @@
registerTime, legalPerson, legalIdCard, registerAddress, contactWay, comments, checkStatus,
checkTime
</sql>
<select id="selectAllInfo" resultType="com.glxp.api.res.auth.registComPerResponse">
<select id="selectAllInfo" resultType="com.glxp.api.res.auth.registComPerResponse"
parameterType="com.glxp.api.req.auth.UserRegisterFilterRequest">
select user_register.*,
user_person.`name`,
user_person.tel,
user_person.qq,
user_person.weChat,
user_person.id as upId,
user_company.checkStatus as ucstatus,
user_company.reason,
@ -42,9 +39,38 @@
user_register LEFT JOIN user_company on user_register.companyId=user_company.id
LEFT JOIN user_person on user_register.companyId=user_person.companyId
<where>
<if test="companyId !=null and companyId != ''">
and user_register.companyId =#{companyId}
<if test="mobile !=null and mobile != ''">
and user_register.mobile =#{mobile}
</if>
<if test="companyId !=null and companyId != ''">
and user_register.companyId =#{companyId}
</if>
</where>
</select>
<select id="selectResList" resultType="com.glxp.api.res.auth.registComPerResponse"
parameterType="com.glxp.api.req.auth.UserRegisterFilterRequest">
select user_register.*,
user_person.id as upId,
user_company.checkStatus as ucstatus,
user_company.reason,
user_company.id as ucId
from
user_register LEFT JOIN user_company on user_register.companyId=user_company.id
LEFT JOIN user_person on user_register.companyId=user_person.companyId
<where>
and user_register.checkStatus != 0
<if test="companyName !=null and companyName != ''">
and user_register.companyName like concat('%', #{companyName},'%')
</if>
<if test="checkStatus !=null and checkStatus != ''">
and user_register.checkStatus =#{checkStatus}
</if>
</where>

@ -7,7 +7,8 @@ CALL Pro_Temp_ColumnWork('user_register', 'tel', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('user_register', 'qq', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('user_register', 'weChat', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('user_register', 'xemail', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('user_company', 'reason', 'varchar(255)', 1);
-- CALL Pro_Temp_ColumnWork('user_company', 'reason', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('user_register', 'fmobile', 'varchar(255)', 1);

Loading…
Cancel
Save