时序图

wente

2024-10-30 5f7101c8de0603c876b70735a881caa2d8437130

 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,6 +34,7 @@
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 java.io.File;
import java.io.FileInputStream;
@@ -51,12 +57,6 @@

    @Autowired
    private RedisTemplate redisTemplate;

    @Autowired
    private PythonLib pythonLib;

    @Autowired
    private TaskService taskService;


    @Autowired
@@ -85,14 +85,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) {
@@ -107,8 +133,8 @@
    }

    @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);
    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);
    }

@@ -137,14 +163,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")
@@ -154,13 +248,26 @@
    }

    @GetMapping("SchemeCompar")
    public Result<SchemeComparDto> SchemeCompar(@RequestParam("taskList[]") String[] taskList,Long showProductId) {
       SchemeComparDto data = simulatAssessService.SchemeCompar(taskList,showProductId);
    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();
    }

    @PutMapping
    @ApiOperation("修改")