From 71d355f4db31807a13d78e6e257e9d26c4702c23 Mon Sep 17 00:00:00 2001
From: shikeying <shikeying@163.com>
Date: 星期二, 11 十月 2022 14:24:52 +0800
Subject: [PATCH] 修复写入问题,要更新包jdbc

---
 recommend-video/src/main/java/com/iplatform/recvideo/service/VideoLoaderServiceImpl.java |    4 ++++
 deploy-jar-template/src/main/resources/application-dev.yml                               |    5 +++--
 recommend-video/src/main/java/com/iplatform/recvideo/scheduler/VideoSearchScheduler.java |    5 +++++
 recommend-video/src/main/java/com/iplatform/recvideo/support/DefaultVideoLoader.java     |    4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/deploy-jar-template/src/main/resources/application-dev.yml b/deploy-jar-template/src/main/resources/application-dev.yml
index 6f39844..30d170d 100644
--- a/deploy-jar-template/src/main/resources/application-dev.yml
+++ b/deploy-jar-template/src/main/resources/application-dev.yml
@@ -92,13 +92,14 @@
 #    data-folder: /opt/ai/video/
 
     # 瑙嗛鐩镐技搴I鏈嶅姟URL
-    ai-service: http://121.36.40.27:12345
+#    ai-service: http://121.36.40.27:12345
+    ai-service: http://127.0.0.1:8801
 
     # 鎺ㄨ崘鐩镐技瑙嗛(绠楁硶)鍓嶅灏戜釜
     top-n: 40
 
     # 娴嬭瘯妯″紡锛屽鏋滄槸鍒欎粎鐢熸垚鍥哄畾娴嬭瘯鏁版嵁锛屾寮忛儴缃查渶瑕佹敼涓� false
-    test-mode: true
+    test-mode: false
 
     #涓氬姟瑙嗛鎵�鍦ㄦ暟鎹簱淇℃伅
     business-datasource-url: 124.70.39.177
diff --git a/recommend-video/src/main/java/com/iplatform/recvideo/scheduler/VideoSearchScheduler.java b/recommend-video/src/main/java/com/iplatform/recvideo/scheduler/VideoSearchScheduler.java
index 9467a33..b55ae99 100644
--- a/recommend-video/src/main/java/com/iplatform/recvideo/scheduler/VideoSearchScheduler.java
+++ b/recommend-video/src/main/java/com/iplatform/recvideo/scheduler/VideoSearchScheduler.java
@@ -48,9 +48,14 @@
                 return null;
             }
             logger.debug("寮�濮嬪惎鍔ㄦ壒娆℃煡璇�:" + this.currentVideoSearchMeta.getBatchId());
+        } else {
+            // 濡傛灉 this.videoSearchTask 宸茬粡鍒濆鍖栵紝浣� currentVideoSearchMeta == null锛屽垯闇�瑕佹煡璇㈡暟鎹簱鐘舵��
+            Object[] params = new Object[]{this.videoSearchTask.getSql(), new Object[]{}};
+            this.currentVideoSearchMeta = (VideoSearchMeta)this.videoSearchTask.run(null, null, null, params);
         }
         if(this.currentVideoSearchMeta == null){
             // 璇存槑涓婃宸茬粡鍒涘缓 videoSearchTask 浠诲姟锛屼絾娌℃湁杩斿洖鏈夋晥浠诲姟璁板綍
+            logger.debug(".........娌℃湁鏌ヨ鍒拌閲囬泦鐨勮褰�:currentVideoSearchMeta");
             return null;
         }
 
diff --git a/recommend-video/src/main/java/com/iplatform/recvideo/service/VideoLoaderServiceImpl.java b/recommend-video/src/main/java/com/iplatform/recvideo/service/VideoLoaderServiceImpl.java
index 371ff34..c0b958c 100644
--- a/recommend-video/src/main/java/com/iplatform/recvideo/service/VideoLoaderServiceImpl.java
+++ b/recommend-video/src/main/java/com/iplatform/recvideo/service/VideoLoaderServiceImpl.java
@@ -38,7 +38,11 @@
      * @date 2022-09-26
      */
     public int execSaveBatchAndStatus(List<Rc_video_batch> videoBatchList, Rc_task_status status){
+        // 娉ㄦ剰锛氬鏋滆鎻掑叆鏁版嵁锛屼笉瑕佽缃缃富閿�(save)锛�
+        // 濡傛灉瑕佽缃嚜宸变富閿紝璇蜂娇鐢ㄦ柟娉�: insert();
+        // 2022-10-11
         this.save(videoBatchList);
+        // 宸茬粡鍦ㄥ閮ㄤ繚瀛樹簡锛岃繖閲屽氨涓嶉渶瑕佷簡銆�
 //        this.save(status);
         return videoBatchList.size();
     }
diff --git a/recommend-video/src/main/java/com/iplatform/recvideo/support/DefaultVideoLoader.java b/recommend-video/src/main/java/com/iplatform/recvideo/support/DefaultVideoLoader.java
index 60f96f3..29c262d 100644
--- a/recommend-video/src/main/java/com/iplatform/recvideo/support/DefaultVideoLoader.java
+++ b/recommend-video/src/main/java/com/iplatform/recvideo/support/DefaultVideoLoader.java
@@ -18,6 +18,7 @@
 import com.walker.infrastructure.utils.CollectionUtils;
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.NumberGenerator;
+import com.walker.infrastructure.utils.StringUtils;
 
 import java.io.File;
 import java.util.*;
@@ -60,7 +61,8 @@
 
         VideoSimilarProperties videoSimilarProperties = BeanContextAware.getBeanByType(VideoSimilarProperties.class);
         String dataFolder = videoSimilarProperties.getDataFolder();
-        String pathSeparator = File.separator;
+//        String pathSeparator = File.separator;
+        String pathSeparator = StringUtils.FOLDER_SEPARATOR;
 
         for (Map<String, Object> srcVideoMap : srcVideoList) {
             //  videoSrcPath ==銆媅{"name": "/opt/home/train/tmp/2020/10/28/video/489c9fd871a04537bd20ebfc47457368.mp4", "path": "/train/2020/10/28/100cecfe4d4b4e70a2eb2733d78ec12e.mp4"}]

--
Gitblit v1.9.1