From 6250f74b2a02770a37f2f0144c762f7952a12bd6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 18 二月 2025 08:58:51 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 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 a69a11e..11537ef 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
@@ -121,16 +121,7 @@
Map<Integer, String> templetsStrMap2 = new HashMap<>();
private JSONObject xmlJSONObj;
-
- /**
- * 鍒嗛〉鏌ヨ
- *
- * @param queryFilter
- * @return
- */
- /* public List<SimulatAssess> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
- }*/
+
/**
* 鍒犻櫎
@@ -912,11 +903,11 @@
ele.addAttribute("value", String.valueOf(failureModel.getParam1()));
break;
case FailureModel.TYPE_BIN:
- ele = failureModelTag.addElement("reliability");
+ ele = failureModelTag.addElement("p");
ele.addAttribute("value", String.valueOf(failureModel.getParam1()));
ele = failureModelTag.addElement("n");
ele.addAttribute("value", String.valueOf(failureModel.getParam2()));
- ele = failureModelTag.addElement("k");
+ ele = failureModelTag.addElement("m");
ele.addAttribute("value", String.valueOf(failureModel.getParam3()));
break;
case FailureModel.TYPE_WBL:
@@ -1321,9 +1312,25 @@
if (StringUtils.isNotBlank(nameValue)) {
productId1 = Convert.toLong(nameValue.split("-")[0]);
- Double mtbf = (Double) jsonArray.getJSONObject(i).get("mttf");
- Double mttr = (Double) jsonArray.getJSONObject(i).get("mttr");
- Double msr = (Double) jsonArray.getJSONObject(i).get("msr");
+ Double mtbf = null;
+ Double mttr = null;
+ Double msr = null;
+ if (!jsonArray.getJSONObject(i).get("mttf").equals("inf")){
+ mtbf = (Double)jsonArray.getJSONObject(i).get("mttf");
+ }else{
+ mtbf = 0.0;
+ }
+ if (!jsonArray.getJSONObject(i).get("mttr").equals("inf")){
+ mttr = (Double)jsonArray.getJSONObject(i).get("mttr");
+ }else{
+ mttr = 0.0;
+ }
+ if (!jsonArray.getJSONObject(i).get("msr").equals("inf")){
+ msr = (Double)jsonArray.getJSONObject(i).get("msr");
+ }else{
+ msr = 0.0;
+ }
+
WeakDto weakDto = new WeakDto();
weakDto.setId(productId1);
weakDto.setMtbf(mtbf);
@@ -1500,12 +1507,43 @@
param.setXData(xList);
param.setYData(doubleArray);
- Double mtbf = (Double) jsonArray.getJSONObject(i).get("mttf");
- Double mttr = (Double) jsonArray.getJSONObject(i).get("mttr");
- Double msr = (Double) jsonArray.getJSONObject(i).get("msr");
+
+ Double mttfMle = null;
+ Double mttrMle = null;
+ Double mtbf = null;
+ Double mttr = null;
+ Double msr = null;
+ if (!jsonArray.getJSONObject(i).get("mttf").equals("inf")){
+ mtbf = (Double)jsonArray.getJSONObject(i).get("mttf");
+ }else{
+ mtbf = 0.0;
+ }
+ if (!jsonArray.getJSONObject(i).get("mttr").equals("inf")){
+ mttr = (Double)jsonArray.getJSONObject(i).get("mttr");
+ }else{
+ mttr = 0.0;
+ }
+ if (!jsonArray.getJSONObject(i).get("msr").equals("inf")){
+ msr = (Double)jsonArray.getJSONObject(i).get("msr");
+ }else{
+ msr = 0.0;
+ }
+
+ if (!jsonArray.getJSONObject(i).get("mttr_MLE").equals("inf")){
+ mttrMle = (Double)jsonArray.getJSONObject(i).get("mttr_MLE");
+ }else{
+ mttrMle = 0.0;
+ }
+ if(!jsonArray.getJSONObject(i).get("mttf_MLE").equals("inf")){
+ mttfMle = (Double) jsonArray.getJSONObject(i).get("mttf_MLE");
+ }else{
+ mttfMle = 0.0;
+ }
data.setMtbf(mtbf);
data.setMttr(mttr);
data.setMsr(msr);
+ data.setMttfMle(mttfMle);
+ data.setMttrMle(mttrMle);
}
data.setCurveParam(param);
}
@@ -1678,12 +1716,8 @@
ObjectMapper mapper = new ObjectMapper();
String jsonStr = null;
try {
- // 浣跨敤 ObjectMapper 鐨� readValue 鏂规硶锛屽皢鏂囦欢涓殑 JSON 鏁版嵁杞崲涓轰竴涓� Java 瀵硅薄
- // 杩欓噷浣跨敤 Object 绫讳綔涓烘硾鍨嬪弬鏁帮紝琛ㄧず浠绘剰绫诲瀷鐨勫璞�
Object obj = mapper.readValue(new File(filePath), Object.class);
- // 浣跨敤 ObjectMapper 鐨� writeValueAsString 鏂规硶锛屽皢 Java 瀵硅薄杞崲涓� JSON 瀛楃涓�
jsonStr = mapper.writeValueAsString(obj);
-
} catch (IOException e) {
// 澶勭悊寮傚父
e.printStackTrace();
--
Gitblit v1.9.1