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 | 180 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 141 insertions(+), 39 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 811745c..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
@@ -6,6 +6,11 @@
import cn.hutool.json.XML;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.zt.common.annotation.LogOperation;
+import com.zt.common.annotation.QueryParam;
+import com.zt.common.constant.Constant;
+import com.zt.common.db.query.QueryFilter;
+import com.zt.common.exception.RenException;
+import com.zt.common.servlet.PageResult;
import com.zt.common.servlet.Result;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
@@ -13,13 +18,13 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.async.PythonLib;
import com.zt.life.modules.mainPart.taskReliability.dto.*;
-import com.zt.life.modules.mainPart.taskReliability.model.CurveParam;
-import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
-import com.zt.life.modules.mainPart.taskReliability.model.Task;
-import com.zt.life.modules.mainPart.taskReliability.model.TimeDiagram;
+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;
@@ -29,7 +34,10 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
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;
@@ -52,29 +60,9 @@
@Autowired
private RedisTemplate redisTemplate;
- @Autowired
- private PythonLib pythonLib;
-
- @Autowired
- private TaskService taskService;
-
@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("淇℃伅")
@@ -99,14 +87,40 @@
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<Long> analyze(@RequestBody SimulatAssess simulatAssess) {
+ public Result<Object> analyze(@RequestBody SimulatAssess simulatAssess) {
//鏁堥獙鏁版嵁
// Result result = pythonLib.callPython(simulatAssess);
- Result result = simulatAssessService.simulate(simulatAssess);
-
- return result;
+ List<TaskModelCheckResultDto> result = simulatAssessService.simulateChecK(simulatAssess);
+ if (result != null) {
+ return Result.ok(result);
+ }
+ 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) {
@@ -121,8 +135,8 @@
}
@GetMapping("getStatus")
- public Result<String> getTimeDiagram(Long productId, Long taskId, Long fzId) {
- String data = simulatAssessService.getTimeDiagram(productId, taskId, fzId);
+ 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);
}
@@ -151,14 +165,82 @@
}
@GetMapping("getCalcProgress")
- public Result getCalcProgress(Long taskId) {
- String key = taskId.toString() + simulatAssessService.RELIA_SIM_TASK_TYPE_PROGRESS;
- String progress = (String) redisTemplate.opsForValue().get(key);
- if (progress == null) progress = "0";
- if (Objects.equals(progress, "100")) {
- simulatAssessService.deleteSimInfoInRedis(taskId);
+ 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);
+
+ 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")
@@ -168,11 +250,31 @@
}
@GetMapping("SchemeCompar")
- public Result<SchemeComparDto> SchemeCompar(@RequestParam("taskList[]") String[] taskList) {
- SchemeComparDto data = simulatAssessService.SchemeCompar(taskList);
+ 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
@ApiOperation("淇敼")
--
Gitblit v1.9.1