From 19beea5d5dc165efb0feca7c4c0a296819010178 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 04 十二月 2024 11:16:17 +0800
Subject: [PATCH] 修改bug：传给仿真算法包的modelId重复。（将工况ID改为阶段模型ID）
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 6 ++++--
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/dao/SysMysqlDao.java | 1 -
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/controller/SysMysqlController.java | 7 -------
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/controller/SysMysqlController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/controller/SysMysqlController.java
index f9f2565..a12988f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/controller/SysMysqlController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/controller/SysMysqlController.java
@@ -6,14 +6,7 @@
import com.zt.common.constant.Constant;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
-import com.zt.common.validator.AssertUtils;
-import com.zt.common.validator.ValidatorUtils;
-import com.zt.common.validator.group.AddGroup;
-import com.zt.common.validator.group.DefaultGroup;
-import com.zt.common.validator.group.UpdateGroup;
-import com.zt.life.modules.mainPart.sys.model.SysChangeLog;
import com.zt.life.modules.mainPart.sys.model.SysMysql;
-import com.zt.life.modules.mainPart.sys.service.SysChangeLogService;
import com.zt.life.modules.mainPart.sys.service.SysMysqlService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/dao/SysMysqlDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/dao/SysMysqlDao.java
index fc3e937..7adda81 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/dao/SysMysqlDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/dao/SysMysqlDao.java
@@ -2,7 +2,6 @@
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.mainPart.sys.model.SysChangeLog;
import com.zt.life.modules.mainPart.sys.model.SysMysql;
import org.apache.ibatis.annotations.Mapper;
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 0925f14..613d3f1 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
@@ -885,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 ->
@@ -1011,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 ->
--
Gitblit v1.9.1