From a8230f1ab02069431738bd72f36ab95a0ace01ae Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 06 八月 2024 15:22:22 +0800
Subject: [PATCH] 修改仿真后台
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 116 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 80 insertions(+), 36 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 89f2744..10595e9 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
@@ -19,6 +19,7 @@
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;
@@ -41,13 +42,9 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
-import java.util.ArrayList;
+import java.util.*;
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;
@@ -58,9 +55,10 @@
* @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";
+ public static final String RELIA_SIM_TASK_TYPE_SIMULATION = "calcreq";
+ public static final String RELIA_SIM_TASK_TYPE_PROGRESS = "calcprog";
@Value("${spring.redis.host}")
private String redisHost;
@@ -70,6 +68,8 @@
private String reliaSimMain;
@Value("${data.reliaSimLib.resultHome}")
private String resultHome;
+ @Value("${data.reliaSimLib.fixedRandomSeed}")
+ private String fixedRandomSeed;
@Autowired
private RedisTemplate redisTemplate;
@@ -206,7 +206,9 @@
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);
@@ -224,7 +226,7 @@
int spaceWitdth = 80;
x1 = -spaceWitdth;
x2 = -11;
- y = -100;
+ y = -130;
String[] tlArr = "O,F,I,S,M".split(",");
for (String s : tlArr) {
JSONObject f = templetsMap.get(s);
@@ -237,19 +239,20 @@
//闃舵妯″瀷鍙婂埢搴�
x1 = 0;
x2 = 0;
- double y1 = -60;
- y = -30;
- double y2 = -10;
- JSONObject modelJson = new JSONObject(templetsStrMap.get("model"));
+ double y1 = -100;
+ y = -70;
+ double y2 = -50;
- setlineXy(modelJson, x1, y1, x1, y2, null);
+ 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();
- x2 = x2 + modelDto.getGkDuration() * pointNumPerHour;
+ double gkPoint = modelDto.getGkDuration() * pointNumPerHour;
+ x2 = x2 + gkPoint;
if (i < modelDtoList.size() - 1) {
setlineXy(modelJson2, x2, y1, x2, y, null);
} else {
@@ -265,12 +268,16 @@
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, "position/x".split("/"), x1 + 30);
+
+ 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;
@@ -279,13 +286,28 @@
setlineXy(modelJson3, 0, y, x2, y, null);
jsonArray.add(modelJson3);
- double curPointHour = 50, periodHour = 50;
+ Integer curPointHour = 50, periodHour = 50;
while (curPointHour < totalHours) {
JSONObject modelJson4 = new JSONObject(templetsStrMap.get("model"));
double x = curPointHour * pointNumPerHour;
- setlineXy(modelJson4, x, y, x, y, null);
+ 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();
}
@@ -295,6 +317,7 @@
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", "");
}
@@ -680,16 +703,16 @@
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(); // 寮傛鏂瑰紡锛屼笉绛夊緟绠楁硶搴撹绠楀畬姣曪紝鎵�浠ヨ娉ㄩ噴鎺夎琛�
@@ -735,10 +758,21 @@
// 浠跨湡娆℃暟
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);
+ if (null != fixedRandomSeed && "1".equals(fixedRandomSeed)) {
+ // 鍥哄畾绉嶅瓙
+ jsonObject.put("seed", 1000);
+ } else {
+ // 闅忔満绉嶅瓙
+ jsonObject.put("seed", new Random().nextInt(1000));
+ }
redisTemplate.opsForValue().set(key, jsonObject.toJSONString());
+ }
+
+ public void deleteSimInfoInRedis(Long simId) {
+ redisTemplate.delete(simId.toString() + RELIA_SIM_TASK_TYPE_SIMULATION);
+ redisTemplate.delete(simId.toString() + RELIA_SIM_TASK_TYPE_PROGRESS);
}
private void assembleModelXml(SimulatAssess simulatAssess) {
@@ -794,6 +828,8 @@
} finally {
if (xmlWriter != null) xmlWriter.close();
}
+ // XML瀛樼洏
+ update(simulatAssess);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("缁勮绠楁硶搴撲豢鐪熻绠楃敤妯″瀷XML澶辫触: " + e.getMessage());
@@ -876,7 +912,7 @@
}
private void addRepairModelsTag(List<RepairModel> repairModels,
- Element root) {
+ Element root) {
Element ele = null;
Element repairModelsTag = root.addElement("repair_models");
for (RepairModel repairModel : repairModels) {
@@ -901,7 +937,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;
@@ -912,8 +948,8 @@
taskPhaseModelAll.add(taskPhaseModel);
}
// 鎶婇浂澶磋ˉ鍒版渶鍚庝竴涓伐鍐垫ā鍨�
- double duration = taskPhaseModels.get(taskPhaseModels.size()-1).getOperatConditDuration();
- taskPhaseModels.get(taskPhaseModels.size()-1).setOperatConditDuration(duration + 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) {
@@ -926,8 +962,8 @@
sum += duration;
}
// 鎶婇浂澶磋ˉ鍒版渶鍚庝竴涓樁娈�
- double duration = taskPhases.get(taskPhases.size()-1).getPhaseDuration();
- taskPhases.get(taskPhases.size()-1).setPhaseDuration(duration + task.getTaskDuration() - sum);
+ double duration = taskPhases.get(taskPhases.size() - 1).getPhaseDuration();
+ taskPhases.get(taskPhases.size() - 1).setPhaseDuration(duration + task.getTaskDuration() - sum);
return taskPhases;
}
@@ -956,7 +992,8 @@
"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,
@@ -969,7 +1006,8 @@
}
// 閫掑綊鍑芥暟
- private void node2DOM(List<XhProductModel> productList,
+ private void node2DOM(Long productId,
+ List<XhProductModel> productList,
List<ParamData> paramDataList,
List<OperatConditModel> gkModelsAssembled,
List<Algorithm> algorithmList,
@@ -994,7 +1032,8 @@
"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,
@@ -1034,7 +1073,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())) {
@@ -1051,7 +1094,8 @@
for (String nodeStr : computerNodeListStr) {
ModelNode mn = modelNodeAndVnodeList.stream().filter(item ->
nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- node2DOM(productList,
+ node2DOM(null,
+ productList,
paramDataList,
gkModelsAssembled,
algorithmList,
--
Gitblit v1.9.1