修改

xyc

2024-07-24 93e6bae4c6b4ce5b37d73517a4c212c5496c4d68

修改

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/async/PythonLib.java

@@ -115,6 +115,7 @@
    private void setParamToRedis(SimulatAssess simulatAssess) {
        String key = simulatAssess.getId().toString() + taskType;
        logger.info("redis key：" + key);
/*
        String xmlfile = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
                "<des name=\"General system\">\n" +
                "    <tasks>\n" +
@@ -243,6 +244,107 @@
                "        </repair_model>\n" +
                "    </repair_models>\n" +
                "</des>";
*/
        String xmlfile = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
                "<des name=\"General system\">\n" +
                "    <tasks>\n" +
                "        <task duration=\"200\" model=\"model1\"/>\n" +
                "        <task duration=\"100\" model=\"model2\"/>\n" +
                "    </tasks>\n" +
                "    <models>\n" +
                "        <model name =\"model1\">\n" +
                "            <logic name=\"1813102074724945921\" type=\"series\">                \n" +
                "\t\t\t\t<logic name=\"1721113377977629981\" type=\"series\">                \n" +
                "\t\t\t\t\t<logic name=\"p1\" type=\"parallel\">                \n" +
                "\t\t\t\t\t\t<node name=\"1721113796232438988\" type=\"node\">\n" +
                "\t\t\t\t\t\t\t<failure_model name=\"fm1\"/>\n" +
                "                            <repair_model name=\"rm1\"/>\n" +
                "\t\t\t\t\t\t</node>                \n" +
                "\t\t\t\t\t\t<node name=\"1721113971135848726\" type=\"node\" cycon=\"15\" cycdown=\"5\">\n" +
                "\t\t\t\t\t\t\t<failure_model name=\"fm1\"/>\n" +
                "\t\t\t\t\t\t</node>\n" +
                "\t\t\t\t\t</logic>\n" +
                "                    <logic name=\"v1\" type=\"vote\" k=\"2\">\n" +
                "\t\t\t\t\t\t<node name=\"1721113929312687055\" type=\"node\">\n" +
                "\t\t\t\t\t\t\t<failure_model name=\"fm1\"/>\n" +
                "                            <repair_model name=\"rm2\"/>\n" +
                "\t\t\t\t\t\t</node>                \n" +
                "\t\t\t\t\t\t<node name=\"1721113465658619786\" type=\"node\">\n" +
                "\t\t\t\t\t\t\t<failure_model name=\"fm2\"/>\n" +
                "\t\t\t\t\t\t</node>\n" +
                "\t\t\t\t\t\t<node name=\"1721113182603098012\" type=\"node\">\n" +
                "\t\t\t\t\t\t\t<failure_model name=\"fm1\"/>\n" +
                "\t\t\t\t\t\t</node>                \n" +
                "\t\t\t\t\t</logic>\n" +
                "\t\t\t\t</logic>\n" +
                "\t\t\t\t<logic name=\"1721113127170514122\" type=\"series\">                \n" +
                "\t\t\t\t\t<node name =\"1721113197988754255\" type=\"node\">\n" +
                "\t\t\t\t\t\t<failure_model name=\"fm1\"/>\n" +
                "\t\t\t\t\t</node>\n" +
                "\t\t\t\t\t<node name=\"1721113169705470682\" type=\"node\">\n" +
                "\t\t\t\t\t\t<failure_model name=\"fm2\"/>\n" +
                "\t\t\t\t\t</node>\n" +
                "\t\t\t\t</logic>\n" +
                "            </logic>\n" +
                "        </model>\n" +
                "        <model name =\"model2\">\n" +
                "            <logic name=\"1813102074724945921\" type=\"series\">                \n" +
                "\t\t\t\t<logic name=\"1721113377977629981\" type=\"series\">                \n" +
                "\t\t\t\t\t<logic name=\"p1\" type=\"parallel\">                \n" +
                "\t\t\t\t\t\t<node name=\"1721113796232438988\" type=\"node\">\n" +
                "\t\t\t\t\t\t\t<failure_model name=\"fm1\"/>\n" +
                "                            <repair_model name=\"rm1\"/>\n" +
                "\t\t\t\t\t\t</node>                \n" +
                "\t\t\t\t\t\t<node name=\"1721113971135848726\" type=\"node\" cycon=\"15\" cycdown=\"5\">\n" +
                "\t\t\t\t\t\t\t<failure_model name=\"fm1\"/>\n" +
                "\t\t\t\t\t\t</node>\n" +
                "\t\t\t\t\t</logic>\n" +
                "                    <logic name=\"v1\" type=\"vote\" k=\"2\">\n" +
                "\t\t\t\t\t\t<node name=\"1721113929312687055\" type=\"node\">\n" +
                "\t\t\t\t\t\t\t<failure_model name=\"fm1\"/>\n" +
                "                            <repair_model name=\"rm2\"/>\n" +
                "\t\t\t\t\t\t</node>                \n" +
                "\t\t\t\t\t\t<node name=\"1721113465658619786\" type=\"node\">\n" +
                "\t\t\t\t\t\t\t<failure_model name=\"fm2\"/>\n" +
                "\t\t\t\t\t\t</node>\n" +
                "\t\t\t\t\t\t<node name=\"1721113182603098012\" type=\"node\">\n" +
                "\t\t\t\t\t\t\t<failure_model name=\"fm1\"/>\n" +
                "\t\t\t\t\t\t</node>                \n" +
                "\t\t\t\t\t</logic>\n" +
                "\t\t\t\t</logic>\n" +
                "\t\t\t\t<logic name=\"1721113127170514122\" type=\"parallel\">                \n" +
                "\t\t\t\t\t<node name =\"1721113197988754255\" type=\"node\">\n" +
                "\t\t\t\t\t\t<failure_model name=\"fm1\"/>\n" +
                "\t\t\t\t\t</node>\n" +
                "\t\t\t\t\t<node name=\"1721113169705470682\" type=\"node\">\n" +
                "\t\t\t\t\t\t<failure_model name=\"fm2\"/>\n" +
                "\t\t\t\t\t</node>\n" +
                "\t\t\t\t</logic>\n" +
                "            </logic>\n" +
                "        </model>\n" +
                "    </models>\n" +
                "    <failure_models>\n" +
                "        <failure_model name=\"fm1\" type=\"exponential\">\n" +
                "            <failure-rate value=\"0.004\"/>\n" +
                "        </failure_model>\n" +
                "        <failure_model name=\"fm2\" type=\"fixed\">\n" +
                "            <unreliability value=\"0.04\"/>\n" +
                "        </failure_model>\n" +
                "        <failure_model name=\"fm3\" type=\"weibull\">\n" +
                "            <scale value=\"100\"/>\n" +
                "            <shape value=\"2\"/>\n" +
                "        </failure_model>\n" +
                "    </failure_models>\n" +
                "    <repair_models>\n" +
                "        <repair_model name=\"rm1\" type=\"exponential\">\n" +
                "            <repair-rate value=\"0.1\"/>\n" +
                "        </repair_model>\n" +
                "        <repair_model name=\"rm2\" type=\"weibull\">\n" +
                "            <scale value=\"13\"/>\n" +
                "            <shape value=\"2\"/>\n" +
                "        </repair_model>\n" +
                "    </repair_models>\n" +
                "</des>";
        JSONObject jsonObject = new JSONObject();
/*
        Long simulate_times = 10000L;