wangzhiqiang 2 lat temu
rodzic
commit
573aff3e6a

+ 13 - 0
simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScoringRulesController.java

@@ -142,4 +142,17 @@ public class ScoringRulesController {
         List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesList(params);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, list);
     }
+
+    //该打分规则是否被引用
+    @PostMapping("/queryCsbById")
+    @ResponseBody
+    public ResponseBodyVO<Integer> queryCsbById(@RequestBody ScoringRulesParam params) {
+        if (ObjectUtil.isNull(params.getRulesId())) {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "rulesId为空,请检查");
+        }
+        Integer num = scoringRulesService.queryCsbById(params);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, num);
+    }
+
+
 }

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScoringRulesMapper.java

@@ -16,7 +16,7 @@ public interface ScoringRulesMapper {
     List<ScoringRulesPO> queryScoringRulesByRuleName(ScoringRulesParam params);
 
     List<ScoringRulesPO> queryScoringRulesList(ScoringRulesParam params);
-
+    Integer queryCsbById(ScoringRulesParam params);
     ScoringRulesPO queryScoringRules(ScoringRulesParam params);
 
     void updateScoringRules(ScoringRulesPO params);

+ 7 - 0
simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScoringRulesService.java

@@ -74,4 +74,11 @@ public class ScoringRulesService {
         scoringRulesMapper.updateScoringRules(params);
         LogUtil.delete();
     }
+
+    @SneakyThrows
+    public Integer queryCsbById(ScoringRulesParam params) {
+
+        Integer num = scoringRulesMapper.queryCsbById(params);
+        return num;
+    }
 }

+ 13 - 0
simulation-resource-server/src/main/resources/mapper/scene/ScoringRulesMapper.xml

@@ -136,4 +136,17 @@
         where rules_id = #{rulesId,jdbcType=VARCHAR}
 
     </update>
+
+
+
+    <select id="queryCsbById" parameterType="api.common.pojo.param.scene.ScoringRulesParam"
+            resultType="java.lang.Integer">
+        select
+        COUNT(sublist_id)
+        from simulation.scene_package_sublist
+        where
+            is_deleted = '0'
+                and package_and_rules = #{rulesId,jdbcType=VARCHAR}
+    </select>
+
 </mapper>

+ 1 - 1
simulation-resource-video/src/main/java/com/css/simulation/resource/video/service/VideoService.java

@@ -103,7 +103,7 @@ public class VideoService {
         String esminiCommandTemp = esminiCommand + " " + xoscPath + " " + pictureDirectoryPath + "/screenshot " + StringUtil.doubleToString(Double.parseDouble(maxSimulationTime), 2);
         LinuxUtil.execute2(XvfbCommand, esminiCommandTemp);
 //        String esminiResult = LinuxUtil.execute(esminiCommandTemp);
-        int num=10;
+        int num=14;
         for (int i=0;i<num;i++ ) {
             String remove="rm -f "+ pictureDirectoryPath + "/screenshot_0000"+i+".tga";
             log.info("删除图片=="+remove);