修改仿真后台

xyc

2024-08-06 a8230f1ab02069431738bd72f36ab95a0ace01ae

修改仿真后台

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

@@ -53,7 +53,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;
@@ -240,7 +239,7 @@

    @GetMapping("getCalcProgress")
    public Result getCalcProgress(Long taskId) {
        String key = taskId.toString() + taskTypeProgress;
        String key = taskId.toString() + simulatAssessService.RELIA_SIM_TASK_TYPE_PROGRESS;
        String progress = (String) redisTemplate.opsForValue().get(key);
        if (progress == null) progress = "0";
        return Result.ok(progress);

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java

@@ -38,18 +38,13 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.awt.*;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.*;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;


@@ -62,7 +57,8 @@
@Service
public class SimulatAssessService extends BaseService<SimulatAssessDao, SimulatAssess> {
    private static final Logger logger = LoggerFactory.getLogger(SimulatAssessService.class);
    private static final String RELIA_SIM_TASK_TYPE_SIMULATION = "calcreq";
    public static final String RELIA_SIM_TASK_TYPE_SIMULATION = "calcreq";
    public static final String RELIA_SIM_TASK_TYPE_PROGRESS = "calcprog";

    @Value("${spring.redis.host}")
    private String redisHost;
@@ -72,6 +68,8 @@
    private String reliaSimMain;
    @Value("${data.reliaSimLib.resultHome}")
    private String resultHome;
    @Value("${data.reliaSimLib.fixedRandomSeed}")
    private String fixedRandomSeed;

    @Autowired
    private RedisTemplate redisTemplate;
@@ -762,8 +760,19 @@
        // 采样周期
        jsonObject.put("timeslice", simulatAssess.getSamplPeriod() / 60.0);   // 单位统一换算为小时
        jsonObject.put("result_home", resultHome);
        if (null != fixedRandomSeed && "1".equals(fixedRandomSeed)) {
            // 固定种子
        jsonObject.put("seed", 1000);
        } else {
            // 随机种子
            jsonObject.put("seed", new Random().nextInt(1000));
        }
        redisTemplate.opsForValue().set(key, jsonObject.toJSONString());
    }

    public void deleteSimInfoInRedis(Long simId) {
        redisTemplate.delete(simId.toString() + RELIA_SIM_TASK_TYPE_SIMULATION);
        redisTemplate.delete(simId.toString() + RELIA_SIM_TASK_TYPE_PROGRESS);
    }

    private void assembleModelXml(SimulatAssess simulatAssess) {
@@ -819,6 +828,8 @@
            } finally {
                if (xmlWriter != null) xmlWriter.close();
            }
            // XML存盘
            update(simulatAssess);
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException("组装算法库仿真计算用模型XML失败: " + e.getMessage());

 starter/src/main/resources/application.yml

@@ -150,3 +150,5 @@
    mainPy: D:/relia_sim/main.py
    # 算法库仿真结果存放根目录
    resultHome: d:/relia_sim/sim_result
    # 是否固定仿真随机种子（1：是，0：否）
    fixedRandomSeed: 0