mlx

simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/common/utils/AuthUtil.java

@@ -15,8 +15,7 @@ public class AuthUtil {
     public static String getCurrentUserId(){
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails)authentication.getPrincipal();
-        String userId = userDetails.getId();
-        return userId;
+        return userDetails.getId();
     }
 
     /**
@@ -25,8 +24,7 @@ public class AuthUtil {
     public static String getCurrentUserRoleCode(){
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails)authentication.getPrincipal();
-        String roleCode = userDetails.getRoleCode();
-        return roleCode;
+        return userDetails.getRoleCode();
     }
 
     /**
@@ -35,8 +33,7 @@ public class AuthUtil {
     public static String getCurrentUseType(){
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails)authentication.getPrincipal();
-        String useType = userDetails.getUseType();
-        return useType;
+        return userDetails.getUseType();
     }
 
     /**
@@ -45,8 +42,7 @@ public class AuthUtil {
     public static String getCurrentUsername(){
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails)authentication.getPrincipal();
-        String username = userDetails.getUsername();
-        return username;
+        return userDetails.getUsername();
     }
 
     /**
@@ -55,8 +51,7 @@ public class AuthUtil {
     public static String getCreateUserId(){
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails)authentication.getPrincipal();
-        String createUserId = userDetails.getCreateUserId();
-        return createUserId;
+        return userDetails.getCreateUserId();
     }
 
 }

simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/controller/SceneImportCtrl.java

@@ -7,6 +7,7 @@ import api.common.pojo.po.system.SceneImportPO;
 import com.css.simulation.resource.scene.common.oauth.AuthorizationHolder;
 import com.css.simulation.resource.scene.feign.SceneService;
 import com.css.simulation.resource.scene.service.SceneImportService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,6 +17,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 @Controller
+@Slf4j
 @RequestMapping("/sceneImport")
 public class SceneImportCtrl {
 
@@ -32,49 +34,48 @@ public class SceneImportCtrl {
     @ResponseBody
     public ResponseBodyVO<String> startImport(@RequestBody SceneImportPO po, HttpServletRequest request) {
         try {
-            //路径校验
+            //* -------------------------------- 路径校验 --------------------------------
             Boolean directory = sceneImportService.checkDirectory(po);
-            if(!directory){
+            if (!directory) {
                 po.setErrorMessage("路径错误: " + po.getDataDirectory());
                 po.setStatus(DictConstants.SCENE_IMPORT_STATUS_0);
                 sceneImportService.updateStatus(po);
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
             }
-            //开始上传
+            //* -------------------------------- 上传到 minio --------------------------------
             po.setStatus(DictConstants.SCENE_IMPORT_STATUS_1);
             sceneImportService.updateStatus(po);
-            //上传
-            Boolean sceneType = sceneImportService.startImport(po);
-            if(!sceneType){
+            log.info("上传到minio " + po);
+            Boolean sceneType = sceneImportService.startImport(po); // 上传
+            if (!sceneType) {
                 po.setErrorMessage("场景类型错误！");
                 po.setStatus(DictConstants.SCENE_IMPORT_STATUS_0);
                 sceneImportService.updateStatus(po);
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
             }
-            //上传成功
             po.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
             sceneImportService.updateStatus(po);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             po.setStatus(DictConstants.SCENE_IMPORT_STATUS_0);
             po.setErrorMessage("上传失败");
             sceneImportService.updateStatus(po);
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
         }
-        //异步-启动解析
+        //* -------------------------------- 解析 --------------------------------
         SceneImportParam param = new SceneImportParam();
         param.setId(po.getId());
         param.setMinioDirectory(po.getDataDirectory());
         String authorization = request.getHeader("Authorization");
         AuthorizationHolder.setAuthorization(authorization);
-        switch (po.getSceneType()){
-            case DictConstants.SCENE_NATURAL://自然驾驶
-                sceneService.saveSceneNaturalBatch(param);
+        switch (po.getSceneType()) {
+            case DictConstants.SCENE_NATURAL:
+                sceneService.saveSceneNaturalBatch(param);  //自然驾驶
                 break;
-            case DictConstants.SCENE_STANDARD:// 标准法规
+            case DictConstants.SCENE_STANDARD:  // 标准法规
                 sceneService.saveStandardsRegulationsBatch(param);
                 break;
-            case DictConstants.SCENE_ACCIDENT:// 交通事故
+            case DictConstants.SCENE_ACCIDENT:  // 交通事故
                 sceneService.saveSceneAccidentBatch(param);
         }
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);

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

@@ -10,7 +10,7 @@ import com.css.simulation.resource.scene.SceneImportMapper;
 import com.css.simulation.resource.scene.common.utils.PoUtil;
 import io.minio.MinioClient;
 import io.minio.UploadObjectArgs;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -30,18 +30,19 @@ public class SceneImportService {
     @Value("${minio.bucket-name}")
     String bucketName;
 
-    @Autowired
+    @Resource
     SceneImportMapper sceneImportMapper;
 
     @Resource(name = "minioClientPrivate")
     MinioClient minioClient;
 
-    public Boolean startImport(SceneImportPO po) throws Exception {
+    @SneakyThrows
+    public Boolean startImport(SceneImportPO po) {
         //minio路径生成
         String sceneType = po.getSceneType();
         Integer nowTime = TimeUtil.getRq(new Date(), 0);
         String randomCode = StringUtil.getRandomCode();
-        String sceneName = "";
+        String sceneName;
         if (DictConstants.SCENE_NATURAL.equals(sceneType)) {
             sceneName = "自然驾驶场景";
         } else if (DictConstants.SCENE_STANDARD.equals(sceneType)) {

simulation-resource-server/src/main/java/com/css/simulation/resource/common/utils/AuthUtil.java

@@ -17,9 +17,7 @@ public class AuthUtil {
     public static String getCurrentUserId() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
-        String userId = userDetails.getId();
-        log.info("AuthUtil--getCurrentUserId 当前用户的 userId 为：" + userId);
-        return userId;
+        return userDetails.getId();
     }
 
     /**
@@ -28,9 +26,7 @@ public class AuthUtil {
     public static String getCurrentUserRoleCode() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
-        String roleCode = userDetails.getRoleCode();
-        log.info("AuthUtil--getCurrentUserId 当前用户的 roleCode 为：" + roleCode);
-        return roleCode;
+        return userDetails.getRoleCode();
     }
 
     /**
@@ -50,9 +46,7 @@ public class AuthUtil {
     public static String getCurrentUsername() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
-        String username = userDetails.getUsername();
-        log.info("AuthUtil--getCurrentUserId 当前用户的 username 为：" + username);
-        return username;
+        return userDetails.getUsername();
     }
 
     /**
@@ -61,9 +55,7 @@ public class AuthUtil {
     public static String getCreateUserId() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
-        String createUserId = userDetails.getCreateUserId();
-        log.info("AuthUtil--getCurrentUserId 当前用户的 createUserId 为：" + createUserId);
-        return createUserId;
+        return userDetails.getCreateUserId();
     }
 
 }

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

@@ -67,17 +67,22 @@ public class SceneNaturalController {
         sceneNaturalService.deleteSceneNatural(params);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
-    //批量导入
+
+    /**
+     * 解析已经上传好的数据
+     * @param sceneImportParam
+     * @return
+     */
     @PostMapping("/saveSceneNaturalBatch")
     @ResponseBody
     public ResponseBodyVO<String> saveSceneNaturalBatch(@RequestBody SceneImportParam sceneImportParam) {
-        SceneImportPO sceneImportPO=new  SceneImportPO();
+        SceneImportPO sceneImportPO = new SceneImportPO();
         sceneImportPO.setId(sceneImportParam.getId());
         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_3);
         sceneImportService.updateStatus(sceneImportPO);
