修改生成二维码逻辑

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

@@ -439,6 +439,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         if(arrearCap) {
             sceneJson.setPayStatus(PayStatus.NO_CAPACITY.code());
         }
+        String qrLogo = null;
         // 获取企业logo
         CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
         if(!ObjectUtils.isEmpty(cameraDetail.getCompanyId())){
@@ -454,25 +455,12 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 sceneJson.setFloorLogo("user");
                 sceneJson.setFloorLogoFile("floorLogo-user.png");
             }
-            String qrLogo = null;
             if (!ObjectUtils.isEmpty(company.getQrLogo())) {
                 if (!new File(ConstantFilePath.AGENT_PATH + company.getQrLogo()).exists()) {
                     fYunFileService.downloadFile(company.getQrLogo(), ConstantFilePath.AGENT_PATH + company.getQrLogo());
                 }
                 qrLogo = ConstantFilePath.AGENT_PATH + company.getQrLogo();
             }
-            //生成二维码
-            String outPathZh = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+num+".png";
-            String outPathEn = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+num+"_en.png";
-            QrConfig qrConfig = QrConfig.create();
-            if(!ObjectUtils.isEmpty(qrLogo)){
-                qrConfig.setImg(qrLogo);
-            }
-            QrCodeUtil.generate(scenePlusExt.getWebSite(), qrConfig, FileUtil.file(outPathZh));
-            QrCodeUtil.generate(scenePlusExt.getWebSite() + "&lang=en", qrConfig, FileUtil.file(outPathEn));
-            //上传二维码
-            fYunFileService.uploadFile(outPathZh, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + ".png");
-            fYunFileService.uploadFile(outPathEn, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + "_en.png");
         }
         String sceneJsonStr = JSON.toJSONString(sceneJson);
         //上传sceneJson文件
@@ -494,6 +482,19 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json",
                 dataViewPath + "status.json");
 
+        //生成二维码
+        String outPathZh = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+num+".png";
+        String outPathEn = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+num+"_en.png";
+        QrConfig qrConfig = QrConfig.create();
+        if(!ObjectUtils.isEmpty(qrLogo)){
+            qrConfig.setImg(qrLogo);
+        }
+        QrCodeUtil.generate(scenePlusExt.getWebSite(), qrConfig, FileUtil.file(outPathZh));
+        QrCodeUtil.generate(scenePlusExt.getWebSite() + "&lang=en", qrConfig, FileUtil.file(outPathEn));
+        //上传二维码
+        fYunFileService.uploadFile(outPathZh, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + ".png");
+        fYunFileService.uploadFile(outPathEn, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + "_en.png");
+
     }
 
     private void pushMsgToApp(Integer pushChannel, String pushToken, int cameraType, String sceneName, String webSite){