From 55fefdfac9a281cc57a1b3bad1fd061eec4b066d Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期四, 27 六月 2024 09:52:05 +0800
Subject: [PATCH] 统计状态过滤
---
project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java | 180 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 143 insertions(+), 37 deletions(-)
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
index ed25210..c3f46d2 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.project.common.constant.UserConstants;
import com.project.common.core.domain.entity.SysUser;
+import com.project.common.core.domain.model.ImportError;
import com.project.common.exception.base.BaseException;
import com.project.common.utils.SecurityUtils;
+import com.project.system.domain.vo.SysCompanyResultVo;
import com.project.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,7 @@
import com.project.system.mapper.SysCompanyMapper;
import com.project.system.service.ISysCompanyService;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -57,9 +60,12 @@
public Boolean insertByBo(SysCompanyBo bo)
{
SysCompany add = Convert.convert(SysCompany.class, bo);
- validEntityBeforeSave(add, 0);
+ add.setCompanyStatus(1);
+ validEntityBeforeSave(add);
boolean save = this.save(add);
- addCompanyUser(add);
+ if (isAddUser(bo.getCompanyPhone())){
+ addCompanyUser(add, 0);
+ }
return save;
}
@@ -69,15 +75,32 @@
{
SysCompany old = this.getById(bo.getCompanyId());
SysCompany update = Convert.convert(SysCompany.class, bo);
+ validEntityBeforeSave(update);
if (!old.getCompanyPhone().equals(update.getCompanyPhone())){
- boolean delUser = delCompanyUser(old.getCompanyId());
- if (!delUser) {
- throw new BaseException("鍘熶紒涓氱敤鎴锋竻闄ゅけ璐ワ紝璇疯仈绯荤鐞嗗憳锛�");
+ if (this.count(SysCompany::getCompanyPhone, old.getCompanyPhone())==1){
+ boolean delUser = delCompanyUser(old.getCompanyPhone());
+ if (!delUser) {
+ throw new BaseException("鍘熶紒涓氱敤鎴锋竻闄ゅけ璐ワ紝璇疯仈绯荤鐞嗗憳锛�");
+ }
}
- this.addCompanyUser(update);
+ if (isAddUser(update.getCompanyPhone())){
+ addCompanyUser(update, update.getCompanyStatus()==0 ? 1 : 0);
+ }
}
- validEntityBeforeSave(update, 0);
return this.updateById(update);
+ }
+
+ @Override//鐘舵�佸紑鍏�
+ @Transactional
+ public Boolean updStatus(SysCompanyBo bo)
+ {
+ if (bo.getCompanyId()==null || bo.getCompanyStatus()==null) {
+ throw new BaseException("鍙傛暟鏈夎锛岀姸鎬佷慨鏀瑰け璐ワ紒");
+ }
+ SysCompany company = this.getById(bo.getCompanyId());
+ company.setCompanyStatus(bo.getCompanyStatus());
+ updCompanyUserStatus(company.getCompanyPhone(), bo.getCompanyStatus());
+ return this.updateById(company);
}
@Override//鍒犻櫎
@@ -85,7 +108,7 @@
public Boolean deleteByIds(Collection<Long> ids)
{
for (Long id : ids) {
- boolean b = delCompanyUser(id);
+ boolean b = delCompanyUser(this.getById(id).getCompanyPhone());
if (!b) {
throw new BaseException(String.format("鍘熶紒涓� %1$s 鐢ㄦ埛娓呴櫎澶辫触锛岃鑱旂郴绠＄悊鍛橈紒", id));
}
@@ -93,18 +116,52 @@
return this.removeByIds(ids);
}
- @Override//瀵煎叆
- @Transactional
- public Boolean importList(List<SysCompanyVo> list)
+
+ @Override
+ public SysCompanyResultVo doImport(List<SysCompanyVo> list)
{
if (list==null || list.size()<1){
- throw new BaseException("鏈幏鍙栧埌瀵煎叆淇℃伅");
+ throw new BaseException("鏈幏鍙栧埌瀵煎叆淇℃伅锛�");
}
- List<SysCompany> companies = Convert.toList(SysCompany.class, list);
- companies.forEach(e-> validEntityBeforeSave(e,1));
- boolean b = this.saveOrUpdateBatch(companies);
+ SysCompanyResultVo resultVo = new SysCompanyResultVo();
+ resultVo.setVoList(list);
+ return this.checkImport(resultVo);
- companies.forEach(this::addCompanyUser);
+ }
+
+ @Override
+ public SysCompanyResultVo checkImport(SysCompanyResultVo resultVo)
+ {
+ if (resultVo==null || StringUtils.isEmpty(resultVo.getVoList())){
+ throw new BaseException("鏈幏鍙栧埌瀵煎叆淇℃伅锛�");
+ }
+ for (SysCompanyVo vo : resultVo.getVoList()) {
+ List<ImportError> errors = new ArrayList<>();
+ validEntityBeforeImport(vo, errors);
+ vo.setErrorList(errors);
+ }
+ return resultVo;
+ }
+
+ @Override
+ @Transactional
+ public Boolean saveImport(SysCompanyResultVo resultVo)
+ {
+ if (resultVo==null || StringUtils.isEmpty(resultVo.getVoList())){
+ throw new BaseException("鏈幏鍙栧埌瀵煎叆淇℃伅锛�");
+ }
+ resultVo.getVoList().forEach(e-> {
+ if (StringUtils.isNotEmpty(e.getErrorList())) {
+ throw new BaseException("杩樻湁鏈鐞嗛敊璇俊鎭紒");
+ }
+ });
+ List<SysCompany> companies = Convert.toList(SysCompany.class, resultVo.getVoList());
+ boolean b = this.saveOrUpdateBatch(companies);
+ for (SysCompany company : companies) {
+ if (isAddUser(company.getCompanyPhone())){
+ addCompanyUser(company,1);
+ }
+ }
return b;
}
@@ -114,14 +171,13 @@
/**
* 淇濆瓨鍓嶆牎楠�
* @param entity 鍙傛暟
- * @param isImport 鏄惁瀵煎叆锛�0鍚︼紝1鏄�
*/
- private void validEntityBeforeSave(SysCompany entity, int isImport)
+ private void validEntityBeforeSave(SysCompany entity)
{
- if (isImport!=1){
- if (StringUtils.isEmpty(entity.getCompanyImg())){
- throw new BaseException(String.format("%1$s锛岃涓婁紶钀ヤ笟鎵х収", entity.getCompanyName()));
- }
+ entity.setIsImport(0);
+
+ if (StringUtils.isEmpty(entity.getCompanyImg())){
+ throw new BaseException(String.format("%1$s锛岃涓婁紶钀ヤ笟鎵х収", entity.getCompanyName()));
}
if (StringUtils.isEmpty(entity.getCompanyCode())){
throw new BaseException(String.format("%1$s锛岃濉啓浼佷笟绀句細缂栫爜锛�", entity.getCompanyName()));
@@ -131,6 +187,9 @@
}
if (StringUtils.isEmpty(entity.getCompanyPhone())){
throw new BaseException(String.format("%1$s锛岃濉啓浼佷笟鑱旂郴浜虹數璇濓紒", entity.getCompanyName()));
+ }
+ if (StringUtils.isEmpty(entity.getCompanyAddress())){
+ throw new BaseException(String.format("%1$s锛岃濉啓浼佷笟鍦板潃锛�", entity.getCompanyName()));
}
if (StringUtils.isEmpty(entity.getCompanyName())){
throw new BaseException("璇峰～鍐欎紒涓氬悕锛�");
@@ -144,10 +203,8 @@
if (nameCount>0){
throw new BaseException(String.format("%1$s锛屼紒涓氬悕宸插瓨鍦紒", entity.getCompanyName()));
}
- int phoneCount = this.count(lq().eq(SysCompany::getCompanyPhone, entity.getCompanyPhone()));
- if (phoneCount>0){
- throw new BaseException(String.format("%1$s锛屼紒涓氳仈绯荤數璇濆凡瀛樺湪锛�", entity.getCompanyName()));
- }
+ SysUser user = new SysUser();
+ user.setPhonenumber(entity.getCompanyPhone());
} else {
int codeCount = this.count(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()).ne(SysCompany::getCompanyId,entity.getCompanyId()));
if (codeCount>0){
@@ -157,29 +214,67 @@
if (nameCount>0){
throw new BaseException(String.format("%1$s锛屼紒涓氬悕宸插瓨鍦紒", entity.getCompanyName()));
}
- int phoneCount = this.count(lq().eq(SysCompany::getCompanyPhone, entity.getCompanyPhone()).ne(SysCompany::getCompanyId,entity.getCompanyId()));
- if (phoneCount>0){
- throw new BaseException(String.format("%1$s锛屼紒涓氳仈绯荤數璇濆凡瀛樺湪锛�", entity.getCompanyName()));
- }
}
}
+
+ private void validEntityBeforeImport(SysCompanyVo entity, List<ImportError> errorList)
+ {
+ entity.setIsImport(1);
+ if (StringUtils.isEmpty(entity.getCompanyName())){
+ errorList.add(new ImportError(0, "璇峰～鍐欎紒涓氬悕锛�"));
+ }
+ if (StringUtils.isEmpty(entity.getCompanyCode())){
+ errorList.add(new ImportError(1, "璇峰～鍐欎紒涓氱ぞ浼氱紪鐮侊紒"));
+ }
+ if (StringUtils.isEmpty(entity.getCompanyUser())){
+ errorList.add(new ImportError(2, "璇峰～鍐欎紒涓氳仈绯讳汉锛�"));
+ }
+ if (StringUtils.isEmpty(entity.getCompanyPhone())){
+ errorList.add(new ImportError(3, "璇峰～鍐欎紒涓氳仈绯讳汉鐢佃瘽锛�"));
+ } else {
+ if (entity.getCompanyPhone().length()!=11){
+ errorList.add(new ImportError(3, "璇峰～鍐欐纭墜鏈哄彿锛�"));
+ }
+ }
+ if (StringUtils.isEmpty(entity.getCompanyAddress())){
+ errorList.add(new ImportError(4, "璇峰～鍐欎紒涓氬湴鍧�锛�"));
+ }
+ int codeCount = this.count(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()));
+ if (codeCount>0){
+ errorList.add(new ImportError(1, "浼佷笟绀句細缂栫爜宸插瓨鍦紒"));
+ }
+ int nameCount = this.count(lq().eq(SysCompany::getCompanyName, entity.getCompanyName()));
+ if (nameCount>0){
+ errorList.add(new ImportError(0, "浼佷笟鍚嶅凡瀛樺湪锛�"));
+ }
+ entity.setCheckStatus(2);
+ }
/**
* 娣诲姞浼佷笟鐢ㄦ埛
* @param entity 浼佷笟淇℃伅
*/
@Async
- protected void addCompanyUser(SysCompany entity)
+ @Override
+ public void addCompanyUser(SysCompany entity, Integer isImport)
{
+
SysUser user = new SysUser();
+ if (isImport==1){
+ user.setStatus("0");
+ } else {
+ user.setStatus("1");
+ }
SysCompany one = this.getOne(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()));
String phone = entity.getCompanyPhone();
user.setPhonenumber(phone);
- user.setUserName(entity.getCompanyUser());
+ user.setUserName(phone);
+ user.setNickName(entity.getCompanyUser());
user.setPassword(phone);
user.setDeptId(one.getCompanyId());
user.setUserType("02");
+ user.setRecommendUser(user.getPassword());
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
{
return;
@@ -194,19 +289,23 @@
{
return;
}
- user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setRecommendUser(user.getPassword());
userService.insertUser(user);
+ }
+
+ @Async
+ protected void updCompanyUserStatus(String phone, Integer status)
+ {
+ userService.update(userService.lu().set(SysUser::getStatus,status).eq(SysUser::getPhonenumber, phone));
}
/**
* 鍒犻櫎浼佷笟鐢ㄦ埛
- * @param companyId 浼佷笟id
+ * @param companyPhone 浼佷笟id
*/
- protected boolean delCompanyUser(Long companyId)
+ protected boolean delCompanyUser(String companyPhone)
{
- return userService.deleteUserByDeptId(companyId)>0;
+ return userService.deleteUserByCompanyPhone(companyPhone)>0;
}
/**
@@ -224,6 +323,8 @@
qw.eq(StringUtils.isNotEmpty(bo.getCompanyPhone()), "company_phone", bo.getCompanyPhone());
qw.eq(StringUtils.isNotEmpty(bo.getCompanyAddress()), "company_address", bo.getCompanyAddress());
qw.eq(StringUtils.isNotEmpty(bo.getCompanyImg()), "company_img", bo.getCompanyImg());
+ qw.eq(StringUtils.isNotEmpty(bo.getCompanyType()), "company_type", bo.getCompanyType());
+ qw.eq(bo.getIsImport() != null, "is_import", bo.getIsImport());
qw.eq(bo.getCompanyStatus() != null, "company_status", bo.getCompanyStatus());
qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());
@@ -238,4 +339,9 @@
}
return qw;
}
+
+ private Boolean isAddUser(String phone)
+ {
+ return userService.count(userService.lq().eq(SysUser::getUserName, phone).eq(SysUser::getDelFlag,0))==0;
+ }
}
--
Gitblit v1.9.1