Merge remote-tracking branch 'origin/master'

xyc

2024-10-22 1dad50645c6e61980f15b2be4505f75e7c922ee7

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelRbdNodeService.java

@@ -1,32 +1,13 @@
package com.zt.life.modules.mainPart.taskReliability.service;

import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.service.BaseService;
import com.zt.common.utils.JsonUtils2;
import com.zt.common.utils.UUIDUtil;
import com.zt.life.modules.mainPart.basicInfo.dao.ParamDataDao;
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.taskReliability.dao.*;
import com.zt.life.modules.mainPart.taskReliability.dto.ModelLinePair;
import com.zt.life.modules.mainPart.taskReliability.model.*;
import org.apache.commons.lang3.StringUtils;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.io.StringWriter;
import java.util.*;
import java.util.stream.Collectors;
import java.util.HashMap;
import java.util.Map;


/**
@@ -39,14 +20,19 @@
public class ModelRbdNodeService extends BaseService<ModelRbdNodeDao, ModelRbdNode> {
    public void saveNodeArr(ModelRbd modelRbd) {
//
        baseDao.deteleModelRbdNode(modelRbd.getId());
        ModelRbdNode node = new ModelRbdNode();
        node.setProductId(modelRbd.getProductId());
        node.setModelId(modelRbd.getId());
        Long[] nodeArr = modelRbd.getNodeArr();
        Map<Long,Integer> nodeMap = new HashMap<>();
        for(Long nodeId :nodeArr){
            node.setId(UUIDUtil.generateId());
            node.setNodeId(nodeId);
            baseDao.insert(node);
            if (nodeMap.get(nodeId)!=null) {
                node.setId(UUIDUtil.generateId());
                node.setNodeId(nodeId);
                baseDao.insert(node);
                nodeMap.put(nodeId,1);
            }
        }
    }
}