Quellcode durchsuchen

金牛项目未展示问题
批量添加课程
批量上传视频问题
鸿德堂小程序授权问题处理

yfh vor 1 Woche
Ursprung
Commit
b32ab30bea

+ 19 - 1
fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseServiceImpl.java

@@ -9,6 +9,7 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.*;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
@@ -43,7 +44,9 @@ import com.fs.qw.service.IQwCompanyService;
 import com.fs.qw.service.impl.AsyncUploadQwCourseImageService;
 import com.fs.qwApi.Result.QwUploadResult;
 import com.fs.qwApi.service.QwApiService;
+import com.fs.system.mapper.SysDictDataMapper;
 import com.fs.system.service.ISysConfigService;
+import com.fs.system.vo.DictVO;
 import com.fs.voice.utils.StringUtil;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
@@ -83,6 +86,8 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
     @Autowired
     private FsCourseWatchLogMapper fsCourseWatchLogMapper;
     @Autowired
+    private SysDictDataMapper sysDictDataMapper;
+    @Autowired
     private FsUserCourseCommentMapper fsUserCourseCommentMapper;
     @Autowired
     private FsUserCourseNoteMapper fsUserCourseNoteMapper;
@@ -279,7 +284,20 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
 
     @Override
     public List<FsUserCourseListPVO> selectFsUserCourseListPVO(FsUserCourse param) {
-        return fsUserCourseMapper.selectFsUserCourseListPVO(param);
+        List<DictVO> dictVOS = sysDictDataMapper.selectDictDataListByType("sys_course_project");
+        // Create a map for faster lookup (dictValue -> dictVO)
+        Map<String, String> projectMap = dictVOS.stream()
+                .collect(Collectors.toMap(DictVO::getDictValue, DictVO::getDictLabel));
+        List<FsUserCourseListPVO> list =  fsUserCourseMapper.selectFsUserCourseListPVO(param);
+        for (FsUserCourseListPVO vo : list) {
+            if (vo.getProject() != null) {
+                String projectName = projectMap.get(vo.getProject().toString());
+                if (projectName != null) {
+                    vo.setProjectName(projectName);
+                }
+            }
+        }
+        return list;
     }
 
     @Override

+ 8 - 2
fs-service/src/main/java/com/fs/course/vo/FsUserCourseListPVO.java

@@ -44,6 +44,12 @@ public class FsUserCourseListPVO extends BaseEntity
     private Integer isShow;
 
     private Integer isPrivate;
-
-
+    /**
+     * 项目ID
+     */
+    private Long project;
+    /**
+     * 项目名称
+     */
+    private String projectName;
 }

+ 4 - 0
fs-user-app/src/main/java/com/fs/app/controller/UserController.java

@@ -1,6 +1,7 @@
 package com.fs.app.controller;
 
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fs.app.annotation.Login;
 import com.fs.app.param.FsDoctorRegisterParam;
 import com.fs.app.param.FsUserEditParam;
@@ -151,6 +152,9 @@ public class UserController extends  AppBaseController {
         user.setUserId(Long.parseLong(getUserId()));
         user.setAvatar(param.getAvatar());
         user.setNickName(param.getNickname());
+        if (ObjectUtils.isNotEmpty(param.getIsWeixinAuth())){
+            user.setIsWeixinAuth(param.getIsWeixinAuth());
+        }
         if(userService.updateFsUser(user)>0){
             return R.ok("修改成功");
         }

+ 1 - 0
fs-user-app/src/main/java/com/fs/app/param/FsUserEditParam.java

@@ -21,4 +21,5 @@ public class FsUserEditParam implements Serializable {
     private String avatar;
 
     private Long userId;
+    private Integer isWeixinAuth;
 }