From fa6457abb06e751eb12715dac6e2b0e7b371164b Mon Sep 17 00:00:00 2001 From: chengqf <584883665@139.com> Date: Tue, 16 May 2023 15:32:53 +0800 Subject: [PATCH] person,cert --- .../controller/auth/RegisterController.java | 7 ++- .../com/glxp/api/dao/auth/UserCertDao.java | 15 +++++ .../com/glxp/api/dao/auth/UserPersonDao.java | 3 +- .../api/req/auth/UserCertFilterRequest.java | 17 ++++++ .../api/service/auth/UserCertService.java | 12 ++++ .../api/service/auth/UserPersonService.java | 3 +- .../auth/impl/UserCertServiceImpl.java | 36 ++++++++++++ .../auth/impl/UserPersonServiceImpl.java | 3 +- .../mybatis/mapper/auth/UserCertMapper.xml | 55 +++++++++++++++++++ 9 files changed, 144 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/glxp/api/dao/auth/UserCertDao.java create mode 100644 src/main/java/com/glxp/api/req/auth/UserCertFilterRequest.java create mode 100644 src/main/java/com/glxp/api/service/auth/UserCertService.java create mode 100644 src/main/java/com/glxp/api/service/auth/impl/UserCertServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/auth/UserCertMapper.xml diff --git a/src/main/java/com/glxp/api/controller/auth/RegisterController.java b/src/main/java/com/glxp/api/controller/auth/RegisterController.java index 71abe4b..4c975f4 100644 --- a/src/main/java/com/glxp/api/controller/auth/RegisterController.java +++ b/src/main/java/com/glxp/api/controller/auth/RegisterController.java @@ -21,9 +21,11 @@ import com.alibaba.fastjson2.JSON; 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.auth.UserCertEntity; import com.glxp.api.entity.auth.UserPersonEntity; import com.glxp.api.entity.auth.UserRegisterEntity; import com.glxp.api.req.auth.UserRegisterFilterRequest; +import com.glxp.api.service.auth.UserCertService; import com.glxp.api.service.auth.UserPersonService; import com.glxp.api.service.auth.UserRegisterService; import com.glxp.api.util.CaptchaUtils; @@ -40,7 +42,8 @@ public class RegisterController { private UserRegisterService userRegisterService; @Resource private UserPersonService userPersonService; - + @Resource + private UserCertService userCertService; @PostMapping("/admin/auth/register/getCheckcode") public BaseResponse getCheckcode(@RequestBody Map params, HttpSession httpSession) { logger.info("---------------"+JSON.toJSONString(params)); @@ -67,6 +70,8 @@ public class RegisterController { } else { List userPersons = userPersonService.selectByRegisterId(userRegisterEntity.getId().toString()); userRegisterEntity.setUserPersons(userPersons); + List userCerts = userCertService.selectByRegisterId(userRegisterEntity.getId().toString()); + userRegisterEntity.setUserCerts(userCerts); } return ResultVOUtils.success(userRegisterEntity); } diff --git a/src/main/java/com/glxp/api/dao/auth/UserCertDao.java b/src/main/java/com/glxp/api/dao/auth/UserCertDao.java new file mode 100644 index 0000000..c92f204 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/auth/UserCertDao.java @@ -0,0 +1,15 @@ +package com.glxp.api.dao.auth; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.auth.UserCertEntity; +import com.glxp.api.req.auth.UserCertFilterRequest; + +public interface UserCertDao extends BaseMapperPlus { + + List filterUserCerts(UserCertFilterRequest userCertFilterRequest); + List selectByRegisterId(@Param("registerId") String registerId); +} diff --git a/src/main/java/com/glxp/api/dao/auth/UserPersonDao.java b/src/main/java/com/glxp/api/dao/auth/UserPersonDao.java index 0e44b85..2a5d627 100644 --- a/src/main/java/com/glxp/api/dao/auth/UserPersonDao.java +++ b/src/main/java/com/glxp/api/dao/auth/UserPersonDao.java @@ -6,11 +6,10 @@ import org.apache.ibatis.annotations.Param; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.UserPersonEntity; -import com.glxp.api.entity.auth.UserRegisterEntity; import com.glxp.api.req.auth.UserPersonFilterRequest; public interface UserPersonDao extends BaseMapperPlus { - List filterUserPersons(UserPersonFilterRequest userPersonFilterRequest); + List filterUserPersons(UserPersonFilterRequest userPersonFilterRequest); List selectByRegisterId(@Param("registerId") String registerId); } diff --git a/src/main/java/com/glxp/api/req/auth/UserCertFilterRequest.java b/src/main/java/com/glxp/api/req/auth/UserCertFilterRequest.java new file mode 100644 index 0000000..45414f9 --- /dev/null +++ b/src/main/java/com/glxp/api/req/auth/UserCertFilterRequest.java @@ -0,0 +1,17 @@ +package com.glxp.api.req.auth; + +import com.glxp.api.util.page.ListPageRequest; + +import lombok.Data; + +@Data +public class UserCertFilterRequest extends ListPageRequest { + private String registerId; + private String companyId; + private String name; + private String code; + private String checkStatus; + private String registerTime; + private String checkTime; + private String status; +} diff --git a/src/main/java/com/glxp/api/service/auth/UserCertService.java b/src/main/java/com/glxp/api/service/auth/UserCertService.java new file mode 100644 index 0000000..fc80699 --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/UserCertService.java @@ -0,0 +1,12 @@ +package com.glxp.api.service.auth; + +import java.util.List; + +import com.glxp.api.entity.auth.UserCertEntity; +import com.glxp.api.req.auth.UserCertFilterRequest; + +public interface UserCertService { + + List filterUserCerts(UserCertFilterRequest userCertFilterRequest); + List selectByRegisterId(String registerId); +} diff --git a/src/main/java/com/glxp/api/service/auth/UserPersonService.java b/src/main/java/com/glxp/api/service/auth/UserPersonService.java index f37f2e8..e5db729 100644 --- a/src/main/java/com/glxp/api/service/auth/UserPersonService.java +++ b/src/main/java/com/glxp/api/service/auth/UserPersonService.java @@ -3,11 +3,10 @@ package com.glxp.api.service.auth; import java.util.List; import com.glxp.api.entity.auth.UserPersonEntity; -import com.glxp.api.entity.auth.UserRegisterEntity; import com.glxp.api.req.auth.UserPersonFilterRequest; public interface UserPersonService { - List filterUserPersons(UserPersonFilterRequest userPersonFilterRequest); + List filterUserPersons(UserPersonFilterRequest userPersonFilterRequest); List selectByRegisterId(String registerId); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/UserCertServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/UserCertServiceImpl.java new file mode 100644 index 0000000..be9899b --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/impl/UserCertServiceImpl.java @@ -0,0 +1,36 @@ +package com.glxp.api.service.auth.impl; + +import java.util.Collections; +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.auth.UserCertDao; +import com.glxp.api.entity.auth.UserCertEntity; +import com.glxp.api.req.auth.UserCertFilterRequest; +import com.glxp.api.service.auth.UserCertService; + +@Service +@Transactional(rollbackFor = Exception.class) +public class UserCertServiceImpl implements UserCertService { + @Resource + UserCertDao userCertDao; + @Override + public List filterUserCerts(UserCertFilterRequest userCertFilterRequest) { + if (userCertFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (userCertFilterRequest.getPage() - 1) * userCertFilterRequest.getLimit(); + PageHelper.offsetPage(offset, userCertFilterRequest.getLimit()); + return userCertDao.filterUserCerts(userCertFilterRequest); + } + + @Override + public List selectByRegisterId(String registerId) { + return userCertDao.selectByRegisterId(registerId); + } +} diff --git a/src/main/java/com/glxp/api/service/auth/impl/UserPersonServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/UserPersonServiceImpl.java index 1846f97..da55679 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/UserPersonServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/UserPersonServiceImpl.java @@ -11,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.UserPersonDao; import com.glxp.api.entity.auth.UserPersonEntity; -import com.glxp.api.entity.auth.UserRegisterEntity; import com.glxp.api.req.auth.UserPersonFilterRequest; import com.glxp.api.service.auth.UserPersonService; @@ -21,7 +20,7 @@ public class UserPersonServiceImpl implements UserPersonService { @Resource UserPersonDao userPersonDao; @Override - public List filterUserPersons(UserPersonFilterRequest userPersonFilterRequest) { + public List filterUserPersons(UserPersonFilterRequest userPersonFilterRequest) { if (userPersonFilterRequest == null) { return Collections.emptyList(); } diff --git a/src/main/resources/mybatis/mapper/auth/UserCertMapper.xml b/src/main/resources/mybatis/mapper/auth/UserCertMapper.xml new file mode 100644 index 0000000..ccd8dcb --- /dev/null +++ b/src/main/resources/mybatis/mapper/auth/UserCertMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +