肖海南个人中心课程推荐接口

src/main/java/com/teaching/backend/controller/records/CourseLearningRecordController.java

@@ -79,9 +79,6 @@ public class CourseLearningRecordController {
     @PostMapping("/recommendCourses")
     public CommonResult<List<CoursesVO>> recommendCourses(@RequestParam String userId) {
         List<CoursesVO> coursesVOList = courseLearningRecordService.queryrecommendCourses(userId);
-        if (coursesVOList == null){
-            CommonResult.failed("用户或角色错误");
-        }
         return CommonResult.success(coursesVOList);
     }
 

src/main/java/com/teaching/backend/controller/records/KnowledgeLearningRecordController.java

@@ -8,6 +8,7 @@ import com.teaching.backend.filter.ValidateParams;
 import com.teaching.backend.mapper.records.KnowledgeLearningRecordMapper;
 import com.teaching.backend.model.entity.records.CourseLearningRecord;
 import com.teaching.backend.model.entity.records.KnowledgeLearningRecord;
+import com.teaching.backend.model.vo.courses.CoursesVO;
 import com.teaching.backend.model.vo.knowGraph.KnowVO;
 import com.teaching.backend.service.impl.records.KnowledgeLearningRecordServiceImpl;
 import io.swagger.annotations.ApiOperation;
@@ -84,5 +85,15 @@ public class KnowledgeLearningRecordController {
         return CommonResult.success(knowVO);
     }
 
+    /**
+     * 推荐知识点
+     * @return
+     */
+    @ApiOperation("推荐知识点")
+    @PostMapping("/recommendKnowledge")
+    public CommonResult<List<KnowVO>> recommendCourses(@RequestParam String userId) {
+        List<KnowVO> coursesVOList = knowledgeLearningRecordService.queryRecommendKnowledge(userId);
+        return CommonResult.success(coursesVOList);
+    }
 
 }

src/main/java/com/teaching/backend/mapper/records/CourseLearningRecordMapper.java

@@ -18,7 +18,7 @@ public interface CourseLearningRecordMapper extends BaseMapper<CourseLearningRec
 
     CourseLearningRecord selectNewRecord(String student);
 
-    List<String> selectMaxNumber();
+    List<String> selectMaxNumber(String userId);
 
     List<String> selectMaxCourseId(String userId);
 }

src/main/java/com/teaching/backend/model/entity/umsAdmin/AdminUserDetails.java

@@ -59,6 +59,6 @@ public class AdminUserDetails implements UserDetails {
 
     @Override
     public boolean isEnabled() {
-        return umsAdmin.getStatus().equals(1);
+        return umsAdmin.getStatus().equals("1");
     }
 }

src/main/java/com/teaching/backend/service/impl/records/CourseLearningRecordServiceImpl.java

@@ -127,7 +127,7 @@ public class CourseLearningRecordServiceImpl extends ServiceImpl<CourseLearningR
         String roleId = umsUserMapper.getByIdRoleId(userId);
         List<Courses> coursesList = new ArrayList<>();
         if (roleId.equals("1")){
-            List<String> courseIds = courseLearningRecordMapper.selectMaxNumber();
+            List<String> courseIds = courseLearningRecordMapper.selectMaxNumber(userId);
             for (String courseId : courseIds) {
                 Courses courses = coursesMapper.selectById(courseId);
                 coursesList.add(courses);
@@ -149,18 +149,15 @@ public class CourseLearningRecordServiceImpl extends ServiceImpl<CourseLearningR
 
     @Override
     public List<CoursesVO> queryrecommendCourses(String userId) {
-        String roleId = umsUserMapper.getByIdRoleId(userId);
-
-        if (roleId.equals("1")) {
-
-            return null;
-        } else if (roleId.equals("2")) {
-
-            return null;
-        }else {
-
-            return null;
+        List<Courses> coursesList = new ArrayList<>();
+        List<String> courseIds = courseLearningRecordMapper.selectMaxNumber(userId);
+        for (String courseId : courseIds) {
+            Courses courses = coursesMapper.selectById(courseId);
+            if (courses != null){
+                coursesList.add(courses);
+            }
         }
+        List<CoursesVO> coursesVOList = BeanUtil.copyToList(coursesList, CoursesVO.class);
+        return coursesVOList;
     }
-
 }

src/main/java/com/teaching/backend/service/impl/records/KnowledgeLearningRecordServiceImpl.java

@@ -171,4 +171,25 @@ public class KnowledgeLearningRecordServiceImpl extends ServiceImpl<KnowledgeLea
         }
     }
 
