From 140a56d490d2f0f1b9829bd2c4186090deb52d3b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 一月 2025 16:57:02 +0800
Subject: [PATCH] 阿里云身份证二要素校验工具类

---
 ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java
index 91ffd48..77a4a96 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java
@@ -17,6 +17,7 @@
 import com.ruoyi.company.mapper.CompanyMapper;
 import com.ruoyi.company.service.CompanyService;
 import com.ruoyi.company.service.UserService;
+import com.ruoyi.company.utils.AliyunCloudAuthUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,7 @@
 public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
     private final UserService userService;
     private final HttpServletResponse response;
+    private final AliyunCloudAuthUtil aliyunCloudAuthUtil;
     /**
      * 获取企业列表
      * @param query
@@ -41,12 +43,22 @@
     @Override
     public PageDTO<MgtCompanyVO> queryPage(MgtCompanyQuery query) {
         Page<Company> page = this.lambdaQuery()
-                .like(StringUtils.isNotBlank(query.getCompanyInfo()), Company::getCompanyName, query.getCompanyInfo())
-                .like(StringUtils.isNotBlank(query.getCompanyInfo()), Company::getSocialCode, query.getCompanyInfo())
-                .like(StringUtils.isNotBlank(query.getLegalPersonInfo()), Company::getLegalPersonName, query.getLegalPersonInfo())
-                .like(StringUtils.isNotBlank(query.getLegalPersonInfo()), Company::getIdCardNumber, query.getLegalPersonInfo())
-                .like(StringUtils.isNotBlank(query.getContactInfo()), Company::getContactName, query.getContactInfo())
-                .like(StringUtils.isNotBlank(query.getContactInfo()), Company::getContactPhone, query.getContactInfo())
+                .and(StringUtils.isNotBlank(query.getCompanyInfo()),
+                        queryWrapper -> queryWrapper
+                                .like(Company::getCompanyName, query.getCompanyInfo())
+                                .or()
+                                .like(Company::getSocialCode, query.getCompanyInfo()))
+                .and(StringUtils.isNotBlank(query.getLegalPersonInfo()),
+                        queryWrapper -> queryWrapper
+                                .like(Company::getLegalPersonName, query.getLegalPersonInfo())
+                                .or()
+                                .like(Company::getIdCardNumber, query.getLegalPersonInfo()))
+                .and(StringUtils.isNotBlank(query.getContactInfo()),
+                        queryWrapper -> queryWrapper
+                                .like(Company::getContactName, query.getContactInfo())
+                                .or()
+                                .like(Company::getContactPhone, query.getContactInfo()))
+                .orderByDesc(Company::getCreateTime)
                 .page(new Page<>(query.getPageCurr(), query.getPageSize()));
         return PageDTO.of(page,MgtCompanyVO.class);
     }
@@ -88,13 +100,18 @@
         User user = BeanUtils.copyBean(dto, User.class);
         user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
         userService.save(user);
-        // TODO 校验身份证信息
+
         Company company = BeanUtils.copyBean(dto, Company.class);
         company.setUserId(user.getUserId());
         //根据公司名称查询数据库
         Long count = this.lambdaQuery().eq(Company::getCompanyName, company.getCompanyName()).count();
         if (count > 0) {
             throw new ServiceException("该公司账号已存在");
+        }
+        //身份证二要素校验
+        Boolean res = aliyunCloudAuthUtil.verifyIdCard(dto.getLegalPersonName(), dto.getIdCardNumber());
+        if (!res) {
+            throw new ServiceException("身份证信息不匹配");
         }
         this.save(company);
     }
@@ -133,6 +150,11 @@
         if (count > 0) {
             throw new ServiceException("该公司账号已存在");
         }
+        //身份证二要素校验
+        Boolean res = aliyunCloudAuthUtil.verifyIdCard(dto.getLegalPersonName(), dto.getIdCardNumber());
+        if (!res) {
+            throw new ServiceException("身份证信息不匹配");
+        }
         Company companyUpd = BeanUtils.copyBean(dto, Company.class);
         companyUpd.setId(company.getId());
         this.updateById(companyUpd);

--
Gitblit v1.7.1