mlx

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

@@ -31,7 +31,7 @@ public class SceneAccidentController {
 
     //查询列表
     @PostMapping("/querySceneAccidentList")
-    @ResponseBody
+    
     public ResponseBodyVO<List<SceneAccidentVO>> querySceneAccidentList(@RequestBody SceneAccidentParam params) {
         PageUtil.setPageInfo(params);
         List<SceneAccidentPO> list = sceneAccidentService.querySceneAccidentList(params);
@@ -50,7 +50,7 @@ public class SceneAccidentController {
 
     //新增交通事故
     @PostMapping("/saveSceneAccident")
-    @ResponseBody
+    
     public ResponseBodyVO<String> saveSceneAccident(@RequestBody SceneAccidentParam params) {
         return sceneAccidentService.importJtSg(params);
 
@@ -58,7 +58,7 @@ public class SceneAccidentController {
 
     //删除交通事故
     @PostMapping("/deleteSceneAccident")
-    @ResponseBody
+    
     public ResponseBodyVO<String> deleteSceneAccident(@RequestBody SceneAccidentPO params) {
         if (ObjectUtil.isNull(params.getAccidentId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数场景 id 不能为空，请检查。", null);
@@ -69,12 +69,13 @@ public class SceneAccidentController {
 
     //测试批量导入
     @PostMapping("/saveSceneAccidentBatch")
-    @ResponseBody
+    
     public ResponseBodyVO<String> saveSceneAccidentBatch(@RequestBody SceneImportParam sceneImportParam) {
         SceneImportPO sceneImportPO = new SceneImportPO();
         sceneImportPO.setId(sceneImportParam.getId());
         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_3);
         sceneImportService.updateStatus(sceneImportPO);
+        // 解析参数
         sceneImportPO = sceneAccidentService.importMiNio(sceneImportParam);
         sceneImportService.updateInfo(sceneImportPO);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
@@ -82,7 +83,7 @@ public class SceneAccidentController {
 
     //分享交通事故
     @PostMapping("/instShareSceneAccident")
-    @ResponseBody
+    
     public ResponseBodyVO<String> instShareSceneAccident(@RequestBody SceneAccidentPO params) {
          sceneAccidentService.instShareSceneAccident(params);
 

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

@@ -658,6 +658,7 @@ public class SceneAccidentService {
                 if (filePath.contains("/Scenarios")) {
                     MI.setObjectName(filePath);
                     List<String> listScene = fileDownService.listDeepOne(MI).getInfo();
+                    log.info("importMinio() 共需要上传 " + listScene.size() + " 个交通事故场景");
                     for (String scenePath : listScene) {
                         try {
                             MI.setObjectName(scenePath);
@@ -680,7 +681,9 @@ public class SceneAccidentService {
                                     String selfReaction = root.path("自车反应行为").asText();
                                     if (ObjectUtil.isNull(sceneName) || ObjectUtil.isNull(selfDriving) || ObjectUtil.isNull(conflictType) || ObjectUtil.isNull(conflictBehavior)) {
                                         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
-                                        sceneImportPO.setErrorMessage("文件 " + adress + " 内容不符合标准格式（场景名称、自车驾驶行为、冲突行为、冲突类型不能为空）。");
+                                        String em = "文件 " + adress + " 内容不符合标准格式（场景名称、自车驾驶行为、冲突行为、冲突类型不能为空）。";
+                                        log.error(em);
+                                        sceneImportPO.setErrorMessage(em);
                                         return sceneImportPO;
                                     }
 

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

@@ -507,14 +507,18 @@ public class SceneNaturalService {
                 if (filePath.contains("/Scenarios")) {
                     MI.setObjectName(filePath);
                     List<String> listScene = fileDownService.listDeepOne(MI).getInfo();
+                    log.info("importMinio() 共需要上传 " + listScene.size() + " 个自然驾驶场景");
+                    int addNumber = 0;
+                    int updateNumber = 0;
                     for (String scenePath : listScene) {
                         try {
                             MI.setObjectName(scenePath);
-                            List<String> listAderss = fileDownService.list(MI).getInfo();
+                            List<String> addressList = fileDownService.list(MI).getInfo();
                             SceneNaturalPO sceneNaturalPO = new SceneNaturalPO();
                             sceneNaturalPO.setShare("0");
-                            String isupdate = null;
-                            for (String adress : listAderss) {
+                            boolean update = false;
+                            for (String adress : addressList) {
+                                // 自然驾驶场景取json名称作为场景名称
                                 if (adress.contains(".json")) {
                                     MI.setObjectName(adress);
                                     Response download = fileDownService.download(MI);
@@ -548,16 +552,17 @@ public class SceneNaturalService {
 
                                     if (naturalEnvironment == null || road == null || (selfDrivingBehavior == null && targetBehavior == null)) {
                                         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
-                                        sceneImportPO.setErrorMessage("文件 " + adress + " 内容不符合标准格式（自然环境和道路不为空且自车行为、冲突行为不同时为空）。");
+                                        String em = "文件 " + adress + " 内容不符合标准格式（自然环境和道路不为空且自车行为、冲突行为不同时为空）。";
+                                        log.error(em);
+                                        sceneImportPO.setErrorMessage(em);
                                         return sceneImportPO;
                                     }
                                     if (ObjectUtil.isNotNull(sceneNaturalPOByName)) {
-                                        isupdate = "1";
+                                        update = true;
                                         sceneNaturalPO.setNaturalId(sceneNaturalPOByName.getNaturalId());
                                     } else {
-                                        isupdate = "0";
+                                        sceneNaturalPO.setNaturalId(api.common.util.StringUtil.getRandomUUID());
                                     }
-                                    sceneNaturalPO.setNaturalId(api.common.util.StringUtil.getRandomUUID());
                                     sceneNaturalPO.setNaturalName(fileName);
                                     sceneNaturalPO.setWeather(getSequenceNew(naturalEnvironment, "天气情况"));
                                     sceneNaturalPO.setBacklight(getSequenceNew(naturalEnvironment, "逆光"));
@@ -596,13 +601,8 @@ public class SceneNaturalService {
                                     sceneNaturalPO.setTargetBehavior(getSequenceNew(targetBehavior));
                                     sceneNaturalPO.setMaxTime(root.path("max_time").asText());
                                     sceneNaturalPO.setIsDeleted("0");
-                                    if (ObjectUtil.isNull(sceneNaturalPO.getOsgbAddress())) {
-                                        sceneNaturalPO.setOsgbAddress(osgbAdress);
-                                    }
-                                    if (ObjectUtil.isNull(sceneNaturalPO.getXodrAddress())) {
-                                        sceneNaturalPO.setXodrAddress(xodrAdress);
-                                    }
-
+                                    sceneNaturalPO.setOsgbAddress(osgbAdress);
+                                    sceneNaturalPO.setXodrAddress(xodrAdress);
                                 }
                                 if (adress.contains(".json")) {
                                     sceneNaturalPO.setJsonAddress(adress);
@@ -618,17 +618,19 @@ public class SceneNaturalService {
                                     sceneNaturalPO.setVideoPreview(adress);
                                 }
                             }
-                            if (isupdate.equals("0")) {
+                            if (update) {
+                                // -------------------------------- 修改数据到 mysql --------------------------------
+                                updateNumber++;
+                                sceneNaturalPO.setModifyTime(TimeUtil.getNowForMysql());
+                                sceneNaturalPO.setModifyUserId(AuthUtil.getCurrentUserId());
+                                sceneNaturalMapper.updateSceneNatural(sceneNaturalPO);
+                            } else {
                                 // -------------------------------- 保存数据到 mysql --------------------------------
+                                addNumber++;
                                 sceneNaturalPO.setCreateTime(TimeUtil.getNowForMysql());
                                 sceneNaturalPO.setCreateUserId(AuthUtil.getCurrentUserId());
                                 sceneNaturalPO.setModifyTime(TimeUtil.getNowForMysql());
                                 sceneNaturalMapper.saveSceneNatural(sceneNaturalPO);
-                            } else if (isupdate.equals("1")) {
-                                // -------------------------------- 修改数据到 mysql --------------------------------
-                                sceneNaturalPO.setModifyTime(TimeUtil.getNowForMysql());
-                                sceneNaturalPO.setModifyUserId(AuthUtil.getCurrentUserId());
-                                sceneNaturalMapper.updateSceneNatural(sceneNaturalPO);
                             }
                             successNum = successNum + 1;
                         } catch (Exception e) {
@@ -637,6 +639,7 @@ public class SceneNaturalService {
                             falseNum = falseNum + 1;
                         }
                     }
+                    log.info("importMinio() 共新增 " + addNumber + " 个自然驾驶场景，修改 " + updateNumber + "个场景。");
                 }
             }
             sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_4);

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

@@ -116,28 +116,29 @@ public class StandardsRegulationsService {
 
         //添加权限
         String roleCode = AuthUtil.getCurrentUserRoleCode();
-        log.info("标准法规------" +roleCode);
+        log.info("标准法规------" + roleCode);
         String userId = AuthUtil.getCurrentUserId();
         if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) { //管理员账户
             list = standardsRegulationsMapper.queryStandardsRegulationsList(params);
-            log.info("标准法规---list---" +list.size()+"----------"+params);
+            log.info("标准法规---list---" + list.size() + "----------" + params);
         } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
             //查询父账户
             userId = AuthUtil.getCreateUserId();
             params.setUserId(userId);
-            if(params.getShare().equals("0")){
+            if (params.getShare().equals("0")) {
                 list = standardsRegulationsMapper.queryStandardsRegulationsList(params);
-            }else {
+            } else {
                 list = standardsRegulationsMapper.queryStandardsRegulationsListByQx(params);
             }
         } else if (DictConstants.ROLE_CODE_UESR.equals(roleCode)) {
             //查询普通账户
             params.setUserId(userId);
-            if(params.getShare().equals("0")){
+            if (params.getShare().equals("0")) {
                 list = standardsRegulationsMapper.queryStandardsRegulationsList(params);
-            }else {
+            } else {
                 list = standardsRegulationsMapper.queryStandardsRegulationsListByQx(params);
-            }        }
+            }
+        }
        /* if(params.getLabel()!=null&&params.getLabel().size()>0){
             if(params.getRegulationType()!=null&&params.getRegulationType().size()>0){
                 List<String> regulationType= params.getRegulationType();
@@ -219,15 +220,16 @@ public class StandardsRegulationsService {
                 if (filePath.contains("/Scenarios")) {
                     MI.setObjectName(filePath);
                     List<String> listScene = fileDownService.listDeepOne(MI).getInfo();
+                    log.info("importMinio() 共需要上传 " + listScene.size() + " 个标准法规场景");
                     for (String scenePath : listScene) {
                         try {
                             MI.setObjectName(scenePath);
-                            List<String> listAderss = fileDownService.list(MI).getInfo();
+                            List<String> addressList = fileDownService.list(MI).getInfo();
                             StandardsRegulationsPO standardsRegulationsPO = new StandardsRegulationsPO();
                             String isupdate = null;
-                            for (String adress : listAderss) {
-                                if (adress.contains(".json")) {
-                                    MI.setObjectName(adress);
+                            for (String address : addressList) {
+                                if (address.contains(".json")) {
+                                    MI.setObjectName(address);
                                     Response download = fileDownService.download(MI);
                                     // -------------------------------- label.json --------------------------------
                                     String json = download.body().toString();
@@ -241,7 +243,9 @@ public class StandardsRegulationsService {
                                     String xodr = root.path("xodr").asText();
                                     if (StringUtil.isEmpty(sceneName) || (StringUtil.isEmpty(regulationType) && StringUtil.isEmpty(standardType))) {
                                         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
-                                        sceneImportPO.setErrorMessage("文件 " + adress + " 内容不符合标准格式（场景名称不为空且法规类型和标准类型不同时为空）。");
+                                        String em = "文件 " + address + " 内容不符合标准格式（场景名称不为空且法规类型和标准类型不同时为空）。";
+                                        log.error(em);
+                                        sceneImportPO.setErrorMessage(em);
                                         return sceneImportPO;
                                     }
                                     String osgbAdress = OsgbPath + "/" + osgb;
@@ -267,16 +271,16 @@ public class StandardsRegulationsService {
                                         standardsRegulationsPO.setXodrAddress(xodrAdress);
                                     }
                                 }
-                                if (adress.contains(".json")) {
-                                    standardsRegulationsPO.setJsonAddress(adress);
-                                } else if (adress.contains(".xml") || adress.contains(".xosc")) {
-                                    standardsRegulationsPO.setXmlAddress(adress);
-                                } else if (adress.contains(".xodr")) {
-                                    standardsRegulationsPO.setXodrAddress(adress);
-                                } else if (adress.contains(".osgb")) {
-                                    standardsRegulationsPO.setOsgbAddress(adress);
-                                } else if (adress.contains(".mp4")) {
-                                    standardsRegulationsPO.setVideoAddress(adress);
+                                if (address.contains(".json")) {
+                                    standardsRegulationsPO.setJsonAddress(address);
+                                } else if (address.contains(".xml") || address.contains(".xosc")) {
+                                    standardsRegulationsPO.setXmlAddress(address);
+                                } else if (address.contains(".xodr")) {
+                                    standardsRegulationsPO.setXodrAddress(address);
+                                } else if (address.contains(".osgb")) {
+                                    standardsRegulationsPO.setOsgbAddress(address);
+                                } else if (address.contains(".mp4")) {
+                                    standardsRegulationsPO.setVideoAddress(address);
                                 }
                             }
                             if (isupdate.equals("0")) {

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/DictService.java

@@ -115,7 +115,6 @@ public class DictService {
     }
 
     public Map<String, Map<String, String>> getDictMapsByTypes(DictParam param) {
-        log.info("DictService--getDictMapsByTypes 查询字典信息：" + param);
         //解析参数进行查询
         String dictTypes = param.getDictTypes();
         List<String> dictTypeList = Arrays.asList(dictTypes.split(","));