修改V3场景构建逻辑

src/main/java/com/fdkankan/contro/schedule/ScheduleJob.java

@@ -15,12 +15,6 @@ public class ScheduleJob {
     @Value("${rocketmq.autoScaling.num.normal}")
     private String baseNum;
 
-    @Value("${rocketmq.autoScaling.num.laser}")
-    private String baseNumLaser;
-
-    @Value("${environment}")
-    private String environment;
-
     @Autowired
     private RabbitMqProducer rabbitMqProducer;
 
@@ -31,11 +25,8 @@ public class ScheduleJob {
     private String queueModelingCall;
 
 
-    @Scheduled(cron = "0 0/5 8-21 * * ? ")
+    @Scheduled(cron = "0/10 * * * * ? ")
     public void job8() {
-        if("hq".equals(environment)){
-            return;
-        }
         try {
             //当mq排队数大于指定数量时使用弹性升缩
             int mqNum = rabbitMqProducer.getMessageCount(queueModelingCall);
@@ -49,27 +40,4 @@ public class ScheduleJob {
             log.error(e.getMessage());
         }
     }
-
-    /**
-     * 判断激光相机
-     */
-    @Scheduled(cron = "${mq.scale.laser:-}")
-    public void job9() {
-        if("hq".equals(environment)){
-            return;
-        }
-//        try {
-//            //当mq排队数大于指定数量时使用弹性升缩
-//            int mqNum = rabbitMqProducer.getLaserMessageCount();
-//            log.info("每5分钟查询一次激光排队队列,mqNum:" + mqNum);
-//            if(mqNum - Integer.parseInt(baseNumLaser) > 0){
-//
-//                log.info("使用激光弹性升缩开启一台ECS");
-//                log.info(rubberSheetingUtil.createEcs());
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            log.error(e.getMessage());
-//        }
-    }
 }

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

@@ -408,11 +408,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             firmwareVersion.put("version", jsonObject.getString("version"));
         }
 
-        String sceneUrl = mainUrl + "/" + sceneProNewUrl;
-
-        //重算的场景，先移除该场景对应的容量
-        scenePlusService.resetSpace(sceneNum);
-
         //删除oss的houst_floor.json(国际版可能会卡住)
         fYunFileService.deleteFile(dataViewPath + "houst_floor.json");
 
@@ -421,8 +416,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         ScenePlusVO scenePlusVO = this.createScenePro(sceneNum, camera.getId(), camera.getChildName(), jsonObject.getString("creator"),
                 jsonObject.getString("pwd"), unicode,cameraType, fileId, icon,  cameraDetail.getUserId(), userName,algorithm,
                 jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
-                jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), 1,
-                jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());
+                jsonObject.getInteger("scenetype"), jsonObject.getString("gps"),
+                jsonObject.getInteger("resolution"), firmwareVersion.toString(), buildType);
 
         if (Objects.nonNull(scenePlusVO)) {
             JSONObject statusJson = new JSONObject();
@@ -451,9 +446,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
                 if (StrUtil.isNotEmpty(company.getQrLogo())) {
                     //生成新的分享的二维码
-                    MatrixToImageWriterUtil.createQRCode(sceneUrl + sceneNum, ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + sceneNum + ".png",
+                    MatrixToImageWriterUtil.createQRCode(scenePlusVO.getWebSite(), ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + sceneNum + ".png",
                             false, ConstantFilePath.SCENE_PATH + imgViewPath + "QRShareLogo.png");
-                    MatrixToImageWriterUtil.createQRCode(sceneUrl + sceneNum + "&lang=en", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + sceneNum + "_en.png",
+                    MatrixToImageWriterUtil.createQRCode(scenePlusVO.getWebSite() + "&lang=en", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + sceneNum + "_en.png",
                             false, ConstantFilePath.SCENE_PATH + imgViewPath + "QRShareLogo.png");
                 }
                 sceneProEditService.updateById(sceneEditInfo);
@@ -789,20 +784,18 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
     public ScenePlusVO createScenePro(String projectNum, Long cameraId, String cameraName, String phoneId, String sceneKey,
                                        String unicode, Long cameraType, String fileId, String pic, Long userId, String userName,
-                                       String algorithm, Integer sceneShootCount, String sceneName,
-                                       String sceneDec, Integer sceneType, String gps,Integer type,
-                                       Integer resolution, String firmwareVersion, String url, String buildType,
-                                       Long cooperationUser)throws Exception{
+                                       String algorithm, Integer sceneShootCount, String sceneName,String sceneDec,
+                                      Integer sceneType, String gps,Integer resolution, String firmwareVersion, String buildType
+                                       )throws Exception{
 
 
         ScenePro scene = sceneProService.getByNum(projectNum);
         SceneProEdit sceneEdit = sceneProEditService.getByProId(scene.getId());
 
-        //先返回链接地址
-        scene.setWebSite(url+projectNum);
         scene.setCameraId(cameraId);
         scene.setPhoneId(phoneId);
         scene.setNum(projectNum);
+        scene.setSpace(0L);
 
         scene.setSceneSource(1);
         if(cameraType.longValue() == 5 || cameraType.longValue() == 6){
@@ -969,8 +962,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data/data"+projectNum+File.separator+"scene.json", scenejson.toString());
 
         //生成二维码
-        MatrixToImageWriterUtil.createQRCode(url + projectNum, ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+projectNum+".png",false, null);
-        MatrixToImageWriterUtil.createQRCode(url + projectNum + "&lang=en", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+projectNum+"_en.png",false, null);
+        MatrixToImageWriterUtil.createQRCode(scene.getWebSite(), ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+projectNum+".png",false, null);
+        MatrixToImageWriterUtil.createQRCode(scene.getWebSite() + "&lang=en", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+projectNum+"_en.png",false, null);
         log.info("二维码生成完成");
 
         ScenePlusVO scenePlusVO = new ScenePlusVO();
@@ -979,6 +972,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePlusVO.setPayStatus(scene.getPayStatus());
         scenePlusVO.setId(scene.getId());
         scenePlusVO.setNum(scene.getNum());
+        scenePlusVO.setWebSite(scene.getWebSite());
         return scenePlusVO;
     }