Bläddra i källkod

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-cloud

yumeng 3 år sedan
förälder
incheckning
ade4ab647e

+ 5 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/BossDataExhibitionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.ctop.material.mapper.BossDataExhibitionMapper">
 
-    <!--  素材产出占比 快手 -->
+    <!--  素材产出占比 快手 master-->
     <select id="getMeterialProduceRateKuaiShou" resultType="java.util.LinkedHashMap">
         SELECT a.*,
         sum(a.meterial) meterialNum,
@@ -18,6 +18,7 @@
         WHEN '上海汇创思拓数字科技有限公司' then '华东'
         WHEN '杭州妙构思数字科技有限公司' then '杭州'
         WHEN '北京骄阳数字科技有限公司' then '骄阳'
+        WHEN '北京聚意创量文化传媒有限公司' then '聚意'
         else '其他'
         end area,
         company_name as companyName,
@@ -67,6 +68,7 @@
         WHEN '上海汇创思拓数字科技有限公司' then '华东'
         WHEN '杭州妙构思数字科技有限公司' then '杭州'
         WHEN '北京骄阳数字科技有限公司' then '骄阳'
+        WHEN '北京聚意创量文化传媒有限公司' then '聚意'
         else '其他'
         end area,
         company_name as companyName,
@@ -116,6 +118,7 @@
         WHEN '4b10089775c040119e139087517aed88' THEN '华东'
         WHEN '5e46b5dea3d740eeb8ff1a2895015a4b' THEN '骄阳'
         WHEN '1648c7ceb4d449a9a13fbed7a8d9976c' THEN '杭州'
+        WHEN 'ace886fa51a244818e918b5d6d1bcc62' then '聚意'
         ELSE '其他'
         END area,
         ( SELECT SUM(cost) FROM application.bytedance_material_video_report_daily_dw
@@ -157,6 +160,7 @@
         WHEN '4b10089775c040119e139087517aed88' then '华东'
         WHEN '5e46b5dea3d740eeb8ff1a2895015a4b' then '骄阳'
         WHEN '1648c7ceb4d449a9a13fbed7a8d9976c' then '杭州'
+        WHEN 'ace886fa51a244818e918b5d6d1bcc62' then '聚意'
         else '其他'
         end area,
         (SELECT SUM(charge) from application.kuaishou_material_video_report_daily_dw

+ 3 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/service/impl/ExternalMaterialCollectionServiceImpl.java

@@ -192,6 +192,7 @@ public class ExternalMaterialCollectionServiceImpl extends ServiceImpl<ExternalM
                     File file = new File(localUrl);
                     it.sauronsoftware.jave.Encoder encoder = new Encoder();
                     MultimediaInfo m = encoder.getInfo(file);
+                    Thread.sleep(5000);
                     long duration = m.getDuration();
                     long secondDuration = duration / 1000;
                     // 视频秒数
@@ -319,8 +320,8 @@ public class ExternalMaterialCollectionServiceImpl extends ServiceImpl<ExternalM
                 String platePosition = eeu.getCellValue(row.getCell(3));
                 //描述
                 String materialDescribe = eeu.getCellValue(row.getCell(4));
-                if(!Check.isNull(materialDescribe)){
-                    materialDescribe = materialDescribe.substring(0,10);
+                if (!Check.isNull(materialDescribe) && materialDescribe.length() > 10) {
+                    materialDescribe = materialDescribe.substring(0, 10);
                 }
                 ExternalMaterialCollection materialCollection = new ExternalMaterialCollection();
                 QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();