From cb94ff4f0a46eb74c21dd7b34b8d958ef9a9f11c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 二月 2026 09:05:28 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang
---
server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java | 220 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 190 insertions(+), 30 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
index 1503157..e268a1b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
@@ -10,17 +10,11 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.tyyun.TyyZosUtil;
-import com.doumee.dao.business.CasesMapper;
-import com.doumee.dao.business.CategoryMapper;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.CasesImport;
import com.doumee.dao.business.dto.MemberImport;
-import com.doumee.dao.business.model.Cases;
-import com.doumee.dao.business.model.Category;
-import com.doumee.dao.business.model.ImportRecord;
+import com.doumee.dao.business.model.*;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.ImportRecordMapper;
-import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ImportRecordService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +38,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.io.ByteArrayInputStream;
import java.math.BigDecimal;
@@ -67,6 +62,8 @@
private MemberMapper memberMapper;
@Autowired
private CasesMapper casesMapper;
+ @Autowired
+ private MultifileMapper multifileMapper;
@Resource
private RedisTemplate<String, Object> redisTemplate;
@Resource
@@ -145,7 +142,8 @@
MPJLambdaWrapper<ImportRecord> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(ImportRecord.class )
- .selectAs(SystemUser::getRealname,ImportRecord::getUpdateUserName)
+ .select( "(select count(c.id) from cases c where c.import_id= t.id)",ImportRecord::getIngNum)
+ .selectAs(SystemUser::getRealname,ImportRecord::getUpdateUserName)
.leftJoin(SystemUser.class,SystemUser::getId,ImportRecord::getUpdateUser);
queryWrapper.eq(pageWrap.getModel().getId() != null,ImportRecord::getId, pageWrap.getModel().getId());
queryWrapper.eq(pageWrap.getModel().getDeleted() != null,ImportRecord::getDeleted, pageWrap.getModel().getDeleted());
@@ -203,9 +201,7 @@
Map<String, XSSFPictureData> pics = ie.getExcelPictures();
if(type == 1) {
List<CasesImport> importList = (ie.getDataList(CasesImport.class,null));
- if(importList==null || importList.size()==0){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵煎叆鏂囦欢妗堜緥淇℃伅鍐呭涓虹┖锛�");
- }
+ model.setCaseList(isvalidImpartCasesParam(loginUserInfo,pics,importList));
model.setTotalNum(model.getCaseList().size());
}else{
List<MemberImport> importList = (ie.getDataList(MemberImport.class,null));
@@ -242,19 +238,21 @@
int index = 1;
for(MemberImport param :memberList){
index ++;
- if(StringUtils.isBlank(param.getImgurl())
- ||StringUtils.isBlank(param.getFee())
- ||StringUtils.isBlank(param.getName())
- ||StringUtils.isBlank(param.getInfo())
- ||StringUtils.isBlank(param.getJobYear())
- ||StringUtils.isBlank(param.getPosition())
- ||StringUtils.isBlank(param.getFieldNames())
- ||StringUtils.isBlank(param.getSex())
- ||StringUtils.isBlank(param.getCode())
- ||StringUtils.isBlank(param.getZqNames())
- ||StringUtils.isBlank(param.getLevelName())
- ||StringUtils.isBlank(param.getServeNum())
- ||StringUtils.isBlank(param.getTypeNames())){
+ if(( param.getImgurl() == null
+ ||param.getImgurl().getData() == null
+ ||param.getImgurl().getData().length == 0)
+ &&StringUtils.isBlank(param.getFee())
+ &&StringUtils.isBlank(param.getName())
+ &&StringUtils.isBlank(param.getInfo())
+ &&StringUtils.isBlank(param.getJobYear())
+ &&StringUtils.isBlank(param.getPosition())
+ &&StringUtils.isBlank(param.getFieldNames())
+ &&StringUtils.isBlank(param.getSex())
+ &&StringUtils.isBlank(param.getCode())
+ &&StringUtils.isBlank(param.getZqNames())
+ &&StringUtils.isBlank(param.getLevelName())
+ &&StringUtils.isBlank(param.getServeNum())
+ &&StringUtils.isBlank(param.getTypeNames())){
continue;
}
Member member = new Member();
@@ -295,7 +293,7 @@
if(StringUtils.isBlank(param.getFee())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 璐圭敤鏍囧噯淇℃伅涓嶈兘涓虹┖");
}
- if(pics!=null && StringUtils.isNotBlank(param.getImgurl())){
+ /* if(pics!=null && StringUtils.isNotBlank(param.getImgurl())){
log.info("===================="+param.getImgurl());
int start = param.getImgurl().indexOf("(\"")+2;
int end = param.getImgurl().indexOf("\",");
@@ -307,7 +305,11 @@
member.setImgurlData(data.getData());
}
}
- }
+ }*/
+ if(param.getImgurl() ==null ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屻��"+param.getName()+"銆戞暟鎹紝 鏈鍙栧埌浠讳綍鑱屼笟鐓у浘鐗囨暟鎹�");
+ }
+ member.setImgurlData(param.getImgurl().getData());
if(member.getImgurlData() ==null || member.getImgurlData().length==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屻��"+param.getName()+"銆戞暟鎹紝 鏈鍙栧埌浠讳綍鑱屼笟鐓у浘鐗囨暟鎹�");
}
@@ -350,6 +352,91 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈鍙栧埌鏈夋晥鏁版嵁");
}
return insertMember;
+
+ }
+ private List<Cases> isvalidImpartCasesParam(LoginUserInfo user, Map<String, XSSFPictureData> pics, List<CasesImport> casesImportList) {
+ if(casesImportList ==null || casesImportList.size()==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈鍙栧埌鏈夋晥鏁版嵁");
+ }
+ if(pics ==null || pics.size()==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈鍙栧埌浠讳綍鑱屼笟鐓у浘鐗囨暟鎹�");
+ }
+ List<Cases> insertList = new ArrayList<>();
+ List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .eq(Member::getDeleted,Constants.ZERO));
+ allList=allList==null?new ArrayList<>():allList;
+ if(allList == null || allList.size()==0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝 璇诲彇鑰佸笀鏁版嵁寮傚父锛岃鍏堢淮鎶よ�佸笀鏁版嵁淇℃伅锛�");
+ }
+ Date date = new Date();
+ int index = 1;
+ for(CasesImport param :casesImportList){
+ index ++;
+ if( StringUtils.isBlank(param.getName())
+ &&StringUtils.isBlank(param.getMemberCode())
+ &&StringUtils.isBlank(param.getStartDate())
+ &&StringUtils.isBlank(param.getEndDate())
+ &&StringUtils.isBlank(param.getDetail())){
+ continue;
+ }
+ Cases cases = new Cases();
+ cases.setStartDate(DateUtil.fromStringToDate("yyyy-MM-dd",param.getStartDate()));
+ cases.setEndDate(DateUtil.fromStringToDate("yyyy-MM-dd",param.getEndDate()));
+ if(StringUtils.isBlank(param.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 妗堜緥涓婚涓嶈兘涓虹┖");
+ }
+ Member member =null;
+ for(Member m : allList){
+ if(StringUtils.equals(param.getMemberCode(),m.getCode())){
+ member = m;
+ }
+ }
+ if(member == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 鑰佸笀宸ュ彿銆�"+param.getMemberCode()+"銆戜俊鎭笉瀛樺湪锛岃纭涓嶈閲嶅褰曞叆");
+
+ }
+ if(StringUtils.isBlank(param.getDetail())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 妗堜緥璇存槑涓嶈兘涓虹┖");
+ }
+ if(param.getImageList() == null){
+ param.setImageList(new ArrayList<>());
+ }
+ param.getImageList().addAll(param.getImageList1()!=null?param.getImageList1():new ArrayList<>());
+ param.getImageList().addAll(param.getImageList2()!=null?param.getImageList2():new ArrayList<>());
+ param.getImageList().addAll(param.getImageList3()!=null?param.getImageList3():new ArrayList<>());
+ param.getImageList().addAll(param.getImageList4()!=null?param.getImageList4():new ArrayList<>());
+ param.getImageList().addAll(param.getImageList5()!=null?param.getImageList5():new ArrayList<>());
+ /* if(param.getImageList() == null
+ ||param.getImageList().size() == 0 ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 妗堜緥鍥句俊鎭笉鑳戒负绌�");
+ }*/
+ if(cases.getStartDate()==null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 寮�濮嬫棩鏈熻鍙栧け璐�");
+ }
+ if(cases.getEndDate()==null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 缁撴潫鏃ユ湡璇诲彇澶辫触");
+ }
+ cases.setImgdataList(new ArrayList<>());
+ for(XSSFPictureData d : param.getImageList()){
+ cases.getImgdataList().add(d.getData());
+ }
+ cases.setCreateTime(date);
+ cases.setUpdateTime(date);
+ cases.setCreateUser(user.getId());
+ cases.setUpdateUser(user.getId());
+ cases.setAddType(Constants.ONE);
+ cases.setDeleted(Constants.ZERO);
+ cases.setStatus(Constants.ZERO);
+ cases.setName(param.getName());
+ cases.setDetail(param.getDetail());
+ cases.setMemberId(member.getId());
+
+ insertList.add(cases);
+ }
+ if(insertList ==null || insertList.size()==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈鍙栧埌鏈夋晥鏁版嵁");
+ }
+ return insertList;
}
@@ -414,22 +501,66 @@
}
/**
+ * 寮傛鎵ц鏂囦欢浠诲姟
+ */
+ @Override
+ public void clearImporTask(){
+ try {
+ List<ImportRecord> records = importRecordMapper.selectList(new QueryWrapper<ImportRecord>()
+ .select("id,total_num,(select count(c.id) from cases c where c.import_id= import_record.id) as doneNum")
+ .lambda()
+ .eq(ImportRecord::getDetail,Constants.ZERO)
+ .ne(ImportRecord::getStatus,Constants.TWO)
+ );
+ for(ImportRecord importRecord : records){
+ importRecord.setErrorNum(Constants.formatIntegerNum(importRecord.getTotalNum()- Constants.formatIntegerNum(importRecord.getDoneNum())));
+ importRecord.setStatus(Constants.TWO);
+ importRecord.setUpdateTime(new Date());
+ importRecord.setRemark("浠诲姟鎵ц涓柇锛屽己鍒惰缃换鍔＄姸鎬�");
+ importRecordMapper.updateById(importRecord);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ redisTemplate.delete(Constants.RedisKeys.IMPORTING_RECORD);
+ }
+ }
+
+ /**
* 澶勭悊妗堜緥瀵煎叆浠诲姟
* @param importRecord
*/
private int dealCaseImportBiz(ImportRecord importRecord) {
int success=0;
- String msg ="";
+ String msg = "";
+ String nowDate =DateUtil.getNowShortDate();
try {
- for(Cases param:importRecord.getCaseList()){
-
+ String bucket =systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.BUCKETNAME).getCode();
+ String folder =systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.CASES_FILES).getCode();
+ TyyZosUtil obs = new TyyZosUtil(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ENDPOINT).getCode(),
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ACCESS_ID).getCode(),
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ACCESS_KEY).getCode());
+ for(Cases param: importRecord.getCaseList()){
+ int ts =0;
+ try {
+ param.setImportId(importRecord.getId());
+ param.setAddType(Constants.ONE);
+ ts = dealCasesInsert(obs,param,folder,nowDate,bucket);
+ }catch (Exception e){
+ log.error("澶勭悊浜哄憳淇℃伅鍙戠敓寮傚父{}",e.getMessage());
+ ts =0;
+ }
+ success += ts;
}
+ obs.shutDown();
}catch (Exception e){
}
importRecord.setDoneNum(success);
importRecord.setErrorNum(importRecord.getTotalNum() - success);
+ importRecord.setDetail(msg);
+ redisTemplate.delete(Constants.RedisKeys.IMPORTING_RECORD);
return success;
}
@@ -464,6 +595,35 @@
}
+ @Transactional
+ private int dealCasesInsert( TyyZosUtil obs,Cases param,String folder,String nowDate,String bucketName) {
+ int success = casesMapper.insert(param);
+ if(param.getImgdataList()!=null && param.getImgdataList().size()>0){
+ List<Multifile> multifileList = new ArrayList<>();
+ for(byte[] d : param.getImgdataList()){
+ String fileName = UUID.randomUUID() + ".png";
+ String tempFileName = nowDate + "/" + fileName;
+ String key = folder + tempFileName;// 鏂囦欢鍚�
+ if (obs.uploadInputstreamObjectNoShutdown(new ByteArrayInputStream(d ) ,bucketName, key)) {
+ Multifile s = new Multifile();
+ s.setIsdeleted(Constants.ZERO);
+ s.setCreator(param.getCreateUser());
+ s.setCreateDate(param.getCreateTime());
+ s.setObjId(param.getId());
+ s.setType(Constants.ZERO);
+ s.setFileurl(tempFileName);
+ s.setObjType(Constants.ONE);
+ multifileList.add(s);
+ param.setImgurl(tempFileName);//璇佷欢鐓у湴鍧�
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鍥鹃泦涓婁紶澶辫触锛�");
+ }
+ }
+ multifileMapper.insert(multifileList);
+ }
+ return success;
+}
+
private int dealMemberInsert( TyyZosUtil obs,Member param,String folder,String nowDate,String bucketName) {
int success =0;
try {
--
Gitblit v1.9.3