去掉recStatus

4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ISceneProMapper.java

@@ -28,7 +28,7 @@ public interface ISceneProMapper extends BaseMapper<ScenePro> {
 
     ScenePro findByNum(@Param("sceneCode")String sceneCode);
 
-    SceneProPO getSceneStatusByUnicode(@Param("unicode") String unicode, @Param("recStatus") String recStatus);
+    SceneProPO getSceneStatusByUnicode(@Param("unicode") String unicode, @Param("tbStatus") Integer tbStatus);
 
     List<SceneProPO> findByUserIdAndCameraType(@Param("userId") Long userId, @Param("cameraType") Integer cameraType);
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneProService.java

@@ -37,7 +37,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     ScenePro findDeleteSceneBySceneNum(String sceneNum);
 
-    SceneProPO getSceneStatusByUnicode(String unicode, String recStatus);
+    SceneProPO getSceneStatusByUnicode(String unicode, Integer tbStatus);
 
     List<SceneProPO> findByUserIdAndCameraType(Long userId, Integer cameraType);
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneFileBuildServiceImpl.java

@@ -292,7 +292,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
 
         log.info("mac：" + mac + "准备上传文件");
-        SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + folderName, "A");
+        SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + folderName, TbStatus.VALID.code());
         if(scenePro != null && scenePro.getDataSource() != null){
             int n = scenePro.getDataSource().split("/").length;
             if(n > 1){
@@ -420,7 +420,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         Object folderNameObject = redisUtil.get(fileId);
         String folderName = folderNameObject == null ? null : (String)folderNameObject;
         if(StringUtils.isEmpty(folderName)){
-            SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", "A");
+            SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", TbStatus.VALID.code());
             if(scenePro != null){
                 folderName = scenePro.getDataSource().substring(scenePro.getDataSource().lastIndexOf("/") + 1);
             }
@@ -536,7 +536,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         Object folderNameObject = redisUtil.get(fileId);
         String folderName = folderNameObject == null ? null : (String)folderNameObject;
         if(StringUtils.isEmpty(folderName)){
-            SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", "A");
+            SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", TbStatus.VALID.code());
             if(scenePro != null){
                 folderName = scenePro.getDataSource().substring(scenePro.getDataSource().lastIndexOf("/") + 1);
             }
@@ -582,7 +582,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         Object folderNameObject = redisUtil.get(fileId);
         String folderName = folderNameObject == null ? null : (String)folderNameObject;
         if(StringUtils.isEmpty(folderName)){
-            SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", "A");
+            SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", TbStatus.VALID.code());
             if(sceneProPO != null){
                 folderName = sceneProPO.getDataSource().substring(sceneProPO.getDataSource().lastIndexOf("/") + 1);
             }
@@ -638,7 +638,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         Object folderNameObject = redisUtil.get(fileId);
         String folderName = folderNameObject == null ? null : (String)folderNameObject;
         if(StringUtils.isEmpty(folderName)){
-            SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", "A");
+            SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", TbStatus.VALID.code());
             if(sceneProPO != null){
                 folderName = sceneProPO.getDataSource().substring(sceneProPO.getDataSource().lastIndexOf("/") + 1);
             }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProAppServiceImpl.java

@@ -2138,9 +2138,9 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             throw new BusinessException(ErrorCode.FAILURE_CODE_3014);
         }
 
-        SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode(user.getUnicode(), "A");
+        SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode(user.getUnicode(), TbStatus.VALID.code());
         if(sceneProPO == null){
-            sceneProPO = sceneProService.getSceneStatusByUnicode(user.getUnicode(), "I");
+            sceneProPO = sceneProService.getSceneStatusByUnicode(user.getUnicode(), TbStatus.DELETE.code());
             if(sceneProPO == null){
                 throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
             }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -188,8 +188,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
-    public SceneProPO getSceneStatusByUnicode(String unicode, String recStatus) {
-        return baseMapper.getSceneStatusByUnicode(unicode, recStatus);
+    public SceneProPO getSceneStatusByUnicode(String unicode, Integer tbStatus) {
+        return baseMapper.getSceneStatusByUnicode(unicode, tbStatus);
     }
 
     @Override

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -1205,7 +1205,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         String sceneNum = null;
         if(scene == null)
         {
-            SceneProPO scenePro = sceneProService.getSceneStatusByUnicode(path, "A");
+            SceneProPO scenePro = sceneProService.getSceneStatusByUnicode(path, TbStatus.VALID.code());
             if(scenePro == null)
                 throw new BusinessException(ErrorCode.FAILURE_CODE_5005);