场景库模块代码

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

@@ -7,7 +7,7 @@ import java.util.TimeZone;
 
 public class TimeUtil {
 
-    private static String[] dateFmtArr= new String[]{"yyyyMMdd", "yyyy-MM-dd HH:mm:ss","yyyy-MM-dd"};
+    private static String[] dateFmtArr= new String[]{"yyyyMMdd", "yyyy-MM-dd HH:mm:ss","yyyy-MM-dd","HHmmssSS"};
 
     public static long getNow() {
         return System.currentTimeMillis();

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/FileController.java

@@ -4,6 +4,7 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.MinioParameter;
 import api.common.util.FileUtil;
+import api.common.util.TimeUtil;
 import com.css.simulation.resource.feign.FileDownService;
 import feign.Response;
 import lombok.extern.slf4j.Slf4j;
@@ -13,10 +14,12 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,47 +32,39 @@ public class FileController {
     @Resource
     private FileDownService fileDownService;
 
-    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseBodyVO<Map> upload(@RequestPart("file") MultipartFile file,
-                      @RequestParam("type") String type,@RequestParam("objectPath") String objectPath) {
-        String fileName="";
-        if(type.equals(DictConstants.SCENE_NATURAL)){
-            fileName="自然驾驶/"+objectPath+"/"+file.getOriginalFilename();
-        }else if(type.equals(DictConstants.SCENE_STANDARD)){
-            fileName="标准法规/"+objectPath+"/"+file.getOriginalFilename();
-        }else if(type.equals(DictConstants.SCENE_ACCIDENT)){
-            fileName="交通事故/"+objectPath+"/"+file.getOriginalFilename();
-        }else if(type.equals(DictConstants.SCENE_GENERAL)){
-            fileName="泛化场景/"+objectPath+"/"+file.getOriginalFilename();
-        }else{
-            fileName=file.getOriginalFilename();
+    @PostMapping(value = "/uploadWj", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseBodyVO<Map>  uploadWj(@RequestParam( "file") MultipartFile multipartFile, HttpServletRequest request)  {
+        //获取文件类型
+        String type = request.getParameter("type");
+        String objectPath = request.getParameter("objectPath");
+        if (multipartFile != null) {
+            String fileName="";
+            Integer nowTime= TimeUtil.getRq(new Date(),0);
+            if(type.equals(DictConstants.SCENE_NATURAL)){
+                fileName="自然驾驶场景/"+nowTime+"/"+objectPath+"/"+multipartFile.getOriginalFilename();
+            }else if(type.equals(DictConstants.SCENE_STANDARD)){
+                fileName="标准法规场景/"+nowTime+"/"+objectPath+"/"+multipartFile.getOriginalFilename();
+            }else if(type.equals(DictConstants.SCENE_ACCIDENT)){
+                fileName="交通事故场景/"+nowTime+"/"+objectPath+"/"+multipartFile.getOriginalFilename();
+            }else if(type.equals(DictConstants.SCENE_GENERAL)){
+                fileName="泛化场景/"+nowTime+"/"+objectPath+"/"+multipartFile.getOriginalFilename();
+            }else{
+                fileName=multipartFile.getOriginalFilename();
+            }
+            log.info("上传文件名称--------"+fileName);
+            log.info("文件类型--------"+multipartFile.getContentType());
+
+            ResponseBodyVO<String> respon=fileDownService.upload(multipartFile,fileName);
+            String videoPreview=  respon.getMessage();
+            Map map=new HashMap();
+            map.put("videoPreview",videoPreview);
+            map.put("fileName",fileName);
+
+            return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,map);
         }
-       log.info("上传文件名称--------"+file.getOriginalFilename());
-
-        ResponseBodyVO<String> respon=fileDownService.upload(file,fileName);
-          String videoPreview=  respon.getMessage();
-             Map map=new HashMap();
-             map.put("videoPreview",videoPreview);
-              map.put("fileName",fileName);
-
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,map);
-    }
-
-
-    @PostMapping(value = "/uploadNew", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseBodyVO<Map> upload(@RequestPart("file") MultipartFile file) {
-        log.info("上传文件名称--------"+file.getOriginalFilename());
-        String fileName=file.getOriginalFilename();
-        ResponseBodyVO<String> respon=fileDownService.upload(file,fileName);
-        String videoPreview=  respon.getMessage();
-        Map map=new HashMap();
-        map.put("videoPreview",videoPreview);
-        map.put("fileName",fileName);
-
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,map);
+        return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"文件流file为空，请检查！");
     }
 
-
     @PostMapping(value = "/download")
     public void download(
             HttpServletResponse response,@RequestBody @Validated MinioParameter parms
@@ -80,19 +75,6 @@ public class FileController {
        downloadForHttp(parms.getObjectName(), inputStream, response, 1024);
     }
 
-    @GetMapping(value = "/download1")
-    public void download1(
-            HttpServletResponse response
-    ) throws IOException {
-        MinioParameter parms =new MinioParameter();
-        parms.setObjectName("simulation.mp4");
-        Response download = fileDownService.download(parms);
-        Response.Body body = download.body();
-        InputStream inputStream = body.asInputStream();
-        downloadForHttp(parms.getObjectName(), inputStream, response, 1024);
-    }
-
-
 
     public  void downloadForHttp(String fileName, InputStream in, HttpServletResponse response, int bufferSize) throws IOException {
         int idx=fileName.lastIndexOf("/");
@@ -111,4 +93,5 @@ public class FileController {
         }
     }
 
+
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/SceneAccidentController.java

@@ -52,6 +52,14 @@ public class SceneAccidentController {
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 
+    //删除交通事故
+    @PostMapping("/deleteSceneAccident")
+    @ResponseBody
+    public ResponseBodyVO<String> deleteSceneAccident(@RequestBody SceneAccidentPO parms) {
+        sceneAccidentService.deleteSceneAccidentList(parms);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+    }
+
     @Resource
     private FileDownService fileDownService;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/SceneNaturalController.java

@@ -46,14 +46,22 @@ public class SceneNaturalController {
 
 
     //新增标准法规
-    @PostMapping("/saveSceneAccident")
+    @PostMapping("/saveSceneNatural")
     @ResponseBody
-    public ResponseBodyVO<String> saveSceneAccident(@RequestBody SceneNaturalParam parms) {
+    public ResponseBodyVO<String> saveSceneNatural(@RequestBody SceneNaturalParam parms) {
         sceneNaturalService.importZrjsSceneCicv(parms);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 
-    @Resource
+    //删除
+    @PostMapping("/deleteSceneNatural")
+    @ResponseBody
+    public ResponseBodyVO<String> deleteSceneNatural(@RequestBody SceneNaturalPO parms) {
+        sceneNaturalService.deleteSceneNatural(parms);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+    }
+
+   /* @Resource
     private FileDownService fileDownService;
 
     @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@@ -61,7 +69,7 @@ public class SceneNaturalController {
                                          @RequestParam("objectName") String objectName) {
         System.out.println("上传文件名称--------"+file.getOriginalFilename());
         return fileDownService.upload(file,file.getOriginalFilename());
-    }
+    }*/
 
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/StandardsRegulationsController.java

@@ -59,6 +59,14 @@ public class StandardsRegulationsController {
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 
+    //删除
+    @PostMapping("/deleteStandardsRegulations")
+    @ResponseBody
+    public ResponseBodyVO<String> deleteStandardsRegulations(@RequestBody StandardsRegulationsPO parms) {
+        standardsRegulationsService.deleteStandardsRegulations(parms);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+    }
+
     @Resource
     private FileDownService fileDownService;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/SceneAccidentMapper.java

@@ -16,5 +16,6 @@ public interface SceneAccidentMapper {
    void saveSceneAccident(SceneAccidentPO params);
 
    List<SceneAccidentPO> querySceneAccidentList(SceneAccidentParam params);
+  void deleteSceneAccidentList(SceneAccidentPO params);
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/SceneNaturalMapper.java

@@ -18,4 +18,6 @@ public interface SceneNaturalMapper {
 
    List<SceneNaturalPO> querySceneNaturalList(SceneNaturalParam params);
 
+   void deleteSceneNatural(SceneNaturalPO params);
+
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/StandardsRegulationsMapper.java

@@ -16,4 +16,6 @@ public interface StandardsRegulationsMapper {
 
    List<StandardsRegulationsPO> queryStandardsRegulationsList(StandardsRegulationsParam params);
 
+   void deleteStandardsRegulations(StandardsRegulationsPO params);
+
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneAccidentService.java

@@ -95,13 +95,12 @@ public class SceneAccidentService {
 
     /**
      * 获取交通事故场景数据：
-     *//*
+     */
     @SneakyThrows
-    public void importJtSg(SceneAccidentParam param) {
+    public void testCS(SceneAccidentParam param) {
         //1 获取所有目录下所有场景
-        // String dataUrl0 ="C:\\Users\\CSS\\Desktop\\GQ\\仿真云平台\\测试场景样例数据\\交通事故场景\\China_Expressway_002";     // 场景数据根路径
-        String dataUrl0 =param.getPath();
-        System.out.println("--------"+param.getPath());
+         String dataUrl0 ="C:\\Users\\CSS\\Desktop\\GQ\\仿真云平台\\测试场景样例数据\\交通事故场景\\China_Expressway_002";     // 场景数据根路径
+      //  System.out.println("--------"+param.getPath());
         File[] scenes = FileUtil.getDirectory(dataUrl0).listFiles();
         if (scenes == null) {
             throw new RuntimeException("目录：" + dataUrl0 + " 下没有文件！");
@@ -109,7 +108,7 @@ public class SceneAccidentService {
 
         String fileName = null;
         try {
-
+            SceneAccidentPO sceneAccidentPO = null;
             for (File scene : scenes) {
                 String dataUrl = scene.getAbsolutePath();
                 if(dataUrl.indexOf(".json")!=-1){
@@ -123,8 +122,6 @@ public class SceneAccidentService {
                     String json = FileUtil.readFile(dataUrl);
                     ObjectMapper objMap = new ObjectMapper();
                     JsonNode root = objMap.readTree(json);
-
-                    SceneAccidentPO sceneAccidentPO = null;
                     sceneAccidentPO = sceneAccidentPO.builder()
                             .accidentId(StringUtil.getRandomUUID())
                             .sceneName(root.path("场景名称").asText())
@@ -156,21 +153,29 @@ public class SceneAccidentService {
                         sceneAccidentPO.setVideoAddress(param.getVideoAddress());
                     }
 
-                    SceneAccidentMapper.saveSceneAccident(sceneAccidentPO);
+
 
                 }
 
             }
+            SceneAccidentMapper.saveSceneAccident(sceneAccidentPO);
+
         } catch (Exception e) {
             log.error("标准法规场景" + fileName + " 解析出错：", e);
         }
 
 
     }
-*/
 
     public   List<SceneAccidentPO> querySceneAccidentList(SceneAccidentParam params) {
         List<SceneAccidentPO> list = SceneAccidentMapper.querySceneAccidentList(params);
         return list;
     }
+
+    public   void deleteSceneAccidentList(SceneAccidentPO params) {
+        params.setIsDeleted("1");
+        params.setModifyTime(TimeUtil.getNowForMysql());
+        params.setModifyUserId(AuthUtil.getCurrentUserId());
+      SceneAccidentMapper.deleteSceneAccidentList(params);
+    }
 }

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

@@ -234,4 +234,11 @@ public class SceneNaturalService {
         List<SceneNaturalPO> list = sceneNaturalMapper.querySceneNaturalList(po);
         return list;
     }
+
+    public   void deleteSceneNatural(SceneNaturalPO params) {
+        params.setIsDeleted("1");
+        params.setModifyTime(TimeUtil.getNowForMysql());
+        params.setModifyUserId(AuthUtil.getCurrentUserId());
+        sceneNaturalMapper.deleteSceneNatural(params);
+    }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/StandardsRegulationsService.java

@@ -83,4 +83,12 @@ public class StandardsRegulationsService {
         List<StandardsRegulationsPO> list = standardsRegulationsMapper.queryStandardsRegulationsList(params);
         return list;
     }
+
+
+    public   void deleteStandardsRegulations(StandardsRegulationsPO params) {
+        params.setIsDeleted("1");
+        params.setModifyTime(TimeUtil.getNowForMysql());
+        params.setModifyUserId(AuthUtil.getCurrentUserId());
+        standardsRegulationsMapper.deleteStandardsRegulations(params);
+    }
 }

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

@@ -71,4 +71,20 @@
         </where>
     </select>
 
+    <update id="deleteSceneAccidentList" parameterType="api.common.pojo.po.scene.SceneAccidentPO">
+    update simulation.scene_accident
+    <set>
+        <if test="isDeleted != null and isDeleted!=''">
+            is_deleted = #{isDeleted,jdbcType=VARCHAR},
+        </if>
+        <if test="modifyUserId != null and modifyUserId!=''">
+            modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
+        </if>
+        <if test="modifyTime != null">
+            modify_time = #{modifyTime},
+        </if>
+    </set>
+    where accident_id = #{accidentId,jdbcType=VARCHAR}
+    </update>
+
 </mapper>

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

@@ -300,4 +300,20 @@
         </where>
     </select>
 
+    <update id="deleteSceneNatural" parameterType="api.common.pojo.po.scene.SceneNaturalPO">
+        update simulation.scene_natural
+        <set>
+            <if test="isDeleted != null and isDeleted!=''">
+                is_deleted = #{isDeleted,jdbcType=VARCHAR},
+            </if>
+            <if test="modifyUserId != null and modifyUserId!=''">
+                modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
+            </if>
+            <if test="modifyTime != null">
+                modify_time = #{modifyTime},
+            </if>
+        </set>
+        where natural_id = #{naturalId,jdbcType=VARCHAR}
+    </update>
+
 </mapper>

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

@@ -44,4 +44,20 @@
         </where>
     </select>
 
+    <update id="deleteStandardsRegulations" parameterType="api.common.pojo.po.scene.StandardsRegulationsPO">
+        update simulation.scene_standards_regulations
+        <set>
+            <if test="isDeleted != null and isDeleted!=''">
+                is_deleted = #{isDeleted,jdbcType=VARCHAR},
+            </if>
+            <if test="modifyUserId != null and modifyUserId!=''">
+                modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
+            </if>
+            <if test="modifyTime != null">
+                modify_time = #{modifyTime},
+            </if>
+        </set>
+        where regulations_id = #{regulationsId,jdbcType=VARCHAR}
+    </update>
+
 </mapper>