From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 05 十二月 2024 09:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 ba5f857..7ab70ec 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
@@ -567,17 +567,15 @@
ProductStatusDto newRow = null;
if (sameNum > 1) {
newRow = item.clone();
- }
- else
+ } else
newRow = item;
- if ("5".equals(newRow.getProductType())){
+ if ("5".equals(newRow.getProductType())) {
newRow.setDeviceNo(i);
newRow.setDataId(item.getId().toString() + "-" + i);
- if (i>1){
+ if (i > 1) {
newRow.setName(item.getName() + "-" + i);
}
- }
- else{
+ } else {
newRow.setDeviceNo(0);
newRow.setDataId(item.getId().toString());
}
@@ -887,7 +885,8 @@
for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
Element taskTag = tasksTag.addElement("task");
taskTag.addAttribute("duration", String.valueOf(taskPhaseModel.getOperatConditDuration()));
- taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
+// taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
+ taskTag.addAttribute("model", taskPhaseModel.getId().toString());
if (null != taskPhaseModel.getPhaseConstraints() && taskPhaseModel.getPhaseConstraints().size() > 0) {
taskTag.addAttribute("NAM",
taskPhaseModel.getPhaseConstraints().stream().map(item ->
@@ -1013,7 +1012,8 @@
Element modelsTag = root.addElement("models");
for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
Element modelTag = modelsTag.addElement("model");
- modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
+// modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
+ modelTag.addAttribute("name", taskPhaseModel.getId().toString());
List<OperatConditModel> gkModelsAssembled = operatConditModelDao.getGKModelAssembled(
taskPhaseModel.getOperatConditId());
OperatConditModel gkModelTop = gkModelsAssembled.stream().filter(item ->
@@ -1102,7 +1102,8 @@
ParamData paramData = paramDataList.stream().filter(item ->
dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
Double ratio = paramData.getTaskMtbcfOperatingRatio();
- if (null != ratio && ratio > 0) {
+// if (null != ratio && ratio > 0) {
+ if (null != ratio && ratio != 1.0) {
// 闂存柇鍨嬭澶囩殑澶勭悊
double cycon = taskPhaseModel.getOperatConditDuration() * ratio;
double cycdown = taskPhaseModel.getOperatConditDuration() - cycon;
@@ -1410,8 +1411,7 @@
public SimulaDataDto getResultXML(SimulatAssess simulatAssess) {
if (simulatAssess.getDataType() != null && simulatAssess.getDataType().equals("fz")) {
- Integer num = this.getNumById(simulatAssess.getProductId(), simulatAssess.getTaskModelId());
- simulatAssess.setName("浠跨湡璁板綍" + (num + 1));
+ simulatAssess.setName(simulatAssess.getName());
this.update(simulatAssess);
}
String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
@@ -1469,7 +1469,11 @@
String[] arr = availability.split(" ");
// 閬嶅巻瀛愬瓧绗︿覆鏁扮粍锛屽皢姣忎釜鍏冪礌杞崲涓篸ouble骞跺瓨鍌ㄥ埌double鏁扮粍涓�
Double j = 0.0;
- for (int a = 0; a < arr.length; a++) {
+ Double b = 100.0;
+ for (int a = 0; a < arr.length - 1; a++) {
+ if (Convert.toDouble(arr[a]) < Convert.toDouble(arr[a+1])) {
+ System.out.println(arr[a]);
+ }
j = samplPeriod + j;
doubleArray.add(Double.parseDouble(arr[a]));
xList.add(j);
@@ -1609,6 +1613,7 @@
SchemeComparCurve curve = new SchemeComparCurve();
curve.setName(task.getTaskName());
+ curve.setSymbol("none");
curve.setSmooth(true);
curve.setType("line");
curve.setData(resultData.getCurveParam().getYData());
--
Gitblit v1.9.1