From fdcbb7d39382252319d8c865d68cf0dd712e7c35 Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Mon, 31 Jul 2023 18:04:46 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=87=E6=A1=A3=E5=AD=98=E6=A1=A3-?=
 =?UTF-8?q?=E4=BA=92=E5=8A=A8=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlw/dao/TeacherOpenCourseChatLogDao.java  |  6 ++++++
 .../TeacherOpenCourseChatLogService.java      | 13 +++++++++++++
 .../TeacherOpenCourseChatLogController.java   | 14 +++++++++++++-
 .../sql/jlw/teacherOpenCourseChatLog.md       | 19 +++++++++++++++++++
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java
index f47ccd14..22a2c206 100644
--- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java
@@ -63,6 +63,12 @@ public interface TeacherOpenCourseChatLogDao extends BaseMapper<TeacherOpenCours
      */
     TeacherOpenCourseChatLogAnalysisVO chatLogAnalysis(TeacherOpenCourseChatLogAnalysisDTO dto);
 
+    /**
+     * 互动日志的统计-新
+     * @return
+     */
+    TeacherOpenCourseChatLogAnalysisVO chatLogAnalysisNew(TeacherOpenCourseChatLogAnalysisDTO dto);
+
     Integer getTeacherAskUnReadCountByTeacher(ChatLogUnReadNumDTO dto);
 
     Integer getTeacherAskUnReadCountByStudent(ChatLogUnReadNumDTO dto);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java
index e23f8460..37f91443 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java
@@ -456,6 +456,19 @@ public class TeacherOpenCourseChatLogService extends CoreBaseService<TeacherOpen
         return teacherOpenCourseChatLogDao.chatLogAnalysis(dto);
     }
 
+    /**
+     * 功能描述: <br>
+     * 互动日志的统计-新
+     *
+     * @param dto
+     * @return {@link TeacherOpenCourseChatLogAnalysisVO}
+     * @Author: lx
+     * @Date: 2023/1/20 0:35
+     */
+    public TeacherOpenCourseChatLogAnalysisVO chatLogAnalysisNew(TeacherOpenCourseChatLogAnalysisDTO dto) {
+        return teacherOpenCourseChatLogDao.chatLogAnalysisNew(dto);
+    }
+
     /**
      * 得到老师提问模块的未读数
      *
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java
index ff2d7331..f0f71d6a 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java
@@ -610,7 +610,19 @@ public class TeacherOpenCourseChatLogController extends BaseController {
      */
     @GetMapping(API + "/chatLogAnalysis.do")
     public JsonResult chatLogAnalysis(TeacherOpenCourseChatLogAnalysisDTO dto, @SCoreUser CoreUser coreUser) {
-        return JsonResult.success(teacherOpenCourseChatLogService.chatLogAnalysis(dto));
+        return JsonResult.success(teacherOpenCourseChatLogService.chatLogAnalysisNew(dto));
+    }
+
+    /**
+     * 互动日志统计-新
+     *
+     * @param dto
+     * @param coreUser
+     * @return
+     */
+    @GetMapping(API + "/chatLogAnalysisNew.do")
+    public JsonResult chatLogAnalysisNew(TeacherOpenCourseChatLogAnalysisDTO dto, @SCoreUser CoreUser coreUser) {
+        return JsonResult.success(teacherOpenCourseChatLogService.chatLogAnalysisNew(dto));
     }
 
     /**
diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md
index e0bb4b46..4b9cb1fb 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md
@@ -706,6 +706,25 @@ chatLogAnalysis
   AND t.teacher_open_course_chat_log_status = 1
 
 
+chatLogAnalysisNew
+===
+* 互动日志统计-新
+
+  SELECT
+  SUM( chat_log_send_type = 'discuss' ) AS chat_log_count,
+  SUM( chat_log_send_type = 'student_ask' ) AS student_send_count,
+  SUM(
+  FIND_IN_SET( chat_log_send_type, 'specify_ask,random_ask' )) AS teacher_send_count
+  FROM
+  teacher_open_course_chat_log t
+  WHERE
+  1
+  @if(isNotEmpty(teacherOpenCourseId)) {
+  AND t.teacher_open_course_id = #teacherOpenCourseId#
+  @}
+  AND t.teacher_open_course_chat_log_status = 1
+
+
 
 getTeacherAskUnReadCountByTeacher
 ===