From 3d72db70fcb406e02b283c4b624e8282ed301422 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 14 十月 2024 10:09:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 653 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 346 insertions(+), 307 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 b85272a..8609219 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
@@ -14,16 +14,17 @@
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.XhProductModel;
-import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
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.*;
+import com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto;
+import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResultDto;
+import com.zt.life.modules.mainPart.taskReliability.dto.TaskPhaseConstraintDto;
import com.zt.life.modules.mainPart.taskReliability.model.*;
import com.zt.life.modules.mainPart.utils.GetStringSpace;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
@@ -74,8 +75,6 @@
@Autowired
private TaskService taskService;
@Autowired
- private XhProductModelService xhProductModelService;
- @Autowired
private SimulatAssessTaskPhaseModelService simulatAssessTaskPhaseModelService;
@Autowired
private TaskPhaseDao taskPhaseDao;
@@ -108,6 +107,7 @@
String templetStr = "{\"cells\":[]}";
Map<String, JSONObject> templetsMap = new HashMap<>();
Map<String, String> templetsStrMap = new HashMap<>();
+ Map<Integer, String> templetsStrMap2 = new HashMap<>();
private JSONObject xmlJSONObj;
@@ -151,7 +151,10 @@
return baseDao.getChildren(productId, taskId);
}
- public String getTimeDiagram(Long productId, Long taskId, Long fzId) {
+ public TimeDiagramDto getTimeDiagram(Long productId, Long taskId, Long fzId, double smallWidth, double minPointNum) {
+ TimeDiagramDto timeDiagramDto = new TimeDiagramDto();
+ timeDiagramDto.setSmallWidth(smallWidth);
+ timeDiagramDto.setMinPointNum(minPointNum);
String filePath = path + "/" + fzId + "/" + "status.json";
ObjectMapper mapper = new ObjectMapper();
String jsonStr = null;
@@ -179,76 +182,82 @@
JSONObject jsonObject = new JSONObject(templetStr);
JSONArray jsonArray = jsonObject.getJSONArray("cells");
- this.getPetsInfo();
+ JSONObject jsonObject3 = new JSONObject(templetStr);
+ JSONArray jsonArray3 = jsonObject3.getJSONArray("cells");
+
+ String modelStr2 = this.getPetsInfo();
double x1 = 0;
double x2 = 0;
- int y = 0;
+ int y = -10;
int groupY = 0;
int spaceHeight = 20;
int groupHeight = 20;
double pointNumPerHour = 60.0 / simulatAssess.getSamplPeriod();
+
//鏃跺簭鍥剧嚎
+ List<List<TimeDiagramStatusDto>> lineArray = new ArrayList();
for (int i = 0; i < list.size(); i++) {
+ List<TimeDiagramStatusDto> statusDtoList = new ArrayList<>();
x1 = 0;
groupY = groupHeight * i;
ProductStatusDto dto = list.get(i);
+ double startTime = 0.0;
+ int status2 = 5;
for (StatusDto status : dto.getStatusList()) {
switch (status.getStatus()) {
case "O":
y = groupY;
+ status2 = 5;
break;
case "F":
y = groupY;// + spaceHeight;
+ status2 = 1;
break;
case "I":
+ y = groupY;// + spaceHeight;
+ status2 = 3;
+ break;
case "S":
+ y = groupY;// + spaceHeight;
+ status2 = 2;
+ break;
case "M":
y = groupY;// + 2 * spaceHeight;
+ status2 = 4;
break;
}
x2 = x1 + status.getTimes() * pointNumPerHour + 5;
+ statusDtoList.add(new TimeDiagramStatusDto(x1, x2, status2));
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, "data/startTimes".split("/"), String.format("%.1f", startTime));
+ JsonUtils2.setJsonValueByPath(lineJson, "data/endTimes".split("/"), String.format("%.1f", startTime + status.getTimes()));
JsonUtils2.setJsonValueByPath(lineJson, "id".split("/"), UUIDUtil.generateId().toString());
+ startTime = startTime + status.getTimes();
x1 = x2 - 5;
jsonArray.add(lineJson);
}
+ lineArray.add(statusDtoList);
+
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);
+ jsonArray3.add(textJson);
}
//闃舵妯″瀷鍙婂埢搴�
x1 = 0;
x2 = 0;
- double y1 = -100;
- y = -70;
- double y2 = -50;
+ double y1 = -60;
+ y = -40;
+ double y2 = -30;
JSONObject modelJson = new JSONObject(templetsStrMap.get("model"));
- setlineXy(modelJson, 2, y1, 2, y2, null);
+ setlineXy(modelJson, 1, y1, 1, y2, null);
jsonArray.add(modelJson);
double totalHours = 0;
for (int i = 0; i < modelDtoList.size(); i++) {
@@ -272,25 +281,28 @@
modelName = modelRbd.getModelName();
modelId = modelRbd.getId().toString();
}
- Map<String, Integer> mapSpace = GetStringSpace.getStringSpaceSize(modelName, null, 18);
+ Map<String, Integer> mapSpace = GetStringSpace.getStringSpaceSize(modelName, null, 12);
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, "attrs/label/textWrap/text".split("/"), "妯″瀷" + (i + 1));
+ JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/modelName".split("/"), modelName);
- JsonUtils2.setJsonValueByPath(textJson, "size/width".split("/"), mapSpace.get("width") + 20);
+ JsonUtils2.setJsonValueByPath(textJson, "size/width".split("/"), mapSpace.get("width") + 10);
- double x11 = x1 + ((gkPoint - mapSpace.get("width") - 20) / 2);
+ double x11 = x1 + ((gkPoint - mapSpace.get("width") + 12) / 2);
JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x11);
- JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y1);
+ JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y1 - 10);
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;
+ //鍒诲害
+ Integer curPointHour = 100, periodHour = 100;
while (curPointHour < totalHours) {
JSONObject modelJson4 = new JSONObject(templetsStrMap.get("model"));
double x = curPointHour * pointNumPerHour;
@@ -306,15 +318,128 @@
double x11 = x - mapSpace.get("width") / 2 - 5;
JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x11);
- JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y2);
+ JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y2 - 10);
jsonArray.add(textJson);
curPointHour += periodHour;
}
+ timeDiagramDto.setTotalWidth(x2);
+ double pointRate = timeDiagramDto.getTotalWidth() / timeDiagramDto.getSmallWidth();
- return jsonObject.toString();
+ List<TimeDiagramStatusDto> subStatusDtoList = new ArrayList<>();
+ int lastStatus = 5;
+ boolean isFirst = true;
+ x1 = 0;
+ for (double i = 0; i < timeDiagramDto.getSmallWidth(); i = i + timeDiagramDto.getMinPointNum()) {
+ int netStatus = 5;
+ for (int j = 1; j < list.size(); j++) {
+ if (i >= 448) {
+ System.out.println(111);
+ }
+ int tmpStatus = getPointStatus(lineArray.get(j), i * pointRate, (i + timeDiagramDto.getMinPointNum()) * pointRate - 1);
+ if (tmpStatus < netStatus) {
+ netStatus = tmpStatus;
+ }
+ }
+ if (!isFirst) {
+ if (lastStatus != netStatus) {
+ subStatusDtoList.add(new TimeDiagramStatusDto(x1, x2, lastStatus));
+ lastStatus = netStatus;
+ x1 = i;
+ }
+ } else {
+ lastStatus = netStatus;
+ isFirst = false;
+ }
+ x2 = i + timeDiagramDto.getMinPointNum() - 1;
+ }
+ subStatusDtoList.add(new TimeDiagramStatusDto(x1, x2, lastStatus));
+
+ List<TimeDiagramStatusDto> parentStatusDtoList = new ArrayList<>();
+ lastStatus = 5;
+ isFirst = true;
+ x1 = 0;
+ for (double i = 0; i < timeDiagramDto.getSmallWidth(); i = i + timeDiagramDto.getMinPointNum()) {
+ if (i >= 448) {
+ System.out.println(111);
+ }
+ int netStatus = getPointStatus(lineArray.get(0), i * pointRate, (i + timeDiagramDto.getMinPointNum()) * pointRate - 1);
+ if (!isFirst) {
+ if (lastStatus != netStatus) {
+ parentStatusDtoList.add(new TimeDiagramStatusDto(x1, x2, lastStatus));
+ lastStatus = netStatus;
+ x1 = i;
+ }
+ } else {
+ lastStatus = netStatus;
+ isFirst = false;
+ }
+ x2 = i + timeDiagramDto.getMinPointNum() - 1;
+ }
+ parentStatusDtoList.add(new TimeDiagramStatusDto(x1, x2, lastStatus));
+
+ JSONObject jsonObject2 = new JSONObject(modelStr2);
+ JSONArray jsonArray2 = jsonObject2.getJSONArray("cells");
+ List<List<TimeDiagramStatusDto>> smallStatusDtoList = new ArrayList<>();
+ smallStatusDtoList.add(parentStatusDtoList);
+ smallStatusDtoList.add(subStatusDtoList);
+
+ y = 10;
+ for (int i = 0; i < smallStatusDtoList.size(); i++) {
+ for (TimeDiagramStatusDto status : smallStatusDtoList.get(i)) {
+ JSONObject lineJson = new JSONObject(templetsStrMap2.get(status.getStatus()));
+ setlineXy(lineJson, status.getX1(), y, status.getX2() + 5, y, "");
+ JsonUtils2.setJsonValueByPath(lineJson, "data/status".split("/"), status.getStatus());
+ JsonUtils2.setJsonValueByPath(lineJson, "id".split("/"), UUIDUtil.generateId().toString());
+ jsonArray2.add(lineJson);
+ }
+ y = y + 25;
+ }
+
+ //鍥句緥
+ int spaceWitdth = 80;
+ x1 = 0;
+ x2 = spaceWitdth - 11;
+ y = 60;
+ 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);
+ jsonArray2.add(f);
+ }
+ timeDiagramDto.setDiagramJson(jsonObject.toString());
+ timeDiagramDto.setSmallDiagramJson(jsonObject2.toString());
+ timeDiagramDto.setTextDiagramJson(jsonObject3.toString());
+
+ return timeDiagramDto;
}
+
+ private int getPointStatus(List<TimeDiagramStatusDto> dtoList, double x1, double x2) {
+ int status = 5;
+ boolean findStart = false;
+ for (int i = 0; i < dtoList.size(); i++) {
+ if (x2 <= dtoList.get(i).getX1()) {
+ break;
+ }
+
+ if (!findStart) {
+ if (dtoList.get(i).getX1() >= x1 && x1 <= dtoList.get(i).getX2()) {
+ status = dtoList.get(i).getStatus();
+ findStart = true;
+ }
+ }
+
+ if (dtoList.get(i).getX2() >= x2) {
+ if (dtoList.get(i).getStatus() < status)
+ status = dtoList.get(i).getStatus();
+ }
+ }
+ return status;
+ }
+
public void setlineXy(JSONObject lineJson, double x1, double y1, double x2, double y2, String text) {
JsonUtils2.setJsonValueByPath(lineJson, "source/x".split("/"), x1);
@@ -327,12 +452,14 @@
}
}
- public void getPetsInfo() {
+ public String getPetsInfo() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("projectId", 10000);
params.put("diagramId", 10000);
+ String modelStr2 = "";
List<TimeDiagram> list_style = baseDao.getTimeDiagram(params);
if (list_style.size() > 0) {
+ modelStr2 = list_style.get(0).getContent2();
String modelStr = list_style.get(0).getContent();
JSONObject modelJson = new JSONObject(modelStr);
JSONArray modelJsonArray = modelJson.getJSONArray("cells");
@@ -346,22 +473,27 @@
if ("杩愯".equals(nodeMarker)) {
templetsMap.put("O", jsonObject);
templetsStrMap.put("O", jsonObject.toString());
+ templetsStrMap2.put(5, jsonObject.toString());
}
if ("鏁呴殰".equals(nodeMarker)) {
templetsMap.put("F", jsonObject);
templetsStrMap.put("F", jsonObject.toString());
+ templetsStrMap2.put(1, jsonObject.toString());
}
if ("绌洪棽".equals(nodeMarker)) {
templetsMap.put("I", jsonObject);
templetsStrMap.put("I", jsonObject.toString());
+ templetsStrMap2.put(3, jsonObject.toString());
}
if ("澶囦唤".equals(nodeMarker)) {
templetsMap.put("S", jsonObject);
templetsStrMap.put("S", jsonObject.toString());
+ templetsStrMap2.put(2, jsonObject.toString());
}
if ("鏈敤".equals(nodeMarker)) {
templetsMap.put("M", jsonObject);
templetsStrMap.put("M", jsonObject.toString());
+ templetsStrMap2.put(4, jsonObject.toString());
}
if ("妯″瀷".equals(nodeMarker)) {
JsonUtils2.setJsonValueByPath(tmpJSONObject, "attrs/text/text".split("/"), "");
@@ -400,6 +532,7 @@
}
}
}
+ return modelStr2;
}
public List<ProductStatusDto> getStatusData(Long productId, Long taskId) {
@@ -472,217 +605,15 @@
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) {
Result result = null;
// 1. 妫�鏌ユā鍨嬪畬鏁存��
- List<TaskModelCheckResult> chkResult = taskService.checkTaskModel(simulatAssess.getProductId(),
+ List<TaskModelCheckResultDto> chkResult = taskService.checkTaskModel(simulatAssess.getProductId(),
simulatAssess.getTaskModelId());
if (chkResult.size() > 0) {
result = Result.error("妯″瀷涓嶅畬鏁达紝璇锋鏌ユā鍨嬪畾涔夊強鍙傛暟閰嶇疆銆�");
+// result = Result.ok(chkResult);
return result;
}
@@ -781,12 +712,12 @@
private void assembleModelXml(SimulatAssess simulatAssess) {
Long productId = simulatAssess.getProductId();
+ XhProductModel product = xhProductModelDao.getById(productId);
List<XhProductModel> productList = xhProductModelDao.getByShipId(productId);
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);
@@ -805,12 +736,14 @@
Element root = document.addElement("des");
root.addAttribute("name", "General system");
addTasksTag(taskPhaseModelAll, root);
- addModelsTag(productId,
+ addModelsTag(taskId,
+ productId,
+ product.getName(),
+ product.getNamePath(),
productList,
paramDataList,
taskPhaseModelAll,
binoParams,
- taskRepairParams,
root,
failureModels, repairModels);
addFailureModelsTag(failureModels, root);
@@ -833,7 +766,7 @@
if (xmlWriter != null) xmlWriter.close();
}
// XML瀛樼洏
- update(simulatAssess);
+ insert(simulatAssess);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("缁勮绠楁硶搴撲豢鐪熻绠楃敤妯″瀷XML澶辫触: " + e.getMessage());
@@ -858,7 +791,8 @@
satpm.setPhaseName(phase.getPhaseName());
satpm.setPhaseDurationRate(phase.getPhaseDurationRate());
satpm.setPhaseDuration(phase.getPhaseDuration());
- satpm.setPhaseConstraint(null); // TODO
+ satpm.setPhaseConstraint(tpm.getPhaseConstraints().stream().map(item ->
+ item.getProductId().toString()).collect(Collectors.joining(",")));
satpm.setGkId(tpm.getOperatConditId());
satpm.setGkName(tpm.getOperatConditName());
satpm.setGkDurationRate(tpm.getOperatConditDurationRate());
@@ -868,13 +802,18 @@
}
}
- private void addTasksTag(List<TaskPhaseModel> taskPhaseModelAll,
- Element root) {
+ public void addTasksTag(List<TaskPhaseModel> taskPhaseModelAll,
+ Element root) {
Element tasksTag = root.addElement("tasks");
for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
Element taskTag = tasksTag.addElement("task");
taskTag.addAttribute("duration", String.valueOf(taskPhaseModel.getOperatConditDuration()));
taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
+ if (null != taskPhaseModel.getPhaseConstraints() && taskPhaseModel.getPhaseConstraints().size() > 0) {
+ taskTag.addAttribute("NAM",
+ taskPhaseModel.getPhaseConstraints().stream().map(item ->
+ item.getProductId().toString()).collect(Collectors.joining(",")));
+ }
}
}
@@ -906,7 +845,7 @@
ele.addAttribute("value", String.valueOf(failureModel.getParam3()));
break;
case FailureModel.TYPE_FIX:
- ele = failureModelTag.addElement("unreliability");
+ ele = failureModelTag.addElement("reliability");
ele.addAttribute("value", String.valueOf(failureModel.getParam1()));
break;
default:
@@ -940,8 +879,8 @@
}
}
- private void calcTaskPhaseModelDuration(TaskPhase taskPhase,
- List<TaskPhaseModel> taskPhaseModelAll) {
+ public void calcTaskPhaseModelDuration(TaskPhase taskPhase,
+ List<TaskPhaseModel> taskPhaseModelAll) {
List<TaskPhaseModel> taskPhaseModels = taskPhaseModelDao.getListByPhaseId(taskPhase.getId());
double totalRate = taskPhaseModels.stream().mapToDouble(TaskPhaseModel::getOperatConditDurationRate).sum();
double sum = 0.0;
@@ -949,6 +888,10 @@
double duration = taskPhase.getPhaseDuration() * taskPhaseModel.getOperatConditDurationRate() / totalRate;
taskPhaseModel.setOperatConditDuration(duration);
sum += duration;
+
+ List<TaskPhaseConstraintDto> taskRepairConstraints = taskRepairParamDao.getTaskRepairConstraints(taskPhase.getTaskId(),
+ taskPhaseModel.getPhaseId(), taskPhaseModel.getOperatConditId());
+ taskPhaseModel.setPhaseConstraints(taskRepairConstraints);
taskPhaseModelAll.add(taskPhaseModel);
}
// 鎶婇浂澶磋ˉ鍒版渶鍚庝竴涓伐鍐垫ā鍨�
@@ -956,7 +899,7 @@
taskPhaseModels.get(taskPhaseModels.size() - 1).setOperatConditDuration(duration + taskPhase.getPhaseDuration() - sum);
}
- private List<TaskPhase> calcTaskPhaseDuration(Task task) {
+ public List<TaskPhase> calcTaskPhaseDuration(Task task) {
List<TaskPhase> taskPhases = taskPhaseDao.getListByTaskId(task.getId());
double totalRate = taskPhases.stream().mapToDouble(TaskPhase::getPhaseDurationRate).sum();
double sum = 0.0;
@@ -972,12 +915,14 @@
return taskPhases;
}
- private void addModelsTag(Long productId,
+ private void addModelsTag(Long taskId,
+ Long productId,
+ String productName,
+ String productNamePath,
List<XhProductModel> productList,
List<ParamData> paramDataList,
List<TaskPhaseModel> taskPhaseModelAll,
List<TaskBinoParam> binoParams,
- List<TaskRepairParam> taskRepairParams,
Element root,
List<FailureModel> failureModels,
List<RepairModel> repairModels) {
@@ -996,28 +941,36 @@
"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(productId,
+ node2DOM(taskId,
+ taskPhaseModel,
+ gkModelTop.getModelId(),
+ productId,
+ productName,
+ productNamePath,
productList,
paramDataList,
gkModelsAssembled,
algorithmList,
modelNodeAndVnodeList,
binoParams,
- taskRepairParams,
computerNode, modelTag,
failureModels, repairModels);
}
}
// 閫掑綊鍑芥暟
- private void node2DOM(Long productId,
+ private void node2DOM(Long taskId,
+ TaskPhaseModel taskPhaseModel,
+ Long modelId,
+ Long productId,
+ String productName,
+ String productNamePath,
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,
@@ -1036,37 +989,57 @@
"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(product.getId(),
+ node2DOM(taskId,
+ taskPhaseModel,
+ gkModel.getModelId(),
+ product.getId(),
+ product.getName(),
+ product.getNamePath(),
productList,
paramDataList,
gkModelsAssembled,
algorithmListSub,
modelNodeAndVnodeListSub,
binoParams,
- taskRepairParams,
computerNode, parent,
failureModels, repairModels);
} else if ("5".equals(product.getProductType())) {
// 璁惧
- ParamData paramData = paramDataList.stream().filter(item ->
- dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
Element nodeTag = parent.addElement("node");
nodeTag.addAttribute("name", dataId.toString());
+ nodeTag.addAttribute("real_name", product.getName());
+ nodeTag.addAttribute("name_path", product.getNamePath());
nodeTag.addAttribute("type", "node");
- FailureModel failureModel = new FailureModel();
- failureModel.setId(UUIDUtil.generateId());
- failureModel.setType(FailureModel.TYPE_EXP);
- failureModel.setParam1(1.0 / paramData.getTaskMtbcfRegulate());
+ ParamData paramData = paramDataList.stream().filter(item ->
+ dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
+ Double ratio = paramData.getTaskMtbcfOperatingRatio();
+ if (null != ratio && ratio > 0) {
+ // 闂存柇鍨嬭澶囩殑澶勭悊
+ double cycon = taskPhaseModel.getOperatConditDuration() * ratio;
+ double cycdown = taskPhaseModel.getOperatConditDuration() - cycon;
+ nodeTag.addAttribute("cycon", String.valueOf(cycon));
+ nodeTag.addAttribute("cycdown", String.valueOf(cycdown));
+ }
+ TaskBinoParam taskBinoParam = null;
+ if (3 == paramData.getReliabDistribType()) {
+ // 浜岄」鍒嗗竷澶勭悊
+ taskBinoParam = binoParams.stream()
+ .filter(item -> taskId.equals(item.getTaskId()))
+ .filter(item -> taskPhaseModel.getPhaseId().equals(item.getPhaseId()))
+ .filter(item -> taskPhaseModel.getOperatConditId().equals(item.getOperatConditId()))
+ .filter(item -> modelId.equals(item.getModelId()))
+ .filter(item -> dataId.equals(item.getProductId()))
+ .collect(Collectors.toList()).get(0);
+ }
+ FailureModel failureModel = createFailureModel(paramData, taskBinoParam);
failureModels.add(failureModel);
-
Element failureTag = nodeTag.addElement("failure_model");
failureTag.addAttribute("name", failureModel.getId().toString());
+
if (1 == paramData.getRepairable()) {
- RepairModel repairModel = new RepairModel();
- repairModel.setId(UUIDUtil.generateId());
- repairModel.setType(RepairModel.TYPE_EXP);
- repairModel.setParam1(1.0 / paramData.getRepairMttcr());
+ // 鍙淮淇�
+ RepairModel repairModel = createRepairModel(paramData);
repairModels.add(repairModel);
Element repairTag = nodeTag.addElement("repair_model");
repairTag.addAttribute("name", repairModel.getId().toString());
@@ -1081,6 +1054,8 @@
element.addAttribute("name", algo.getId().toString());
} else {
element.addAttribute("name", productId.toString());
+ element.addAttribute("real_name", productName);
+ element.addAttribute("name_path", productNamePath);
}
if ("series".equals(algo.getAlgorithmType())) {
element.addAttribute("type", "series");
@@ -1091,6 +1066,7 @@
element.addAttribute("k", algo.getVoteNum().toString());
} else if ("switch".equals(algo.getAlgorithmType())) {
element.addAttribute("type", "standby");
+ element.addAttribute("k", algo.getVoteNum().toString());
} else if ("bridge".equals(algo.getAlgorithmType())) {
element.addAttribute("type", "bridge");
}
@@ -1098,35 +1074,52 @@
for (String nodeStr : computerNodeListStr) {
ModelNode mn = modelNodeAndVnodeList.stream().filter(item ->
nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- node2DOM(null,
+ node2DOM(taskId,
+ taskPhaseModel,
+ modelId,
+ null,
+ null,
+ null,
productList,
paramDataList,
gkModelsAssembled,
algorithmList,
modelNodeAndVnodeList,
binoParams,
- taskRepairParams,
mn, element,
failureModels, repairModels);
}
}
}
- private FailureModel createFailureModel(ParamData paramData) {
+ private FailureModel createFailureModel(ParamData paramData, TaskBinoParam taskBinoParam) {
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);
+ // 浜岄」鍒嗗竷
+ if (taskBinoParam.getSimulatTimes().intValue() == taskBinoParam.getSuccessTimes().intValue()) {
+ // 鐩哥瓑鍒欎负鎴愯触鍨�
+ failureModel.setType(FailureModel.TYPE_FIX);
+ failureModel.setParam1(taskBinoParam.getSuccessRate());
+ } else {
+ // 浜岄」鍒嗗竷
+ failureModel.setType(FailureModel.TYPE_BIN);
+ failureModel.setParam1(taskBinoParam.getSuccessRate());
+ failureModel.setParam2(taskBinoParam.getSimulatTimes());
+ failureModel.setParam3(taskBinoParam.getSuccessTimes());
+ }
break;
default:
break;
@@ -1135,23 +1128,52 @@
return failureModel;
}
+ private RepairModel createRepairModel(ParamData paramData) {
+ RepairModel repairModel = new RepairModel();
+ repairModel.setId(UUIDUtil.generateId());
+ switch (paramData.getRepairDistribType()) {
+ case 1:
+ // 鎸囨暟鍒嗗竷
+ repairModel.setType(FailureModel.TYPE_EXP);
+ repairModel.setParam1(1.0 / paramData.getRepairMttcr());
+ break;
+ case 2:
+ // 濞佸竷灏斿垎甯�
+ repairModel.setType(FailureModel.TYPE_WBL);
+ repairModel.setParam2(paramData.getRepairMttcrOtherParams2());
+ repairModel.setParam3(paramData.getRepairMttcrOtherParams3());
+ break;
+ case 3:
+ // 浜岄」鍒嗗竷锛堢淮淇病鏈夛級
+ break;
+ default:
+ break;
+ }
+
+ return repairModel;
+ }
+
public List<WeakDto> getReliabilityWeakness(Long fzId, Long taskId, Long productId) {
String filePath = path + "/" + fzId + "/" + "result.xml";
List<WeakDto> list = new ArrayList<>();
Map<Long, WeakDto> map = new HashMap<>();
- String xml = null;
+ String xml;
InputStream in = null;
try {
in = new FileInputStream(filePath);
xml = IOUtils.toString(in);
} catch (IOException e) {
e.printStackTrace();
+ throw new RenException("鏂囦欢涓嶅瓨鍦ㄦ垨鑰呮枃浠舵墦涓嶅紑");
} finally {
try {
- in.close();
+ if (in != null) {
+ in.close();
+ }
} catch (IOException e) {
e.printStackTrace();
}
+
}
List<WeakDto> productList = baseDao.getProductList(taskId, productId);
@@ -1162,39 +1184,45 @@
JSONArray jsonArray = xmlJSONObj.getJSONObject("ResultNodes").getJSONArray("ResultNode");
for (int i = 0; i < jsonArray.size(); i++) {
WeakDto data = new WeakDto();
- Long productId1 = null;
+ Long productId1;
Object nameValue = jsonArray.getJSONObject(i).get("name");
if (nameValue instanceof Long) {
productId1 = (Long) nameValue;
- WeakDto weakDto = map.get(productId1);
- Double mtbfTime = null;
+ if (map.get(productId1) != null) {
+ WeakDto weakDto = map.get(productId1);
+ Double mtbfTime = null;
- Double mtbf = (Double) jsonArray.getJSONObject(i).get("mttf");
- Double mttr = (Double) jsonArray.getJSONObject(i).get("mttr");
- Double msr = (Double) jsonArray.getJSONObject(i).get("msr");
+ Double mtbf = (Double) jsonArray.getJSONObject(i).get("mttf");
+ Double mttr = (Double) jsonArray.getJSONObject(i).get("mttr");
+ Double msr = (Double) jsonArray.getJSONObject(i).get("msr");
- data.setMtbf(mtbf);
- data.setMttr(mttr);
- data.setMsr(msr);
+ data.setMtbf(mtbf);
+ data.setMttr(mttr);
+ data.setMsr(msr);
- if (weakDto != null) {
- data.setId(weakDto.getId());
- data.setSort(weakDto.getSort());
- data.setPid(weakDto.getPid());
- data.setName(weakDto.getName());
- data.setProductType(weakDto.getProductType());
- data.setTimeRate(weakDto.getTimeRate());
- mtbfTime = mtbf / weakDto.getTimeRate();
+ if (weakDto != null) {
+ data.setId(weakDto.getId());
+ data.setSort(weakDto.getSort());
+ data.setPid(weakDto.getPid());
+ data.setName(weakDto.getName());
+ data.setProductType(weakDto.getProductType());
+ data.setTimeRate(weakDto.getTimeRate());
+ mtbfTime = mtbf / weakDto.getTimeRate();
+ }
+
+ data.setMtbfTime(mtbfTime);
+ data.setIsWeak(0);
+
+ list.add(data);
}
-
- data.setMtbfTime(mtbfTime);
- data.setIsWeak(0);
-
- list.add(data);
}
}
- List<WeakDto> treeList = TreeUtils.build(list);
- this.getIsweak(treeList.get(0).getChildren());
+ List<WeakDto> treeList = new ArrayList<>();
+ if (list.size() > 0) {
+ treeList = TreeUtils.build(list);
+ this.getIsweak(treeList.get(0).getChildren());
+ }
+
return treeList;
}
@@ -1216,7 +1244,7 @@
}
}
- public SchemeComparDto SchemeCompar(String[] taskList) {
+ public SchemeComparDto SchemeCompar(String[] taskList, Long showProductId) {
SchemeComparDto dto = new SchemeComparDto();
List<SimulaDataDto> dataDtoList = new ArrayList<>();
List<SchemeComparCurve> curveList = new ArrayList<>();
@@ -1229,7 +1257,14 @@
Long taskModelId = Long.parseLong(taskId);
task = taskService.get(taskModelId);
simulatAssess = this.getByTaskId(taskModelId);
- SimulaDataDto resultData = this.getResultXML(simulatAssess);
+ SimulaDataDto resultData;
+ if (showProductId != null) {
+ simulatAssess.setProductId(showProductId);
+ resultData = this.getResultXML(simulatAssess);
+ } else {
+ resultData = this.getResultXML(simulatAssess);
+ }
+
data = resultData;
data.setName(task.getTaskName());
dataDtoList.add(data);
@@ -1252,19 +1287,23 @@
if (simulatAssess.getDataType() != null && simulatAssess.getDataType().equals("fz")) {
Integer num = this.getNumById(simulatAssess.getProductId(), simulatAssess.getTaskModelId());
simulatAssess.setName("浠跨湡璁板綍" + (num + 1));
- this.insert(simulatAssess);
+ this.update(simulatAssess);
}
String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
- String xml = null;
+ String xml;
InputStream in = null;
+
try {
in = new FileInputStream(filePath);
xml = IOUtils.toString(in);
} catch (IOException e) {
e.printStackTrace();
+ throw new RenException("鏂囦欢涓嶅瓨鍦ㄦ垨鑰呮枃浠舵墦涓嶅紑");
} finally {
try {
- in.close();
+ if (in != null) {
+ in.close();
+ }
} catch (IOException e) {
e.printStackTrace();
}
--
Gitblit v1.9.1