Merge branch 'feature-scrb' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -417,8 +417,12 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 commonService.sendEmail(sceneCode, "standar");
             }
 
+            //发送到文保系统
             wbService.sendMq(sceneCode, CommonSuccessStatus.SUCCESS.code());
 
+            //四川日报打包消费
+            this.sendMqToPackScene4Scrb(sceneCode);
+
             log.info("场景计算结果处理结束，场景码：{}", sceneCode);
 
         }catch (Exception e){
@@ -443,6 +447,20 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             map.put(pngPath, String.format(UploadFilePath.IMG_VIEW_PATH, num) + "cover/" + FileUtil.getName(pngPath));
         }
     }
+    private void sendMqToPackScene4Scrb(String num){
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        if(Objects.isNull(scenePlus.getCameraId())){
+            return;
+        }
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
+        if(Objects.isNull(cameraDetail)){
+            return;
+        }
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("num", num);
+        mqProducer.sendByWorkQueue("scrb-package-scene", jsonObject);
+    }
+
 
 
     private void uploadFloorCad(String path, String num, Map<String, String> uploadFiles){