1111

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

@@ -26,8 +26,8 @@ import com.fdkankan.contro.bean.SendCallAlgorithmDetail;
 import com.fdkankan.contro.common.Result;
 import com.fdkankan.contro.constant.RedisConstants;
 import com.fdkankan.contro.entity.*;
-import com.fdkankan.contro.httpclient.MyClient;
 import com.fdkankan.contro.enums.CameraTypeEnum;
+import com.fdkankan.contro.httpclient.MyClient;
 import com.fdkankan.contro.mapper.ISceneFileBuildMapper;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.util.HttpUtilExt;
@@ -1696,11 +1696,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePlusExt.setIsObj(isObj ? CommonStatus.YES.code() : CommonStatus.NO.code());
         scenePlusExtService.updateById(scenePlusExt);
 
-        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-        boolean isObj = jsonObject.containsKey("exportMeshObj") && jsonObject.getIntValue("exportMeshObj") == 1;
-        scenePlusExt.setIsObj(isObj ? CommonStatus.YES.code() : CommonStatus.NO.code());
-        scenePlusExtService.updateById(scenePlusExt);
-
         BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject, buildType, scenePlusVO.getDataSource());
 
         if (cameraDetail.getCompanyId() != null) {
@@ -2477,18 +2472,15 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 fdkkLaserService.saveScene(scenePlus,fdageData,camera,user.getUserName(),rebuild == 1 ? true : false, scenePlus.getPayStatus());
             }
             sceneOrigBd.setStatus(CommonSuccessStatus.SUCCESS.code());
+            sceneOrigBd.setUpdateTime(null);
+            sceneOrigBdService.updateById(sceneOrigBd);
+
         }catch (Exception e){
             sceneOrigBd.setStatus(CommonSuccessStatus.FAIL.code());
             sceneOrigBd.setReason(ExceptionUtil.stacktraceToString(e,5000));
-        }
-        sceneOrigBd.setUpdateTime(null);
-        sceneOrigBdService.updateById(sceneOrigBd);
-            scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
-            if(cameraType == 14){
-                fdkkLaserService.saveScene(scenePlus,fdageData,camera,user.getUserName(),rebuild == 1 ? true : false, scenePlus.getPayStatus());
-            }
+            sceneOrigBd.setUpdateTime(null);
+            sceneOrigBdService.updateById(sceneOrigBd);
 
-        }catch (Exception e){
             log.error("通知计算报错,uuid:{}", uuid, e);
             if(StrUtil.isNotEmpty(sceneNum)){
                 scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
@@ -2497,18 +2489,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 String buildLogPath = String.format(UploadFilePath.BUILD_LOG_PATH, sceneNum);
                 String preLogPath = buildLogPath + "noticeBuild-error-" + DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN) + ".log";
                 fYunFileService.uploadFile(ExceptionUtil.stacktraceToString(e).getBytes(StandardCharsets.UTF_8), preLogPath);
-
-                Map<String, Object> param = new HashMap<>();
-                try {
-                    param.put("event_type", "通知计算失败");
-                    param.put("event_content", "通知计算失败");
-                    param.put("scene_num", sceneNum);
-                    param.put("event_time", new Date());
-                    param.put("ryid", scenePlusService.getRyIdByNum(sceneNum));
-                    jmgaService.sendStatus(param);
-                }catch (Exception ex){
-                    log.info("推送事件失败,param:{}", param);
-                }
             }
 
             throw e;