-        sceneImportPO= sceneNaturalService.importMiNio(sceneImportParam);
+        sceneImportPO = sceneNaturalService.importMiNio(sceneImportParam);
         sceneImportService.updateInfo(sceneImportPO);
-       return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
 
@@ -85,8 +90,7 @@ public class SceneNaturalController {
     @PostMapping("/instShareSceneNatural")
     @ResponseBody
     public ResponseBodyVO<String> instShareSceneNatural(@RequestBody SceneNaturalPO po) {
-      sceneNaturalService.instShareSceneNatural(po);
-
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        sceneNaturalService.instShareSceneNatural(po);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 }

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

@@ -8,7 +8,6 @@ import api.common.pojo.param.scene.SceneAccidentParam;
 import api.common.pojo.param.scene.SceneImportParam;
 import api.common.pojo.po.scene.SceneAccidentPO;
 import api.common.pojo.po.system.SceneImportPO;
-import api.common.util.FileUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
@@ -25,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -747,11 +745,13 @@ public class SceneAccidentService {
                             }
                             successNum = successNum + 1;
                         } catch (Exception e) {
-                            if (ObjectUtil.isNull(errorMessage)) {
-                                errorMessage = scenePath;
-                            } else {
-                                errorMessage = errorMessage + ";" + scenePath;
-                            }
+//                            if (ObjectUtil.isNull(errorMessage)) {
+//                                errorMessage = scenePath;
+//                            } else {
+//                                errorMessage = errorMessage + ";" + scenePath;
+//                            }
+                            errorMessage = e.getMessage();
+                            e.printStackTrace();
                             falseNum = falseNum + 1;
                         }
                     }

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

