Parcourir la source

http://192.168.0.21/index.php?m=bug&f=view&id=33879
添加通知激光系统逻辑

tianboguang il y a 2 ans
Parent
commit
aa726a0dca

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

@@ -1283,6 +1283,14 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                     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();
+                }
+                fdkkLaserService.saveScene(scenePlus,fdageData.getString("pwd"),cameraEntity,userName,false);
                 break;
         }
         Map<String,Object> result = new HashMap<>();
@@ -1328,7 +1336,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         // 通知激光场景系统开始构建场景
         if(cameraType == 14){
-            fdkkLaserService.saveScene(scenePro, null, cameraEntity, userName, true);
+            fdkkLaserService.saveScene(scenePro, null, cameraEntity, userName, false);
         }
 
         BuildSceneCallMessage buildSceneMqMessage = this.getBuildSceneMqMessage(