From 4ad463a47507e01b790262a59ae7ad348dde8a6c Mon Sep 17 00:00:00 2001
From: typ <tuyaping@ykhl.com>
Date: Sun, 16 Oct 2022 13:17:55 +0800
Subject: [PATCH] 每日学习时长计算bug修复

---
 src/main/java/com/subsidy/controller/VodPlayHistoryController.java    |  2 +-
 src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java | 22 +++++++++++++++-------
 src/main/resources/application-dev.properties                         |  4 ++--
 src/main/resources/application.properties                             |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/subsidy/controller/VodPlayHistoryController.java b/src/main/java/com/subsidy/controller/VodPlayHistoryController.java
index 8aaf441..02afe1d 100644
--- a/src/main/java/com/subsidy/controller/VodPlayHistoryController.java
+++ b/src/main/java/com/subsidy/controller/VodPlayHistoryController.java
@@ -37,7 +37,7 @@ public class VodPlayHistoryController {
 
     @PostMapping("insertHistory")
     @ApiOperation("记录学生看视频位置 ajax请求  classId班级id vodId 视频id  memberId 成员id  playLength 播放时长 playRecord 位点")
-    @LoginRequired
+//    @LoginRequired
     @TimeRequired
     public ResponseVO insertHistory(@RequestBody VodPlayHistoryDO vodPlayHistoryDO){
         return ResponseData.generateCreatedResponse(0,vodPlayHistoryService.insertHistory(vodPlayHistoryDO));
diff --git a/src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java b/src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
index 9bc9f14..470fa3c 100644
--- a/src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
@@ -67,16 +67,18 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                     .lambda()
                     .eq(ClassDictDO::getId, vodPlayHistoryDO.getClassId()));
 
-            if (classDictDO.getLimitHour()==1){
+            if (classDictDO.getLimitHour() == 1) {
                 //查看当天这个人看了多少时间
                 Integer total = vodPlayHistoryMapper.memberDailyStudyLength(vodPlayHistoryDO.getMemberId(), classDictDO.getId());
 
-                if (total == 6 * 3600) {
+                if (total >= 6 * 3600) {
                     throw new HttpException(13001);
                 }
 
-                //是否超过时长  没超过  false 超过 true
+                //是否超过时长
                 if (total + vodPlayHistoryDO.getPlayLength() > 6 * 3600) {
+
+                    //超过时长
                     int playLength = 6 * 3600 - total;
                     vodPlayHistoryDO.setPlayLength(playLength);
                     vodPlayHistoryDO.setPlayCount(1);
@@ -84,10 +86,13 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                         this.baseMapper.insert(vodPlayHistoryDO);
                     }
 //                    throw new HttpException(13001);
-                }else {
+                } else {
                     vodPlayHistoryDO.setPlayCount(1);
                     this.baseMapper.insert(vodPlayHistoryDO);
                 }
+            } else if (classDictDO.getLimitHour() == 0) {
+                vodPlayHistoryDO.setPlayCount(1);
+                this.baseMapper.insert(vodPlayHistoryDO);
             }
         }
         return ConstantUtils.ADD_SUCCESS;
@@ -105,9 +110,9 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                     .lambda()
                     .eq(ClassDictDO::getId, insertHistoryNewDTO.getClassId()));
 
-            if (classDictDO.getLimitHour()==1){
+            if (classDictDO.getLimitHour() == 1) {
                 //查看当天这个人看了多少时间
-                Integer total = vodPlayHistoryMapper.memberDailyStudyLength(insertHistoryNewDTO.getMemberId(),insertHistoryNewDTO.getClassId());
+                Integer total = vodPlayHistoryMapper.memberDailyStudyLength(insertHistoryNewDTO.getMemberId(), insertHistoryNewDTO.getClassId());
 
                 if (total == 6 * 3600) {
                     throw new HttpException(13001);
@@ -122,8 +127,11 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                         this.baseMapper.insert(vodPlayHistoryDO);
                     }
 //                    throw new HttpException(13001);
+                } else {
+                    vodPlayHistoryDO.setPlayCount(1);
+                    this.baseMapper.insert(vodPlayHistoryDO);
                 }
-            }else {
+            } else if (classDictDO.getLimitHour() == 0) {
                 vodPlayHistoryDO.setPlayCount(1);
                 this.baseMapper.insert(vodPlayHistoryDO);
             }
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index cbbe544..441d9b9 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,8 +1,8 @@
 # 本地环境配置
-spring.server.port=23457
+spring.server.port=23462
 
 # 数据源配置
-spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_online?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 #spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 50ca700..559f4ed 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 # 环境配置
-spring.profiles.active=prod
+spring.profiles.active=dev
 #和CPU数
 spring.server.acceptorThreadCount=600
 spring.server.minSpareThreads=100
--
libgit2 0.25.0