From fbde4ed692dd1d5da72fb7a41bd0e3c4103fc898 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 15 十一月 2024 17:01:48 +0800
Subject: [PATCH] 修改二项分布基本可靠性计算公式
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 263 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 208 insertions(+), 55 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
index fa81fd7..5486365 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
@@ -1,27 +1,33 @@
package com.zt.life.modules.mainPart.taskReliability.controller;
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.XML;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.zt.common.annotation.LogOperation;
-import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
+import com.zt.common.constant.Constant;
import com.zt.common.db.query.QueryFilter;
-import com.zt.common.servlet.Result;
+import com.zt.common.exception.RenException;
import com.zt.common.servlet.PageResult;
-import com.zt.common.utils.JsonUtils;
+import com.zt.common.servlet.Result;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.async.PythonLib;
-import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
+import com.zt.life.modules.mainPart.taskReliability.dto.*;
+import com.zt.life.modules.mainPart.taskReliability.model.*;
import com.zt.life.modules.mainPart.taskReliability.service.SimulatAssessService;
+import com.zt.life.modules.mainPart.taskReliability.service.TaskService;
+import com.zt.life.modules.mainPart.utils.OSUtils.ProcessUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +36,13 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.*;
/**
@@ -45,32 +56,13 @@
@Api(tags = "simulat_assess")
public class SimulatAssessController {
private static final Logger logger = LoggerFactory.getLogger(SimulatAssessController.class);
- private static final String taskTypeProgress = "calcprog";
@Autowired
private RedisTemplate redisTemplate;
- @Autowired
- private PythonLib pythonLib;
-
- @Value("${data.reliaSimLib.resultHome}")
- private String path;
@Autowired
private SimulatAssessService simulatAssessService;
-
- @GetMapping("page")
- @ApiOperation("鍒嗛〉")
- @ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- })
- public PageResult<SimulatAssess> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
-
- return PageResult.ok(simulatAssessService.page(queryFilter));
- }
@GetMapping("{id}")
@ApiOperation("淇℃伅")
@@ -80,48 +72,208 @@
return Result.ok(data);
}
- @PostMapping("analyze")
- public Result<Long> analyze(@RequestBody SimulatAssess simulatAssess) {
- //鏁堥獙鏁版嵁
-/*
- ValidatorUtils.validateEntity(simulatAssess, AddGroup.class, DefaultGroup.class);
- Long taskId = UUIDUtil.generateId();
- Integer time = simulatAssess.getSamplPeriod();
- Integer Frequency = simulatAssess.getSimulatFrequency();
- HashMap<String, Object> paramMap = new HashMap<>();
- paramMap.put("taskId", taskId);
- paramMap.put("time", time);
- paramMap.put("Frequency", Frequency);
- paramMap.put("url", "http://localhost:8050/test-project//taskReliability/SimulatAssess/calculate");
- String result1 = HttpUtil.get("http://localhost:8080/system/user/get", paramMap);
-*/
- Result result = pythonLib.callPython(simulatAssess);
+ @GetMapping("getSimulatList")
+ @ApiOperation("淇℃伅")
+ public Result<List<SimulatAssess>> getSimulatList(Long taskModelId) {
+ List<SimulatAssess> data = simulatAssessService.getList(taskModelId);
- return result;
+ return Result.ok(data);
}
- @GetMapping("getResultXML")
- public Result getResultXML(Long taskId) {
- String filePath = path + "/"+taskId+"/"+"result.xml";
- InputStream in = JsonUtils.class.getResourceAsStream(filePath);
- String xml = null;
- try {
- xml = IOUtils.toString(in);
- } catch (IOException e) {
- e.printStackTrace();
+ @GetMapping("getSimulatParams")
+ @ApiOperation("淇℃伅")
+ public Result<SimulatAssess> getSimulatParams(Long id, Long taskModelId) {
+ SimulatAssess data = simulatAssessService.getParams(id, taskModelId);
+ return Result.ok(data);
+ }
+
+ @GetMapping("verify")
+ public Result<String> verify(Long taskId) {
+ String result = simulatAssessService.verify(taskId);
+ result = result.replaceAll("\n", "<br>");
+ return Result.ok(result);
+ }
+
+ @PostMapping("analyze")
+ public Result<Object> analyze(@RequestBody SimulatAssess simulatAssess) {
+ //鏁堥獙鏁版嵁
+// Result result = pythonLib.callPython(simulatAssess);
+ List<TaskModelCheckResultDto> result = simulatAssessService.simulateChecK(simulatAssess);
+ if (result != null) {
+ return Result.ok(result);
}
- JSONObject xmlJSONObj = XML.toJSONObject(xml);
+ Boolean result2 = simulatAssessService.simulate(simulatAssess);
+ if (result2)
+ return Result.ok();
+ else
+ return Result.error("绠楁硶搴撹绠楀け璐ワ紒");
+ }
+
+ @GetMapping("process")
+ @ApiOperation("鑾峰彇绠楁硶搴撹繘绋嬩俊鎭�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = "isAlive", value = "瀛樻椿", dataType = Constant.QT.Boolean),
+ })
+ public PageResult<SimulatAssess> process(@ApiIgnore @QueryParam QueryFilter queryFilter) {
+ List<SimulatAssess> page = simulatAssessService.process(queryFilter);
+ return PageResult.ok(page);
+ }
+ @PostMapping("getResultXML")
+ public Result<SimulaDataDto> getResultXML(@RequestBody SimulatAssess simulatAssess) {
+ SimulaDataDto data = simulatAssessService.getResultXML(simulatAssess);
+ return Result.ok(data);
+ }
+
+ @PostMapping("getResultData")
+ public Result<SimulaDataDto> getData(@RequestBody SimulatAssess simulatAssess) {
+ SimulaDataDto data = simulatAssessService.getResultData(simulatAssess);
+ return Result.ok(data);
+ }
+
+ @GetMapping("getStatus")
+ public Result<TimeDiagramDto> getTimeDiagram(Long productId, Long taskId, Long fzId, double smallWidth, double minPointNum) {
+ TimeDiagramDto data = simulatAssessService.getTimeDiagram(productId, taskId, fzId, smallWidth, minPointNum);
+ return Result.ok(data);
+ }
+
+ @GetMapping("getDiagram")
+ @ApiOperation("鏌ヨ娴佺▼鍥�")
+ @LogOperation("鏌ヨ娴佺▼鍥�")
+ public Result<TimeDiagram> getDiagram(String projectId, String diagramId, String showType, String isShow, String digramParams, String majorId, Integer winWidth, Integer winHeight) throws Exception {
+ if (StringUtils.isBlank(diagramId))
+ diagramId = projectId;
+ TimeDiagram diagram = simulatAssessService.getDiagram(projectId, diagramId, showType, isShow, digramParams, majorId, winWidth, winHeight);
+ return Result.ok(diagram);
+ }
+
+ @PutMapping("saveDiagram")
+ @ApiOperation("鏌ヨ娴佺▼鍥�")
+ @LogOperation("鏌ヨ娴佺▼鍥�")
+ public Result saveDiagram(@RequestBody TimeDiagram diagram) {
+ // 鏁堥獙鏁版嵁
+ //ValidatorUtils.validateEntity(project.getProject(), UpdateGroup.class, DefaultGroup.class);
+ if (diagram.getConfigChange() == null)
+ diagram.setConfigChange(0);
+ diagram.setSaveStatus(2);
+ simulatAssessService.updateDiagram(diagram);
+ //simulatAssessService.combineDiagram(diagram);
return Result.ok();
}
@GetMapping("getCalcProgress")
- public Result getCalcProgress(Long taskId) {
- String key = taskId.toString() + taskTypeProgress;
- String progress = (String)redisTemplate.opsForValue().get(key);
- if (progress==null) progress = "0";
- return Result.ok(progress);
+ public Result getCalcProgress(@RequestParam("taskList[]") Long[] taskList) {
+ Integer progress = 0;
+ String progress2 = "";
+ String key = null;
+ if (taskList.length == 1) {
+ Long taskId = taskList[0];
+ SimulatAssess simulatAssess = simulatAssessService.get(taskId);
+ boolean isProcessAlive = ProcessUtils.isProcessAlive(simulatAssess.getPid());
+ key = taskId.toString() + simulatAssessService.RELIA_SIM_TASK_TYPE_PROGRESS;
+ progress2 = (String) redisTemplate.opsForValue().get(key);
+ if (progress2 == null) progress2 = "0";
+ progress = Integer.parseInt(progress2);
+ if (progress == null) progress = 0;
+ updateSimulateAssess(simulatAssess, isProcessAlive, progress);
+ if (progress < 100 && !isProcessAlive) {
+ logger.error("绠楁硶搴撹繘绋嬪湪璁＄畻閫斾腑寮傚父缁堟浜嗭細taskId="+taskId+" pid="+simulatAssess.getPid()+" progress="+progress);
+ simulatAssessService.deleteSimInfoInRedis(taskId);
+ return Result.error("绠楁硶搴撹繘绋嬪湪璁＄畻閫斾腑寮傚父缁堟浜嗭紒");
+ }
+ if (progress == 100) {
+ try {
+ Thread.sleep(1000);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ isProcessAlive = ProcessUtils.isProcessAlive(simulatAssess.getPid());
+ simulatAssess.setProcessIsAlive(isProcessAlive);
+ simulatAssessService.update(simulatAssess);
+// simulatAssessService.deleteSimInfoInRedis(taskId);
+ }
+ } else {
+ for (Long taskId : taskList) {
+ int progTmp = 0;
+ SimulatAssess simulatAssess = simulatAssessService.get(taskId);
+ boolean isProcessAlive = ProcessUtils.isProcessAlive(simulatAssess.getPid());
+ key = taskId.toString() + simulatAssessService.RELIA_SIM_TASK_TYPE_PROGRESS;
+ progress2 = (String) redisTemplate.opsForValue().get(key);
+ if (progress2 == null) progress2 = "0";
+ progTmp = Integer.parseInt(progress2);
+ updateSimulateAssess(simulatAssess, isProcessAlive, progTmp);
+ if (progTmp < 100 && !isProcessAlive) {
+ logger.error("绠楁硶搴撹繘绋嬪湪璁＄畻閫斾腑寮傚父缁堟浜嗭細taskId="+taskId+" pid="+simulatAssess.getPid()+" progress="+progTmp);
+// simulatAssessService.deleteSimInfoInRedis(taskId);
+ return Result.error("绠楁硶搴撹繘绋嬪湪璁＄畻閫斾腑寮傚父缁堟浜嗭紒");
+ }
+ if (progTmp == 100) {
+ try {
+ Thread.sleep(500);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ isProcessAlive = ProcessUtils.isProcessAlive(simulatAssess.getPid());
+ simulatAssess.setProcessIsAlive(isProcessAlive);
+ simulatAssessService.update(simulatAssess);
+// simulatAssessService.deleteSimInfoInRedis(taskId);
+ }
+ progress = progress + progTmp;
+ }
+ progress = progress / taskList.length;
+ }
+
+ return Result.ok(progress.toString());
+ }
+
+ private void updateSimulateAssess(SimulatAssess simulatAssess, boolean isProcessAlive, int progress) {
+ if (!isProcessAlive) {
+ simulatAssess.setProcessIsAlive(false);
+ simulatAssess.setProgress(progress);
+ simulatAssess.setProcessEndTime(new Date());
+ simulatAssessService.update(simulatAssess);
+ } else {
+ if (simulatAssess.getProgress() != progress) {
+ simulatAssess.setProgress(progress);
+ simulatAssessService.update(simulatAssess);
+ }
+ }
+ }
+
+ @GetMapping("ReliabilityWeakness")
+ public Result<List<WeakDto>> getReliabilityWeakness(Long fzId, Long taskId, Long productId) {
+ List<WeakDto> data = simulatAssessService.getReliabilityWeakness(fzId, taskId, productId);
+ return Result.ok(data);
+ }
+
+ @GetMapping("SchemeCompar")
+ public Result<SimulatResult> SchemeCompar(@RequestParam("taskList[]") String[] taskList, Long showProductId, Integer samplPeriod, Integer simulatFrequency) {
+ SimulatResult data = simulatAssessService.SchemeCompar(taskList, showProductId, samplPeriod, simulatFrequency);
+ return Result.ok(data);
+ }
+
+ @GetMapping("getEcharts")
+ public Result<SchemeComparDto> getEcharts(@RequestParam("taskList[]") String[] taskList, Long showProductId) {
+ SchemeComparDto data = simulatAssessService.getEcharts(taskList, showProductId);
+ return Result.ok(data);
+ }
+
+ @GetMapping("killProcess")
+ public Result<SchemeComparDto> killProcess(@RequestParam("taskId") Long taskId) {
+ SimulatAssess simulatAssess = simulatAssessService.get(taskId);
+ ProcessUtils.killProcess(simulatAssess.getPid());
+ boolean isProcessAlive = ProcessUtils.isProcessAlive(simulatAssess.getPid());
+ simulatAssess.setProcessIsAlive(isProcessAlive);
+ simulatAssessService.update(simulatAssess);
+ return Result.ok();
+ }
+
+ @GetMapping("downloadXml")
+ public void downloadXml(HttpServletRequest request, HttpServletResponse response, String type,Long id,Integer xml) {
+ simulatAssessService.downloadXml(request, response,type,id,xml);
}
@PutMapping
@@ -146,4 +298,5 @@
return Result.ok();
}
+
}
--
Gitblit v1.9.1