mlx

api-common/src/main/java/api/common/util/PythonUtil.java

@@ -34,10 +34,10 @@ public class PythonUtil {
     @SneakyThrows
     public static String pylint(String pythonCode, String... disables) {
         //1 把代码保存成本地文件
-        String filePath = "/home/ubuntu/test/" + UUID.randomUUID().toString().replace("-", "") + ".py";
+        String filePath = "/SimulationCloud/Evaluate/test/" + UUID.randomUUID().toString().replace("-", "") + ".py";
         FileUtil.writeStringToLocalFile(pythonCode, filePath);
         //2 执行命令检查格式
-        StringBuilder command = new StringBuilder("pylint --disable=");
+        StringBuilder command = new StringBuilder("pylint3 --disable=");
         for (String disable : disables) {
             command.append(disable).append(",");
         }

simulation-resource-server/src/main/resources/mapper/scene/SceneAccidentMapper.xml

@@ -4,18 +4,22 @@
 
     <insert id="saveSceneAccident" parameterType="api.common.pojo.po.scene.SceneAccidentPO">
         insert into simulation.scene_accident
-        (accident_id,scene_name,self_driving,target_driving,
-        self_reaction,conflict_behavior,conflict_type,
-        scence_resume,scene_time,scene_weather,
-       create_user_id,create_time,modify_user_id,modify_time,
-         is_deleted,share,video_preview,video_address,osgb_address,xml_address,xodr_address,
-        json_address,max_time)
-        values (#{accidentId,jdbcType=VARCHAR},#{sceneName,jdbcType=VARCHAR},#{selfDriving,jdbcType=VARCHAR}, #{targetDriving,jdbcType=VARCHAR},
-        #{selfReaction,jdbcType=VARCHAR}, #{conflictBehavior,jdbcType=VARCHAR},#{conflictType,jdbcType=VARCHAR},
-        #{scenceResume,jdbcType=VARCHAR}, #{sceneTime,jdbcType=VARCHAR},#{sceneWeather,jdbcType=VARCHAR},
-       #{createUserId,jdbcType=VARCHAR},#{createTime},#{modifyUserId,jdbcType=VARCHAR},#{modifyTime},
-        #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR},#{videoPreview,jdbcType=VARCHAR},#{videoAddress,jdbcType=VARCHAR},#{osgbAddress,jdbcType=VARCHAR},
-        #{xmlAddress,jdbcType=VARCHAR}, #{xodrAddress,jdbcType=VARCHAR},#{jsonAddress,jdbcType=VARCHAR},#{maxTime,jdbcType=VARCHAR})
+        (accident_id, scene_name, self_driving, target_driving,
+         self_reaction, conflict_behavior, conflict_type,
+         scence_resume, scene_time, scene_weather,
+         create_user_id, create_time, modify_user_id, modify_time,
+         is_deleted, share, video_preview, video_address, osgb_address, xml_address, xodr_address,
+         json_address, max_time)
+        values (#{accidentId,jdbcType=VARCHAR}, #{sceneName,jdbcType=VARCHAR}, #{selfDriving,jdbcType=VARCHAR},
+                #{targetDriving,jdbcType=VARCHAR},
+                #{selfReaction,jdbcType=VARCHAR}, #{conflictBehavior,jdbcType=VARCHAR},
+                #{conflictType,jdbcType=VARCHAR},
+                #{scenceResume,jdbcType=VARCHAR}, #{sceneTime,jdbcType=VARCHAR}, #{sceneWeather,jdbcType=VARCHAR},
+                #{createUserId,jdbcType=VARCHAR}, #{createTime}, #{modifyUserId,jdbcType=VARCHAR}, #{modifyTime},
+                #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{videoPreview,jdbcType=VARCHAR},
+                #{videoAddress,jdbcType=VARCHAR}, #{osgbAddress,jdbcType=VARCHAR},
+                #{xmlAddress,jdbcType=VARCHAR}, #{xodrAddress,jdbcType=VARCHAR}, #{jsonAddress,jdbcType=VARCHAR},
+                #{maxTime,jdbcType=VARCHAR})
     </insert>
     <insert id="saveSceneAccidentList" parameterType="java.util.List">
         insert into simulation.scene_accident
@@ -284,14 +288,24 @@
 
     <update id="updateSceneAccident" parameterType="api.common.pojo.po.scene.SceneAccidentPO">
         update simulation.scene_accident
-       set scene_name=#{sceneName},self_driving=#{selfDriving},
-       target_driving=#{targetDriving},self_reaction=#{selfReaction},
-       conflict_behavior=#{conflictBehavior},conflict_type=#{conflictType},
-       scence_resume=#{scenceResume},scene_time=#{sceneTime},
-       scene_weather=#{sceneWeather},modify_time=#{modifyTime},
-       modify_user_id=#{modifyUserId},video_address=#{videoAddress},
-       osgb_address=#{osgbAddress},xml_address=#{xmlAddress},
-       xodr_address=#{xodrAddress},json_address=#{jsonAddress},max_time=#{maxTime},share=#{share}
+        set scene_name=#{sceneName},
+            self_driving=#{selfDriving},
+            target_driving=#{targetDriving},
+            self_reaction=#{selfReaction},
+            conflict_behavior=#{conflictBehavior},
+            conflict_type=#{conflictType},
+            scence_resume=#{scenceResume},
+            scene_time=#{sceneTime},
+            scene_weather=#{sceneWeather},
+            modify_time=#{modifyTime},
+            modify_user_id=#{modifyUserId},
+            video_address=#{videoAddress},
+            osgb_address=#{osgbAddress},
+            xml_address=#{xmlAddress},
+            xodr_address=#{xodrAddress},
+            json_address=#{jsonAddress},
+            max_time=#{maxTime},
+            share=#{share}
         where accident_id = #{accidentId,jdbcType=VARCHAR}
     </update>
 
@@ -326,7 +340,8 @@
         JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
         JOIN system_scene_package_sublist s on p.id = s.scene_and_package
         where scene_type='3' and s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join scene_accident
-        jt on qx.scene_name=jt.scene_name  and jt.share='2' union select jtNew.* from scene_accident jtNew where jtNew.share='1' and is_deleted='0') cc
+        jt on qx.scene_name=jt.scene_name and jt.share='2' union select jtNew.* from scene_accident jtNew where
+        jtNew.share='1' and is_deleted='0') cc
         <where>
             <if test="sceneName != null and sceneName != ''">
                 and scene_name like CONCAT('%',#{sceneName,jdbcType=VARCHAR},'%')
@@ -441,15 +456,31 @@
 
     <select id="querySceneAccidentById" parameterType="java.lang.String"
             resultType="api.common.pojo.po.scene.SceneAccidentPO">
-        select
-       accident_id,scene_name,self_driving,target_driving,
-        self_reaction,conflict_behavior,conflict_type,
-        scence_resume,scene_time,scene_weather,
-       create_user_id,create_time,modify_user_id,modify_time,
-         is_deleted,share,video_preview,video_address,osgb_address,xml_address,xodr_address,
-        json_address,max_time
+        select accident_id,
+               scene_name,
+               self_driving,
+               target_driving,
+               self_reaction,
+               conflict_behavior,
+               conflict_type,
+               scence_resume,
+               scene_time,
+               scene_weather,
+               create_user_id,
+               create_time,
+               modify_user_id,
+               modify_time,
+               is_deleted,
+               share,
+               video_preview,
+               video_address,
+               osgb_address,
+               xml_address,
+               xodr_address,
+               json_address,
+               max_time
         from simulation.scene_accident
-        where accident_id=#{id}
+        where accident_id = #{id}
     </select>