From 9cce0085b767a7d1431be158fa469308798c0ecc Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 18 九月 2023 14:08:22 +0800
Subject: [PATCH] #联调修改
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 98 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 89 insertions(+), 9 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 b8e28e8..8f6815e 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
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.biz.system.SystemDictBiz;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -16,10 +18,17 @@
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.dto.CompanyCreatOrUpdateRequest;
+import com.doumee.dao.system.SystemDictMapper;
import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.SystemUserRoleMapper;
+import com.doumee.dao.system.model.SystemDict;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.system.model.SystemUserRole;
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;
@@ -48,13 +57,20 @@
@Autowired
private SystemUserMapper systemUserMapper;
+
+ @Autowired
+ private SystemUserRoleMapper systemUserRoleMapper;
+
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@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())){
@@ -63,7 +79,26 @@
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(),"浼佷笟宸插瓨鍦ㄨ閲嶆柊杈撳叆");
+ }
+ if(StringUtils.isNotBlank(company.getCreditCode())){
+ 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());
@@ -72,7 +107,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());
@@ -80,14 +115,57 @@
insert.setOepnValidDate(company.getOepnValidDate());
insert.setOepnType(company.getOepnType());
insert.setSalesmanId(company.getSalesmanId());
+ insert.setStatus(Constants.ZERO);
companyMapper.insert(insert);
+ //鍒涘缓浼佷笟鐢ㄦ埛
+ SystemUser companyUser = createCompanyUser(company.getManagerUserName(), insert.getId());
+ Company update = new Company();
+ update.setId(insert.getId());
+ update.setManagerId(companyUser.getId());
+ companyMapper.updateById(update);
- UpdateWrapper<SystemUser> systemUserQuery = new UpdateWrapper<>();
- systemUserQuery.lambda()
- .eq(SystemUser::getId,company.getManagerId())
- .set(SystemUser::getCompanyId,insert.getId());
- systemUserMapper.update(null,systemUserQuery);
+ SystemDictData dictData = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.COMPANY_MANAGE_ROLE);
+ SystemUserRole systemUserRole = new SystemUserRole();
+ 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::getType,Constants.ONE)
+ .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
@@ -117,6 +195,8 @@
.set(Company::getShortName,company.getShortName())
.set(Company::getCreditCode,company.getCreditCode())
.set(Company::getSalesmanId,company.getSalesmanId())
+ .set(company.getOepnValidDate()!=null,Company::getOepnValidDate,company.getOepnValidDate())
+ .set(company.getUserNum()!=null,Company::getUserNum,company.getUserNum())
.set(Company::getLinkname,company.getLinkname())
.set(Company::getLinkephone,company.getLinkephone());
companyMapper.update(null,wrapper);
@@ -220,7 +300,7 @@
"(select count(g.id) from goods g where g.COMPANY_ID = t.ID )goodsNum");
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
- .eq(Objects.nonNull(pageWrap.getModel().getManagerUserName()),Company::getStatus,pageWrap.getModel().getStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,pageWrap.getModel().getStatus())
.between((Objects.nonNull(pageWrap.getModel().getOepnValidDateStart()) && Objects.nonNull(pageWrap.getModel().getOepnValidDateEnd())),
Company::getOepnValidDate,pageWrap.getModel().getOepnValidDateStart(),pageWrap.getModel().getOepnValidDateEnd());
return PageData.from(companyJoinMapper.selectJoinPage(page,Company.class,queryWrapper));
--
Gitblit v1.9.3