Przeglądaj źródła

Merge branch 'feature-场景看见场景推送消息至文保系统-20240912' into test

dengsixing 11 miesięcy temu
rodzic
commit
3d60e14c1c

+ 1 - 1
pom.xml

@@ -216,4 +216,4 @@
   </build>
 
 
-</project>
+</project>

+ 1 - 1
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -468,7 +468,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             rabbitMqProducer.sendByWorkQueue(queueIntermitModelingPre, mqMessage);
         }else{
             //如果是四普的看见相机场景,也需要推送全景vr
-            if(cameraType == 13 && cameraDetail.getCompanyId() == 26){
+            if(cameraType == 13 && Objects.nonNull(cameraDetail.getCompanyId()) && cameraDetail.getCompanyId() == 26){
                 wbService.sendMq(sceneNum, CommonSuccessStatus.WAITING.code());
             }
             rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);