@@ -336,7 +336,7 @@ public class SceneNaturalService {
             if((po.getXlk().equals("0")&&po.getBq().equals("0"))||(po.getXlk().equals("1")&&po.getBq().equals("0"))){
 */
             list = sceneNaturalMapper.querySceneNaturalList(po);
-            System.out.println(" //添加权限------"+list.size()+"------"+po);
+            System.out.println(" //添加权限------" + list.size() + "------" + po);
             /*}else if((po.getXlk().equals("0")&&po.getBq().equals("1"))) {
                 list = sceneNaturalMapper.querySceneNaturalListByBq(map);
             }else{
@@ -349,9 +349,9 @@ public class SceneNaturalService {
             po.setUserId(userId);
             // poBq.setUserId(userId);
             //if((po.getXlk().equals("0")&&po.getBq().equals("0"))||(po.getXlk().equals("1")&&po.getBq().equals("0"))){
-            if(po.getShare().equals("0")){
+            if (po.getShare().equals("0")) {
                 list = sceneNaturalMapper.querySceneNaturalList(po);
-            }else {
+            } else {
                 list = sceneNaturalMapper.querySceneNaturalListByQx(po);
             }
            /* }else if((po.getXlk().equals("0")&&po.getBq().equals("1"))) {
@@ -365,9 +365,9 @@ public class SceneNaturalService {
             po.setUserId(userId);
             // poBq.setUserId(userId);
             //  if((po.getXlk().equals("0")&&po.getBq().equals("0"))||(po.getXlk().equals("1")&&po.getBq().equals("0"))){
-            if(po.getShare().equals("0")){
+            if (po.getShare().equals("0")) {
                 list = sceneNaturalMapper.querySceneNaturalList(po);
-            }else {
+            } else {
                 list = sceneNaturalMapper.querySceneNaturalListByQx(po);
             }           /* }else if((po.getXlk().equals("0")&&po.getBq().equals("1"))) {
                 list = sceneNaturalMapper.querySceneNaturalListByBqAndQx(map);
@@ -484,7 +484,6 @@ public class SceneNaturalService {
     }
 
 
-
     /**
      * 获取自然场景数据：
      */
@@ -502,14 +501,14 @@ public class SceneNaturalService {
             int falseNum = 0;
             String errorMessage = "";
             for (String filePath : list) {
-                if (filePath.indexOf("/OSGB") != -1) {
+                if (filePath.contains("/OSGB")) {
                     OsgbPath = filePath;
-                } else if (filePath.indexOf("/XODR") != -1) {
+                } else if (filePath.contains("/XODR")) {
                     XodrPath = filePath;
                 }
             }
             for (String filePath : list) {
-                if (filePath.indexOf("/Scenarios") != -1) {
+                if (filePath.contains("/Scenarios")) {
                     MI.setObjectName(filePath);
                     List<String> listScene = fileDownService.listDeepOne(MI).getInfo();
                     for (String scenePath : listScene) {
@@ -520,7 +519,7 @@ public class SceneNaturalService {
                             sceneNaturalPO.setShare("0");
                             String isupdate = null;
                             for (String adress : listAderss) {
-                                if (adress.indexOf(".json") != -1) {
+                                if (adress.contains(".json")) {
                                     MI.setObjectName(adress);
                                     Response download = fileDownService.download(MI);
                                     // -------------------------------- label.json --------------------------------
@@ -551,7 +550,10 @@ public class SceneNaturalService {
                                     // -------------------------------- 目标行为 --------------------------------
                                     JsonNode targetBehavior = root.path("目标行为");
 
-                                    if (ObjectUtil.isNull(naturalEnvironment) && ObjectUtil.isNull(road) && ObjectUtil.isNull(selfDrivingBehavior) && ObjectUtil.isNull(targetBehavior)) {
+                                    if (ObjectUtil.isNull(naturalEnvironment)
+                                            && ObjectUtil.isNull(road)
+                                            && ObjectUtil.isNull(selfDrivingBehavior)
+                                            && ObjectUtil.isNull(targetBehavior)) {
                                         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
                                         sceneImportPO.setErrorMessage("该文件：" + adress + "与自然场景类型不匹配，解析失败，请检查");
                                         return sceneImportPO;
@@ -608,17 +610,17 @@ public class SceneNaturalService {
                                         sceneNaturalPO.setNaturalId(sceneNaturalPOByName.getNaturalId());
                                     }
                                 }
-                                if (adress.indexOf(".json") != -1) {
+                                if (adress.contains(".json")) {
                                     sceneNaturalPO.setJsonAddress(adress);
-                                } else if (adress.indexOf(".xml") != -1 || adress.indexOf(".xosc") != -1) {
+                                } else if (adress.contains(".xml") || adress.contains(".xosc")) {
                                     sceneNaturalPO.setXoscAddress(adress);
-                                } else if (adress.indexOf(".xodr") != -1) {
+                                } else if (adress.contains(".xodr")) {
                                     sceneNaturalPO.setXodrAddress(adress);
-                                } else if (adress.indexOf(".osgb") != -1) {
+                                } else if (adress.contains(".osgb")) {
                                     sceneNaturalPO.setOsgbAddress(adress);
-                                } else if (adress.indexOf("simulation.mp4") != -1) {
+                                } else if (adress.contains("simulation.mp4")) {
                                     sceneNaturalPO.setVideoAddress(adress);
-                                } else if (adress.indexOf(".mp4") != -1) {
+                                } else if (adress.contains(".mp4")) {
                                     sceneNaturalPO.setVideoPreview(adress);
                                 }
                             }
@@ -637,11 +639,13 @@ public class SceneNaturalService {
                             listLog.add(sceneNaturalPO.getNaturalName());
                             successNum = successNum + 1;
                         } catch (Exception e) {
-                            if (ObjectUtil.isNull(errorMessage)) {
-                                errorMessage = scenePath;
-                            } else {
-                                errorMessage = errorMessage + ";" + scenePath;
-                            }
+//                            if (ObjectUtil.isNull(errorMessage)) {
+//                                errorMessage = scenePath;
+//                            } else {
+//                                errorMessage = errorMessage + ";" + scenePath;
+//                            }
+                            errorMessage = e.getMessage();
+                            e.printStackTrace();
                             falseNum = falseNum + 1;
                         }
                     }
@@ -663,8 +667,8 @@ public class SceneNaturalService {
     /**
      * 分享
      */
-       public void instShareSceneNatural(SceneNaturalPO parms) {
-        SceneNaturalPO syPo=sceneNaturalMapper.querySceneNaturalById(parms.getNaturalId());
+    public void instShareSceneNatural(SceneNaturalPO parms) {
+        SceneNaturalPO syPo = sceneNaturalMapper.querySceneNaturalById(parms.getNaturalId());
         syPo.setShare("1");
         SceneNaturalPO sceneNaturalPOByName = sceneNaturalMapper.querySceneNaturaByName(syPo);
         if (ObjectUtil.isNull(sceneNaturalPOByName)) {

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

@@ -301,11 +301,13 @@ public class StandardsRegulationsService {
                             }
                             successNum = successNum + 1;
                         } catch (Exception e) {
-                            if (ObjectUtil.isNull(errorMessage)) {
-                                errorMessage = scenePath;
-                            } else {
-                                errorMessage = errorMessage + ";" + scenePath;
-                            }
+//                            if (ObjectUtil.isNull(errorMessage)) {
+//                                errorMessage = scenePath;
+//                            } else {
+//                                errorMessage = errorMessage + ";" + scenePath;
+//                            }
+                            errorMessage = e.getMessage();
+                            e.printStackTrace();
                             falseNum = falseNum + 1;
                         }
                     }

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/SceneImportCtrl.java

@@ -35,25 +35,27 @@ public class SceneImportCtrl {
      */
     @RequestMapping("/saveTask")
     @ResponseBody
-    public ResponseBodyVO saveTask(@RequestBody SceneImportPO po, HttpServletRequest request) {
-        if(ObjectUtil.isNull(po)){
-            return new ResponseBodyVO(false, 500, "参数错误！",null);
+    public ResponseBodyVO<SceneImportPO> saveTask(@RequestBody SceneImportPO po, HttpServletRequest request) {
+        if (ObjectUtil.isNull(po)) {
+            return new ResponseBodyVO<>(false, 500, "参数错误！", null);
         }
         String sceneType = po.getSceneType();
-        if(ObjectUtil.isNull(sceneType) || DictConstants.SCENE_GENERAL.equals(sceneType)){
-            return new ResponseBodyVO(false, 500, "参数错误！",null);
+        if (ObjectUtil.isNull(sceneType) || DictConstants.SCENE_GENERAL.equals(sceneType)) {
+            return new ResponseBodyVO<>(false, 500, "参数错误！", null);
         }
+        // 保存场景导入任务
         po = sceneImportService.saveTask(po);
-        if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO(false, 500, "任务名称重复！",null);
+        if (ObjectUtil.isNull(po.getId())) {
+            return new ResponseBodyVO<>(false, 500, "任务名称重复！", null);
         }
-        ResponseBodyVO<SceneImportPO> response = new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<SceneImportPO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(po);
         //异步-启动上传
         String authorization = request.getHeader("Authorization");
         AuthorizationHolder.setAuthorization(authorization);
         po.setCreateTime(null);//防止类型转换异常
         po.setModifyTime(null);//防止类型转换异常
+        //* -------------------------------- 启动导入 --------------------------------
         sceneService.startImport(po);
         return response;
     }

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

@@ -13,22 +13,24 @@ import com.css.simulation.resource.common.utils.PoUtil;
 import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.system.mapper.SceneImportMapper;
 import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
 @Service
+@Slf4j
 public class SceneImportService {
 
-    @Autowired
+    @Resource
     DictService dictService;
 
-    @Autowired
+    @Resource
     LogService logService;
 
-    @Autowired
+    @Resource
     SceneImportMapper sceneImportMapper;
 
     public SceneImportPO saveTask(SceneImportPO po) {
@@ -42,7 +44,7 @@ public class SceneImportService {
         PoUtil.initAddPo(po);
         String id = po.getId();
         po.setStatus(DictConstants.SCENE_IMPORT_STATUS_0); //重置状态
-        if (ObjectUtil.isNull(id)) { // 新增
+        if (ObjectUtil.isNull(id)) { // 新增场景导入任务
             po.setId(StringUtil.getRandomUUID());
             sceneImportMapper.insert(po);
             // 记录日志
@@ -50,6 +52,7 @@ public class SceneImportService {
             String type = dictMap.get(po.getSceneType());
             String content = "创建" + type + "上传任务:" + po.getName() + "(ID:" + po.getId() + ")";
             logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK_INSERT, content);
+            log.info(content);
         } else {
             sceneImportMapper.update(po);
         }