commit

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/TaskDomainService.java

@@ -583,7 +583,7 @@ public class TaskDomainService {
                 bufferedReader.close();
             } catch (IOException e) {
                 log.error("读取场景评价结果失败", e);
-                return false;
+                continue;
             }
             String resultStr = result.toString();
             String replace = StringUtil.replace(resultStr, "'", "\"");
@@ -594,7 +594,7 @@ public class TaskDomainService {
                 rootNode = mapper.readTree(replace);
             } catch (Exception e) {
                 log.error("场景" + sceneEvaluationComputeParam.getSceneId() + " 的场景评价失败：", e);
-                return false;
+                continue;
             }
             if (StringUtils.equals(sceneEvaluationComputeParam.getComputeType(), DictConstants.COMPLEXITY)) {
                 String complexity = rootNode.path("复杂度").asText();

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneEvaluationRuleService.java

@@ -362,7 +362,7 @@ public class SceneEvaluationRuleService {
                 bufferedReader.close();
             } catch (IOException e) {
                 log.error("读取场景评价结果失败", e);
-                return false;
+                continue;
             }
             String resultStr = result.toString();
             String replace = StringUtil.replace(resultStr, "'", "\"");
@@ -373,7 +373,7 @@ public class SceneEvaluationRuleService {
                 rootNode = mapper.readTree(replace);
             } catch (Exception e) {
                 log.error("场景" + sceneEvaluationComputeParam.getSceneId() + " 的场景评价失败：", e);
-                return false;
+                continue;
             }
             if (StringUtils.equals(sceneEvaluationComputeParam.getComputeType(), DictConstants.COMPLEXITY)) {
                 String complexity = rootNode.path("复杂度").asText();

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneStandardsService.java

@@ -159,7 +159,7 @@ public class SceneStandardsService {
                 .collect(Collectors.toList());
 
 
-        standardsRegulationsPOS.stream().forEach(po -> {            // 赋值复杂度
+        standardsRegulationsPOS.forEach(po -> {            // 赋值复杂度
 
             // 赋值复杂度
             if (complexityPOMap.get(po.getRegulationsId()) != null) {

simulation-resource-server/src/main/resources/mysql/mapper/SceneComplexityMapper.xml

@@ -8,26 +8,25 @@
         FROM
         (
         SELECT
-        DISTINCT(srl.scene_id) scene_id,
-        sc.complexity complexity,
-        sc.complexity_level complexity_level,
-        sc.create_time create_time
+        DISTINCT(scene_id),
+        complexity,
+        complexity_level,
+        create_time
         FROM
-        simulation.scene_reference_lib srl
-        LEFT JOIN scene_complexity sc ON srl.scene_id = sc.scene_id
+        scene_complexity
         <where>
-            srl.is_deleted = '0'
+            is_deleted = '0'
             <if test="minComplexity != null and minComplexity != ''">
-                AND sc.complexity+0 >= #{minComplexity}
+                AND complexity+0 >= #{minComplexity}
             </if>
             <if test="maxComplexity != null and maxComplexity != ''">
-                AND sc.complexity+0 &lt;=  #{maxComplexity}
+                AND complexity+0 &lt;=  #{maxComplexity}
             </if>
             <if test="complexityLevel != null and complexityLevel != ''">
-                AND sc.complexity_level+0 >=  #{complexityLevel}
+                AND complexity_level+0 >=  #{complexityLevel}
             </if>
             <if test="sceneIdList != null and sceneIdList.size()>0">
-                AND srl.scene_id IN
+                AND scene_id IN
                 <foreach collection="sceneIdList" item="item" index="index"
                          separator="," open="(" close=")">
                     #{item}
@@ -35,7 +34,7 @@
             </if>
         </where>
         ORDER BY
-        sc.create_time DESC
+        create_time DESC
         ) srlsc GROUP BY scene_id;
     </select>
 

simulation-resource-server/src/main/resources/mysql/mapper/SceneRiskMapper.xml

@@ -8,26 +8,25 @@
         FROM
         (
         SELECT
-        DISTINCT(srl.scene_id) scene_id,
-        sr.risk risk,
-        sr.risk_level risk_level,
-        sr.create_time create_time
+        DISTINCT(scene_id),
+        risk,
+        risk_level,
+        create_time
         FROM
-        simulation.scene_reference_lib srl
-        LEFT JOIN scene_risk sr ON srl.scene_id = sr.scene_id
+        scene_risk
         <where>
-            srl.is_deleted = '0'
+            is_deleted = '0'
             <if test="minRisk != null and minRisk != ''">
-                AND sr.risk+0 >= #{minRisk}
+                AND risk+0 >= #{minRisk}
             </if>
             <if test="maxRisk != null and maxRisk != ''">
-                AND sr.risk+0 &lt;=  #{maxRisk}
+                AND risk+0 &lt;=  #{maxRisk}
             </if>
             <if test="riskLevel != null and riskLevel != ''">
-                AND sr.risk_level+0 >=  #{riskLevel}
+                AND risk_level+0 >=  #{riskLevel}
             </if>
             <if test="sceneIdList != null and sceneIdList.size()>0">
-                AND srl.scene_id IN
+                AND scene_id IN
                 <foreach collection="sceneIdList" item="item" index="index"
                          separator="," open="(" close=")">
                     #{item}
@@ -35,7 +34,7 @@
             </if>
         </where>
         ORDER BY
-        sr.create_time DESC
+        create_time DESC
         ) srlsc GROUP BY scene_id;
     </select>