签到数据删除了历史数据

pom.xml

@@ -133,11 +133,11 @@
             <version>${swagger2.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.amdelamar</groupId>
-            <artifactId>jhash</artifactId>
-            <version>${jhash.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.amdelamar</groupId>-->
+<!--            <artifactId>jhash</artifactId>-->
+<!--            <version>${jhash.version}</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.apache.poi</groupId>

src/main/java/com/subsidy/service/impl/SignInRecordServiceImpl.java

@@ -56,9 +56,6 @@ public class SignInRecordServiceImpl extends ServiceImpl<SignInRecordMapper, Sig
     //private RedisUtil redisUtil;
 
     @Autowired
-    private SignInRecordMapper signInRecordMapper;
-
-    @Autowired
     private ClassDictMapper classDictMapper;
 
     @Autowired
@@ -89,10 +86,10 @@ public class SignInRecordServiceImpl extends ServiceImpl<SignInRecordMapper, Sig
             //}
             //redisUtil.set(RedisPrefixConstant.SUBSIDY_SIGN_INFO_PREFIX + signInRecordDO.getMemberId() + ":classId:" + classDictDO.getId() + ":" + DateFormatUtil.format(new Date(), "yyyy-MM-dd") + ":" + System.currentTimeMillis(), null);
 
-            signInRecordMapper.delete(new QueryWrapper<SignInRecordDO>()
+            this.baseMapper.delete(new QueryWrapper<SignInRecordDO>()
                     .lambda()
-            .eq(SignInRecordDO::getMemberId,signInRecordDO.getMemberId())
-            .eq(SignInRecordDO::getClassId,classDictDO.getId()));
+                    .eq(SignInRecordDO::getMemberId, signInRecordDO.getMemberId())
+                    .gt(SignInRecordDO::getSignInDate, LocalDate.now()));
 
             // 存储到缓存到同时保存到数据库
             SignInRecordDO sign = this.baseMapper.selectOne(new QueryWrapper<SignInRecordDO>()
@@ -138,7 +135,7 @@ public class SignInRecordServiceImpl extends ServiceImpl<SignInRecordMapper, Sig
             for (ClassMemberMappingDO classMemberMappingDO : classMemberMappingDOS) {
 
                 //签到
-                Integer signCount = signInRecordMapper.selectCount(new QueryWrapper<SignInRecordDO>()
+                Integer signCount = this.baseMapper.selectCount(new QueryWrapper<SignInRecordDO>()
                         .lambda()
                         .eq(SignInRecordDO::getMemberId, classMemberMappingDO.getMemberId())
                         .eq(SignInRecordDO::getClassId, dataViewVO.getClassId()));

src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java

@@ -366,12 +366,16 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                     .eq(SignInRecordDO::getMemberId, classMemberMappingDO.getMemberId())
                     .eq(SignInRecordDO::getClassId, classId));
 
+            //确定每日最大学习时长
+            int maxLength = memberStudyLengthDO.getTotalLength()/signInRecordDOS.size()+650;
+
+
             for (int k = signInRecordDOS.size() - 1; k >= 0; k--) {
 
                 //查看当天这人已经看的视频时长
                 List<VodPlayHistoryDO> vodPlayHistoryDOS = vodPlayHistoryMapper.exPlayInfo(classMemberMappingDO.getMemberId(), String.valueOf(classId), signInRecordDOS.get(k).getSignInDate());
 
-                //查看学生一看视频时长
+                //查看学生已看视频时长
                 int totalLength = 0;
                 System.out.println("111111111111111");
                 List<VodPlayHistoryDO> vodPlayHistoryDOS1 = vodPlayHistoryMapper.selectList(new QueryWrapper<VodPlayHistoryDO>()
@@ -398,12 +402,13 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                     playLength += vodPlayHistoryDOS.get(m).getPlayLength();
                 }
 
-                System.out.println("33333333333333333333");
+                if (maxLength>playLength){
                     if (leftLength > 0) {
                         //随机看几个视频
                         int playCounts = new Random().nextInt(4) + 2;
                         System.out.println("4444444444444444");
                         for (int i = 0; i < playCounts; i++) {
+
                             VodPlayHistoryDO vodPlayHistoryDO = new VodPlayHistoryDO();
                             Random random1 = new Random();
                             System.out.println("55555555555555555555");
@@ -432,6 +437,8 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                         }
                     }
                 }
+                System.out.println("33333333333333333333");
+            }
         }
     }
 

src/main/resources/application.properties

 # 环境配置
-spring.profiles.active=dev
+spring.profiles.active=prod
 # 端口号
-spring.server.port=23457
+spring.server.port=23459
 #嵌入tomcat配置
 #和CPU数
 spring.server.acceptorThreadCount=600