1.修复章节下课时资源没通过也能显示的bug

2.修复课程中心课程详情视频资源返的不是预览地址
3.应需增加字段
4.修改站内信未读数量接口

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/ClassHourMapper.xml

@@ -97,7 +97,28 @@
             IFNULL (su.NAME,'') AS createUserName
         FROM  COURSE_CLASSHOUR cc
         LEFT JOIN SYS_USER su ON cc.CREATE_USER =su.ID AND su.DELETE_FLAG ='NOT_DELETE'
+        <if test="verifyPass !=null  and verifyPass != ''">
+            <if test="verifyPass == 1">
+                LEFT JOIN (
+                    SELECT
+                    DISTINCT cr.MAIN_ID AS mainId,
+                    cr.ID AS realId
+                    FROM COURSE_RELATE cr
+                    LEFT JOIN RESOURCE_RECORD rr ON rr.ID =cr.RELATE_ID AND rr.DELETE_FLAG ='NOT_DELETE'
+                    WHERE cr.DELETE_FLAG ='NOT_DELETE'
+                    AND rr.VERIFY_STATUS='2'
+                    AND cr.FUNC_TYPE ='1'
+                    AND cr.CHAPTERHOUR_TYPE='1'
+                    AND cr.INFO_TYPE ='0'
+                )rel ON rel.mainId=cc.id
+            </if>
+        </if>
         where cc.DELETE_FLAG ='NOT_DELETE'
+        <if test="verifyPass !=null  and verifyPass != ''">
+            <if test="verifyPass == 1">
+                AND rel.realId IS NOT null
+            </if>
+        </if>
         <if test="chapterId !=null and chapterId != ''">
             and cc.chapter_id=#{chapterId}
         </if>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseAuditRecordMapper.xml

@@ -8,6 +8,7 @@
             IFNULL (t1.USERFILE_ID,'') AS fileId,
             IFNULL (t2.FILE_NAME,'') AS fileName,
             IFNULL (rf.FILE_URL,'') AS fileUrl,
+            IFNULL (t2.FILE_ID,'') AS resourceFileId,
             IFNULL (TO_CHAR(t1.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS'),'')  as uploadTime,
             IFNULL (t2.EXTEND_NAME,'') AS suffix,
             IFNULL (t1.VERIFY_STATUS,'') as verifyStatus,
@@ -85,6 +86,7 @@
         SELECT
         t1.ID as id,
         IFNULL (t1.USERFILE_ID,'') AS fileId,
+        IFNULL (t2.FILE_ID,'') AS resourceFileId,
         IFNULL (t2.FILE_NAME,'') AS fileName,
         IFNULL (TO_CHAR(t1.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS'),'')  as uploadTime,
         IFNULL (t1.VERIFY_STATUS,'') as verifyStatus,
@@ -168,6 +170,7 @@
             IFNULL (t1.USERFILE_ID,'') AS fileId,
             IFNULL (t2.FILE_NAME,'') AS fileName,
             IFNULL (rf.FILE_URL,'') AS fileUrl,
+            IFNULL (t2.FILE_ID,'') AS resourceFileId,
             IFNULL (rf.PRIVIEW_FILE_URL,'') as priviewFileUrl,
             IFNULL (rf.FILE_SIZE,0) AS fileSize,
             IFNULL (TO_CHAR(t1.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS'),'')  as uploadTime,

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseRelateMapper.xml

@@ -18,7 +18,7 @@
         <if test="funcType !=null  and funcType != ''">
             <if test="funcType == 1">
                 IFNULL (ru.FILE_NAME,'') AS name,
-                IFNULL (rf.FILE_URL,'') AS url,
+                IFNULL (rf.PRIVIEW_FILE_URL,'') AS url,
             </if>
             <if test="funcType == 0 || funcType == 2 ||funcType == 3 ">
                 IFNULL (CAST(df.NAME AS VARCHAR),'') AS name,

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/UserReadMapper.xml

@@ -4,26 +4,14 @@
 
     <select id="getDevMessageCount" resultType="java.util.Map">
         SELECT
-            collectCount.allCount -collectCount.alreadyCount AS unreadCount
-        from(
-            SELECT
-                (SELECT count(dme.ID) FROM DEV_MESSAGE dme WHERE dme.DELETE_FLAG='NOT_DELETE') AS allCount,
-                (SELECT count(userId)
-                    from(SELECT
-                    ur.USER_ID AS userId,
-                    ur.MAIN_ID AS mainId
-                    FROM USER_READ ur
-                    where ur.DELETE_FLAG ='NOT_DELETE'
-                    <if test="userId !=null and userId != ''">
-                        AND ur.USER_ID=#{userId}
-                    </if>
-                    <if test="funcType !=null and funcType != ''">
-                        AND ur.FUNC_TYPE =#{funcType}
-                    </if>
-                    GROUP BY ur.USER_ID,ur.MAIN_ID)
-                 ) AS alreadyCount
-            FROM DUAL
-        )AS collectCount
+            count(dr.ID) AS unreadCount
+        FROM DEV_MESSAGE dme
+        LEFT JOIN DEV_RELATION dr ON dr.OBJECT_ID=dme.ID AND dr.CATEGORY='MSG_TO_USER'
+        WHERE dme.DELETE_FLAG ='NOT_DELETE'
+        AND JSON_VALUE(dr.EXT_JSON, '$.read') = 'false'
+        <if test="userId !=null and userId != ''">
+            AND dr.TARGET_ID=#{userId}
+        </if>
     </select>
 
     <select id="getNoticeCount" resultType="java.util.Map">