From cd7b35b1acc7467deac78ba843b5870a22c9c7f6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 06 八月 2024 08:59:12 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 655 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 633 insertions(+), 22 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index 69e67d1..5050520 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -1,6 +1,10 @@
package com.zt.life.modules.mainPart.taskReliability.service;
-import com.alibaba.fastjson.JSONObject;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONArray;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.spire.pdf.tables.table.convert.Convert;
+import com.zt.common.exception.RenException;
import com.zt.common.service.BaseService;
import com.zt.common.servlet.Result;
import com.zt.common.utils.UUIDUtil;
@@ -9,9 +13,13 @@
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.taskReliability.dao.*;
+import com.zt.common.utils.JsonUtils2;
+import com.zt.life.modules.mainPart.taskReliability.dao.SimulatAssessDao;
+import com.zt.life.modules.mainPart.taskReliability.dao.TimeDiagramDao;
import com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto;
import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResult;
import com.zt.life.modules.mainPart.taskReliability.model.*;
+import com.zt.life.modules.mainPart.utils.GetStringSpace;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
@@ -19,18 +27,29 @@
import org.dom4j.io.XMLWriter;
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.awt.*;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
import java.util.ArrayList;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Hashtable;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@@ -41,7 +60,7 @@
* @since 1.0.0 2024-03-20
*/
@Service
-public class SimulatAssessService extends BaseService<SimulatAssessDao, SimulatAssess> {
+public class SimulatAssessService extends BaseService<SimulatAssessDao, SimulatAssess> {
private static final Logger logger = LoggerFactory.getLogger(SimulatAssessService.class);
private static final String RELIA_SIM_TASK_TYPE_SIMULATION = "calcreq";
@@ -76,6 +95,24 @@
private XhProductModelDao xhProductModelDao;
@Autowired
private ParamDataDao paramDataDao;
+ @Autowired
+ private TaskBinoParamDao taskBinoParamDao;
+ @Autowired
+ private TaskRepairParamDao taskRepairParamDao;
+
+ @Autowired
+ private TimeDiagramDao timeDiagramDao;
+
+ @Value("${data.reliaSimLib.resultHome}")
+ private String path;
+
+ private JSONObject dialgramJson;
+
+
+ String templetStr = "{\"cells\":[]}";
+ Map<String, JSONObject> templetsMap = new HashMap<>();
+ Map<String, String> templetsStrMap = new HashMap<>();
+
/**
* 鍒嗛〉鏌ヨ
@@ -108,9 +145,533 @@
return baseDao.getParams(id, taskModelId);
}
- public List<ProductStatusDto> getChildren(Long productId, Long taskId) {
+ public List<ProductStatusDto> getProduct(Long productId, Long taskId) {
return baseDao.getChildren(productId, taskId);
}
+
+ public String getTimeDiagram(Long productId, Long taskId, Long fzId) {
+ String filePath = path + "/" + fzId + "/" + "status.json";
+ ObjectMapper mapper = new ObjectMapper();
+ String jsonStr = null;
+ try {
+ // 浣跨敤 ObjectMapper 鐨� readValue 鏂规硶锛屽皢鏂囦欢涓殑 JSON 鏁版嵁杞崲涓轰竴涓� Java 瀵硅薄
+ // 杩欓噷浣跨敤 Object 绫讳綔涓烘硾鍨嬪弬鏁帮紝琛ㄧず浠绘剰绫诲瀷鐨勫璞�
+ Object obj = mapper.readValue(new File(filePath), Object.class);
+ // 浣跨敤 ObjectMapper 鐨� writeValueAsString 鏂规硶锛屽皢 Java 瀵硅薄杞崲涓� JSON 瀛楃涓�
+ jsonStr = mapper.writeValueAsString(obj);
+
+ } catch (IOException e) {
+ // 澶勭悊寮傚父
+ e.printStackTrace();
+ throw new RenException("鏂囦欢涓嶅瓨鍦ㄦ垨鑰呮枃浠舵墦涓嶅紑");
+ }
+ dialgramJson = new JSONObject(jsonStr);
+
+ // 闃舵妯″瀷
+ List<SimulatAssessTaskPhaseModel> modelDtoList = baseDao.getModelList(productId, fzId);
+ // 鎵�鏈夐樁娈垫ā鍨嬬殑鑺傜偣闆嗗悎 锛堢嚎鏉★級
+ List<ProductStatusDto> list = this.getStatusData(productId, taskId);
+ // 姣忔浠跨湡璁板綍
+ SimulatAssess simulatAssess = this.get(fzId);
+
+ JSONObject jsonObject = new JSONObject(templetStr);
+ JSONArray jsonArray = jsonObject.getJSONArray("cells");
+
+ this.getPetsInfo();
+ double x1 = 0;
+ double x2 = 0;
+ int y = 0;
+ int groupY = 0;
+ int spaceHeight = 20;
+ int groupHeight = 20;
+
+ double pointNumPerHour = 60.0 / simulatAssess.getSamplPeriod();
+ //鏃跺簭鍥剧嚎
+ for (int i = 0; i < list.size(); i++) {
+ x1 = 0;
+ groupY = groupHeight * i;
+ ProductStatusDto dto = list.get(i);
+ for (StatusDto status : dto.getStatusList()) {
+ switch (status.getStatus()) {
+ case "O":
+ y = groupY;
+ break;
+ case "F":
+ y = groupY;// + spaceHeight;
+ break;
+ case "I":
+ case "S":
+ case "M":
+ y = groupY;// + 2 * spaceHeight;
+ break;
+ }
+ x2 = x1 + status.getTimes() * pointNumPerHour + 5;
+ JSONObject lineJson = new JSONObject(templetsStrMap.get(status.getStatus()));
+ setlineXy(lineJson, x1, y, x2, y, "");
+ JsonUtils2.setJsonValueByPath(lineJson,"data/status".split("/"),status.getStatus());
+ JsonUtils2.setJsonValueByPath(lineJson,"data/startTimes".split("/"),String.format("%.4f", x1));
+ JsonUtils2.setJsonValueByPath(lineJson,"data/endTimes".split("/"),String.format("%.4f", x1 + status.getTimes()));
+ JsonUtils2.setJsonValueByPath(lineJson, "id".split("/"), UUIDUtil.generateId().toString());
+ x1 = x2 - 5;
+ jsonArray.add(lineJson);
+ }
+ JSONObject textJson = new JSONObject(templetsStrMap.get("text"));
+ JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
+ JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), dto.getName());
+ JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), 20);
+ JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y - 15);
+ jsonArray.add(textJson);
+
+ }
+
+ //鍥句緥
+ int spaceWitdth = 80;
+ x1 = -spaceWitdth;
+ x2 = -11;
+ y = -130;
+ String[] tlArr = "O,F,I,S,M".split(",");
+ for (String s : tlArr) {
+ JSONObject f = templetsMap.get(s);
+ x1 = x1 + spaceWitdth;
+ x2 = x2 + spaceWitdth;
+ setlineXy(f, x1, y, x2, y, null);
+ jsonArray.add(f);
+ }
+
+ //闃舵妯″瀷鍙婂埢搴�
+ x1 = 0;
+ x2 = 0;
+ double y1 = -100;
+ y = -70;
+ double y2 = -50;
+
+ JSONObject modelJson = new JSONObject(templetsStrMap.get("model"));
+ setlineXy(modelJson, 2, y1, 2, y2, null);
+ jsonArray.add(modelJson);
+ double totalHours = 0;
+ for (int i = 0; i < modelDtoList.size(); i++) {
+ JSONObject modelJson2 = new JSONObject(templetsStrMap.get("model"));
+ SimulatAssessTaskPhaseModel modelDto = modelDtoList.get(i);
+ totalHours = totalHours + modelDto.getGkDuration();
+ double gkPoint = modelDto.getGkDuration() * pointNumPerHour;
+ x2 = x2 + gkPoint;
+ if (i < modelDtoList.size() - 1) {
+ setlineXy(modelJson2, x2, y1, x2, y, null);
+ } 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();
+ }
+ Map<String, Integer> mapSpace = GetStringSpace.getStringSpaceSize(modelName, null, 18);
+ JSONObject textJson = new JSONObject(templetsStrMap.get("text"));
+ JsonUtils2.setJsonValueByPath(textJson, "data/dataId".split("/"), modelId);
+ JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
+ JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), modelName);
+
+ JsonUtils2.setJsonValueByPath(textJson, "size/width".split("/"), mapSpace.get("width") + 20);
+
+ double x11 = x1 + ((gkPoint - mapSpace.get("width") - 20) / 2);
+ JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x11);
+ JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y1);
+ jsonArray.add(textJson);
+ x1 = x2;
+ }
+ JSONObject modelJson3 = new JSONObject(templetsStrMap.get("model"));
+ setlineXy(modelJson3, 0, y, x2, y, null);
+ jsonArray.add(modelJson3);
+
+ Integer curPointHour = 50, periodHour = 50;
+ while (curPointHour < totalHours) {
+ JSONObject modelJson4 = new JSONObject(templetsStrMap.get("model"));
+ double x = curPointHour * pointNumPerHour;
+ setlineXy(modelJson4, x, y, x, y2, null);
+ jsonArray.add(modelJson4);
+
+ Map<String, Integer> mapSpace = GetStringSpace.getStringSpaceSize(curPointHour.toString(), null, 20);
+ JSONObject textJson = new JSONObject(templetsStrMap.get("text"));
+ JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
+ JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), curPointHour.toString());
+
+ JsonUtils2.setJsonValueByPath(textJson, "size/width".split("/"), mapSpace.get("width") + 20);
+
+ double x11 = x - mapSpace.get("width") / 2 - 5;
+ JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x11);
+ JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y2);
+ jsonArray.add(textJson);
+
+ curPointHour += periodHour;
+ }
+
+
+ return jsonObject.toString();
+ }
+
+ public void setlineXy(JSONObject lineJson, double x1, double y1, double x2, double y2, String text) {
+ JsonUtils2.setJsonValueByPath(lineJson, "source/x".split("/"), x1);
+ JsonUtils2.setJsonValueByPath(lineJson, "source/y".split("/"), y1);
+ JsonUtils2.setJsonValueByPath(lineJson, "target/x".split("/"), x2);
+ JsonUtils2.setJsonValueByPath(lineJson, "target/y".split("/"), y2);
+ JsonUtils2.setJsonValueByPath(lineJson, "id".split("/"), UUIDUtil.generateId().toString());
+ if (text != null) {
+ JsonUtils2.setArrJsonValueByPath(lineJson, "labels".split("/"), null, "0", "attrs/text/text", "");
+ }
+ }
+
+ public void getPetsInfo() {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("projectId", 10000);
+ params.put("diagramId", 10000);
+ List<TimeDiagram> list_style = baseDao.getTimeDiagram(params);
+ if (list_style.size() > 0) {
+ String modelStr = list_style.get(0).getContent();
+ JSONObject modelJson = new JSONObject(modelStr);
+ JSONArray modelJsonArray = modelJson.getJSONArray("cells");
+ for (int i = 0; i < modelJsonArray.size(); i++
+ ) {
+ JSONObject jsonObject = modelJsonArray.getJSONObject(i);
+ if (jsonObject.get("shape").equals("edge")) {
+ JSONArray tmpArray = jsonObject.getJSONArray("labels");
+ JSONObject tmpJSONObject = (JSONObject) tmpArray.get(0);
+ Object nodeMarker = JsonUtils2.getJsonValueByPath(tmpJSONObject, "attrs/text/text".split("/"));
+ if ("杩愯".equals(nodeMarker)) {
+ templetsMap.put("O", jsonObject);
+ templetsStrMap.put("O", jsonObject.toString());
+ }
+ if ("鏁呴殰".equals(nodeMarker)) {
+ templetsMap.put("F", jsonObject);
+ templetsStrMap.put("F", jsonObject.toString());
+ }
+ if ("绌洪棽".equals(nodeMarker)) {
+ templetsMap.put("I", jsonObject);
+ templetsStrMap.put("I", jsonObject.toString());
+ }
+ if ("澶囦唤".equals(nodeMarker)) {
+ templetsMap.put("S", jsonObject);
+ templetsStrMap.put("S", jsonObject.toString());
+ }
+ if ("鏈敤".equals(nodeMarker)) {
+ templetsMap.put("M", jsonObject);
+ templetsStrMap.put("M", jsonObject.toString());
+ }
+ if ("妯″瀷".equals(nodeMarker)) {
+ JsonUtils2.setJsonValueByPath(tmpJSONObject, "attrs/text/text".split("/"), "");
+ templetsMap.put("model", jsonObject);
+ templetsStrMap.put("model", jsonObject.toString());
+ }
+
+ } else if (jsonObject.get("shape").equals("custom-rect")) {
+ Object nodeMarker = JsonUtils2.getJsonValueByPath(jsonObject, "attrs/label/textWrap/text".split("/"));
+ if ("鏂囧瓧妯℃澘1".equals(nodeMarker)) {
+ templetsMap.put("text", jsonObject);
+ templetsStrMap.put("text", jsonObject.toString());
+ }
+ } else if (jsonObject.get("shape").equals("image")) {
+ Object nodeMarker = JsonUtils2.getJsonValueByPath(jsonObject, "data/imagePost".split("/"));
+ if ("center".equals(nodeMarker)) {
+ templetsMap.put("center", jsonObject);
+ templetsStrMap.put("center", jsonObject.toString());
+ }
+ if ("top".equals(nodeMarker)) {
+ templetsMap.put("top", jsonObject);
+ templetsStrMap.put("top", jsonObject.toString());
+ }
+ if ("right".equals(nodeMarker)) {
+ templetsMap.put("right", jsonObject);
+ templetsStrMap.put("right", jsonObject.toString());
+ }
+ if ("bottom".equals(nodeMarker)) {
+ templetsMap.put("bottom", jsonObject);
+ templetsStrMap.put("bottom", jsonObject.toString());
+ }
+ if ("left".equals(nodeMarker)) {
+ templetsMap.put("left", jsonObject);
+ templetsStrMap.put("left", jsonObject.toString());
+ }
+ }
+ }
+ }
+ }
+
+ public List<ProductStatusDto> getStatusData(Long productId, Long taskId) {
+ List<ProductStatusDto> childList = this.getProduct(productId, taskId);
+ for (ProductStatusDto item : childList) {
+ JSONArray jsonArray = dialgramJson.getJSONArray(String.valueOf(item.getId()));
+ if (jsonArray != null) {
+ this.processJSONArray(jsonArray, item, taskId);
+ }
+ }
+ return childList;
+ }
+
+ public void processJSONArray(JSONArray jsonArray, ProductStatusDto productStatusDto, Long taskId) {
+
+ List<SimulatAssessTaskPhaseModel> phaseModelList = baseDao.getTaskPhaseModelByTaskId(taskId);
+ String status = null;
+ Double times = null;
+ JSONArray jsonArray2 = jsonArray.getJSONArray(0);
+ for (int j = 0; j < jsonArray2.size(); j++) {
+ JSONArray jsonArray3 = jsonArray2.getJSONArray(j);
+ if (jsonArray3.size() == 0) {
+ StatusDto statusDto = new StatusDto();
+ statusDto.setTimes(phaseModelList.get(j).getGkDuration());
+ statusDto.setStatus("");
+ productStatusDto.getStatusList().add(statusDto);
+ } else {
+ for (int a = 0; a < jsonArray3.size(); a++) {
+ JSONArray jsonArray4 = jsonArray3.getJSONArray(a);
+ for (int b = 0; b < jsonArray4.size(); b++) {
+ Object item = jsonArray4.get(b);
+ if (item instanceof Double) {
+ times = (Double) item;
+ } else {
+ status = String.valueOf(item);
+ }
+ }
+ if (status != null || times != null) {
+ StatusDto statusDto = new StatusDto();
+ statusDto.setTimes(times);
+ statusDto.setStatus(status);
+ productStatusDto.getStatusList().add(statusDto);
+ }
+ }
+ }
+ }
+ }
+
+ public TimeDiagram getDiagram(String projectId, String diagramId, String showType, String isShow, String digramParams, String majorId, Integer winWidth, Integer winHeight) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("projectId", projectId);
+ params.put("diagramId", diagramId);
+
+ TimeDiagram diagram = null;
+
+ List<TimeDiagram> list = baseDao.getTimeDiagram(params);
+ if (list.size() > 0) {
+ diagram = list.get(0);
+ } else {
+ diagram = new TimeDiagram();
+ diagram.setProjectId(Convert.toLong(projectId));
+ diagram.setDiagramId(Convert.toLong(diagramId));
+ }
+
+
+ return diagram;
+ }
+
+ public void updateDiagram(TimeDiagram diagram) {
+ timeDiagramDao.updateById(diagram);
+ }
+
+/* public void combineDiagram(TimeDiagram networkDiagram) {
+
+ if (!networkDiagram.getDiagramId().equals(1L) && !networkDiagram.getDiagramId().equals(2L))
+ return null;
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("projectId", networkDiagram.getProjectId());
+
+ ProjectNetworkDiagram combineDiagram = null;
+ params.put("diagramId", 100);
+ List<ProjectNetworkDiagram> list = baseDao.getList(params);
+ if (list.size() > 0) {
+ combineDiagram = list.get(0);
+ }
+
+ ProjectNetworkDiagram phaseDiagram = null;
+ params.put("diagramId", 1);
+ List<ProjectNetworkDiagram> list1 = baseDao.getList(params);
+ if (list1.size() > 0) {
+ phaseDiagram = list1.get(0);
+ }
+
+ ProjectNetworkDiagram inspectDiagram = null;
+ params.put("diagramId", 2);
+ List<ProjectNetworkDiagram> list2 = baseDao.getList(params);
+ if (list2.size() > 0) {
+ inspectDiagram = list2.get(0);
+ }
+
+ String jsonStr = "";
+ Map<String, Map<String, String>> leftMap = new Hashtable<>();
+ Map<String, Map<String, String>> rightMap = new Hashtable<>();
+ if (phaseDiagram != null && inspectDiagram != null) {
+ String inspectJsonStr = inspectDiagram.getContent();
+ JSONObject inspectJsonObj = new JSONObject(inspectJsonStr);
+ JSONArray inspectJsonArray = inspectJsonObj.getJSONArray("cells");
+
+ String phaseJsonStr = phaseDiagram.getContent();
+ JSONObject phaseJsonObj = new JSONObject(phaseJsonStr);
+ JSONArray phaseJsonArray = phaseJsonObj.getJSONArray("cells");
+
+ JSONArray leftArray = inspectJsonArray.stream().filter(iter -> "edge".equals(((JSONObject) iter).get("shape"))
+ && "left".equals(((JSONObject) iter).get("phaseType"))).collect(Collectors.toCollection(JSONArray::new));
+ int leftPhaseMaxX = 0;
+ int phaseY = 0;
+ String leftPhaseMaxId = "";
+ for (int i = 0; i < leftArray.size(); i++) {
+ Map<String, String> tmpMap = new Hashtable<>();
+
+ JSONObject lineObject = (JSONObject) leftArray.get(i);
+ String phaseId = lineObject.getStr("phaseId");
+ JSONArray phaseArray = phaseJsonArray.stream().filter(iter -> "custom-circle".equals(((JSONObject) iter).get("shape"))
+ && phaseId.equals(((JSONObject) iter).get("id"))).collect(Collectors.toCollection(JSONArray::new));
+
+ tmpMap.put("lineId", lineObject.getStr("id"));
+ tmpMap.put("phaseId", phaseId);
+ String portId = "";
+ if (phaseArray.size() > 0) {
+ JSONObject phaseObject = (JSONObject) phaseArray.get(0);
+ Object portIdObject = JsonUtils2.getArrJsonValueByPath(phaseObject, "ports/items/".split("/"), "group", "right", "id");
+ //portId = portIdObject == null ? "" : portIdObject.toString();
+ Object xObject = JsonUtils2.getJsonValueByPath(phaseObject, "position/x".split("/"));
+ int x = xObject == null ? 0 : Convert.toInt(xObject.toString());
+ if (x > leftPhaseMaxX) {
+ leftPhaseMaxX = x;
+ leftPhaseMaxId = phaseObject.getStr("id");
+ }
+ if (phaseY == 0) {
+ Object yObject = JsonUtils2.getJsonValueByPath(phaseObject, "position/y".split("/"));
+ phaseY = yObject == null ? 0 : Convert.toInt(yObject.toString());
+ }
+ }
+ tmpMap.put("portId", portId);
+ leftMap.put(lineObject.getStr("id"), tmpMap);
+ }
+
+ JSONArray rightArray = inspectJsonArray.stream().filter(iter -> "edge".equals(((JSONObject) iter).get("shape"))
+ && "right".equals(((JSONObject) iter).get("phaseType"))).collect(Collectors.toCollection(JSONArray::new));
+ int rightPhaseMinX = 10000000;
+ String rightPhaseMinId = "";
+ for (int i = 0; i < rightArray.size(); i++) {
+ Map<String, String> tmpMap = new Hashtable<>();
+
+ JSONObject lineObject = (JSONObject) rightArray.get(i);
+ String phaseId = lineObject.getStr("phaseId");
+ JSONArray phaseArray = phaseJsonArray.stream().filter(iter -> "custom-circle".equals(((JSONObject) iter).get("shape"))
+ && phaseId.equals(((JSONObject) iter).get("id"))).collect(Collectors.toCollection(JSONArray::new));
+
+ tmpMap.put("lineId", lineObject.getStr("id"));
+ tmpMap.put("phaseId", phaseId);
+ String portId = "";
+ if (phaseArray.size() > 0) {
+ JSONObject phaseObject = (JSONObject) phaseArray.get(0);
+ Object portIdObject = JsonUtils2.getArrJsonValueByPath(phaseObject, "ports/items/".split("/"), "group", "left", "id");
+ //portId = portIdObject == null ? "" : portIdObject.toString();
+ Object xObject = JsonUtils2.getJsonValueByPath(phaseObject, "position/x".split("/"));
+ int x = xObject == null ? 100000000 : Convert.toInt(xObject.toString());
+ if (x < rightPhaseMinX) {
+ rightPhaseMinX = x;
+ rightPhaseMinId = phaseObject.getStr("id");
+ }
+ }
+ tmpMap.put("portId", portId);
+ rightMap.put(lineObject.getStr("id"), tmpMap);
+ }
+
+
+ JSONArray startArray = inspectJsonArray.stream().filter(iter -> "custom-circle".equals(((JSONObject) iter).get("shape"))
+ && "10000".equals(((JSONObject) iter).get("id"))).collect(Collectors.toCollection(JSONArray::new));
+ int inspectBeginX = 0;
+ int inspectY = 0;
+ if (startArray.size() > 0) {
+ JSONObject inspectObject = (JSONObject) startArray.get(0);
+ Object xObject = JsonUtils2.getJsonValueByPath(inspectObject, "position/x".split("/"));
+ inspectBeginX = xObject == null ? 0 : Convert.toInt(xObject.toString());
+ Object yObject = JsonUtils2.getJsonValueByPath(inspectObject, "position/y".split("/"));
+ inspectY = yObject == null ? 0 : Convert.toInt(yObject.toString());
+ }
+
+ JSONArray endArray = inspectJsonArray.stream().filter(iter -> "custom-circle".equals(((JSONObject) iter).get("shape"))
+ && "20000".equals(((JSONObject) iter).get("id"))).collect(Collectors.toCollection(JSONArray::new));
+ int inspectEndX = 10000000;
+ if (endArray.size() > 0) {
+ JSONObject inspectObject = (JSONObject) endArray.get(0);
+ Object xObject = JsonUtils2.getJsonValueByPath(inspectObject, "position/x".split("/"));
+ inspectEndX = xObject == null ? 100000000 : Convert.toInt(xObject.toString());
+ }
+
+ JSONObject beginObject = null;
+ JSONObject endObject = null;
+ for (int i = 0; i < inspectJsonArray.size(); i++) {
+ JSONObject inspectObject = (JSONObject) inspectJsonArray.get(i);
+ String inspectObjectId = inspectObject.getStr("id");
+ if (leftMap.get(inspectObjectId) != null) {
+ JsonUtils2.setJsonValueByPath(inspectObject, "target/cell".split("/"), leftMap.get(inspectObjectId).get("phaseId"));
+ JsonUtils2.setJsonValueByPath(inspectObject, "target/port".split("/"), leftMap.get(inspectObjectId).get("portId"));
+ }
+ if (rightMap.get(inspectObjectId) != null) {
+ JsonUtils2.setJsonValueByPath(inspectObject, "target/cell".split("/"), rightMap.get(inspectObjectId).get("phaseId"));
+ JsonUtils2.setJsonValueByPath(inspectObject, "target/port".split("/"), rightMap.get(inspectObjectId).get("portId"));
+ }
+ if ("10000".equals(inspectObjectId)) {
+ //inspectJsonArray.remove(inspectObject);
+ beginObject = inspectObject;
+ }
+ if ("20000".equals(inspectObjectId)) {
+ //inspectJsonArray.remove(inspectObject);
+ endObject = inspectObject;
+ }
+ }
+
+ if (endObject != null)
+ inspectJsonArray.remove(endObject);
+ if (beginObject != null)
+ inspectJsonArray.remove(beginObject);
+
+ for (int i = 0; i < phaseJsonArray.size(); i++) {
+ JSONObject phaseObject = (JSONObject) phaseJsonArray.get(i);
+ if ("custom-circle".equals(phaseObject.getStr("shape"))) {
+ Object xObject = JsonUtils2.getJsonValueByPath(phaseObject, "position/x".split("/"));
+ Object yObject = JsonUtils2.getJsonValueByPath(phaseObject, "position/y".split("/"));
+ int x = Convert.toInt(xObject.toString());
+ int y = Convert.toInt(yObject.toString());
+ if (x <= leftPhaseMaxX)
+ x = x + (inspectBeginX - leftPhaseMaxX);
+ else if (x >= rightPhaseMinX)
+ x = x + (inspectEndX - rightPhaseMinX);
+ y = y + (inspectY - phaseY);
+ JsonUtils2.setJsonValueByPath(phaseObject, "position/x".split("/"), x);
+ JsonUtils2.setJsonValueByPath(phaseObject, "position/y".split("/"), y);
+ }
+ }
+
+ for (int i = 0; i < phaseJsonArray.size(); i++) {
+ JSONObject phaseObject = (JSONObject) phaseJsonArray.get(i);
+ if ("edge".equals(phaseObject.getStr("shape"))) {
+ Object sourceId = JsonUtils2.getJsonValueByPath(phaseObject, "source/cell".split("/"));
+ Object targetId = JsonUtils2.getJsonValueByPath(phaseObject, "target/cell".split("/"));
+ if (leftPhaseMaxId.equals(sourceId) && rightPhaseMinId.equals(targetId)) {
+ phaseJsonArray.remove(phaseObject);
+ }
+ }
+ }
+ inspectJsonArray.addAll(phaseJsonArray);
+ jsonStr = inspectJsonObj.toString();
+ } else if (phaseDiagram != null) {
+ jsonStr = phaseDiagram.getContent();
+ } else if (inspectDiagram != null) {
+ jsonStr = inspectDiagram.getContent();
+ }
+
+ if (combineDiagram != null) {
+ combineDiagram.setContent(jsonStr);
+ baseDao.updateById(combineDiagram);
+ } else {
+ combineDiagram = new ProjectNetworkDiagram();
+ combineDiagram.setProjectId(networkDiagram.getProjectId());
+ combineDiagram.setDiagramId(100L);
+ combineDiagram.setContent(jsonStr);
+ baseDao.insert(combineDiagram);
+ }
+ return combineDiagram;
+ }*/
@Transactional(rollbackFor = Exception.class)
public Result simulate(SimulatAssess simulatAssess) {
@@ -144,21 +705,21 @@
command += " -ip " + redisHost + " -port " + redisPort;
command += " -taskType " + RELIA_SIM_TASK_TYPE_SIMULATION + " -taskId " + simulatAssess.getId().toString();
logger.info("cmd鍛戒护涓猴細" + command);
- if(System.getProperty("os.name").toLowerCase().indexOf("windows") > -1){
+ if (System.getProperty("os.name").toLowerCase().indexOf("windows") > -1) {
process = Runtime.getRuntime().exec(new String[]{"cmd", "/c", command});
- }else if(System.getProperty("os.name").toLowerCase().indexOf("linux") > -1){
+ } else if (System.getProperty("os.name").toLowerCase().indexOf("linux") > -1) {
process = Runtime.getRuntime().exec(new String[]{"/bin/sh", "-c", command});
- }else{
+ } else {
throw new Exception("鏆備笉鏀寔璇ユ搷浣滅郴缁燂紝杩涜鍚姩绠楁硶搴撹绠楋紒");
}
is = process.getInputStream();
// 浠ュ懡浠よ鏂瑰紡璋冪敤绠楁硶搴撴椂锛屾帴鍙ｇ害瀹氳繑鍥炵殑缁撴灉鏄痷tf-8缂栫爜
- br = new BufferedReader(new InputStreamReader(is,"utf-8"));
+ br = new BufferedReader(new InputStreamReader(is, "utf-8"));
String line = br.readLine();
logger.info("绠楁硶搴撹繑鍥炵粨鏋滐細" + line);
// int exitCode = process.waitFor(); // 寮傛鏂瑰紡锛屼笉绛夊緟绠楁硶搴撹绠楀畬姣曪紝鎵�浠ヨ娉ㄩ噴鎺夎琛�
if (line != null) {
- ReliaSimLibResult rtn = JSONObject.parseObject(line, ReliaSimLibResult.class);
+ ReliaSimLibResult rtn = com.alibaba.fastjson.JSONObject.parseObject(line, ReliaSimLibResult.class);
if ("0".equals(rtn.getCode())) {
logger.info("鍚姩绠楁硶搴撴垚鍔熴��");
result = Result.ok();
@@ -194,12 +755,12 @@
private void setParamToRedis(SimulatAssess simulatAssess) {
String key = simulatAssess.getId().toString() + RELIA_SIM_TASK_TYPE_SIMULATION;
logger.info("redis key锛�" + key);
- JSONObject jsonObject = new JSONObject();
+ com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject();
jsonObject.put("xmlfile", simulatAssess.getXml());
// 浠跨湡娆℃暟
jsonObject.put("simulate_times", simulatAssess.getSimulatFrequency());
// 閲囨牱鍛ㄦ湡
- jsonObject.put("timeslice", simulatAssess.getSamplPeriod()/60.0); // 鍗曚綅缁熶竴鎹㈢畻涓哄皬鏃�
+ jsonObject.put("timeslice", simulatAssess.getSamplPeriod() / 60.0); // 鍗曚綅缁熶竴鎹㈢畻涓哄皬鏃�
jsonObject.put("result_home", resultHome);
jsonObject.put("seed", 1000);
redisTemplate.opsForValue().set(key, jsonObject.toJSONString());
@@ -211,6 +772,9 @@
List<ParamData> paramDataList = paramDataDao.getDeviceParams(productId);
Long taskId = simulatAssess.getTaskModelId();
Task task = taskService.get(taskId);
+ List<TaskBinoParam> binoParams = taskBinoParamDao.getBinoParams(taskId);
+ List<TaskRepairParam> taskRepairParams = taskRepairParamDao.getTaskRepairParams(taskId);
+
// 1. 璁＄畻鍚勪换鍔￠樁娈电殑杩愯鏃堕暱
List<TaskPhase> taskPhases = calcTaskPhaseDuration(task);
// 2. 璁＄畻鍚勫伐鍐垫ā鍨嬬殑杩愯鏃堕暱
@@ -232,6 +796,8 @@
productList,
paramDataList,
taskPhaseModelAll,
+ binoParams,
+ taskRepairParams,
root,
failureModels, repairModels);
addFailureModelsTag(failureModels, root);
@@ -335,7 +901,7 @@
}
private void addRepairModelsTag(List<RepairModel> repairModels,
- Element root) {
+ Element root) {
Element ele = null;
Element repairModelsTag = root.addElement("repair_models");
for (RepairModel repairModel : repairModels) {
@@ -360,7 +926,7 @@
}
private void calcTaskPhaseModelDuration(TaskPhase taskPhase,
- List<TaskPhaseModel> taskPhaseModelAll) {
+ List<TaskPhaseModel> taskPhaseModelAll) {
List<TaskPhaseModel> taskPhaseModels = taskPhaseModelDao.getListByPhaseId(taskPhase.getId());
double totalRate = taskPhaseModels.stream().mapToDouble(TaskPhaseModel::getOperatConditDurationRate).sum();
double sum = 0.0;
@@ -371,7 +937,8 @@
taskPhaseModelAll.add(taskPhaseModel);
}
// 鎶婇浂澶磋ˉ鍒版渶鍚庝竴涓伐鍐垫ā鍨�
- taskPhaseModels.get(taskPhaseModels.size()-1).setOperatConditDuration(taskPhase.getPhaseDuration() - sum);
+ double duration = taskPhaseModels.get(taskPhaseModels.size() - 1).getOperatConditDuration();
+ taskPhaseModels.get(taskPhaseModels.size() - 1).setOperatConditDuration(duration + taskPhase.getPhaseDuration() - sum);
}
private List<TaskPhase> calcTaskPhaseDuration(Task task) {
@@ -384,7 +951,8 @@
sum += duration;
}
// 鎶婇浂澶磋ˉ鍒版渶鍚庝竴涓樁娈�
- taskPhases.get(taskPhases.size()-1).setPhaseDuration(task.getTaskDuration() - sum);
+ double duration = taskPhases.get(taskPhases.size() - 1).getPhaseDuration();
+ taskPhases.get(taskPhases.size() - 1).setPhaseDuration(duration + task.getTaskDuration() - sum);
return taskPhases;
}
@@ -393,6 +961,8 @@
List<XhProductModel> productList,
List<ParamData> paramDataList,
List<TaskPhaseModel> taskPhaseModelAll,
+ List<TaskBinoParam> binoParams,
+ List<TaskRepairParam> taskRepairParams,
Element root,
List<FailureModel> failureModels,
List<RepairModel> repairModels) {
@@ -411,22 +981,28 @@
"end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0);
ModelNode computerNode = modelNodeAndVnodeList.stream().filter(item ->
endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- node2DOM(productList,
+ node2DOM(productId,
+ productList,
paramDataList,
gkModelsAssembled,
algorithmList,
modelNodeAndVnodeList,
+ binoParams,
+ taskRepairParams,
computerNode, modelTag,
failureModels, repairModels);
}
}
// 閫掑綊鍑芥暟
- private void node2DOM(List<XhProductModel> productList,
+ private void node2DOM(Long productId,
+ List<XhProductModel> productList,
List<ParamData> paramDataList,
List<OperatConditModel> gkModelsAssembled,
List<Algorithm> algorithmList,
List<ModelNode> modelNodeAndVnodeList,
+ List<TaskBinoParam> binoParams,
+ List<TaskRepairParam> taskRepairParams,
ModelNode node,
Element parent,
List<FailureModel> failureModels,
@@ -435,7 +1011,7 @@
Long dataId = node.getDataId();
XhProductModel product = productList.stream().filter(item ->
dataId.equals(item.getId())).collect(Collectors.toList()).get(0);
- if ("3,4,10".equals(product.getProductType())) {
+ if ("3,4,10".contains(product.getProductType())) {
// 绯荤粺銆佸垎绯荤粺銆佽櫄鍗曞厓
OperatConditModel gkModel = gkModelsAssembled.stream().filter(item ->
dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
@@ -445,11 +1021,14 @@
"end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0);
ModelNode computerNode = modelNodeAndVnodeListSub.stream().filter(item ->
endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- node2DOM(productList,
+ node2DOM(product.getId(),
+ productList,
paramDataList,
gkModelsAssembled,
algorithmListSub,
modelNodeAndVnodeListSub,
+ binoParams,
+ taskRepairParams,
computerNode, parent,
failureModels, repairModels);
} else if ("5".equals(product.getProductType())) {
@@ -459,11 +1038,13 @@
Element nodeTag = parent.addElement("node");
nodeTag.addAttribute("name", dataId.toString());
nodeTag.addAttribute("type", "node");
+
FailureModel failureModel = new FailureModel();
failureModel.setId(UUIDUtil.generateId());
failureModel.setType(FailureModel.TYPE_EXP);
failureModel.setParam1(1.0 / paramData.getTaskMtbcfRegulate());
failureModels.add(failureModel);
+
Element failureTag = nodeTag.addElement("failure_model");
failureTag.addAttribute("name", failureModel.getId().toString());
if (1 == paramData.getRepairable()) {
@@ -481,7 +1062,11 @@
Algorithm algo = algorithmList.stream().filter(item ->
node.getId().equals(item.getId())).collect(Collectors.toList()).get(0);
Element element = parent.addElement("logic");
- element.addAttribute("name", algo.getId().toString());
+ if (null == productId) {
+ element.addAttribute("name", algo.getId().toString());
+ } else {
+ element.addAttribute("name", productId.toString());
+ }
if ("series".equals(algo.getAlgorithmType())) {
element.addAttribute("type", "series");
} else if ("parallel".equals(algo.getAlgorithmType())) {
@@ -496,16 +1081,42 @@
}
String[] computerNodeListStr = algo.getComputerList().split(",");
for (String nodeStr : computerNodeListStr) {
- ModelNode md = modelNodeAndVnodeList.stream().filter(item ->
+ ModelNode mn = modelNodeAndVnodeList.stream().filter(item ->
nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- node2DOM(productList,
+ node2DOM(null,
+ productList,
paramDataList,
gkModelsAssembled,
algorithmList,
modelNodeAndVnodeList,
- md, element,
+ binoParams,
+ taskRepairParams,
+ mn, element,
failureModels, repairModels);
}
}
}
+
+ private FailureModel createFailureModel(ParamData paramData) {
+ FailureModel failureModel = new FailureModel();
+ failureModel.setId(UUIDUtil.generateId());
+ switch (paramData.getReliabDistribType()) {
+ case 1:
+ failureModel.setType(FailureModel.TYPE_EXP);
+ failureModel.setParam1(1.0 / paramData.getTaskMtbcfRegulate());
+ break;
+ case 2:
+ failureModel.setType(FailureModel.TYPE_WBL);
+ failureModel.setParam2(paramData.getTaskMtbcfOtherParams2());
+ failureModel.setParam3(paramData.getTaskMtbcfOtherParams3());
+ break;
+ case 3:
+ failureModel.setType(FailureModel.TYPE_BIN);
+ break;
+ default:
+ break;
+ }
+
+ return failureModel;
+ }
}
--
Gitblit v1.9.1