Merge remote-tracking branch 'origin/master'

doum

昨天 2f3221b7c90d5663fdb312653a2d188bc4628370

 server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java

@@ -22,7 +22,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.sun.xml.internal.messaging.saaj.util.ByteInputStream;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.CellType;
@@ -38,6 +37,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;
@@ -141,7 +141,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());
@@ -158,8 +159,8 @@
       queryWrapper.eq(pageWrap.getModel().getDoneNum() != null,ImportRecord::getDoneNum, pageWrap.getModel().getDoneNum());
       queryWrapper.eq(pageWrap.getModel().getErrorNum() != null,ImportRecord::getErrorNum, pageWrap.getModel().getErrorNum());
       queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getUpdateUserName()),SystemUser::getRealname, pageWrap.getModel().getUpdateUserName());
       queryWrapper.ge(pageWrap.getModel().getEndtime() != null,ImportRecord::getCreateTime, pageWrap.getModel().getEndtime());
       queryWrapper.ne(pageWrap.getModel().getStarttime() != null,ImportRecord::getCreateTime, pageWrap.getModel().getStarttime());
       queryWrapper.ge(pageWrap.getModel().getStarttime() != null,ImportRecord::getCreateTime, pageWrap.getModel().getStarttime());
       queryWrapper.le(pageWrap.getModel().getEndtime() != null,ImportRecord::getCreateTime, pageWrap.getModel().getEndtime());
       queryWrapper.orderByDesc(ImportRecord::getId);
        return PageData.from(importRecordMapper.selectPage(page, queryWrapper));
    }
@@ -179,7 +180,7 @@
        try {
            List<Category> categoryList = null;
            if(type == 0){
              categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda().eq(Category::getDeleted,Constants.ZERO));
              categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda().eq(Category::getDeleted,Constants.ZERO).eq(Category::getStatus,Constants.ZERO));
                if(categoryList == null || categoryList.size()==0){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起， 读取老师基数数据配置出错，请先配置基础数据信息！");
                }
@@ -199,11 +200,11 @@
            Map<String, XSSFPictureData> pics = ie.getExcelPictures();
            if(type == 1) {
              List<CasesImport> importList =  (ie.getDataList(CasesImport.class,null));
              model.setCaseList(isvalidImpartCasesParam(loginUserInfo,pics,importList));
              model.setCaseList(isvalidImpartCasesParam(loginUserInfo,importList));
              model.setTotalNum(model.getCaseList().size());
            }else{
               List<MemberImport> importList = (ie.getDataList(MemberImport.class,null));
               model.setMemberList(isvalidImpartMemberParam(loginUserInfo,categoryList,pics,importList));
               model.setMemberList(isvalidImpartMemberParam(loginUserInfo,categoryList,importList));
               model.setTotalNum(model.getMemberList().size());
            }
            importRecordMapper.insert(model);
@@ -218,12 +219,9 @@
//            redisTemplate.delete(Constants.RedisKeys.IMPORTING_RECORD);
        }
    }
    private  List<Member> isvalidImpartMemberParam(LoginUserInfo user, List<Category> categoryList ,Map<String, XSSFPictureData> pics, List<MemberImport> memberList) {
    private  List<Member> isvalidImpartMemberParam(LoginUserInfo user, List<Category> categoryList , List<MemberImport> memberList) {
        if(memberList ==null || memberList.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未读取到有效数据");
        }
        if(pics ==null || pics.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未读取到任何职业照图片数据");
        }
        List<Member> insertMember = new ArrayList<>();
        List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
@@ -288,9 +286,13 @@
             if(StringUtils.isBlank(param.getTypeNames())){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， 商业化类型信息不能为空");
             }
             if(StringUtils.isBlank(param.getFieldNames())){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， 擅长领域信息不能为空");
             }
             if(StringUtils.isBlank(param.getFee())){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， 费用标准信息不能为空");
             }

          /*   if(pics!=null && StringUtils.isNotBlank(param.getImgurl())){
                log.info("===================="+param.getImgurl());
                int start = param.getImgurl().indexOf("(\"")+2;
@@ -339,7 +341,8 @@
                 member.setFee(new BigDecimal(param.getFee()));
             }catch (Exception e){
             }
             member.setSex(StringUtils.equals(param.getSex(),"男")?Constants.ZERO:(StringUtils.equals(param.getSex(),"女")?Constants.ZERO:null));
             member.setSex(StringUtils.equals(param.getSex(),"男")?Constants.ZERO:
                     (StringUtils.equals(param.getSex(),"女")?Constants.ONE:null));
             member.setZhanquIds(getIdStrListByList(list0));
             member.setBustypeIds(getIdStrListByList(list1));
             member.setFieldIds(getIdStrListByList(list2));
@@ -352,12 +355,9 @@
         return insertMember;

    }
    private  List<Cases> isvalidImpartCasesParam(LoginUserInfo user,  Map<String, XSSFPictureData> pics, List<CasesImport> casesImportList) {
    private  List<Cases> isvalidImpartCasesParam(LoginUserInfo user,   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()
@@ -370,9 +370,7 @@
        int index = 1;
         for(CasesImport param :casesImportList){
             index ++;
             if( ( param.getImageList() == null
                 ||param.getImageList().size() == 0 )
                     &&StringUtils.isBlank(param.getName())
             if(  StringUtils.isBlank(param.getName())
                     &&StringUtils.isBlank(param.getMemberCode())
                     &&StringUtils.isBlank(param.getStartDate())
                     &&StringUtils.isBlank(param.getEndDate())
@@ -406,10 +404,10 @@
             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
          /*    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+"行数据， 开始日期读取失败");
             }
@@ -501,6 +499,32 @@
    }

    /**
     * 异步执行文件任务
     */
    @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::getDeleted,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
     */
@@ -572,27 +596,29 @@
    @Transactional
    private int dealCasesInsert( TyyZosUtil obs,Cases param,String folder,String nowDate,String bucketName) {
        int success = casesMapper.insert(param);
        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(),"图集上传失败！");
        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);
        }
        multifileMapper.insert(multifileList);
        return success;
}