大理

src/main/java/com/fdkankan/contro/mq/listener/UploadSceneListener.java

@@ -134,8 +134,8 @@ public class UploadSceneListener {
         String uuidTime = dataFdageObj.getString("uuidtime");
         String uniCode = snCode + "_" + uuidTime;
         String fileId = sceneFileBuildService.getFileId(snCode, uniCode);
-        String homePath = ConstantFilePath.OSS_PREFIX + snCode + "/" + fileId + "/";// + uniCode;
-        String fileDir = sourcePath + "/" + uniCode;//本地版压缩包包含了一层unicode目录
+        String homePath = ConstantFilePath.OSS_PREFIX + snCode + File.separator + fileId + File.separator + uniCode + File.separator;
+        String fileDir = sourcePath + File.separator + uniCode;//本地版压缩包包含了一层unicode目录
         fYunFileService.uploadFileByCommand(fileDir, homePath);
 //        String cpCmd = "cp -p -r " + fileDir + "/* " + homePath;
 //        CmdUtils.callLineSh(cpCmd);

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

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ModelKind;
+import com.fdkankan.common.constant.SceneSource;
 import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.contro.entity.*;
@@ -115,6 +116,7 @@ public class JmgaServiceImpl implements IJmgaService {
             scenePlus.setUserId(user.getId());
             scenePlus.setUpdateTime(null);
             scenePlus.setSceneStatus(SceneStatus.wait.code());
+            scenePlus.setSceneSource(SceneSource.SX.code());
             scenePlusService.saveOrUpdate(scenePlus);
 
             ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());

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

@@ -369,7 +369,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         return list.get(0);
     }
 
-    public ScenePlusVO buildScene(String fileId, String prefix, JSONObject jsonObject, String buildType, long cameraType) throws Exception {
+    public ScenePlusVO buildScene(String fileId, String prefix,JSONObject jsonObject,String buildType,long cameraType, boolean forceBuild) throws Exception{
         //调用createScene方法生成scene数据和加入算法队列
         String sceneNum = "";
 
@@ -405,11 +405,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             sceneCopyLogService.checkCanBuild(sceneNum);
             //看看相机固件有bug,会重复发两次计算请求,所以这里判断,如果是看看场景,需要判断场景是否在计算中,如果是,直接返回成功
             if (scenePlus.getSceneStatus().equals(SceneStatus.wait.code())) {
-                if (cameraType == 11L) {
-                    log.info(scenePlus.getNum() + ":场景处于计算中，不能再计算");
+                log.info(scenePlus.getNum() + ":场景处于计算中，不能再计算");
+                if(!forceBuild){
                     return null;
-                } else {
-                    throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
                 }
             }
         }
@@ -742,7 +740,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
 
         if (ObjectUtils.isEmpty(scenePro) || (!ObjectUtils.isEmpty(scenePro.getIsUpgrade()) && scenePro.getIsUpgrade() == 1)) {
-            buildScene(fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType);
+            buildScene(fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType, forceBuild);
         } else {
             buildV3Scene(scenePro, fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType);
         }
@@ -900,7 +898,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         ScenePlusVO scenePlusVO = null;
 
         if (ObjectUtils.isEmpty(scenePro) || (!ObjectUtils.isEmpty(scenePro.getIsUpgrade()) && scenePro.getIsUpgrade() == 1)) {
-            scenePlusVO = buildScene(fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType);
+            scenePlusVO = buildScene(fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType, forceBuild);
         } else {
             scenePlusVO = buildV3Scene(scenePro, fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType);
         }