Merge branch 'release-e57' into release

src/main/java/com/fdkankan/contro/service/IFdkkLaserService.java

@@ -32,5 +32,5 @@ public interface IFdkkLaserService {
 
     void sendE57ToLaser(ScenePlus scenePlus, ScenePlusExt scenePlusExt, String path);
 
-    void sendRebuildE57ToLaser(ScenePlus scenePlus);
+    void sendRebuildE57ToLaser(ScenePlus scenePlus, ScenePlusExt scenePlusExt);
 }

src/main/java/com/fdkankan/contro/service/impl/IFdkkLaserServiceImpl.java

@@ -245,11 +245,12 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         }
     }
 
-    public void sendRebuildE57ToLaser(ScenePlus scenePlus) {
+    public void sendRebuildE57ToLaser(ScenePlus scenePlus, ScenePlusExt scenePlusExt) {
         User user = userService.getById(scenePlus.getUserId());
         Map<String, Object> params = new HashMap<>();
         params.put("sceneCode", scenePlus.getNum());
         params.put("status", SceneStatus.wait.code());
+        params.put("dataSource", scenePlusExt.getDataSource());
         rabbitMqProducer.sendByWorkQueue("laser-e57-update-scene", params);
     }
 

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1485,7 +1485,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         params.put("num", num);
         params.put("rebuild", 1);
         params.put("deleteExtras", deleteExtras);
-        fdkkLaserService.sendRebuildE57ToLaser(scenePlus);
+        fdkkLaserService.sendRebuildE57ToLaser(scenePlus, scenePlusExt);
         rabbitMqProducer.sendByWorkQueue("reverseE57-modeling-pre", params);
 
         //记录日志表