测试节点通过后,状态取上一节点状态,而不是默认完成

刘小明

2024-07-16 fab10f7057c54b5309108ad4e640e30f506fcc74

 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java

@@ -1,5 +1,6 @@
package com.dy.pmsPlatform.product;

import cn.hutool.core.codec.Base64;
import com.alibaba.excel.util.StringUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.daoOth.OthFileMapper;
@@ -12,8 +13,11 @@
import com.dy.pmsGlobal.pojoOth.OthFile;
import com.dy.pmsGlobal.pojoPlt.PltProduct;
import com.dy.pmsGlobal.pojoPlt.PltProductFile;
import com.dy.pmsGlobal.util.QrCodeUtil;
import com.google.zxing.WriterException;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -21,6 +25,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
@@ -71,6 +76,10 @@

    @Transactional
    public int save(PltProduct p) {
        //判断产品不能重名
        if (dao.exists(p.name, p.id)) {
            throw new RuntimeException("产品名称重复");
        }
        int flag=0;
        do {
            p.code = getNextCode();
@@ -105,6 +114,9 @@

    @Transactional
    public int update(PltProduct p) {
        if (dao.exists(p.name, p.id)) {
            throw new RuntimeException("产品名称重复");
        }
        int count = dao.updateByPrimaryKeySelective(p);
        //删除旧数据,重新插入
        pfDao.deleteByProId(p.id);
@@ -119,19 +131,17 @@
            if(param.id !=null){
                paramDao.updateByPrimaryKeySelective(param);
            }else{
                param.deleted=false;
                paramDao.insert(param);
            }
        });
        saveRel(p, p.processDocuments, "01");
        saveRel(p, p.userManual, "02");
        saveRel(p, p.materials, "03");
        saveRel(p, p.proFiles);
    }

    private void saveRel(PltProduct p, List<PltProductFile> docs, String fileType) {
    private void saveRel(PltProduct p, List<PltProductFile> docs) {
        docs.forEach(doc -> {
            doc.proId = p.id;
            doc.fileType = fileType;
            pfDao.insert(doc);
            pfDao.insertSelective(doc);
        });
    }

@@ -161,15 +171,13 @@
                pro.imageWebPathZip = fileOperate.getImgFileZipPath(filePathWithWebUrl);
            }

            Stream.concat(
                     pro.userManual.stream(),
                     Stream.concat(pro.processDocuments.stream(), pro.materials.stream())
             )
             .forEach(doc -> {
            pro.proFiles.stream().forEach(doc -> {
                 OthFile file = othFileMapper.selectByPrimaryKey(doc.fileId);
                 if (file == null) {
                     return;
                 }
                 FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);

                 doc.webUrl = fileRestVo.fileWebUrl + file.filePath;
                 doc.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + doc.fileId;
                 doc.orgName = file.orgName;
                 doc.extName = file.extName;
             });
@@ -196,6 +204,19 @@
        rsVo.calculateAndSet(itemTotal, params);
        //查询符合条件的记录
        rsVo.obj = dao.selectSome(params) ;
        if(CollectionUtils.isNotEmpty(rsVo.obj)){
            rsVo.obj.parallelStream().forEach(item->{
                try {
                    byte[] codes = QrCodeUtil.genQrCode(item.code);
                    item.qrCode = "data:image/jpeg;base64," + Base64.encode(codes);
                    item = addWebUrl(item);
                } catch (IOException e) {
                    e.printStackTrace();
                } catch (WriterException e) {
                    e.printStackTrace();
                }
            });
        }
        return rsVo ;
    }