脚本调整结束，按照时长分配，（第一个脚本）

涂亚平
Commit b17282a8 authored Mar 08, 2022 by 涂亚平
Showing with 73 additions and 55 deletions
src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java
src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
src/main/java/com/subsidy/util/EncryptUtil.java
src/main/resources/application.properties
src/main/resources/mapper/CompanyDictMapper.xml
--- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
@@ -333,7 +333,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
    public IPage<OperatorsVO> operators(OperatorsDTO operatorsDTO) {
        Page pager = new Page(operatorsDTO.getPageNum(), operatorsDTO.getPageSize());
-        IPage<OperatorsVO> operatorsVOIPage = companyDictMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(), null, 0);
+        IPage<OperatorsVO> operatorsVOIPage = companyDictMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(), null, 1);
        List<OperatorsVO> operatorsVOS = operatorsVOIPage.getRecords();
        for (OperatorsVO operatorsVO : operatorsVOS) {

--- a/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java
@@ -102,7 +102,7 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
        if (count > 0){
            administerDO.setCompanyId(null);
        }
-        IPage page = this.baseMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(),administerDO.getCompanyId(),null);
+        IPage page = this.baseMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(),administerDO.getCompanyId(),2);
        List<OperatorsVO> operatorsVOS = page.getRecords();
        for (OperatorsVO operatorsVO : operatorsVOS) {
            //查看公司所在行业

--- a/src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
@@ -61,9 +61,9 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
    public String insertHistory(VodPlayHistoryDO vodPlayHistoryDO) {
        MemberDO memberDO = memberMapper.selectById(vodPlayHistoryDO.getMemberId());
        //查看系统设定的时长
-        ClassHourDictDO classHourDictDO = classHourDictMapper.selectOne (new QueryWrapper<ClassHourDictDO>()
+        ClassHourDictDO classHourDictDO = classHourDictMapper.selectOne(new QueryWrapper<ClassHourDictDO>()
                .lambda()
-                .eq(ClassHourDictDO::getCompanyId,memberDO.getCompanyId()));
+                .eq(ClassHourDictDO::getCompanyId, memberDO.getCompanyId()));
        if (classHourDictDO.getStatus() == 1) {
            //查看当天这个人看了多少时间
@@ -71,7 +71,7 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
            //是否超过时长  没超过  false 超过 true
            if (total + vodPlayHistoryDO.getPlayLength() >= classHourDictDO.getClassHour() * 3600) {
-                int playLength = classHourDictDO.getClassHour()*3600-total;
+                int playLength = classHourDictDO.getClassHour() * 3600 - total;
                vodPlayHistoryDO.setPlayLength(playLength);
                this.baseMapper.insert(vodPlayHistoryDO);
                throw new HttpException(13001);
@@ -85,9 +85,9 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
    public String insertHistoryNew(VodPlayHistoryDO vodPlayHistoryDO) {
        MemberDO memberDO = memberMapper.selectById(vodPlayHistoryDO.getMemberId());
        //查看系统设定的时长
-        ClassHourDictDO classHourDictDO = classHourDictMapper.selectOne (new QueryWrapper<ClassHourDictDO>()
+        ClassHourDictDO classHourDictDO = classHourDictMapper.selectOne(new QueryWrapper<ClassHourDictDO>()
                .lambda()
-                .eq(ClassHourDictDO::getCompanyId,memberDO.getCompanyId()));
+                .eq(ClassHourDictDO::getCompanyId, memberDO.getCompanyId()));
        if (classHourDictDO.getStatus() == 1) {
            //查看当天这个人看了多少时间
@@ -95,7 +95,7 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
            //是否超过时长  没超过  false 超过 true
            if (total + vodPlayHistoryDO.getPlayLength() >= classHourDictDO.getClassHour() * 3600) {
-                int playLength = classHourDictDO.getClassHour()*3600-total;
+                int playLength = classHourDictDO.getClassHour() * 3600 - total;
                vodPlayHistoryDO.setPlayLength(playLength);
                this.baseMapper.insert(vodPlayHistoryDO);
                throw new HttpException(13001);
@@ -366,10 +366,10 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                    .eq(SignInRecordDO::getMemberId, classMemberMappingDO.getMemberId())
                    .eq(SignInRecordDO::getClassId, classId));
-            for (SignInRecordDO signInRecordDO : signInRecordDOS) {
+            for (int k = signInRecordDOS.size() - 1; k >= 0; k--) {
                //查看当天这人已经看的视频时长
-                List<VodPlayHistoryDO> vodPlayHistoryDOS = vodPlayHistoryMapper.exPlayInfo(classMemberMappingDO.getMemberId(), String.valueOf(classId), signInRecordDO.getSignInDate());
+                List<VodPlayHistoryDO> vodPlayHistoryDOS = vodPlayHistoryMapper.exPlayInfo(classMemberMappingDO.getMemberId(), String.valueOf(classId), signInRecordDOS.get(k).getSignInDate());
                //查看学生一看视频时长
                int totalLength = 0;
@@ -418,14 +418,14 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                            vodPlayHistoryDO.setPlayLength(h);
                            playLength += h;
                            vodPlayHistoryDO.setVodId(vodDictDOS.get(j).getId());
-                            vodPlayHistoryDO.setPlayDate(signInRecordDO.getSignInDate().plusSeconds(playLength));
+                            vodPlayHistoryDO.setPlayDate(signInRecordDOS.get(k).getSignInDate().plusSeconds(playLength));
                            leftLength = leftLength - h;
                            vodPlayHistoryMapper.insert(vodPlayHistoryDO);
                        } else {
                            vodPlayHistoryDO.setPlayLength(leftLength);
                            playLength += leftLength;
                            vodPlayHistoryDO.setVodId(vodDictDOS.get(j).getId());
-                            vodPlayHistoryDO.setPlayDate(signInRecordDO.getSignInDate().plusSeconds(playLength));
+                            vodPlayHistoryDO.setPlayDate(signInRecordDOS.get(k).getSignInDate().plusSeconds(playLength));
                            vodPlayHistoryMapper.insert(vodPlayHistoryDO);
                            break;
                        }
@@ -448,6 +448,11 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
        //查找课程里的所有视频
        List<VodDictDO> vodDictDOS = courseContentMapper.getCourseVods(classDictDO.getCourseId());
+        int vodTotalLength = 0;
+        for (VodDictDO vodDictDO : vodDictDOS) {
+            vodTotalLength += vodDictDO.getVodLength();
+        }
        //查看每个人看视频的时长
        for (ClassMemberMappingDO classMemberMappingDO : classMemberMappingDOS) {
@@ -461,7 +466,7 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
            List<LocalDateTime> localDateTimes = new ArrayList<>();
            for (SignInRecordDO signInrecord : signInRecordDOS) {
-                if (signInrecord.getSignInDate().getHour() >= 6 && signInrecord.getSignInDate().getHour() < 15) {
+                if (signInrecord.getSignInDate().getHour() >= 6 && signInrecord.getSignInDate().getHour() < 17) {
                    localDateTimes.add(signInrecord.getSignInDate());
                }
            }
@@ -530,6 +535,12 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                //续播
                if (vodPlayHistoryDOS.size() > 0) {
                    VodPlayHistoryDO vodPlayHistoryDO1 = vodPlayHistoryDOS.get(0);
+                    int count = this.baseMapper.selectCount(new QueryWrapper<VodPlayHistoryDO>()
+                            .lambda()
+                            .eq(VodPlayHistoryDO::getVodId, vodPlayHistoryDO1.getVodId())
+                    .eq(VodPlayHistoryDO::getMemberId,classMemberMappingDO.getMemberId()));
+                    if (count <2) {
                        VodDictDO vodDictDO = vodDictMapper.selectById(vodPlayHistoryDO1.getVodId());
                        //剩下的学习时长
                        int leftLength = vodDictDO.getVodLength() - vodPlayHistoryDO1.getPlayLength();
@@ -546,6 +557,7 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                            vodPlayHistoryMapper.insert(vodPlayHistoryDO);
                        }
                    }
+                }
                //查找这个人应该学的课程
                for (VodDictDO vodDictDO : vodDictDOS) {
@@ -563,10 +575,12 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
                            vodPlayHistoryDO.setClassId(classDictDO.getId());
                            vodPlayHistoryDO.setMemberId(classMemberMappingDO.getMemberId());
                            vodPlayHistoryDO.setPlayRecord(vodDictDO.getVodLength());
-                                if (totalPlay+vodDictDO.getVodLength()<=totalPlayLength){
+                            if (totalPlay + vodDictDO.getVodLength() <= totalPlayLength) {
                                vodPlayHistoryDO.setPlayLength(vodDictDO.getVodLength());
-                                }else {
+                                totalPlay += vodDictDO.getVodLength();
-                                    vodPlayHistoryDO.setPlayLength(totalPlayLength-totalPlay);
+                            } else {
+                                vodPlayHistoryDO.setPlayLength(totalPlayLength - totalPlay);
+                                totalPlay = totalPlayLength;
                            }
                            vodPlayHistoryDO.setVodId(vodDictDO.getId());
                            vodPlayHistoryDO.setPlayDate(localDateTime.plusSeconds(totalPlay));

--- a/src/main/java/com/subsidy/util/EncryptUtil.java
+++ b/src/main/java/com/subsidy/util/EncryptUtil.java
-package com.subsidy.util;
+//package com.subsidy.util;
+//
-import com.amdelamar.jhash.Hash;
+//import com.amdelamar.jhash.Hash;
-import com.amdelamar.jhash.algorithms.Type;
+//import com.amdelamar.jhash.algorithms.Type;
-import com.amdelamar.jhash.exception.InvalidHashException;
+//import com.amdelamar.jhash.exception.InvalidHashException;
+//
-public class EncryptUtil {
+//public class EncryptUtil {
+//
-    /**
+//    /**
-     * 设置密文密码
+//     * 设置密文密码
-     *
+//     *
-     * @param password 原始密码
+//     * @param password 原始密码
-     * @return 加密密码
+//     * @return 加密密码
-     */
+//     */
-    public static String encrypt(String password) {
+//    public static String encrypt(String password) {
-        char[] chars = password.toCharArray();
+//        char[] chars = password.toCharArray();
-        return Hash.password(chars).algorithm(Type.PBKDF2_SHA256).create();
+//        return Hash.password(chars).algorithm(Type.PBKDF2_SHA256).create();
-    }
+//    }
+//
-    /**
+//    /**
-     * 验证加密密码
+//     * 验证加密密码
-     *
+//     *
-     * @param encryptedPassword 密文密码
+//     * @param encryptedPassword 密文密码
-     * @param plainPassword     明文密码
+//     * @param plainPassword     明文密码
-     * @return 验证是否成功
+//     * @return 验证是否成功
-     */
+//     */
-    public static boolean verify(String encryptedPassword, String plainPassword) {
+//    public static boolean verify(String encryptedPassword, String plainPassword) {
-        char[] chars = plainPassword.toCharArray();
+//        char[] chars = plainPassword.toCharArray();
-        try {
+//        try {
-            return Hash.password(chars).algorithm(Type.PBKDF2_SHA256).verify(encryptedPassword);
+//            return Hash.password(chars).algorithm(Type.PBKDF2_SHA256).verify(encryptedPassword);
-        } catch (InvalidHashException e) {
+//        } catch (InvalidHashException e) {
-            return false;
+//            return false;
-        }
+//        }
-    }
+//    }
-}
+//}
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
 # 环境配置
-spring.profiles.active=prod
+spring.profiles.active=dev
 # 端口号
-spring.server.port=23459
+spring.server.port=23457
 #嵌入tomcat配置
 #和CPU数
 spring.server.acceptorThreadCount=600

--- a/src/main/resources/mapper/CompanyDictMapper.xml
+++ b/src/main/resources/mapper/CompanyDictMapper.xml
@@ -34,14 +34,18 @@
            t2.address
        FROM
            administer t
+            left join role_administer_mapping t4 on t.id = t4.administer_id
            left join company_dict t2 on t.company_id = t2.id
            left join company_field_mapping t3 on t2.id = t3.company_id
        WHERE
            t.delete_date IS NULL
            and t2.delete_date is null
            and t3.delete_date is null
-            <if test="role != null">
+            <if test="role == 1">
-                and t.role = #{role}
+                (and t4.role = 1 or t4.role_id = 3)
+            </if>
+            <if test="role == 2">
+                (and t4.role = 2)
            </if>
            <if test="id != null and id != ''">
                and t2.id = #{id}