From 413eae5cb4d5fe78fc25258bf7b5e3b53740b1f9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 24 七月 2024 11:08:01 +0800
Subject: [PATCH] 1）新增仿真时模型及参数完整性检查 2）增加调用算法库后端接口
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index 31d1a1e..fb30953 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -65,7 +65,7 @@
List<XhProductModel> productList = null;
if (showXdy) {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).lt("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
+ Constant.Bool.NO).ne("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
} else {
if (ztShow == 1) {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
@@ -220,23 +220,6 @@
com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓璁惧鍚嶇О", sheetName, row1);
continue;
}
- if (StringUtils.isEmpty(reliabDistribType)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓鍙潬鎬у垎甯冪被鍨�", sheetName, row1);
- continue;
- }
- if (StringUtils.isEmpty(basicJoinCompute)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓鏄惁鍙傚姞璁＄畻", sheetName, row1);
- continue;
- }
- if (StringUtils.isEmpty(repairable)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓鏄惁鍙淮淇�", sheetName, row1);
- continue;
- }
- if (StringUtils.isNotBlank(repairable) && StringUtils.isEmpty(repairDistribType)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "鏈夋湭濉啓鐨勭淮淇垎甯冪被鍨�", sheetName, row1);
- continue;
- }
-
//瀵煎叆鍨嬪彿浜у搧缁撴灉搴�
XhProductModel xhProductModel = new XhProductModel();
@@ -312,6 +295,8 @@
}
if (StringUtils.isNotBlank(basicMtbfOperatingRatio)){
itemEntity.setBasicMtbfOperatingRatio(Double.valueOf(basicMtbfOperatingRatio));
+ }else{
+ itemEntity.setBasicMtbfOperatingRatio(1.0);
}
if (StringUtils.isNotBlank(taskMtbcfRegulate)){
itemEntity.setTaskMtbcfRegulate(Double.valueOf(taskMtbcfRegulate));
@@ -327,6 +312,8 @@
}
if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)){
itemEntity.setTaskMtbcfOperatingRatio(Double.valueOf(taskMtbcfOperatingRatio));
+ }else{
+ itemEntity.setTaskMtbcfOperatingRatio(1.0);
}
itemEntity.setRepairable(isOrNot.get(repairable));
itemEntity.setRepairDistribType(repairType.get(repairDistribType));
--
Gitblit v1.9.1