From 22271e641e4505ba906c3770905b7e84e3ad8d85 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 02 四月 2024 17:05:57 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 136 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 119 insertions(+), 17 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 6becd77..2ef45bc 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
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -31,9 +32,12 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import javax.servlet.http.HttpServletResponse;
import java.io.File;
+import java.io.IOException;
import java.lang.reflect.Array;
import java.net.URI;
+import java.net.URLEncoder;
import java.util.*;
/**
@@ -113,6 +117,48 @@
dealSolutionsData(company);
}
+ @Override
+ @Transactional
+ public void exportFiles(Integer id, HttpServletResponse response){
+ try {
+ Company model = companyMapper.selectById(id);
+ if(model == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ List<File> fileList = new ArrayList<>();
+ List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,id)
+ .isNotNull(Multifile::getFileurl)
+ .in(Multifile::getObjType, Arrays.asList(new Integer[]{
+ Constants.MultiFile.COM_BUSINESS_LICENSE.getKey(),
+ Constants.MultiFile.COM_IDCARD_IMG.getKey(),
+ }))
+ );
+ if(multifileList== null || multifileList.size() == 0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.COMPANY_FILE).getCode();
+ for(Multifile l : multifileList){
+ File f = Constants.getFileByNetFile(path + l.getFileurl(),StringUtils.defaultString(l.getName(),"鏈懡鍚�"));
+ if(f !=null && f.isFile()){
+ fileList.add(f);
+ }
+ }
+ if(fileList == null || fileList.size() == 0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ String fileName = model.getName() +"_浼佷笟璇佷欢_"+System.currentTimeMillis()+".zip" ;
+ String encodeFileName = URLEncoder.encode(fileName);
+ response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+ response.setContentType("application/octet-stream");
+ response.setHeader("eva-opera-type", "download");
+ response.setHeader("eva-download-filename", encodeFileName);
+ Constants.packFilesToZip(fileList,response.getOutputStream());
+ } catch (IOException e) {
+ throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+ }
+ }
+
private void dealSystemUserData(Company company) {
if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getDeleted,Boolean.TRUE)
@@ -181,10 +227,18 @@
List<CompanySolution> list = new ArrayList<>();
int num =0;
for(CompanySolution s :company.getSolutionList()){
- if(s.getSolutionBaseId() == null){
+ if(Objects.isNull(s.getSolution())){
continue;
}
- sIds.add(s.getSolutionBaseId());
+ if(s.getSolution().getBaseId() == null){
+ continue;
+ }
+ Solutions newVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,s.getSolution().getBaseId())
+ .eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
+ if(Objects.isNull(newVersion)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
+ }
+ sIds.add(s.getSolution().getBaseId());
s.setCompanyId(company.getId());
s.setIsdeleted(Constants.ZERO);
s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
@@ -192,6 +246,8 @@
s.setCreateDate(company.getCreateDate());
s.setCreator(company.getCreator());
s.setSortnum(num++);
+ s.setSolutionBaseId( s.getSolution().getBaseId() );
+ s.setSolutionId( newVersion.getId() );
s.setStatus(Constants.ZERO);
list.add(s);
}
@@ -212,6 +268,45 @@
companySolutionJoinMapper.insertBatchSomeColumn(list);
}
+
+
+ /* private void dealSolutionsData(Company company) {
+ List<Integer> sIds = new ArrayList<>();
+ List<CompanySolution> list = new ArrayList<>();
+ int num =0;
+ for(CompanySolution s :company.getSolutionList()){
+ if(s.getSolution() == null || s.getSolution().getBaseId() == null ||s.getSolution().getId()==null){
+ continue;
+ }
+ sIds.add(s.getSolution().getId() );
+ s.setCompanyId(company.getId());
+ s.setIsdeleted(Constants.ZERO);
+ s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
+ s.setCanReduce(Constants.formatIntegerNum(s.getCanReduce()));
+ s.setCreateDate(company.getCreateDate());
+ s.setCreator(company.getCreator());
+ s.setSortnum(num++);
+ s.setSolutionBaseId( s.getSolution().getId() );
+ s.setSolutionId( s.getSolution().getBaseId() );
+ s.setStatus(Constants.ZERO);
+ list.add(s);
+ }
+ if(list.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
+ }
+ List<Solutions> solutionsList = solutionsMapper.selectList(new QueryWrapper<Solutions>().lambda()
+ .in(Solutions::getId,sIds)
+ .eq(Solutions::getIsdeleted,Constants.ZERO));
+ if(solutionsList.size()!= list.size()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅鍝�");
+ }
+ for(Solutions s:solutionsList){
+ if(Constants.equalsInteger(s.getStatus(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇濋櫓鏂规銆�"+s.getName()+"銆戝凡琚鐢紝涓嶈兘杩涜璇ユ搷浣�");
+ }
+ }
+ companySolutionJoinMapper.insertBatchSomeColumn(list);
+ }*/
private void isValidCreateParam(Company company) {
if(StringUtils.isBlank(company.getPhone())
||StringUtils.isBlank(company.getName())
@@ -259,13 +354,11 @@
List<Multifile> multifileList = new ArrayList<>();
List<Integer> objList = new ArrayList<>();
- if(company.getBusinessImg()!=null && StringUtils.isNotBlank(company.getBusinessImg().getFileurl())){
+ if(company.getBusinessImg()!=null && company.getBusinessImg().getId() ==null && StringUtils.isNotBlank(company.getBusinessImg().getFileurl())){
multifileList.add(initMultiFileByCompay(company,company.getBusinessImg(),Constants.MultiFile.COM_BUSINESS_LICENSE.getKey()));
objList.add(Constants.MultiFile.COM_BUSINESS_LICENSE.getKey());
- }else {
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺惀涓氭墽鐓э紒");
}
- if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
+ if(company.getSignImg()!=null&& company.getSignImg().getId() ==null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
objList.add(Constants.MultiFile.COM_SING_IMG.getKey());
company.setSignIdStatus(Constants.ZERO);//鏍囪鐢靛瓙绛剧珷鏈笂浼�
@@ -276,10 +369,16 @@
company.setSignId("");
}
if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null){
+ boolean isNew = false;
for(Multifile f : company.getIdcardImgList()){
+ if(f.getId() !=null){
+ continue;
+ }
+ isNew = true;
multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
}
- objList.add(Constants.MultiFile.COM_IDCARD_IMG.getKey());
+ if(isNew)
+ objList.add(Constants.MultiFile.COM_IDCARD_IMG.getKey());
}
if(objList.size()>0){
multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
@@ -341,7 +440,9 @@
|| StringUtils.isBlank(company.getCaptche())){
throw new BusinessException(ResponseStatus.BAD_REQUEST );
}
- SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+ if(!debugModel){
+ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+ }
Company model = companyMapper.selectById(company.getId());
if(model == null || StringUtils.equals(model.getPhone(),company.getPhone()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎵嬫満鍙锋湭鍙戠敓鏀瑰彉~" );
@@ -379,9 +480,8 @@
}
private void isValidUpdateParam(Company company) {
if( StringUtils.isBlank(company.getName())
- ||StringUtils.isBlank(company.getUsername())
+// ||StringUtils.isBlank(company.getUsername())
||StringUtils.isBlank(company.getCode())
- ||StringUtils.isBlank(company.getCaptche())
||StringUtils.isBlank(company.getLegalName())
||StringUtils.isBlank(company.getEmail()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -418,7 +518,6 @@
dealFileDataForUpdate(company);
Company update = new Company();
- update.setIsdeleted(company.getId());
update.setName(company.getName());
update.setCode(company.getCode());
update.setEditDate(new Date());
@@ -429,6 +528,8 @@
update.setTaxCode(company.getTaxCode());
update.setTaxBank(company.getTaxBank());
update.setEmail(company.getEmail());
+ update.setId(model.getId());
+ update.setLegalName(company.getLegalName());
update.setInvoiceAddr(company.getInvoiceAddr());
update.setSignIdStatus(company.getSignIdStatus());
update.setInvoiceEmail(company.getInvoiceEmail());
@@ -439,7 +540,7 @@
//濡傛灉閭鍙戠敓鏀瑰彉
update.setSignStatus(Constants.ZERO);
}
- companyMapper.updateById(company);
+ companyMapper.updateById(update);
company.setCreator(update.getEditor());
company.setCreateDate(update.getEditDate());
if(StringUtils.isNotBlank(company.getUsername())){
@@ -517,6 +618,7 @@
* public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
*/
@Override
+ @Async
public void startSignAuth(Integer id){
Company company = companyMapper.selectById(id);
Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
@@ -575,8 +677,11 @@
.eq(Company::getSignStatus,Constants.ONE));
if(companyList!=null && companyList.size()>0){
for(Company company :companyList){
- //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
int status = signService.organizationAuditStatus(company.getEmail());
+ if(status == 0){
+ continue;
+ }
if(status == 1){
Company update = new Company();
update.setId(company.getId());
@@ -609,7 +714,7 @@
.eq(Company::getSignIdStatus,Constants.ZERO));
if(companyList!=null && companyList.size()>0){
for(Company company :companyList){
- //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjType,Constants.MultiFile.COM_SING_IMG.getKey())
@@ -630,12 +735,9 @@
//鏇存柊璁よ瘉鐘舵��
companyMapper.updateById(update);
}
-
}
-
}
}
-
}
// @Override
--
Gitblit v1.9.3