From b194be9efbf3114dfdfb4e58eb7802459b78a87a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 15 九月 2023 15:36:10 +0800
Subject: [PATCH] #联调修改
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 71 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 13 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 7dfd956..9a8694d 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -28,6 +28,7 @@
import com.doumee.service.business.CompanyService;
import com.doumee.service.system.SystemDictService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,9 +69,8 @@
@Override
public Integer create(CompanyCreatOrUpdateRequest company) {
LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Company insert = new Company();
- if (Objects.isNull(company.getManagerId())){
+ if (StringUtils.isBlank(company.getManagerUserName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐧诲綍璐﹀彿涓嶅厑璁镐负绌�");
}
if (Objects.isNull(company.getOepnValidDate())){
@@ -79,7 +79,25 @@
if (Objects.isNull(company.getUserNum())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"涓绘挱璐﹀彿鏁伴噺涓嶅厑璁镐负绌�");
}
+ QueryWrapper<Company> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Company::getDeleted,Boolean.FALSE)
+ .eq(Company::getName,company.getName());
+ Company company1 = companyMapper.selectOne(wrapper);
+ if (Objects.nonNull(company1)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟宸插瓨鍦ㄨ閲嶆柊杈撳叆");
+ }
+
+ wrapper.clear();
+ wrapper.lambda()
+ .eq(Company::getDeleted,Boolean.FALSE)
+ .eq(Company::getCreditCode,company.getCreditCode());
+ Company company2 = companyMapper.selectOne(wrapper);
+ if (Objects.nonNull(company2)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟宸插瓨鍦ㄨ閲嶆柊杈撳叆");
+ }
+ Company insert = new Company();
insert.setDeleted((byte)Constants.ZERO);
insert.setCreateUser(userInfo.getId());
insert.setCreateTime(new Date());
@@ -88,7 +106,7 @@
insert.setName(company.getName());
insert.setShortName(company.getShortName());
insert.setRemark(company.getRemark());
- insert.setManagerId(company.getManagerId());
+// insert.setManagerId(company.getManagerId());
insert.setLinkname(company.getLinkname());
insert.setLinkephone(company.getLinkephone());
insert.setCreditCode(company.getCreditCode());
@@ -97,29 +115,56 @@
insert.setOepnType(company.getOepnType());
insert.setSalesmanId(company.getSalesmanId());
companyMapper.insert(insert);
-
- UpdateWrapper<SystemUser> systemUserQuery = new UpdateWrapper<>();
- systemUserQuery.lambda()
- .eq(SystemUser::getId,company.getManagerId())
- .set(SystemUser::getCompanyId,insert.getId());
- systemUserMapper.update(null,systemUserQuery);
-
+ //鍒涘缓浼佷笟鐢ㄦ埛
+ SystemUser companyUser = createCompanyUser(company.getManagerUserName(), insert.getId());
+ Company update = new Company();
+ update.setId(insert.getId());
+ update.setManagerId(companyUser.getId());
+ companyMapper.updateById(update);
SystemDictData dictData = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.COMPANY_MANAGE_ROLE);
-
SystemUserRole systemUserRole = new SystemUserRole();
- systemUserRole.setUserId(company.getManagerId());
+ systemUserRole.setUserId(companyUser.getId());
systemUserRole.setRoleId(Integer.valueOf(dictData.getCode()));
systemUserRole.setCreateTime(new Date());
systemUserRole.setUpdateTime(new Date());
systemUserRole.setCreateUser(userInfo.getId());
systemUserRole.setUpdateUser(userInfo.getId());
systemUserRole.setDeleted(Boolean.FALSE);
-
systemUserRoleMapper.insert(systemUserRole);
return company.getId();
}
+ private SystemUser createCompanyUser(String managerUserName,Integer companyId){
+
+ QueryWrapper<SystemUser> query = new QueryWrapper<>();
+ query.lambda()
+ .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .eq(SystemUser::getUsername,managerUserName);
+ Integer integer = systemUserMapper.selectCount(query);
+ if (integer > Constants.ZERO){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璐﹀彿宸插瓨鍦ㄨ閲嶆柊杈撳叆璐﹀彿");
+ }
+
+ LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ SystemDictData dictDataPassword = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.DEFAULT_PASSWORD);
+ String salt = RandomStringUtils.randomAlphabetic(6);
+ SystemUser user = new SystemUser();
+ user.setUsername(managerUserName);
+ user.setPassword(Utils.Secure.encryptPassword(dictDataPassword.getCode(), salt));
+ user.setSalt(salt);
+ user.setCompanyId(companyId);
+ user.setType(Constants.ONE);
+ user.setCreateTime(new Date());
+ user.setUpdateTime(new Date());
+ user.setCreateUser(userInfo.getId());
+ user.setUpdateUser(userInfo.getId());
+ user.setDeleted(Boolean.FALSE);
+ user.setStatus(Constants.ZERO);
+ systemUserMapper.insert(user);
+ return user;
+ }
+
@Override
public void deleteById(Integer id) {
companyMapper.deleteById(id);
--
Gitblit v1.9.3