yumeng %!s(int64=5) %!d(string=hai) anos
pai
achega
af845dc0d1

+ 2 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialCutFrameServiceImpl.java

@@ -100,7 +100,7 @@ public class MaterialCutFrameServiceImpl extends ServiceImpl<MaterialCutFrameMap
             JSONObject input = new JSONObject();
             input.put("Location", ossLocation);
             input.put("Bucket", ossBucket);
-         //   https://ctop-media.oss-cn-beijing.aliyuncs.com/video/2020-06-03/bp%E8%95%89%E4%B8%8B%E7%9B%B4%E6%92%AD2-1591188835505.mp4
+            //   https://ctop-media.oss-cn-beijing.aliyuncs.com/video/2020-06-03/bp%E8%95%89%E4%B8%8B%E7%9B%B4%E6%92%AD2-1591188835505.mp4
             String replaceUrl = url.replace("https://ctop-media.oss-cn-beijing.aliyuncs.com/", "");
             input.put("Object", replaceUrl);
 
@@ -224,4 +224,5 @@ public class MaterialCutFrameServiceImpl extends ServiceImpl<MaterialCutFrameMap
     }
 
 
+
 }

+ 15 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoGetServiceImpl.java

@@ -63,14 +63,17 @@ public class KuaiShouVideoGetServiceImpl extends ServiceImpl<KuaiShouVideoGetMap
                 return;
             }
             for (KuaiShouVideoGet videoGet : kuaiShouVideoGets) {
-                if (!Check.isNull(videoGet.getSignature())) {
-                    QueryWrapper<MaterialCutFrame> cutFrameQueryWrapper = new QueryWrapper<>();
-                    cutFrameQueryWrapper.eq("video_signature", videoGet.getSignature());
-                    cutFrameQueryWrapper.last("limit 1");
-                    MaterialCutFrame one = materialCutFrameService.getOne(cutFrameQueryWrapper);
-                    if (!Check.isNull(one)) {
-                        continue;
+                synchronized (this) {
+                    if (!Check.isNull(videoGet.getSignature())) {
+                        QueryWrapper<MaterialCutFrame> cutFrameQueryWrapper = new QueryWrapper<>();
+                        cutFrameQueryWrapper.eq("video_signature", videoGet.getSignature());
+                        cutFrameQueryWrapper.last("limit 1");
+                        MaterialCutFrame one = materialCutFrameService.getOne(cutFrameQueryWrapper);
+                        if (!Check.isNull(one)) {
+                            continue;
+                        }
                     }
+
                     executorService.submit(new Runnable() {
                         @Override
                         public void run() {
@@ -100,6 +103,11 @@ public class KuaiShouVideoGetServiceImpl extends ServiceImpl<KuaiShouVideoGetMap
                                                 e.printStackTrace();
                                                 continue;
                                             }
+                                            Map<String, Object> deleteMap = new HashMap<>();
+                                            deleteMap.put("video_signature", videoGet.getSignature());
+                                            deleteMap.put("signature", md5);
+                                            materialCutFrameService.removeByMap(deleteMap);
+
                                             MaterialCutFrame materialCutFrame = new MaterialCutFrame();
                                             materialCutFrame.setImageIndex(i);
                                             materialCutFrame.setVideoSignature(videoGet.getSignature());