|
@@ -92,6 +92,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
private ISceneUpgradeMapper sceneUpgradeMapper;
|
|
|
@Autowired
|
|
|
ISceneCopyLogService sceneCopyLogService;
|
|
|
+ @Autowired
|
|
|
+ ICameraDetailService cameraDetailService;
|
|
|
+ @Autowired
|
|
|
+ ICameraService cameraService;
|
|
|
+ @Autowired
|
|
|
+ IUserService userService;
|
|
|
|
|
|
|
|
|
@Override
|
|
@@ -330,12 +336,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
if(sceneCopyLogs!=null && sceneCopyLogs.size()>0){
|
|
|
throw new BusinessException(ResultCode.GENERATE_OBJ_ERROR);
|
|
|
}
|
|
|
- laserService.updateBuildObjStatus(num,2);
|
|
|
-
|
|
|
- Integer sceneSource = sceneProEntity == null ? scenePlusEntity.getSceneSource() : sceneProEntity.getSceneSource();
|
|
|
- if(sceneSource != 4){
|
|
|
- throw new BusinessException(ResultCode.GENERATE_OBJ_ERROR_TYPE);
|
|
|
- }
|
|
|
String path = null;
|
|
|
ScenePlusExt scenePlusExt = null;
|
|
|
if(scenePlusEntity != null){
|
|
@@ -347,6 +347,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
}else {
|
|
|
path = sceneProEntity.getDataSource();
|
|
|
}
|
|
|
+
|
|
|
+ Integer sceneSource = sceneProEntity == null ? scenePlusEntity.getSceneSource() : sceneProEntity.getSceneSource();
|
|
|
+ if(sceneSource != 4){
|
|
|
+ throw new BusinessException(ResultCode.GENERATE_OBJ_ERROR_TYPE);
|
|
|
+ }
|
|
|
+
|
|
|
+ laserService.updateBuildObjStatus(num,2);
|
|
|
String ossPath = path.replace("/mnt/data","home")+"/data.fdage";
|
|
|
if(!fYunFileServiceInterface.fileExist(ossPath)){
|
|
|
throw new BusinessException(ResultCode.GENERATE_OBJ_ERROR);
|
|
@@ -404,4 +411,41 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
mqMsg.setPath(dataSource);
|
|
|
mqProducer.sendByWorkQueue(queueObjModelingPre,mqMsg);
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void move(SceneParam param) {
|
|
|
+ if(param.getNumList().isEmpty() || param.getCameraId() == null || StringUtils.isBlank(param.getUserName())){
|
|
|
+ throw new BusinessException(ResultCode.PARAM_ERROR);
|
|
|
+ }
|
|
|
+ for (String num : param.getNumList()) {
|
|
|
+ User user = userService.getByUserName(param.getUserName());
|
|
|
+ if(user == null || user.getCompanyId() == null){
|
|
|
+ throw new BusinessException(ResultCode.USER_NOT_EXIST);
|
|
|
+ }
|
|
|
+ ScenePlus scenePlus = scenePlusService.getByNum(num);
|
|
|
+ ScenePro scenePro = this.getByNum(num);
|
|
|
+ if(scenePlus == null && scenePro == null){
|
|
|
+ throw new BusinessException(ResultCode.SCENE_NOT_EXIT);
|
|
|
+ }
|
|
|
+ Long cameraId = scenePro == null ? scenePlus.getCameraId() : scenePro.getCameraId();
|
|
|
+ Integer sceneSource = scenePro == null ? scenePlus.getSceneSource() : scenePro.getSceneSource();
|
|
|
+
|
|
|
+ Camera oldCamera = cameraService.getById(cameraId);
|
|
|
+ Camera camera = cameraService.getById(param.getCameraId());
|
|
|
+ CameraDetail oldCameraDetail = cameraDetailService.getByCameraId(cameraId);
|
|
|
+ CameraDetail cameraDetail = cameraDetailService.getByCameraId(param.getCameraId());
|
|
|
+ if(oldCamera == null || oldCameraDetail == null || camera == null || cameraDetail == null){
|
|
|
+ throw new BusinessException(ResultCode.CAMERA_NOT_EXIST);
|
|
|
+ }
|
|
|
+ if(!oldCameraDetail.getType().equals(cameraDetail.getType())){
|
|
|
+ throw new BusinessException(ResultCode.CAMERA_TYPE_NOT_ERROR);
|
|
|
+ }
|
|
|
+ scenePlusService.updatePayStatus(num,scenePro == null ?"v4":"v3",scenePro == null?scenePlus.getSceneSource():scenePro.getSceneSource(),1,cameraDetail,user);
|
|
|
+ scenePlusService.move(num,scenePro == null ?"v4":"v3",cameraDetail,user);
|
|
|
+ if(sceneSource == 4 || sceneSource == 5){
|
|
|
+ String dataSource = scenePro == null ? scenePlusExtService.getByPlusId(scenePlus.getId()).getDataSource() : scenePro.getDataSource();
|
|
|
+ laserService.move(num, oldCamera.getSnCode(), camera.getSnCode(), user.getId(), dataSource);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|