Преглед на файлове

v3场景计算失败统一为未知原因

lyhzzz преди 2 години
родител
ревизия
2bc6746295

+ 3 - 0
src/main/java/com/fdkankan/manage/common/SceneBuildProcessLogEnum.java

@@ -20,6 +20,9 @@ public enum SceneBuildProcessLogEnum {
     }
 
     public static String getReason(String process) {
+        if(process == null){
+            return NOT_KNOW_ERROR.remark;
+        }
         switch (process){
             case "pre" : return PRE_ERROR.remark;
             case "call" : return CALL_ERROR.remark;

+ 5 - 4
src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -91,11 +91,12 @@ public class LaserService {
                 vo.setIsObj(obj.getInteger("buildObjStatus"));
                 if(vo.getStatus() == -1){  //计算失败
                     SceneBuildProcessLog sceneBuildProcessLog = sceneBuildProcessLogService.getByNum(vo.getNum());
-                    if(sceneBuildProcessLog != null){
-                        vo.setSceneBuildProcessLog(sceneBuildProcessLog);
-                        vo.setBuildErrorReason(SceneBuildProcessLogEnum.getReason(sceneBuildProcessLog.getProcess()));
-                        vo.setDataSource(scenePlusService.getDataSourceByNum(vo.getNum()));
+                    String process = null;
+                    if(sceneBuildProcessLog !=null){
+                        process = sceneBuildProcessLog.getProcess();
                     }
+                    vo.setBuildErrorReason(SceneBuildProcessLogEnum.getReason(process));
+                    vo.setDataSource(scenePlusService.getDataSourceByNum(vo.getNum()));
                 }
                 sceneVoList.add(vo);
             }

+ 4 - 3
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -330,10 +330,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
             if(record.getStatus() == -1){  //计算失败
                 SceneBuildProcessLog sceneBuildProcessLog = sceneBuildProcessLogService.getByNum(record.getNum());
-                if(sceneBuildProcessLog != null){
-                    record.setSceneBuildProcessLog(sceneBuildProcessLog);
-                    record.setBuildErrorReason(SceneBuildProcessLogEnum.getReason(sceneBuildProcessLog.getProcess()));
+                String process = null;
+                if(sceneBuildProcessLog !=null){
+                    process = sceneBuildProcessLog.getProcess();
                 }
+                record.setBuildErrorReason(SceneBuildProcessLogEnum.getReason(process));
             }
         }
         return PageInfo.PageInfo(page);