|
@@ -1282,15 +1282,16 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
icon = fYunFileConfig.getHost() + imgViewPath + fdageData.getString("icon");
|
|
|
log.info("上传icon成功....");
|
|
|
}
|
|
|
- buildScenePost(dataSource,fdageData,"V3",cameraType,sceneNum,detailEntity,0,icon);
|
|
|
-
|
|
|
- // 通知激光系统
|
|
|
- ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
|
|
|
- String userName = null;
|
|
|
- if(!ObjectUtils.isEmpty(detailEntity.getUserId())){
|
|
|
- userName = userService.getSSOUserByUserId(detailEntity.getUserId()).getUserName();
|
|
|
+ buildScenePost(dataSource, fdageData, "V3", cameraType, sceneNum, detailEntity, 0, icon);
|
|
|
+ if (cameraType == 14) {
|
|
|
+ // 通知激光系统
|
|
|
+ ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
|
|
|
+ String userName = null;
|
|
|
+ if (!ObjectUtils.isEmpty(detailEntity.getUserId())) {
|
|
|
+ userName = userService.getSSOUserByUserId(detailEntity.getUserId()).getUserName();
|
|
|
+ }
|
|
|
+ fdkkLaserService.saveScene(scenePlus, fdageData.getString("pwd"), cameraEntity, userName, false);
|
|
|
}
|
|
|
- fdkkLaserService.saveScene(scenePlus,fdageData.getString("pwd"),cameraEntity,userName,false);
|
|
|
break;
|
|
|
}
|
|
|
Map<String,Object> result = new HashMap<>();
|