2.2.0

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

@@ -539,7 +539,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         boolean isObj = jsonObject.containsKey("exportMeshObj") && jsonObject.getIntValue("exportMeshObj") == 1;
-        scenePlusExt.setIsObj(isObj ? CommonStatus.YES.code() : CommonStatus.NO.code());
+        scenePlusExt.setIsObj(isObj ? CommonStatus.YES.code().intValue() : CommonStatus.NO.code().intValue());
         scenePlusExtService.updateById(scenePlusExt);
 
         //上传app状态文件
@@ -1127,7 +1127,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             scenePlus.setCreateTime(Calendar.getInstance().getTime());
             scenePlus.setBuildFailReason("");
             //只要开始常规场景上传计算，场景就不可以预览了
-            scenePlus.setPreview(CommonStatus.NO.code());
+            scenePlus.setPreview(CommonStatus.NO.code().intValue());
 
             ScenePlusExt oldSceneExt = scenePlusExtService.getScenePlusExtByPlusId(oldScene.getId());
             scenePlusExt.setSpace(oldSceneExt.getSpace());
@@ -1739,7 +1739,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePlusService.updateById(scenePlus);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         boolean isObj = jsonObject.containsKey("exportMeshObj") && jsonObject.getIntValue("exportMeshObj") == 1;
-        scenePlusExt.setIsObj(isObj ? CommonStatus.YES.code() : CommonStatus.NO.code());
+        scenePlusExt.setIsObj(isObj ? CommonStatus.YES.code().intValue() : CommonStatus.NO.code().intValue());
         scenePlusExtService.updateById(scenePlusExt);
 
         BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject, buildType, scenePlusVO.getDataSource());

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

@@ -231,17 +231,17 @@ public class UploadShootingServiceImpl implements UploadShootingService {
             scenePlus.setNum(sceneNum);
             scenePlus.setSceneSource(SceneSource.BM.code());
             scenePlus.setCameraId(camera.getId());
-            scenePlus.setPreview(CommonStatus.YES.code());
+            scenePlus.setPreview(CommonStatus.YES.code().intValue());
             if (camType == CameraTypeEnum.DOUBLE_EYE_TURN.getType()) {
                 scenePlus.setSceneSource(SceneSource.ZT.code());
             }
             if (camType == CameraTypeEnum.LASER_TURN.getType()) {
                 scenePlus.setSceneSource(SceneSource.JG.code());
-                scenePlusExt.setIsObj(CommonStatus.YES.code());
+                scenePlusExt.setIsObj(CommonStatus.YES.code().intValue());
             }
             if (camType == CameraTypeEnum.LASER_SG.getType()) {
                 scenePlus.setSceneSource(SceneSource.SG.code());
-                scenePlusExt.setIsObj(CommonStatus.YES.code());
+                scenePlusExt.setIsObj(CommonStatus.YES.code().intValue());
             }
             scenePlusExt.setThumb(fYunFileConfig.getHost() + "/loading/thumb.jpg");
             if (camType == 5) {//圆周率