1

src/main/java/com/fdkankan/ucenter/service/IScene3dNumService.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IScene3dNumService extends IService<Scene3dNum> {
 
     String generateSceneNum(Integer type);
+    String generateSceneNumByOldNum(String oldNum);
 
     Integer getCameraTypeBySceneSource(Integer sceneSource);
 }

src/main/java/com/fdkankan/ucenter/service/impl/Scene3dNumServiceImpl.java

@@ -55,6 +55,18 @@ public class Scene3dNumServiceImpl extends ServiceImpl<IScene3dNumMapper, Scene3
         return sceneNum;
 
     }
+    @Override
+    public String generateSceneNumByOldNum(String  oldNum) {
+        String sceneNum = redisUtil.lLeftPop(RedisKeyUtil.SCENE_UNUSED_NUMS);
+        if(StringUtils.isEmpty(sceneNum)){
+            throw new BusinessException(ResultCode.FAILURE_CODE_400001,ResultCode.FAILURE_MSG_400001);
+        }
+        if(oldNum.contains("-")){
+            return oldNum.split("-")[0]  + sceneNum;
+        }
+        return sceneNum;
+
+    }
 
     @Override
     public Integer getCameraTypeBySceneSource(Integer sceneSource) {

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -689,8 +689,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 //            throw new BusinessException(CameraConstant.FAILURE_CODE_6029, CameraConstant.FAILURE_MSG_6029);
 //        }
         Integer sceneSource = scenePro == null ? scenePlus.getSceneSource() : scenePro.getSceneSource();
-        Integer cameraType = scene3dNumService.getCameraTypeBySceneSource(sceneSource);
-        String newNum = scene3dNumService.generateSceneNum(cameraType);
+        String newNum = scene3dNumService.generateSceneNumByOldNum(sceneNum);
 
         Long sceneId = scenePro == null ? scenePlus.getId() :scenePro.getId();
         Long newSceneId = null;