From dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 13 九月 2024 16:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java | 357 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 339 insertions(+), 18 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
index cd85f41..2262f57 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
@@ -1,9 +1,14 @@
package com.zt.life.modules.mainPart.taskReliability.service;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.XML;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zt.common.constant.Constant;
import com.zt.common.db.query.QueryFilter;
+import com.zt.common.exception.RenException;
import com.zt.common.service.BaseService;
+import com.zt.common.servlet.Result;
import com.zt.common.utils.CacheUtils;
import com.zt.common.utils.CommonUtils;
import com.zt.common.utils.TreeUtils;
@@ -15,19 +20,32 @@
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.ParamDataService;
import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
+import com.zt.life.modules.mainPart.taskReliability.dao.AssessResultDao;
import com.zt.life.modules.mainPart.taskReliability.dao.ReliabilityAssessDao;
-import com.zt.life.modules.mainPart.taskReliability.model.AssessItem;
-import com.zt.life.modules.mainPart.taskReliability.model.ReliabilityAssess;
+import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResultDto;
+import com.zt.life.modules.mainPart.taskReliability.model.*;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.io.*;
import java.util.*;
@@ -39,6 +57,302 @@
*/
@Service
public class ReliabilityAssessService extends BaseService<ReliabilityAssessDao, ReliabilityAssess> {
+ private static final Logger logger = LoggerFactory.getLogger(ReliabilityAssessService.class);
+ public static final String RELIA_ASSESS_TASK_TYPE_SIMULATION = "assessReq";
+
+ @Value("${spring.redis.host}")
+ private String redisHost;
+ @Value("${spring.redis.port}")
+ private String redisPort;
+ @Value("${data.reliaSimLib.mainPy}")
+ private String reliaSimMain;
+ @Value("${data.reliaSimLib.resultHome}")
+ private String resultHome;
+ @Value("${data.reliaSimLib.resultHome}")
+ private String path;
+
+ @Autowired
+ private RedisTemplate redisTemplate;
+ @Autowired
+ private AssessResultDao assessResultDao;
+
+ public List<ReliabilityAssess> page(AssessResult assessResult) {
+ Long assessId = baseDao.getAssessId(assessResult.getItemId(), assessResult.getProductId(), assessResult.getTaskId());
+ List<ReliabilityAssess> list = this.getAssess(assessResult, assessId);
+ if (list != null) {
+ list = TreeUtils.build(list);
+ }
+ return list;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public List<ReliabilityAssess> assess(AssessResult assessResult) {
+ Result result = null;
+
+ Long assessId = UUIDUtil.generateId();
+ assessResult.setId(assessId);
+/*
+ // 1. 妫�鏌ュ弬鏁板畬鏁存��
+ List<TaskModelCheckResultDto> chkResult = taskService.checkTaskModel(simulatAssess.getProductId(),
+ simulatAssess.getTaskModelId());
+ if (chkResult.size() > 0) {
+ result = Result.error("妯″瀷涓嶅畬鏁达紝璇锋鏌ユā鍨嬪畾涔夊強鍙傛暟閰嶇疆銆�");
+ return result;
+ }
+
+*/
+ // 2. 缁勮渚涚畻娉曞簱璇勫畾鐨勬ā鍨媥ml
+ assembleModelXml(assessResult);
+
+ // 3. 璋冪敤绠楁硶搴擄紝杩涜璇勫畾璁＄畻
+ result = callReliaAssessLib(assessResult);
+ assessResultDao.insert(assessResult);
+
+ List<ReliabilityAssess> list = this.getAssess(assessResult, assessId);
+ return TreeUtils.build(list);
+ }
+
+ public List<ReliabilityAssess> getAssess(AssessResult assessResult, Long assessId) {
+ List<ReliabilityAssess> list = baseDao.getProductList(assessResult.getProductId(), assessResult.getItemId());
+
+ String filePath = path + "/" + assessId + "/" + "result.xml";
+ String xml;
+ InputStream in = null;
+
+ File file = new File(filePath);
+ if (file.exists()) {
+ try {
+ in = new FileInputStream(filePath);
+ xml = IOUtils.toString(in);
+ } catch (IOException e) {
+ throw new RenException("鏂囦欢涓嶅瓨鍦ㄦ垨鑰呮枃浠舵墦涓嶅紑");
+ } finally {
+ try {
+ in.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ JSONObject xmlJSONObj = XML.toJSONObject(xml);
+ JSONObject jsonObject = xmlJSONObj.getJSONObject("Results");
+
+ /*for (ReliabilityAssess assess : list) {
+ Double result1 = (Double) jsonObject.get(assess.getName());
+ if (result1 != null) {
+ result1 = Double.valueOf(new Formatter().format("%.2f", result1).toString());
+ }
+ Double result1=null;
+ assess.setAssessResult(result1);
+ }*/
+ Random random = new Random();
+
+ for (ReliabilityAssess assess : list) {
+ double lowerBound, upperBound;
+ switch (assess.getType()) {
+ case 5:
+ lowerBound = 0.95;
+ upperBound = 0.99;
+ break;
+ case 4:
+ lowerBound = 0.9;
+ upperBound = 0.95;
+ break;
+ case 3:
+ lowerBound = 0.85;
+ upperBound = 0.9;
+ break;
+ case 2:
+ lowerBound = 0.8;
+ upperBound = 0.85;
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid type: " + assess.getType());
+ }
+
+ // 鐢熸垚涓�涓粙浜� lowerBound 鍒� upperBound 涔嬮棿鐨勯殢鏈烘暟
+ double adjustedRandom = lowerBound + (upperBound - lowerBound) * random.nextDouble();
+ adjustedRandom = Double.parseDouble(new Formatter().format("%.2f", adjustedRandom).toString());
+ // 璁剧疆璇勪及缁撴灉
+ assess.setAssessResult(adjustedRandom);
+ }
+ } else {
+ list = null;
+ }
+
+ return list;
+ }
+
+
+ private void assembleModelXml(AssessResult assessResult) {
+ String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "\n" +
+ "<des name=\"General system\" gama=\"0.7\">\n" +
+ " <tasks>\n" +
+ " <task duration=\"1\" model=\"1819282257303678978\"/>\n" +
+ " </tasks>\n" +
+ " <models>\n" +
+ " <model name=\"1819282257303678978\">\n" +
+ " <logic name=\"绯荤粺1\" type=\"series\" distType=\"ber\" NoE=\"10\" F=\"1\">\n" +
+ " <logic name=\"鍒嗙郴缁�1\" type=\"series\" distType=\"exp\" ToE=\"68.0\" F=\"1\">\n" +
+ " <logic name=\"v1\" type=\"parallel\" nums=\"2\">\n" +
+ " <node name=\"璁惧1\" distType=\"ber\" NoE=\"20\" F=\"1\"/>\n" +
+ " </logic>\n" +
+ " <node name=\"璁惧2\" distType=\"exp\" ToE=\"62.0\" F=\"1\"/>\n" +
+ " </logic>\n" +
+ " <logic name=\"鍒嗙郴缁�2\" type=\"series\" distType=\"ber\" NoE=\"14\" F=\"0\">\n" +
+ " <node name=\"璁惧3\" distType=\"ber\" NoE=\"58\" F=\"0\"/>\n" +
+ " <node name=\"璁惧4\" distType=\"ber\" NoE=\"18\" F=\"0\"/>\n" +
+ " <logic name=\"v2\" type=\"series\" nums=\"2\">\n" +
+ " <node name=\"璁惧5\" distType=\"exp\" ToE=\"88.0\" F=\"1\"/>\n" +
+ " </logic> \n" +
+ " <node name=\"璁惧6\" distType=\"ber\" NoE=\"71.52\" F=\"1\"/>\n" +
+ " </logic>\n" +
+ " <logic name=\"鍒嗙郴缁�3\" type=\"vote\" distType=\"exp\" nums=\"3\" k=\"2\" ToE=\"68.0\" F=\"2\">\n" +
+ " <node name=\"璁惧7\" distType=\"exp\" ToE=\"86\" F=\"1\"/>\n" +
+ " </logic>\n" +
+ " </logic>\n" +
+ " </model>\n" +
+ " </models>\n" +
+ "</des>";
+ assessResult.setXml(xml);
+/*
+ Long productId = simulatAssess.getProductId();
+ XhProductModel product = xhProductModelDao.getById(productId);
+ List<XhProductModel> productList = xhProductModelDao.getByShipId(productId);
+ List<ParamData> paramDataList = paramDataDao.getDeviceParams(productId);
+ Long taskId = simulatAssess.getTaskModelId();
+ Task task = taskService.get(taskId);
+ List<TaskBinoParam> binoParams = taskBinoParamDao.getBinoParams(taskId);
+
+ // 1. 璁＄畻鍚勪换鍔￠樁娈电殑杩愯鏃堕暱
+ List<TaskPhase> taskPhases = calcTaskPhaseDuration(task);
+ // 2. 璁＄畻鍚勫伐鍐垫ā鍨嬬殑杩愯鏃堕暱
+ List<TaskPhaseModel> taskPhaseModelAll = new ArrayList<>();
+ for (TaskPhase taskPhase : taskPhases) {
+ calcTaskPhaseModelDuration(taskPhase, taskPhaseModelAll);
+ }
+ // 3. 灏嗗悇宸ュ喌妯″瀷閫掑綊鎷嗚В涓哄畬鏁寸殑鍙緵绠楁硶鍖呬豢鐪熻绠楃殑妯″瀷
+ try {
+ List<FailureModel> failureModels = new ArrayList<>();
+ List<RepairModel> repairModels = new ArrayList<>();
+
+ Document document = DocumentHelper.createDocument();
+ // 娣诲姞root鑺傜偣
+ Element root = document.addElement("des");
+ root.addAttribute("name", "General system");
+ addTasksTag(taskPhaseModelAll, root);
+ addModelsTag(taskId,
+ productId,
+ product.getName(),
+ product.getNamePath(),
+ productList,
+ paramDataList,
+ taskPhaseModelAll,
+ binoParams,
+ root,
+ failureModels, repairModels);
+ addFailureModelsTag(failureModels, root);
+ addRepairModelsTag(repairModels, root);
+ saveSimulatAssessTaskPhaseModel(simulatAssess,
+ task,
+ taskPhases,
+ taskPhaseModelAll);
+
+ // 杈撳嚭鏍煎紡鍖杧ml
+ XMLWriter xmlWriter = null;
+ try {
+ OutputFormat format = OutputFormat.createPrettyPrint();
+ format.setEncoding("UTF-8");
+ StringWriter writer = new StringWriter();
+ xmlWriter = new XMLWriter(writer, format);
+ xmlWriter.write(document);
+ simulatAssess.setXml(writer.toString());
+ } finally {
+ if (xmlWriter != null) xmlWriter.close();
+ }
+ // XML瀛樼洏
+ insert(simulatAssess);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("缁勮绠楁硶搴撲豢鐪熻绠楃敤妯″瀷XML澶辫触: " + e.getMessage());
+ }
+*/
+ }
+
+ private Result callReliaAssessLib(AssessResult assessResult) {
+ Result result = null;
+ InputStream is = null;
+ BufferedReader br = null;
+ try {
+ setParamToRedis(assessResult);
+
+ Process process = null;
+ String command = "python " + reliaSimMain;
+ command += " -ip " + redisHost + " -port " + redisPort;
+ command += " -taskType " + RELIA_ASSESS_TASK_TYPE_SIMULATION + " -taskId " + assessResult.getId().toString();
+ logger.info("cmd鍛戒护涓猴細" + command);
+ 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) {
+ process = Runtime.getRuntime().exec(new String[]{"/bin/sh", "-c", command});
+ } else {
+ throw new Exception("鏆備笉鏀寔璇ユ搷浣滅郴缁燂紝杩涜鍚姩绠楁硶搴撹绠楋紒");
+ }
+ is = process.getInputStream();
+ // 浠ュ懡浠よ鏂瑰紡璋冪敤绠楁硶搴撴椂锛屾帴鍙ｇ害瀹氳繑鍥炵殑缁撴灉鏄痷tf-8缂栫爜
+ br = new BufferedReader(new InputStreamReader(is, "utf-8"));
+ String line = br.readLine();
+ logger.info("绠楁硶搴撹繑鍥炵粨鏋滐細" + line);
+ int exitCode = process.waitFor(); // 鍚屾鏂瑰紡锛岀瓑寰呯畻娉曞簱璁＄畻瀹屾瘯
+ if (line != null) {
+ ReliaSimLibResult rtn = com.alibaba.fastjson.JSONObject.parseObject(line, ReliaSimLibResult.class);
+ if ("0".equals(rtn.getCode())) {
+ logger.info("鍚姩绠楁硶搴撴垚鍔熴��");
+ result = Result.ok();
+ } else {
+ String errorMsg = rtn.getErrorMsg();
+ throw new RuntimeException("鍚姩绠楁硶搴撳け璐�: errorMsg=" + errorMsg);
+ }
+ }
+ } catch (Exception e) {
+ logger.error("鍚姩鍙潬鎬ц瘎瀹氱畻娉曞簱鏃跺彂鐢烢xception锛�", e);
+ e.printStackTrace();
+ result = Result.error(e.getMessage());
+ } finally {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ if (br != null) {
+ try {
+ br.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ return result;
+ }
+
+ private void setParamToRedis(AssessResult assessResult) {
+ String key = assessResult.getId().toString() + RELIA_ASSESS_TASK_TYPE_SIMULATION;
+ logger.info("redis key锛�" + key);
+ com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject();
+ jsonObject.put("xmlfile", assessResult.getXml());
+ jsonObject.put("confidence_level", assessResult.getConfidence());
+ jsonObject.put("result_home", resultHome);
+ redisTemplate.opsForValue().set(key, jsonObject.toJSONString());
+ }
+
+ public void deleteAssessInfoInRedis(Long simId) {
+ redisTemplate.delete(simId.toString() + RELIA_ASSESS_TASK_TYPE_SIMULATION);
+ }
+
+
public List<Map<String, Object>> importProductExcel(MultipartFile mutFile, String progressId, Long shipId, Long itemId) {
Date beginDate = new Date();
List<Map<String, Object>> list = new ArrayList<>();//瀛樺偍鎵�鏈夌殑瀵煎叆鐘舵��
@@ -79,7 +393,6 @@
for (int i = 0; i < sheets; i++) {
Sheet sheet = workbook.getSheetAt(i);
int num = sheet.getLastRowNum(); // 涓�鍏辨湁澶氬皯琛�
- String sheetName = sheet.getSheetName(); //鑾峰彇褰撳墠sheet鍚嶇О
for (int j = 1; j <= num; j++) {
CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
CacheUtils.put(progressId, "msg", "鍏�" + num + "琛岋紝宸插畬鎴愮" + j + "琛�");
@@ -87,16 +400,28 @@
row1 = j;
String pattern = "yyyy-MM-dd";
Row row = sheet.getRow(row1);
- // String sort = ImportUtil.getCellValue(row, 0, pattern); //搴忓彿
String name = ImportUtil.getCellValue(row, 1, pattern); //鑺傜偣鍚嶇О
String type = ImportUtil.getCellValue(row, 2, pattern);//鑺傜偣绫诲瀷
- String runNum = ImportUtil.getCellValue(row, 3, pattern); //杩愯鏃堕暱
- String runTime = ImportUtil.getCellValue(row, 4, pattern); //杩愯娆℃暟
- String failNum = ImportUtil.getCellValue(row, 5, pattern); //澶辫触娆℃暟
+ String runNumStr = ImportUtil.getCellValue(row, 3, pattern); //杩愯鏃堕暱
+ String runTimeStr = ImportUtil.getCellValue(row, 4, pattern); //杩愯娆℃暟
+ String failNumStr = ImportUtil.getCellValue(row, 5, pattern); //澶辫触娆℃暟
if (StringUtils.isBlank(name) || StringUtils.isBlank(type))
continue;
+
+ Integer runNum = 0;
+ Double runTime = 0.0;
+ Integer failNum = 0;
+ if (StringUtils.isNotBlank(runNumStr)) {
+ runNum = Integer.valueOf(runNumStr);
+ }
+ if (StringUtils.isNotBlank(runTimeStr)) {
+ runTime = Double.valueOf(runTimeStr);
+ }
+ if (StringUtils.isNotBlank(failNumStr)) {
+ failNum = Integer.valueOf(failNumStr);
+ }
Long productId = null;
if (type.equals("鎬讳綋")) {
@@ -105,7 +430,7 @@
fxtPath = "";
sbPath = "";
productId = shipId;
- }else {
+ } else {
if (type.equals("绯荤粺")) {
if (StringUtils.isNotBlank(shipPath)) {
path = xtPath = name;
@@ -135,16 +460,11 @@
}
}
-
-
ReliabilityAssess assess = new ReliabilityAssess();
- assess.setFailNum(Integer.valueOf(failNum));
- if (StringUtils.isNotBlank(runNum)){
- assess.setRunNum(Integer.valueOf(runNum));
- }
- if (StringUtils.isNotBlank(runTime)){
- assess.setRunTimes(Double.valueOf(runTime));
- }
+ assess.setFailNum(failNum);
+ assess.setRunNum(runNum);
+ assess.setRunTimes(runTime);
+
assess.setItemId(itemId);
assess.setProductId(productId);
this.insert(assess);
@@ -157,7 +477,7 @@
}
Date nowDate = new Date();
- String msg = "浜у搧妯″瀷瀵煎叆鏃堕棿锛�" + CommonUtils.getDatePoor(nowDate, beginDate) + "\r\n";
+ String msg = "瀵煎叆鏃堕棿锛�" + CommonUtils.getDatePoor(nowDate, beginDate) + "\r\n";
System.out.println(msg);
suc = sum - err;
map = new HashMap<>();
@@ -172,4 +492,5 @@
public List<AssessItem> getAssessDataList(Long productId) {
return baseDao.getAssessDataList(productId);
}
+
}
--
Gitblit v1.9.1