Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 a43fd8f15c7da7f4a14ba4ebb79970dad4ce1fae

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

@@ -27,6 +27,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.zt.life.modules.mainPart.taskReliability.dto.StatusDto;
import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel;
import com.zt.life.modules.mainPart.taskReliability.model.TimeDiagram;
@@ -44,9 +45,10 @@
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.stream.Collectors;
import java.util.Map;
import java.util.stream.Collectors;


/**
@@ -101,7 +103,6 @@

    @Value("${data.reliaSimLib.resultHome}")
    private String path;


    private JSONObject dialgramJson;

@@ -254,13 +255,21 @@
            } else {
                setlineXy(modelJson2, x2, y1, x2, y2, null);
            }

            jsonArray.add(modelJson2);

            //判断是否有模型
            ModelRbd modelRbd = baseDao.getModelByProductGk(modelDto.getGkId(), productId);
            String modelName = "未用";
            String modelId = "";
            if (modelRbd != null) {
                modelName = modelRbd.getModelName();
                modelId = modelRbd.getId().toString();
            }

            JSONObject textJson = new JSONObject(templetsStrMap.get("text"));
            JsonUtils2.setJsonValueByPath(textJson, "data/dataId".split("/"), modelDto.getGkId());
            JsonUtils2.setJsonValueByPath(textJson, "data/dataId".split("/"), modelId);
            JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
            JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), modelDto.getGkName());
            JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), modelName);
            JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x1 + 30);
            JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y1);
            jsonArray.add(textJson);