Merge branch '20240309-saq-fix' of gitee.com:lingxinmeng/simulation-cloud into 20240309-saq-fix

mereg

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/SceneEvaluationController.java

@@ -1,7 +1,6 @@
 package com.css.simulation.resource.scheduler.adapter.controller;
 
 
-import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.SceneEvaluationComputeParam;
 import com.css.simulation.resource.scheduler.domain.service.TaskDomainService;
 import lombok.extern.slf4j.Slf4j;
@@ -21,8 +20,7 @@ public class SceneEvaluationController {
     private TaskDomainService taskDomainService;
 
     @PostMapping("/computeSceneEvaluation")
-    public ResponseBodyVO<String> computeSceneEvaluation(@RequestBody SceneEvaluationComputeParam sceneEvaluationComputeParam) {
+    public void computeSceneEvaluation(@RequestBody SceneEvaluationComputeParam sceneEvaluationComputeParam) {
         taskDomainService.computeSceneEvaluation(sceneEvaluationComputeParam);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SceneComplexityMapper.java

@@ -1,11 +1,15 @@
 package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 import api.common.pojo.po.scene.SceneComplexityPO;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 
 
 @Mapper
 public interface SceneComplexityMapper {
+
+    @Insert( "insert into simulation.scene_complexity (complexity_id, scene_id, scene_type, rule_id, task_id, complexity, complexity_level, is_deleted, create_user_id, create_time)" +
+    " values (#{complexityId,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, #{sceneType,jdbcType=VARCHAR},#{ruleId,jdbcType=VARCHAR},#{taskId,jdbcType=VARCHAR}, #{complexity,jdbcType=VARCHAR},#{complexityLevel,jdbcType=VARCHAR},#{isDeleted,jdbcType=VARCHAR},#{createUserId,jdbcType=VARCHAR}, #{createTime}")
     void saveSceneComplexity(SceneComplexityPO params);
 
 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SceneRiskMapper.java

@@ -1,11 +1,24 @@
 package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 import api.common.pojo.po.scene.SceneRiskPO;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 
 
 @Mapper
 public interface SceneRiskMapper {
+
+    @Insert("        insert into simulation.scene_risk\n" +
+            "        (risk_id, scene_id, scene_type, rule_id,algorithm_id,vehicle_id\n" +
+            "         task_id, risk, risk_level,\n" +
+            "         is_deleted, create_user_id, create_time\n" +
+            "        )\n" +
+            "        values (#{riskId,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, #{sceneType,jdbcType=VARCHAR},\n" +
+            "                #{ruleId,jdbcType=VARCHAR},#{algorithmId,jdbcType=VARCHAR},#{vehicleId,jdbcType=VARCHAR},\n" +
+            "                #{taskId,jdbcType=VARCHAR}, #{risk,jdbcType=VARCHAR},\n" +
+            "                #{riskLevel,jdbcType=VARCHAR},\n" +
+            "                #{isDeleted,jdbcType=VARCHAR},\n" +
+            "                #{createUserId,jdbcType=VARCHAR}, #{createTime})")
     void saveSceneRisk(SceneRiskPO params);
 
 }

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

@@ -687,8 +687,6 @@ public class SceneNaturalService {
                                     sceneNaturalPO.setModifyTime(TimeUtil.getNowForMysql());
                                     sceneNaturalPO.setModifyUserId(AuthUtil.getCurrentUserId());
                                     sceneNaturalMapper.updateSceneNatural(sceneNaturalPO);
-
-                                    // todo 调用 py 脚本计算复杂度 需要参数和返回结果写入 最好走 kafka
                                 });
                             } else {
                                 // -------------------------------- 保存数据到 mysql --------------------------------
@@ -699,8 +697,6 @@ public class SceneNaturalService {
                                 sceneNaturalPO.setCreateUserId(AuthUtil.getCurrentUserId());
                                 sceneNaturalPO.setModifyTime(TimeUtil.getNowForMysql());
                                 sceneNaturalMapper.saveSceneNatural(sceneNaturalPO);
-
-                                // todo 调用 py 脚本计算复杂度 需要参数和返回结果写入 最好走 kafka
                             }
                             successNum = successNum + 1;