|
@@ -3,12 +3,10 @@ package com.fdkankan.manage.httpClient.service;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.fdkankan.manage.common.CacheUtil;
|
|
|
-import com.fdkankan.manage.common.PageInfo;
|
|
|
-import com.fdkankan.manage.common.Result;
|
|
|
-import com.fdkankan.manage.common.ResultCode;
|
|
|
+import com.fdkankan.manage.common.*;
|
|
|
import com.fdkankan.manage.entity.Camera;
|
|
|
import com.fdkankan.manage.entity.CameraDetail;
|
|
|
+import com.fdkankan.manage.entity.SceneBuildProcessLog;
|
|
|
import com.fdkankan.manage.entity.User;
|
|
|
import com.fdkankan.manage.exception.BusinessException;
|
|
|
import com.fdkankan.manage.httpClient.client.LaserClient;
|
|
@@ -16,9 +14,7 @@ import com.fdkankan.manage.httpClient.param.LaserSceneMoveParam;
|
|
|
import com.fdkankan.manage.httpClient.param.LaserSceneParam;
|
|
|
import com.fdkankan.manage.httpClient.param.SSDownSceneParam;
|
|
|
import com.fdkankan.manage.httpClient.vo.FdkkResponse;
|
|
|
-import com.fdkankan.manage.service.ICameraDetailService;
|
|
|
-import com.fdkankan.manage.service.ICameraService;
|
|
|
-import com.fdkankan.manage.service.IUserService;
|
|
|
+import com.fdkankan.manage.service.*;
|
|
|
import com.fdkankan.manage.vo.request.SceneParam;
|
|
|
import com.fdkankan.manage.vo.response.SSDownSceneVo;
|
|
|
import com.fdkankan.manage.vo.response.SceneVo;
|
|
@@ -48,6 +44,10 @@ public class LaserService {
|
|
|
ICameraDetailService cameraDetailService;
|
|
|
@Autowired
|
|
|
ICameraService cameraService;
|
|
|
+ @Autowired
|
|
|
+ ISceneBuildProcessLogService sceneBuildProcessLogService;
|
|
|
+ @Autowired
|
|
|
+ IScenePlusService scenePlusService;
|
|
|
|
|
|
|
|
|
public PageInfo pageList(SceneParam param) {
|
|
@@ -89,6 +89,14 @@ public class LaserService {
|
|
|
vo.setThumb(newBasePath +"/index.html?m="+vo.getNum() );
|
|
|
vo.setPayStatus(1);
|
|
|
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()));
|
|
|
+ }
|
|
|
+ }
|
|
|
sceneVoList.add(vo);
|
|
|
}
|
|
|
|