+    @Override
+    public List<KnowVO> queryRecommendKnowledge(String userId) {
+
+        List<KnowVO> coursesList = new ArrayList<>();
+
+        KnowVO knowVO = null;
+
+        List<String> knowledgeIdList = knowledgeLearningRecordMapper.queryStudyKnowledgeMaxNumber();
+        for (String knowledgeId : knowledgeIdList) {
+            BaseResponse<Knowtmp> knowledge = knowtmpService.query(Long.valueOf(knowledgeId));
+            if (knowledge.getData() != null) {
+                knowVO = new KnowVO();
+                knowVO.setId(knowledge.getData().getId());
+                knowVO.setLabel(knowledge.getData().getName());
+                knowVO.setColor(knowledge.getData().getInfo());
+                coursesList.add(knowVO);
+            }
+        }
+        return coursesList;
+    }
+
 }

src/main/java/com/teaching/backend/service/impl/umsAdmin/UmsStudentManageServiceImpl.java

@@ -124,13 +124,14 @@ public class UmsStudentManageServiceImpl extends ServiceImpl<UmsStudentManageMap
 
     @Override
     public void startOrStop(String status, Long id) {
-        UmsUser umsUser = new UmsUser();
-        umsUser.setStatus(status);
-        umsUser.setId(id);
-        boolean updateUserInformation = umsUserMapper.updateUserInformation(umsUser);
-        if (updateUserInformation == false){
-            throw new BusinessException(400,"账号状态修改失败");
-        }
+
+            UmsUser umsUser = new UmsUser();
+            umsUser.setStatus(status);
+            umsUser.setId(id);
+            boolean updateUserInformation = umsUserMapper.updateUserInformation(umsUser);
+            if (updateUserInformation == false){
+                throw new BusinessException(400,"账号状态修改失败");
+            }
     }
 
     @Override

src/main/java/com/teaching/backend/service/impl/umsAdmin/UmsUserServiceImpl.java

@@ -103,7 +103,7 @@ public class UmsUserServiceImpl extends ServiceImpl<UmsUserMapper, UmsUser> impl
             if(!passwordEncoder.matches(password,userDetails.getPassword())){
                 throw new BusinessException(400,"密码错误");
             }
-            if(userDetails.isEnabled()){
+            if(!userDetails.isEnabled()){
                 throw new BusinessException(400,"帐号已被禁用");
             }
             UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());

src/main/java/com/teaching/backend/service/records/IKnowledgeLearningRecordService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.teaching.backend.common.BaseResponse;
 import com.teaching.backend.model.entity.records.KnowledgeLearningRecord;
+import com.teaching.backend.model.vo.courses.CoursesVO;
 import io.swagger.models.auth.In;
 import com.teaching.backend.model.vo.knowGraph.KnowVO;
 
@@ -28,5 +29,7 @@ public interface IKnowledgeLearningRecordService extends IService<KnowledgeLearn
 
 
     List<KnowVO> queryMaxKnowledge(String userId);
+
+    List<KnowVO> queryRecommendKnowledge(String userId);
 }
 

src/main/resources/mapper/CourseLearningRecordMapper.xml

@@ -12,11 +12,13 @@
             times
                 DESC LIMIT 1;
     </select>
-    <select id="selectMaxNumber" resultType="java.lang.String">
+    <select id="selectMaxNumber" resultType="java.lang.String" parameterType="java.lang.String">
         SELECT
             cln.course_id courseId
         FROM
             course_learning_number cln
+        WHERE
+            CONCAT(',', cln.teacher_user_id, ',') LIKE CONCAT('%,', #{userId}, ',%')
         ORDER BY
             number
                 DESC;