修改

jinlin

2024-08-15 46c8d02ada5e72e5525ee7232e5932dbe383ffe6

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java

@@ -1,37 +1,40 @@
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.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.utils.JsonUtils;
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.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.service.SimulatAssessService;
import com.zt.life.modules.mainPart.taskReliability.service.TaskService;
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;
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;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;


/**
@@ -45,7 +48,6 @@
@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;
@@ -53,13 +55,15 @@
    @Autowired
    private PythonLib pythonLib;

    @Value("${data.reliaSimLib.resultHome}")
    private String path;
    @Autowired
    private TaskService taskService;


    @Autowired
    private SimulatAssessService simulatAssessService;

    @GetMapping("page")

   /* @GetMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
            @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
@@ -70,7 +74,7 @@
    public PageResult<SimulatAssess> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {

        return PageResult.ok(simulatAssessService.page(queryFilter));
    }
    }*/

    @GetMapping("{id}")
    @ApiOperation("信息")
@@ -80,49 +84,95 @@
        return Result.ok(data);
    }

    @GetMapping("getSimulatList")
    @ApiOperation("信息")
    public Result<List<SimulatAssess>> getSimulatList(Long taskModelId) {
        List<SimulatAssess> data = simulatAssessService.getList(taskModelId);

        return Result.ok(data);
    }

    @GetMapping("getSimulatParams")
    @ApiOperation("信息")
    public Result<SimulatAssess> getSimulatParams(Long id, Long taskModelId) {
        SimulatAssess data = simulatAssessService.getParams(id, taskModelId);
        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);
//        Result result = pythonLib.callPython(simulatAssess);
        Result result = simulatAssessService.simulate(simulatAssess);

        return result;
    }

    @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();
        }
        JSONObject xmlJSONObj = XML.toJSONObject(xml);
    @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<String> getTimeDiagram(Long productId, Long taskId, Long fzId) {
        String data = simulatAssessService.getTimeDiagram(productId, taskId, fzId);
        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";
        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);
        }
        return Result.ok(progress);
    }

    @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<SchemeComparDto> SchemeCompar(@RequestParam("taskList[]") String[] taskList) {
       SchemeComparDto data = simulatAssessService.SchemeCompar(taskList);
        return Result.ok(data);
    }


    @PutMapping
    @ApiOperation("修改")
@@ -146,4 +196,5 @@
        return Result.ok();
    }


}