修改表结构

src/main/java/com/fdkankan/contro/mapper/ISceneProMapper.java

@@ -19,9 +19,9 @@ import org.springframework.stereotype.Service;
 @Mapper
 public interface ISceneProMapper extends BaseMapper<ScenePro> {
 
-    @Select("select * from from t_scene_pro t left join t_scene_pro_ext ext on t.id = ext.scene_pro_id WHERE ext.data_source LIKE CONCAT('%',#{unicode},'%') AND t.tb_status = #{tbStatus} order by t.create_time desc LIMIT 1")
-    SceneProPO getSceneStatusByUnicode(@Param("unicode") String unicode, @Param("tbStatus") Integer tbStatus);
+    @Select("select * from t_scene_pro t left join t_scene_plus_ext plusExt on t.id = plusExt.plus_id WHERE plusExt.data_source LIKE CONCAT('%',#{unicode},'%') AND t.rec_status = 'A' order by t.create_time desc LIMIT 1")
+    SceneProPO getSceneStatusByUnicode(@Param("unicode") String unicode);
 
-    @Select("select * FROM t_scene_pro t LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id WHERE ext.data_source LIKE CONCAT('%',#{fileId},'%') AND t.tb_status = 0 order by t.create_time desc LIMIT 1")
+    @Select("select * from t_scene_pro t left join t_scene_plus_ext plusExt on t.id = plusExt.plus_id WHERE plusExt.data_source LIKE CONCAT('%',#{fileId},'%') AND t.rec_status = 'A' order by t.create_time desc LIMIT 1")
     SceneProPO findByFileId(@Param("fileId") String fileId);
 }

src/main/java/com/fdkankan/contro/service/ISceneProService.java

@@ -21,7 +21,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     void updateTime(String sceneNum, Long space, int payStatus, String videos, long computeTime);
 
-    SceneProPO getSceneStatusByUnicode(String s, Integer code);
+    SceneProPO getSceneStatusByUnicode(String s);
 
     ResultData rebuildReduceSpaceBySceneNum(String sceneNum) throws Exception;
 

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

@@ -199,7 +199,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
 
         log.info("mac：" + mac + "准备上传文件");
-        SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + folderName, TbStatus.VALID.code());
+        SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + folderName);
         if(scenePro != null && scenePro.getDataSource() != null){
             int n = scenePro.getDataSource().split("/").length;
             if(n > 1){
@@ -338,7 +338,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 + "/", TbStatus.VALID.code());
+            SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + fileId + "/");
             if(scenePro != null){
                 folderName = scenePro.getDataSource().substring(scenePro.getDataSource().lastIndexOf("/") + 1);
             }
@@ -540,7 +540,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 + "/", TbStatus.VALID.code());
+            SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + fileId + "/");
             if(scenePro != null){
                 folderName = scenePro.getDataSource().substring(scenePro.getDataSource().lastIndexOf("/") + 1);
             }
@@ -899,7 +899,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 + "/", TbStatus.VALID.code());
+            SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode("/" + fileId + "/");
             if(sceneProPO != null){
                 folderName = sceneProPO.getDataSource().substring(sceneProPO.getDataSource().lastIndexOf("/") + 1);
             }

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

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