Merge remote-tracking branch 'origin/master'

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);
+    }
+
+
 }

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);

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;
+    }
 }

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>

simulation-resource-video/src/main/java/com/css/simulation/resource/video/controller/VideoController.java

@@ -1,6 +1,7 @@
 package com.css.simulation.resource.video.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.po.scene.VehicleTypePO;
 import api.common.pojo.vo.scene.SceneAccidentVO;
 import api.common.util.LinuxUtil;
 import com.css.simulation.resource.video.service.VideoService;
@@ -103,4 +104,13 @@ public class VideoController {
           //  return new String(e.getMessage());
         }
     }
+
+    @RequestMapping(value = "/test1")
+    @ResponseBody
+    public ResponseBodyVO<VehicleTypePO> test1(@RequestBody Map<String,String> map) {
+        VehicleTypePO po= videoService.vehicleById(map.get("projectId"),map.get("projectType"));
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, po);
+    }
+
+
 }

simulation-resource-video/src/main/java/com/css/simulation/resource/video/mapper/VehicleMapper.java

@@ -36,6 +36,7 @@ public interface VehicleMapper {
             @Result(column = "right_distance", property = "rightDistance", jdbcType = JdbcType.DECIMAL),
             @Result(column = "height_distance", property = "heightDistance", jdbcType = JdbcType.DECIMAL),
             @Result(column = "wheelbase", property = "wheelbase", jdbcType = JdbcType.DECIMAL),
+            @Result(column = "model_label", property = "modelLabel", jdbcType = JdbcType.VARCHAR),
             @Result(column = "share", property = "share", jdbcType = JdbcType.VARCHAR)
     })
     @Select("select id,\n" +

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

@@ -96,13 +96,14 @@ public class VideoService {
         //3 生成 xosc 文件
         String xoscPath = generateXosc(rootDirectoryPathOfLinux, xodrPathOfLinux, osgbPathOfLinux, projectId, projectType);
         // 启动虚拟窗口
+        log.info("生成xosc文件路径-----"+xoscPath);
         //4 生成图片
         String pictureDirectoryPath = rootDirectoryPathOfLinux + "picture";
         FileUtil.createDirectory(pictureDirectoryPath);
         String esminiCommandTemp = esminiCommand + " " + xoscPath + " " + pictureDirectoryPath + "/screenshot " + StringUtil.doubleToString(Double.parseDouble(maxSimulationTime), 2);
         LinuxUtil.execute2(XvfbCommand, esminiCommandTemp);
 //        String esminiResult = LinuxUtil.execute(esminiCommandTemp);
-        int num=15;
+        int num=14;
         for (int i=0;i<num;i++ ) {
             String remove="rm -f "+ pictureDirectoryPath + "/screenshot_0000"+i+".tga";
             log.info("删除图片=="+remove);
@@ -127,7 +128,7 @@ public class VideoService {
         log.info("上传成功：" + videoTargetPathOfMinio);
         //删除生成的临时文件
         String removeAll="rm -rf "+ pictureDirectoryPath ;
-        log.info("删除图片=="+removeAll);
+        log.info("删除全部图片=="+removeAll);
         LinuxUtil.execute( removeAll);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
@@ -154,6 +155,7 @@ public class VideoService {
         String newXoscPath = oldXoscPath.replace(oldXoscName, newXoscName);
         //获取三维自车对象
         VehicleTypePO po = vehicleById(projectId, projectType);
+        log.info("修改 xosc 文件----=="+po.getModel3d());
 
         //1 创建Reader对象
         SAXReader reader = new SAXReader();
@@ -294,7 +296,7 @@ public class VideoService {
 
     //获取三维自车对象
     @SneakyThrows
-    private VehicleTypePO vehicleById(String projectId, String projectType) {
+    public VehicleTypePO vehicleById(String projectId, String projectType) {
         VehicleTypePO po = new VehicleTypePO();
         //项目类型 1.手动；2.自动
         String vehicle = "";