From 150576686b456ac21f6a687a16ee26eb5eb80c07 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 19 八月 2024 14:48:39 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 239 ++++-------------------------------------------------------
1 files changed, 18 insertions(+), 221 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 f014eb1..b9b65f5 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
@@ -76,8 +76,6 @@
@Autowired
private TaskService taskService;
@Autowired
- private XhProductModelService xhProductModelService;
- @Autowired
private SimulatAssessTaskPhaseModelService simulatAssessTaskPhaseModelService;
@Autowired
private TaskPhaseDao taskPhaseDao;
@@ -184,7 +182,7 @@
this.getPetsInfo();
double x1 = 0;
double x2 = 0;
- int y = 0;
+ int y = -10;
int groupY = 0;
int spaceHeight = 20;
int groupHeight = 20;
@@ -225,14 +223,13 @@
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;
+ y = -110;
String[] tlArr = "O,F,I,S,M".split(",");
for (String s : tlArr) {
JSONObject f = templetsMap.get(s);
@@ -245,12 +242,12 @@
//闃舵妯″瀷鍙婂埢搴�
x1 = 0;
x2 = 0;
- double y1 = -100;
- y = -70;
+ double y1 = -80;
+ y = -60;
double y2 = -50;
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++) {
@@ -274,17 +271,18 @@
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;
}
@@ -292,7 +290,8 @@
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;
@@ -308,7 +307,7 @@
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;
@@ -473,209 +472,6 @@
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) {
@@ -1217,6 +1013,7 @@
xml = IOUtils.toString(in);
} catch (IOException e) {
e.printStackTrace();
+ throw new RenException("鏂囦欢涓嶅瓨鍦ㄦ垨鑰呮枃浠舵墦涓嶅紑");
} finally {
try {
in.close();
@@ -1302,8 +1099,8 @@
simulatAssess = this.getByTaskId(taskModelId);
SimulaDataDto resultData;
if (showProductId!=null){
- simulatAssess.setShowProductId(showProductId);
- resultData =this.getResultData(simulatAssess);
+ simulatAssess.setProductId(showProductId);
+ resultData =this.getResultXML(simulatAssess);
}else{
resultData = this.getResultXML(simulatAssess);
}
@@ -1330,7 +1127,7 @@
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;
--
Gitblit v1.9.1