zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
wangjinlei
2024-05-16 13:54:42 +08:00
parent 1b3803074d
commit 7beb2b2b2c
6 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@@ -135,11 +135,11 @@
<version>3.12.5</version> <version>3.12.5</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.bytedeco</groupId> <!-- <groupId>org.bytedeco</groupId>-->
<artifactId>javacv-platform</artifactId> <!-- <artifactId>javacv-platform</artifactId>-->
<version>1.5.6</version> <!-- <version>1.5.6</version>-->
</dependency> <!-- </dependency>-->
<!--阿里短信服务--> <!--阿里短信服务-->
<dependency> <dependency>
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>

4
src/main/java/com/peanut/common/service/AsyncService.java
View File

@@ -21,8 +21,8 @@ public class AsyncService {
int i = p.getBody().getVideoMeta().getDuration().intValue(); int i = p.getBody().getVideoMeta().getDuration().intValue();
courseCatalogueChapterVideoEntity.setDuration(i); courseCatalogueChapterVideoEntity.setDuration(i);
}else{ }else{
Integer mp4Duration = SpdbUtil.getMp4Duration("https://ehh-private-01.oss-cn-beijing.aliyuncs.com/video/taiHuClass/" + courseCatalogueChapterVideoEntity.getVideo()); // Integer mp4Duration = SpdbUtil.getMp4Duration("https://ehh-private-01.oss-cn-beijing.aliyuncs.com/video/taiHuClass/" + courseCatalogueChapterVideoEntity.getVideo());
courseCatalogueChapterVideoEntity.setDuration(mp4Duration); // courseCatalogueChapterVideoEntity.setDuration(mp4Duration);
} }
courseCatalogueChapterVideoDao.updateById(courseCatalogueChapterVideoEntity); courseCatalogueChapterVideoDao.updateById(courseCatalogueChapterVideoEntity);
} }

26
src/main/java/com/peanut/common/utils/SpdbUtil.java
View File

@@ -5,24 +5,24 @@ import com.aliyun.teautil.models.RuntimeOptions;
import com.aliyun.vod20170321.Client; import com.aliyun.vod20170321.Client;
import com.aliyun.vod20170321.models.GetVideoPlayAuthRequest; import com.aliyun.vod20170321.models.GetVideoPlayAuthRequest;
import com.aliyun.vod20170321.models.GetVideoPlayAuthResponse; import com.aliyun.vod20170321.models.GetVideoPlayAuthResponse;
import org.bytedeco.javacv.FFmpegFrameGrabber; //import org.bytedeco.javacv.FFmpegFrameGrabber;
import org.bytedeco.javacv.FrameGrabber; //import org.bytedeco.javacv.FrameGrabber;
import java.util.HashMap; import java.util.HashMap;
public class SpdbUtil { public class SpdbUtil {
public static Integer getMp4Duration(String url){ // public static Integer getMp4Duration(String url){
double duration = 0; // double duration = 0;
try (FFmpegFrameGrabber frameGrabber = new FFmpegFrameGrabber(url)) { // try (FFmpegFrameGrabber frameGrabber = new FFmpegFrameGrabber(url)) {
frameGrabber.start(); // frameGrabber.start();
duration = frameGrabber.getLengthInTime()/1000000; // duration = frameGrabber.getLengthInTime()/1000000;
frameGrabber.stop(); // frameGrabber.stop();
} catch (FrameGrabber.Exception e) { // } catch (FrameGrabber.Exception e) {
e.printStackTrace(); // e.printStackTrace();
} // }
return (int)duration; // return (int)duration;
}; // };
public static GetVideoPlayAuthResponse getPlayAuth(String vid) throws Exception { public static GetVideoPlayAuthResponse getPlayAuth(String vid) throws Exception {
com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config() com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()

2
src/main/java/com/peanut/modules/master/controller/ShopProductController.java
View File

@@ -39,7 +39,7 @@ public class ShopProductController {
if (StringUtils.isNotEmpty(params.get("productName").toString())) { if (StringUtils.isNotEmpty(params.get("productName").toString())) {
wrapper.like(ShopProduct::getProductName, params.get("productName")); wrapper.like(ShopProduct::getProductName, params.get("productName"));
} }
wrapper.eq(StringUtils.isNotBlank(params.get("goodsType").toString())&&params.get("goodsType").toString()!="00",ShopProduct::getGoodsType,params.get("goodsType").toString()); wrapper.eq((StringUtils.isNotBlank(params.get("goodsType").toString())&&!params.get("goodsType").toString().equals("00")),ShopProduct::getGoodsType,params.get("goodsType").toString());
wrapper.orderByAsc(ShopProduct::getSort); wrapper.orderByAsc(ShopProduct::getSort);
wrapper.orderByAsc(ShopProduct::getCreateTime); wrapper.orderByAsc(ShopProduct::getCreateTime);
Page<ShopProduct> res = shopProductService.page(new Page<>( Page<ShopProduct> res = shopProductService.page(new Page<>(

2
src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
View File

@@ -48,7 +48,7 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
public CourseCatalogueChapterVideoEntity checkVideo(CourseCatalogueChapterVideoEntity videoEntity) throws Exception { public CourseCatalogueChapterVideoEntity checkVideo(CourseCatalogueChapterVideoEntity videoEntity) throws Exception {
CourseCatalogueChapterVideoEntity video = this.getById(videoEntity.getId()); CourseCatalogueChapterVideoEntity video = this.getById(videoEntity.getId());
if (video.getDuration() == 0) { if (video.getDuration() == 0) {
asyncService.pushDurationToVideo(video.getId()); asyncService.pushDurationToVideo(video.getId());//获取mp4总时长
} }
CourseCatalogueChapterEntity courseCatalogueChapterEntity = courseCatalogueChapterDao.selectById(video.getChapterId()); CourseCatalogueChapterEntity courseCatalogueChapterEntity = courseCatalogueChapterDao.selectById(video.getChapterId());
CourseCatalogueEntity courseCatalogueEntity = courseCatalogueDao.selectById(courseCatalogueChapterEntity.getCatalogueId()); CourseCatalogueEntity courseCatalogueEntity = courseCatalogueDao.selectById(courseCatalogueChapterEntity.getCatalogueId());

2
src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
View File

@@ -56,6 +56,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
wrapper.selectAll(CourseEntity.class); wrapper.selectAll(CourseEntity.class);
wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId); wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId);
wrapper.eq(CourseToSociologyEntity::getSociologyId,param.getId()); wrapper.eq(CourseToSociologyEntity::getSociologyId,param.getId());
wrapper.orderByAsc(CourseToSociologyEntity::getSort);
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper); Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper);
return courseEntityPage; return courseEntityPage;
} }
@@ -78,6 +79,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
wrapper.selectAll(CourseEntity.class); wrapper.selectAll(CourseEntity.class);
wrapper.leftJoin(CourseToMarketEntity.class,CourseToMarketEntity::getCourseId,CourseEntity::getId); wrapper.leftJoin(CourseToMarketEntity.class,CourseToMarketEntity::getCourseId,CourseEntity::getId);
wrapper.eq(CourseToMarketEntity::getMarketId,param.getId()); wrapper.eq(CourseToMarketEntity::getMarketId,param.getId());
wrapper.orderByAsc(CourseToSociologyEntity::getSort);
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper); Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper);
return courseEntityPage; return courseEntityPage;
} }