Merge remote-tracking branch 'origin/test' into test

src/main/java/com/sqx/common/exception/SqxExceptionHandler.java

@@ -67,6 +67,7 @@ public class SqxExceptionHandler {
     public Result handleException(Exception e, WebRequest webRequest) {
         logErrorInfo(webRequest);
         logger.error(e.getMessage(), e);
+        e.printStackTrace();
         return Result.error();
     }
 

src/main/java/com/sqx/modules/app/entity/UserInfo.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.app.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,12 +19,14 @@ public class UserInfo implements Serializable {
      *
      */
     @TableId(type = IdType.ID_WORKER)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 用户id
      */
     @TableField(updateStrategy = FieldStrategy.NEVER)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
     /**

src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java

@@ -165,15 +165,15 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
         List<CourseDetails> courseDetails1 = courseIdList.isEmpty() ? new ArrayList<>() :
                 courseDetailsService.list(new LambdaQueryWrapper<CourseDetails>().in(CourseDetails::getCourseDetailsId, courseDetailIds));
         Map<Long, CourseDetails> courseDetailsMap = courseDetails1.stream().collect(Collectors.toMap(CourseDetails::getCourseId, item -> item));
-        List<CourseDetails> courseDetails2 = courseIdList.isEmpty() ? new ArrayList<>() : courseDetailsDao.countByCourseId(courseIdList);
+//        List<CourseDetails> courseDetails2 = courseIdList.isEmpty() ? new ArrayList<>() : courseDetailsDao.countByCourseId(courseIdList);
-        Map<Long, Integer> countMap = courseDetails2.stream()
+//        Map<Long, Integer> countMap = courseDetails2.stream()
-                .collect(Collectors.toMap(CourseDetails::getCourseId, CourseDetails::getCourseDetailsCount));
+//                .collect(Collectors.toMap(CourseDetails::getCourseId, CourseDetails::getCourseDetailsCount));
 
         if (CollectionUtil.isNotEmpty(courseList)) {
             for (Course course : courseList) {
 //                course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId()));
                 CourseDetails courseDetails = courseDetailsMap.getOrDefault(course.getCourseId(), null);
-                course.setCourseDetailsCount(countMap.getOrDefault(course.getCourseId(), 0));
+                course.setCourseDetailsCount(courseDetailsDao.countCourseByCourseId(course.getCourseId()));
                 if (courseDetails != null) {
                     course.setCourseDetailsName(courseDetails.getCourseDetailsName());
                     course.setCourseDetailsId(courseDetails.getCourseDetailsId());

src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java

@@ -154,6 +154,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
 
     @Override
     public Result courseSets(Long userId, Long courseId, Integer sort) {
+        try{
             //观看记录
             CourseCollect courseCollect = courseCollectDao.selectOne(new QueryWrapper<CourseCollect>()
                     .eq("course_id", courseId).eq("user_id", userId)
@@ -233,6 +234,11 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
             map.put("collect", collect == null || collect.equals(0) ? 0L : 1L);
             map.put("list", courseDetailsSetVos);
             return new Result().put("data", map);
+        }catch (Exception e){
+            log.error("请求剧集异常打印:");
+            e.printStackTrace();
+            return Result.error("请求剧集失败");
+        }
     }
 
     @Override

src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java

@@ -203,6 +203,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
                 m.put("courseDetailsName", "");
                 m.put("dyEpisodeId", "");
                 m.put("wxCourseDetailsId", "");
+                m.put("courseId", m.get("courseId").toString());
             }
             PageUtils pageUtils = PageUtils.page(pageInfo);
             setCache(cacheKey, JSONUtil.toJsonStr(pageUtils));
@@ -226,7 +227,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
             map.put("dyEpisodeId", "");
             map.put("wxCourseDetailsId", "");
             map.putAll(countMap);
-            map.put("courseId", courseId + "");
+            map.put("courseId", map.get("courseId").toString());
         }
         PageUtils pageUtils = PageUtils.page(pageInfo);
 //        setCache(cacheKey, JSONUtil.toJsonStr(pageUtils));

src/main/resources/mapper/course/CourseCollectDao.xml

@@ -49,7 +49,6 @@
         FROM `course_collect` c1
         WHERE c1.classify = 3
           AND c1.user_id = #{userId}
-        group by c1.course_id
         order by c1.create_time desc
     </select>
 </mapper>