|
|
@@ -97,7 +97,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
private String jgNotSupportBuildTime;
|
|
|
|
|
|
@Value("#{'${camType.laser:}'.split(',')}")
|
|
|
- private List<Integer> camTypeList;
|
|
|
+ private List<Integer> laserCamTypeList;
|
|
|
|
|
|
@Autowired
|
|
|
private RedisUtil redisUtil;
|
|
|
@@ -720,7 +720,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
//激光相机10 13
|
|
|
int camType = fdageJson.getJSONObject("cam").getIntValue("type");
|
|
|
log.info("camType:{}", camType);
|
|
|
- if(camTypeList.contains(camType)){
|
|
|
+ if(laserCamTypeList.contains(camType)){
|
|
|
//激光转台
|
|
|
cameraType = 14L;
|
|
|
}
|
|
|
@@ -1162,7 +1162,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
cameraType = 14L;
|
|
|
}
|
|
|
BuildSceneCallMessage message = null;
|
|
|
- if(sceneSource == 4){
|
|
|
+ if(sceneSource == SceneSource.JG.code() || sceneSource == SceneSource.SG.code()){
|
|
|
String userName = null;
|
|
|
Long sceneUserId = scenePlus.getUserId();
|
|
|
if (!ObjectUtils.isEmpty(sceneUserId)) {
|
