From 68ee18438e99995d2d108cccb36e75f77ea96d76 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 21 一月 2025 17:36:08 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 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 66a9f29..d2764db 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,7 +17,9 @@
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;
import org.springframework.transaction.annotation.Transactional;
@@ -28,30 +30,44 @@
import java.util.Objects;
@Service
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
private final UserService userService;
private final HttpServletResponse response;
+
+ private final AliyunCloudAuthUtil aliyunCloudAuthUtil;
/**
* 获取企业列表
+ *
* @param query
* @return
*/
@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);
}
/**
* 获取企业详情
+ *
* @param id
* @return
*/
@@ -73,6 +89,7 @@
/**
* 新增企业
+ *
* @param dto
* @return
*/
@@ -87,7 +104,7 @@
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());
//根据公司名称查询数据库
@@ -95,16 +112,22 @@
if (count > 0) {
throw new ServiceException("该公司账号已存在");
}
+ //身份证二要素校验
+ Boolean res = aliyunCloudAuthUtil.verifyIdCard(dto.getLegalPersonName(), dto.getIdCardNumber());
+ if (!res) {
+ throw new ServiceException("身份证信息不匹配");
+ }
this.save(company);
}
/**
* 编辑企业
+ *
* @param dto
*/
@Override
public void editCompany(MgtCompanyDTO dto) {
- if (Objects.isNull(dto.getId())){
+ if (Objects.isNull(dto.getId())) {
throw new ServiceException("企业id不能为空");
}
//查询企业
@@ -123,14 +146,21 @@
}
//用户信息
User userUpd = BeanUtils.copyBean(dto, User.class);
- userUpd.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ if (StringUtils.isNotBlank(dto.getPassword())) {
+ userUpd.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ }
userUpd.setUserId(user.getUserId());
userUpd.setUpdateBy(SecurityUtils.getUserId());
userService.updateById(userUpd);
//根据公司名称查询数据库
- Long count = this.lambdaQuery().ne(Company::getId,dto.getId()).eq(Company::getCompanyName, company.getCompanyName()).count();
+ Long count = this.lambdaQuery().ne(Company::getId, dto.getId()).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("身份证信息不匹配");
}
Company companyUpd = BeanUtils.copyBean(dto, Company.class);
companyUpd.setId(company.getId());
@@ -139,6 +169,7 @@
/**
* 删除企业
+ *
* @param id
*/
@Override
@@ -149,7 +180,7 @@
throw new ServiceException("删除失败，该企业不存在");
}
//删除企业账号
- userService.removeById(company.getUserId());
+ userService.removeById(company.getUserId());
//删除企业信息
this.removeById(id);
--
Gitblit v1.7.1