Browse Source

计算场景 推送结果mq bug修复
计算场景失败修改 scenepro的scenenstatus状态为-1

dengsixing 3 years ago
parent
commit
4bd73109f7

+ 9 - 6
4dkankan-center-scene/src/main/java/com/fdkankan/scene/listener/BuildSceneResultMQListener.java

@@ -1,7 +1,10 @@
 package com.fdkankan.scene.listener;
 
+import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.BuildStatus;
+import com.fdkankan.common.constant.ExpiredStatus;
+import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.mq.message.BuildSceneResultMqMessage;
 import com.fdkankan.platform.api.feign.PlatformGoodsClient;
@@ -77,8 +80,8 @@ public class BuildSceneResultMQListener implements RocketMQListener<String> {
             Integer sceneStatus = message.getSceneStatus();
             if(!buildSuccess){//建模失败,修改状态为失败状态
                 log.error("建模失败,修改状态为失败状态");
-                sceneService.updateStatus(sceneCode, -1);
-                sceneProService.updateStatus(sceneCode, -1);
+                sceneService.updateStatus(sceneCode, SceneStatus.FAILD.code());
+                sceneProService.updateStatus(sceneCode, SceneStatus.FAILD.code());
                 SceneFileBuild sceneFileBuild = sceneFileBuildService.findByFileId(fileId);
                 sceneFileBuild.setBuildStatus(BuildStatus.fail.code());
                 sceneFileBuildService.updateById(sceneFileBuild);
@@ -101,18 +104,18 @@ public class BuildSceneResultMQListener implements RocketMQListener<String> {
                 if(Objects.nonNull(scenePro)){
                     SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
                     ResultData<CameraDetail> resultData = platformGoodsClient.updateCameraDetailByCameraIdAndSpace(scenePro.getCameraId(), sceneProExt.getSpace());
-                    if(resultData.getCode() != 200){
+                    if(resultData.getCode() != HttpStatus.HTTP_OK){
                         log.error("调用platform服务updateCameraDetailByCameraIdAndSpace失败,参数{},{}" ,scenePro.getCameraId(), sceneProExt.getSpace());
                         return ;
                     }
                     CameraDetail cameraDetail = JSONObject.parseObject(JSONObject.toJSONString(resultData.getData()), CameraDetail.class);
 
                     ResultData<UserIncrement> resultData1 = platformUserClient.getUserIncrementByCameraId(scenePro.getCameraId());
-                    if(resultData1.getCode() != 200){
+                    if(resultData1.getCode() != HttpStatus.HTTP_OK){
                         log.error("调用platform服务getUserIncrementByCameraId失败,参数{}" ,scenePro.getCameraId());
                         return;
                     }
-                    if( resultData1.getData() == null || resultData1.getData().getIsExpired() ==1) {
+                    if( resultData1.getData() == null || resultData1.getData().getIsExpired() == ExpiredStatus.Expired.code()) {
                         // 新上传的场景,如果总容量小于使用容量,则该大场景保留在临时存储空间30天
                         if (cameraDetail.getTotalSpace().compareTo(cameraDetail.getUsedSpace()) == -1){
                             List<Long> ids = new ArrayList<>();
@@ -124,7 +127,7 @@ public class BuildSceneResultMQListener implements RocketMQListener<String> {
 
             }
         }catch ( Exception e){
-            log.error("处理消息出错:{}",e);
+            log.error("处理计算结果消息出错:{}",e);
         }
     }