Browse Source

添加不启动弹性伸缩的配置

tianboguang 2 năm trước cách đây
mục cha
commit
3ba19b6b3a

+ 3 - 0
src/main/java/com/fdkankan/contro/entity/Company.java

@@ -81,6 +81,9 @@ public class Company implements Serializable {
 //    @TableField("data_sync_action")
 //    private Integer dataSyncAction;
 
+    @TableField("calculate_flexibility")
+    private Boolean calculateFlexibility;
+
     /**
      * 创建时间
      */

+ 11 - 2
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -64,6 +64,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     @Value("${queue.modeling.modeling-call}")
     private String queueModelingCall;
 
+    @Value("${queue.modeling.single.modeling-call}")
+    private String singleModelingCall;
+
     @Value("${model.type:#{null}}")
     private String modelType;
 
@@ -118,8 +121,14 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             message.getBuildContext().put("cameraType",message.getCameraType());
 
-            //发送mq,就进行计算
-            mqProducer.sendByWorkQueue(queueModelingCall, message);
+            // 判断企业是否配置了弹性伸缩
+            if (message.getFlexibility() == 0) {
+                //发送mq,就进行计算
+                mqProducer.sendByWorkQueue(queueModelingCall, message);
+            } else {
+                //发送mq,就进行计算
+                mqProducer.sendByWorkQueue(singleModelingCall, message);
+            }
 
             success = true;
 

+ 12 - 6
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -326,6 +326,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             FileUtils.writeFile(localDataPath + "status.json", statusJson.toString());
             fYunFileService.uploadFile(localDataPath + "status.json", dataViewPath + "status.json");
         }
+
+        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject.getInteger("resolution"), buildType,
+                scenePlusVO.getDataSource());
+
         if (cameraDetail.getCompanyId() != null) {
             Company company = companyService.getById(cameraDetail.getCompanyId());
             if (company != null) {
@@ -347,12 +351,13 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                             false, ConstantFilePath.SCENE_PATH + "images/images" + sceneNum + "/QRShareLogo.png");
                 }
                 sceneEditInfoService.updateById(sceneEditInfo);
+                if (!ObjectUtils.isEmpty(company.getCalculateFlexibility()) && !company.getCalculateFlexibility()) {
+                    mqMessage.setFlexibility(-1);
+                }
             }
 
         }
 
-        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject.getInteger("resolution"), buildType,
-                scenePlusVO.getDataSource());
         rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
 
         return scenePlusVO;
@@ -431,6 +436,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             FileUtils.writeFile(localDataPath + "status.json", statusJson.toString());
             fYunFileService.uploadFile(localDataPath + "status.json", dataViewPath + "status.json");
         }
+        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject.getInteger("resolution"), buildType,
+                scenePlusVO.getDataSource());
         if (cameraDetail.getCompanyId() != null) {
             Company company = companyService.getById(cameraDetail.getCompanyId());
             if (company != null) {
@@ -452,12 +459,11 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                             false, ConstantFilePath.SCENE_PATH + imgViewPath + "QRShareLogo.png");
                 }
                 sceneProEditService.updateById(sceneEditInfo);
+                if (!ObjectUtils.isEmpty(company.getCalculateFlexibility()) && !company.getCalculateFlexibility()) {
+                    mqMessage.setFlexibility(-1);
+                }
             }
-
         }
-
-        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject.getInteger("resolution"), buildType,
-                scenePlusVO.getDataSource());
         rabbitMqProducer.sendByWorkQueue(queueV3ModelingPre, mqMessage);
 
         return scenePlusVO;