Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

# Conflicts:
#	web/src/main/java/com/ibeetl/jlw/web/StudentController.java

admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java

@@ -17,6 +17,7 @@ import com.ibeetl.admin.core.util.HttpRequestLocal;
 import com.ibeetl.admin.core.web.dto.FunctionNodeView;
 import com.ibeetl.admin.core.web.dto.MenuNodeView;
 import com.ibeetl.admin.core.web.dto.SystemMenuView;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -146,6 +147,7 @@ public class CoreUserController {
 	public JsonResult editDo(CoreUser coreUser) {
 		// 获取当前登录用户
 		CoreUser user = getUser();
+
 		Assert.notNull(user, "请登录后再操作");
 
 		// 禁止修改的一些属性，先给去掉
@@ -158,7 +160,15 @@ public class CoreUserController {
 		if (ObjectUtil.isNotEmpty(password)) {
 			coreUser.setPassword(passwordEncryptService.password(password));
 		}
-		coreUserDao.updateTemplateById(coreUser);
+		int i = coreUserDao.updateTemplateById(coreUser);
+		//及时更新登录用户的信息
+		if (i>0){
+			if (StringUtils.isNotBlank(coreUser.getHeadImg())){
+				user.setHeadImg(coreUser.getHeadImg());
+				httpRequestLocal.setAttribute(CorePlatformService.ACCESS_CURRENT_USER,user);
+			}
+		}
+
 		return JsonResult.success();
 	}
 

admin-core/src/main/resources/static/js/lib.js

@@ -1099,8 +1099,6 @@ var Lib = {
         });
         layui.form.render();
     },downloadFile:function (data){ //下载指定文件/或者预览文件 resourcesInfoType：资源类型(1视频 2课件(ppt 、pdf) 3附件)
-        window.location.href = Common.ctxPath + "/jlw/resourcesInfo/previewData.do?resourcesInfoId="+data.resourcesInfoId;
-        return;
         if(data.resourcesInfoType == 3){//前端下载文件
             var a = document.createElement('a');
             a.setAttribute('href', Common.ctxPath + data.resourcesInfoContent); //a.href='文件链接'

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java

@@ -119,6 +119,9 @@ public class TeacherOpenCourseChatLogService extends CoreBaseService<TeacherOpen
                                 if (bean instanceof Student){
                                     List<Long> idList = ret.getList().stream().filter(e->Objects.equals(e.getStudentReadStatus(),0)).map(TeacherOpenCourseChatLog::getTeacherOpenCourseChatLogId).collect(Collectors.toList());
                                     readChatLogByIds(idList,1);
+                                }else if (bean instanceof Teacher){
+                                    List<Long> idList = ret.getList().stream().filter(e->Objects.equals(e.getTeacherReadStatus(),0)).map(TeacherOpenCourseChatLog::getTeacherOpenCourseChatLogId).collect(Collectors.toList());
+                                    readChatLogByIds(idList,2);
                                 }
                             }
                             break;

web/src/main/java/com/ibeetl/jlw/web/StudentController.java

@@ -19,6 +19,7 @@ import com.ibeetl.admin.core.file.FileService;
 import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.service.CoreUserService;
 import com.ibeetl.admin.core.util.BeanCopyUtil;
+import com.ibeetl.admin.core.util.HttpRequestLocal;
 import com.ibeetl.admin.core.util.DateUtil;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.util.TimeTool;
@@ -67,6 +68,7 @@ import static cn.jlw.token.TokenService.updateByIds;
 import static cn.jlw.util.CacheUserUtil.getStudent;
 import static cn.jlw.util.excel.ExcelUtil.standardName;
 import static com.ibeetl.admin.console.service.OrgConsoleService.setObjectOrgId;
+import static com.ibeetl.admin.core.service.CorePlatformService.T_STUDENT;
 import static com.ibeetl.admin.core.util.ExcelUtil.convertData;
 import static com.ibeetl.admin.core.util.ExcelUtil.write;
 import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.createExcel;
@@ -141,6 +143,9 @@ public class StudentController extends BaseController{
     @Autowired
     private UniversityFacultyService universityFacultyService;
 
+    @Autowired
+    private HttpRequestLocal httpRequestLocal;
+
     /* 前端接口 */
 
     /**
@@ -1655,6 +1660,15 @@ public class StudentController extends BaseController{
         if (success) {
             //更新缓存
             updateByIds(student.getId().toString());
+            if (StringUtils.isNotBlank(studentQuery.getHeadImg())){
+                student.setHeadImg(studentQuery.getHeadImg());
+                Object sessionValue = httpRequestLocal.getSessionValue(T_STUDENT);
+                if(null != sessionValue){
+                    Student bean = (Student) sessionValue;
+                    bean.setHeadImg(studentQuery.getHeadImg());
+                    httpRequestLocal.setSessionValue(T_STUDENT,bean);
+                }
+            }
             return JsonResult.success();
         } else {
             return JsonResult.failMessage("更新失败");

web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md

@@ -186,7 +186,7 @@ queryByConditionQuery
   and find_in_set(t.student_id,#studentIdPlural#)
   @}
   @if(!isEmpty(chatContent)){
-  and t.chat_content =#chatContent#
+  and t.chat_content like #'%'+chatContent+'%'#
   @}
   @if(!isEmpty(keywords)){
   and t.keywords like #"%"+keywords+"%"#
@@ -215,6 +215,13 @@ queryByConditionQuery
   @if(!isEmpty(teacherOpenCourseChatLogAddTime)){
   and t.teacher_open_course_chat_log_add_time =#teacherOpenCourseChatLogAddTime#
   @}
+  @if(!isEmpty(replyStatus)){
+      @if(replyStatus == 2){
+          and exists( select 1 from teacher_open_course_chat_log a where a.teacher_open_course_chat_log_status = 1 and a.teacher_open_course_chat_log_parent_id = t.teacher_open_course_chat_log_id)
+      @}else if(replyStatus == 1){
+          and not exists( select 1 from teacher_open_course_chat_log a where a.teacher_open_course_chat_log_status = 1 and a.teacher_open_course_chat_log_parent_id = t.teacher_open_course_chat_log_id)
+      @}
+  @}
   @if(!isEmpty(orgId)){
   and t.org_id =#orgId#
   @}
@@ -736,20 +743,29 @@ getTeacherAskUnReadCountByStudent
 getStudentAskUnReadCountByTeacher
 ===
     * 获取学生提问模块未读数量，对于老师来说
-
-    SELECT count(*)
-    FROM teacher_open_course_chat_log t
-    WHERE 1
-    AND t.teacher_open_course_id = #teacherOpenCourseId#
-    AND t.chat_log_send_type = 'student_ask'
-    AND NOT EXISTS(
-      SELECT 1
+     select sum(num) from (
+      SELECT count(*) `num`
+      FROM teacher_open_course_chat_log t
+      WHERE 1
+      AND t.teacher_open_course_id = #teacherOpenCourseId#
+      AND t.chat_log_send_type = 'student_ask'
+      AND t.teacher_read_status = 0
+      union all
+      SELECT (
+      SELECT count(*)
       FROM teacher_open_course_chat_log ta
       WHERE 1
-      and ta.teacher_id = #teacherId#
+      and ta.student_id is not null
       AND ta.teacher_open_course_id = #teacherOpenCourseId#
       AND ta.teacher_open_course_chat_log_parent_id = t.teacher_open_course_chat_log_id
-    )
+      AND ta.teacher_read_status =  0
+      ) `num`
+      FROM teacher_open_course_chat_log t
+      WHERE 1
+      AND t.teacher_open_course_id = #teacherOpenCourseId#
+      AND t.chat_log_send_type = 'student_ask'
+     )t1
+   
 
 
 getStudentAskUnReadCountByStudent

web/src/main/resources/static/js/jlw/resourcesInfo/index.js

@@ -142,7 +142,11 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                     {
                         field: 'userId', title: '操作', align: "center", field: 'right', templet: function (d) {
                             var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';
-                            htm += '<a class="layui-table-link" lay-event="previewPage">' + (d.resourcesInfoType == 3 ? '下载' : '预览') + '</a>';
+                            if(d.resourcesInfoType == 4){
+                                htm += '<a class="layui-table-link" href="'+ d.resourcesInfoContent+'" target="_blank">预览</a>';
+                            }else {
+                                htm += '<a class="layui-table-link" lay-event="previewPage" >' + (d.resourcesInfoType == 3 ? '下载' : '预览') + '</a>';
+                            }
                             htm += '<a class="layui-table-link" lay-event="del">删除</a>';
                             return htm;
                         }