qin 11 mesiacov pred
rodič
commit
d45eab8cec

+ 6 - 4
src/main/java/com/poteviohealth/cgp/statistics/controller/ReceiveController.java

@@ -36,9 +36,10 @@ public class ReceiveController extends BaseController {
     @RequestMapping(value = "/jumpImage", method = {RequestMethod.POST})
     @ResponseBody
     public VaultsResponse jumpImage(){
-        List<Distinction> list = Lists.newArrayList();
+
         List<FingerParams> orderList = distinctionService.getFinishOrderList();
         for (FingerParams params : orderList) {
+            List<Distinction> list = Lists.newArrayList();
             List<String> urlList = Lists.newArrayList();
             if(StringUtils.isNotEmpty(params.getStartUrl())){
                urlList.addAll(Arrays.asList(params.getStartUrl().split(",")));
@@ -46,17 +47,18 @@ public class ReceiveController extends BaseController {
             if(StringUtils.isNotEmpty(params.getEndUrl())){
                 urlList.addAll(Arrays.asList(params.getEndUrl().split(",")));
             }
-            params.setUrlList(urlList);
-            for (String s : params.getUrlList()) {
+            //params.setUrlList(urlList);
+            for (String s : urlList) {
                 Distinction distinction = DistinctionConverter.INSTANCE.model2WebDTO(params);
                 String uid =  ossUtils.getFileFinger(s);
                 distinction.setUid(uid);
                 distinction.setUrl(s);
                 list.add(distinction);
             }
+            distinctionService.insertBatch(list);
         }
 
-        distinctionService.insertBatch(list);
+
         return VaultsResponse.success();
     }
 

+ 1 - 2
src/main/java/com/poteviohealth/cgp/statistics/utils/OssUtils.java

@@ -5,7 +5,6 @@ import com.aliyun.oss.OSSClientBuilder;
 import com.poteviohealth.cgp.common.model.VaultsResponse;
 import com.poteviohealth.cgp.common.utils.CgpTool;
 import com.poteviohealth.cgp.common.utils.FingerImage;
-import com.poteviohealth.cgp.common.utils.ImageUtils;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -180,7 +179,7 @@ public class OssUtils {
             String url = fileUrl.replace("https://ptsubsidy.oss-cn-beijing.aliyuncs.com/", "");
             InputStream inputStream = ossClient.getObject(bucketName, url).getObjectContent();
             if(url.indexOf("mp4") != -1){
-                File tempFile = File.createTempFile("temp_", "mp4");
+                File tempFile = File.createTempFile("temp_", ".mp4");
                 FileUtils.copyInputStreamToFile(inputStream, tempFile);
                 File file = this.generateCover(tempFile);
                 tempFile.delete();