From 8c51d8be2297353c651dacddd5b082b5d2a2cd05 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 23 May 2023 14:32:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=20=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 + .../purchase/SupCertController.java | 20 ++- .../purchase/userPersonController.java | 105 ++++++++++++ .../controller/sup/UserComanyController.java | 17 +- .../sup/UserRegisterController.java | 158 ++++++++++++++++-- .../glxp/api/dao/sup/UserRegisterMapper.java | 7 +- .../glxp/api/entity/sup/UserCertEntity.java | 9 + .../glxp/api/entity/sup/UserCheckEntity.java | 6 +- .../api/entity/sup/UserCompanyEntity.java | 6 + .../api/entity/sup/UserRegisterEntity.java | 23 +++ .../api/req/auth/MobileCaptchaRequest.java | 16 ++ .../api/req/auth/UserPersonFilterRequest.java | 15 +- .../req/auth/UserRegisterFilterRequest.java | 2 + .../api/res/auth/registComPerResponse.java | 8 +- .../api/service/sup/UserCertSetService.java | 4 +- .../api/service/sup/UserCheckService.java | 2 + .../api/service/sup/UserPersonService.java | 2 + .../api/service/sup/UserRegisterService.java | 7 +- .../sup/impl/UserCertSetServiceImpl.java | 9 + .../sup/impl/UserCheckServiceImpl.java | 10 ++ .../sup/impl/UserPersonServiceImpl.java | 5 + .../sup/impl/UserRegisterServiceImpl.java | 11 +- .../java/com/glxp/api/util/CaptchaUtils.java | 18 +- .../mybatis/mapper/sup/UserRegisterMapper.xml | 40 ++++- src/main/resources/schemas/schema_v2.1.sql | 3 +- 25 files changed, 456 insertions(+), 53 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/purchase/userPersonController.java create mode 100644 src/main/java/com/glxp/api/req/auth/MobileCaptchaRequest.java diff --git a/pom.xml b/pom.xml index 9894707..719f85d 100644 --- a/pom.xml +++ b/pom.xml @@ -365,6 +365,12 @@ knife4j-spring-boot-starter 2.0.9 + + + org.bouncycastle + bcprov-jdk15to18 + 1.68 + diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 04d4b5c..3606940 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -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; @@ -38,6 +41,9 @@ public class SupCertController { private UserCertService userCertService; @Value("${file_path}") private String filePath; + @Resource + private UserCertSetService userCertSetService; + @GetMapping("/sup/company/cert/filterList") @@ -60,7 +66,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("成功"); @@ -89,6 +96,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("修改成功"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/userPersonController.java b/src/main/java/com/glxp/api/controller/purchase/userPersonController.java new file mode 100644 index 0000000..4099cac --- /dev/null +++ b/src/main/java/com/glxp/api/controller/purchase/userPersonController.java @@ -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 and = new QueryWrapper().like("name", userPersonFilterRequest.getName()).and(i -> i.eq("companyId", userPersonFilterRequest.getCompanyId())); + List list = userPersonService.list(and); + PageInfo pageInfo; + pageInfo = new PageInfo<>(list); + PageSimpleResponse 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(); + } + + + + + + + + + +} diff --git a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java index f1b19d5..54ed8d5 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java +++ b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java @@ -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; @@ -31,9 +34,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 userCompanyEntities = userCompanyService.list(new QueryWrapper().like("companyName", filterUserComapanyRequest.getSearchKey()) .or().like("creditNum", filterUserComapanyRequest.getSearchKey())); - return ResultVOUtils.success(userCompanyEntities); - } + PageInfo pageInfo; + pageInfo = new PageInfo<>(userCompanyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(userCompanyEntities); + + + return ResultVOUtils.success(pageSimpleResponse); + } } diff --git a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java index 266e302..7e563c0 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java +++ b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java @@ -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; @@ -53,6 +57,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); @@ -120,13 +131,7 @@ public class UserRegisterController extends BaseController { return ResultVOUtils.success(); } - @GetMapping("/admin/auth/register/list") - public BaseResponse list(@RequestBody Map params, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - return ResultVOUtils.success(userRegisterService.list(new QueryWrapper().allEq(params))); - } + //第一次完善信息 插入默认数据 @GetMapping("/admin/auth/register/insertInitial") @@ -138,7 +143,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+""); @@ -147,6 +152,7 @@ public class UserRegisterController extends BaseController { userRegisterEntity.setId(IdUtil.getSnowflakeNextId()); userRegisterEntity.setCompanyId(userCompanyEntity.getId()); userRegisterEntity.setMobile(mobile); + userRegisterEntity.setCheckStatus(0+""); userRegisterEntity.setRegisterTime(new Date()); @@ -166,7 +172,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); } @@ -184,11 +193,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()) { @@ -206,7 +218,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 selectlist = userRegisterService.selectlist(userRegisterFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(selectlist); + PageSimpleResponse 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 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().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); + } diff --git a/src/main/java/com/glxp/api/dao/sup/UserRegisterMapper.java b/src/main/java/com/glxp/api/dao/sup/UserRegisterMapper.java index aae9753..871dd7c 100644 --- a/src/main/java/com/glxp/api/dao/sup/UserRegisterMapper.java +++ b/src/main/java/com/glxp/api/dao/sup/UserRegisterMapper.java @@ -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 { - registComPerResponse selectAllInfo(String companyId); + registComPerResponse selectAllInfo(UserRegisterFilterRequest userRegisterFilterRequest); + + List selectResList(UserRegisterFilterRequest userRegisterFilterRequest); } diff --git a/src/main/java/com/glxp/api/entity/sup/UserCertEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCertEntity.java index 9814b6c..c576826 100644 --- a/src/main/java/com/glxp/api/entity/sup/UserCertEntity.java +++ b/src/main/java/com/glxp/api/entity/sup/UserCertEntity.java @@ -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; } diff --git a/src/main/java/com/glxp/api/entity/sup/UserCheckEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCheckEntity.java index 449acf0..be0d95b 100644 --- a/src/main/java/com/glxp/api/entity/sup/UserCheckEntity.java +++ b/src/main/java/com/glxp/api/entity/sup/UserCheckEntity.java @@ -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; diff --git a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java index efe63d3..444bcfc 100644 --- a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java @@ -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; } diff --git a/src/main/java/com/glxp/api/entity/sup/UserRegisterEntity.java b/src/main/java/com/glxp/api/entity/sup/UserRegisterEntity.java index dc18e5f..e4a0c8a 100644 --- a/src/main/java/com/glxp/api/entity/sup/UserRegisterEntity.java +++ b/src/main/java/com/glxp/api/entity/sup/UserRegisterEntity.java @@ -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; } diff --git a/src/main/java/com/glxp/api/req/auth/MobileCaptchaRequest.java b/src/main/java/com/glxp/api/req/auth/MobileCaptchaRequest.java new file mode 100644 index 0000000..24481fb --- /dev/null +++ b/src/main/java/com/glxp/api/req/auth/MobileCaptchaRequest.java @@ -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; + +} diff --git a/src/main/java/com/glxp/api/req/auth/UserPersonFilterRequest.java b/src/main/java/com/glxp/api/req/auth/UserPersonFilterRequest.java index e0a8c37..f75583f 100644 --- a/src/main/java/com/glxp/api/req/auth/UserPersonFilterRequest.java +++ b/src/main/java/com/glxp/api/req/auth/UserPersonFilterRequest.java @@ -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; + + } diff --git a/src/main/java/com/glxp/api/req/auth/UserRegisterFilterRequest.java b/src/main/java/com/glxp/api/req/auth/UserRegisterFilterRequest.java index 8bd0832..f708040 100644 --- a/src/main/java/com/glxp/api/req/auth/UserRegisterFilterRequest.java +++ b/src/main/java/com/glxp/api/req/auth/UserRegisterFilterRequest.java @@ -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; diff --git a/src/main/java/com/glxp/api/res/auth/registComPerResponse.java b/src/main/java/com/glxp/api/res/auth/registComPerResponse.java index 4e8f972..980ecf9 100644 --- a/src/main/java/com/glxp/api/res/auth/registComPerResponse.java +++ b/src/main/java/com/glxp/api/res/auth/registComPerResponse.java @@ -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; diff --git a/src/main/java/com/glxp/api/service/sup/UserCertSetService.java b/src/main/java/com/glxp/api/service/sup/UserCertSetService.java index 64e0152..241f673 100644 --- a/src/main/java/com/glxp/api/service/sup/UserCertSetService.java +++ b/src/main/java/com/glxp/api/service/sup/UserCertSetService.java @@ -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{ +import com.glxp.api.entity.sup.UserCheckEntity; +public interface UserCertSetService extends IService{ + boolean insert(UserCertSetEntity userCertSetEntity); } diff --git a/src/main/java/com/glxp/api/service/sup/UserCheckService.java b/src/main/java/com/glxp/api/service/sup/UserCheckService.java index 24c8d24..0e6d8dc 100644 --- a/src/main/java/com/glxp/api/service/sup/UserCheckService.java +++ b/src/main/java/com/glxp/api/service/sup/UserCheckService.java @@ -4,5 +4,7 @@ import com.glxp.api.entity.sup.UserCheckEntity; import com.baomidou.mybatisplus.extension.service.IService; public interface UserCheckService extends IService{ + boolean insert(UserCheckEntity userCheckEntity); + } diff --git a/src/main/java/com/glxp/api/service/sup/UserPersonService.java b/src/main/java/com/glxp/api/service/sup/UserPersonService.java index f495119..f0da848 100644 --- a/src/main/java/com/glxp/api/service/sup/UserPersonService.java +++ b/src/main/java/com/glxp/api/service/sup/UserPersonService.java @@ -8,4 +8,6 @@ public interface UserPersonService extends IService{ boolean update(UserPersonEntity userPerson); + boolean delete(UserPersonEntity userPerson); + } diff --git a/src/main/java/com/glxp/api/service/sup/UserRegisterService.java b/src/main/java/com/glxp/api/service/sup/UserRegisterService.java index c217cb3..98db1d7 100644 --- a/src/main/java/com/glxp/api/service/sup/UserRegisterService.java +++ b/src/main/java/com/glxp/api/service/sup/UserRegisterService.java @@ -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{ int insert(UserRegisterEntity userRegister); - registComPerResponse selectAllInfo(String companyId); + registComPerResponse selectAllInfo(UserRegisterFilterRequest userRegisterFilterRequest); boolean update( UserRegisterEntity userRegisterEntity); + List selectlist(UserRegisterFilterRequest userRegisterFilterRequest); + } diff --git a/src/main/java/com/glxp/api/service/sup/impl/UserCertSetServiceImpl.java b/src/main/java/com/glxp/api/service/sup/impl/UserCertSetServiceImpl.java index cad014a..6baa760 100644 --- a/src/main/java/com/glxp/api/service/sup/impl/UserCertSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sup/impl/UserCertSetServiceImpl.java @@ -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 implements UserCertSetService { + @Resource + UserCertSetMapper userCertSetMapper; + + @Override + public boolean insert(UserCertSetEntity userCertSetEntity) { + return userCertSetMapper.insert(userCertSetEntity)>0; + } } diff --git a/src/main/java/com/glxp/api/service/sup/impl/UserCheckServiceImpl.java b/src/main/java/com/glxp/api/service/sup/impl/UserCheckServiceImpl.java index a1b1bcc..b5b10bd 100644 --- a/src/main/java/com/glxp/api/service/sup/impl/UserCheckServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sup/impl/UserCheckServiceImpl.java @@ -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 implements UserCheckService { + @Resource + UserCheckMapper userCheckMapper; + + + @Override + public boolean insert(UserCheckEntity userCheckEntity) { + return userCheckMapper.insert(userCheckEntity)>0; + } } diff --git a/src/main/java/com/glxp/api/service/sup/impl/UserPersonServiceImpl.java b/src/main/java/com/glxp/api/service/sup/impl/UserPersonServiceImpl.java index a26249f..d1c6880 100644 --- a/src/main/java/com/glxp/api/service/sup/impl/UserPersonServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sup/impl/UserPersonServiceImpl.java @@ -23,4 +23,9 @@ public class UserPersonServiceImpl extends ServiceImpl0; } + + @Override + public boolean delete(UserPersonEntity userPerson) { + return userPersonMapper.deleteById(userPerson)>0; + } } diff --git a/src/main/java/com/glxp/api/service/sup/impl/UserRegisterServiceImpl.java b/src/main/java/com/glxp/api/service/sup/impl/UserRegisterServiceImpl.java index e9b9105..1a60a85 100644 --- a/src/main/java/com/glxp/api/service/sup/impl/UserRegisterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sup/impl/UserRegisterServiceImpl.java @@ -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 implements UserRegisterService { @@ -22,12 +24,17 @@ public class UserRegisterServiceImpl extends ServiceImpl0; } + + @Override + public List selectlist(UserRegisterFilterRequest userRegisterFilterRequest) { + return userRegisterMapper.selectResList(userRegisterFilterRequest); + } } diff --git a/src/main/java/com/glxp/api/util/CaptchaUtils.java b/src/main/java/com/glxp/api/util/CaptchaUtils.java index a4c5835..d71f86d 100644 --- a/src/main/java/com/glxp/api/util/CaptchaUtils.java +++ b/src/main/java/com/glxp/api/util/CaptchaUtils.java @@ -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 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> httpEntity = new HttpEntity<>(postParameters, headers); -// String response = restTemplate.postForObject(Url, httpEntity, String.class); -// if (response.contains("提交成功")) { + HttpEntity> 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, "验证码发送失败"); + } } } diff --git a/src/main/resources/mybatis/mapper/sup/UserRegisterMapper.xml b/src/main/resources/mybatis/mapper/sup/UserRegisterMapper.xml index df4dc45..6d414ba 100644 --- a/src/main/resources/mybatis/mapper/sup/UserRegisterMapper.xml +++ b/src/main/resources/mybatis/mapper/sup/UserRegisterMapper.xml @@ -28,12 +28,9 @@ registerTime, legalPerson, legalIdCard, registerAddress, contactWay, comments, checkStatus, checkTime - 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 - - and user_register.companyId =#{companyId} + + and user_register.mobile =#{mobile} + + and user_register.companyId =#{companyId} + + + + + + + +