Browse Source

考试,练习,课程学习查询改为不必须登录

yangfeng 1 year ago
parent
commit
cace293303

+ 3 - 3
system/system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.system.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
 import org.jeecg.common.api.CommonAPI;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.config.TenantContext;
@@ -42,7 +40,6 @@ import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo;
 import org.jeecg.modules.system.vo.lowapp.DepartInfo;
 import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -1303,6 +1300,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public LoginUser getLoginUser(String token) {
+        if (StringUtils.isBlank(token)) {
+            return null;
+        }
         String username = JwtUtil.getUsername(token);
         // 查询用户信息
         return TokenUtils.getLoginUser(username, commonApi, redisUtil);

+ 2 - 0
web/src/main/java/com/ynfy/app/api/v1/controller/ApiCourseController.java

@@ -2,6 +2,7 @@ package com.ynfy.app.api.v1.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ynfy.app.api.v1.annoation.IgnoreAuth;
 import com.ynfy.app.api.v1.entity.dto.CourseDTO;
 import com.ynfy.app.api.v1.util.TokenUtil;
 import com.ynfy.buss.course.course.entity.Course;
@@ -57,6 +58,7 @@ public class ApiCourseController extends ApiBaseController {
      * @return
      */
     @ApiOperation(value = "course-分页列表查询", notes = "course-分页列表查询")
+    @IgnoreAuth
     @PostMapping(value = "/list")
     public Result<IPage<Course>> queryPageList(@RequestBody CourseDTO dto) {
         Page<Course> page = new Page<>(dto.getPageNo(), dto.getPageSize());

+ 2 - 0
web/src/main/java/com/ynfy/app/api/v1/controller/ApiExamController.java

@@ -2,6 +2,7 @@ package com.ynfy.app.api.v1.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ynfy.app.api.v1.annoation.IgnoreAuth;
 import com.ynfy.app.api.v1.entity.dto.ExamDTO;
 import com.ynfy.app.api.v1.util.TokenUtil;
 import com.ynfy.buss.exam.exam.dto.ExamSubmitDTO;
@@ -55,6 +56,7 @@ public class ApiExamController extends ApiBaseController {
      * @return
      */
     @PostMapping("/list")
+    @IgnoreAuth
     public Result<IPage<Exam>> list(@RequestBody ExamDTO dto) {
         Page<Exam> page = new Page<>(dto.getPageNo(), dto.getPageSize());
         Exam exam = new Exam();

+ 2 - 0
web/src/main/java/com/ynfy/app/api/v1/controller/ApiRepositoryController.java

@@ -3,6 +3,7 @@ package com.ynfy.app.api.v1.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ynfy.app.api.v1.annoation.IgnoreAuth;
 import com.ynfy.app.api.v1.entity.dto.RepositoryDTO;
 import com.ynfy.buss.course.course.entity.Course;
 import com.ynfy.buss.exam.question.dto.QuestionDTO;
@@ -40,6 +41,7 @@ public class ApiRepositoryController extends ApiBaseController {
      * @return
      */
     @PostMapping("/list")
+    @IgnoreAuth
     public Result<IPage<Repository>> list(@RequestBody RepositoryDTO repositoryDTO) {
         Page<Repository> page = new Page<>(repositoryDTO.getPageNo(), repositoryDTO.getPageSize());
         LambdaQueryWrapper<Repository> query = new LambdaQueryWrapper<>();

+ 11 - 8
web/src/main/java/com/ynfy/buss/course/course/mapper/xml/CourseMapper.xml

@@ -13,7 +13,7 @@
             WHERE
                 open_type = 1
         <choose>
-            <when test="user.orgCode!=null and user.orgCode!=''">
+            <when test="user!=null and user.orgCode!=null and user.orgCode!=''">
             UNION
                 SELECT
                     *
@@ -22,14 +22,17 @@
                     open_type = 2
                     AND learner like concat('%', #{user.orgCode}, '%')
             </when>
-        </choose>
+
+            <when test="user!=null and user.username!=null and user.username!=''">
             UNION
-            SELECT
-                *
-            FROM course
-            WHERE
-                open_type = 3
-                AND learner like concat('%', #{user.username}, '%')
+                SELECT
+                    *
+                FROM course
+                WHERE
+                    open_type = 3
+                    AND learner like concat('%', #{user.username}, '%')
+            </when>
+        </choose>
         ) tmp1
         LEFT JOIN sys_user u on tmp1.teacher_id=u.id
         <where>

+ 1 - 1
web/src/main/java/com/ynfy/buss/course/course/service/impl/CourseServiceImpl.java

@@ -63,7 +63,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         if (StringUtils.isNotBlank(course.getName())) {
             course.setName(course.getName().replace("*", ""));
         }
-        if (StringUtils.isNotBlank(user.getOrgCode())) {
+        if (!Objects.isNull(user) && StringUtils.isNotBlank(user.getOrgCode())) {
             SysDepart depart = sysDepartService.queryByOrgCode(user.getOrgCode());
             if (!Objects.isNull(depart)) {
                 user.setOrgCode(depart.getId());

+ 16 - 14
web/src/main/java/com/ynfy/buss/exam/exam/mapper/xml/ExamMapper.xml

@@ -89,22 +89,24 @@
                 open_type = 1
             <choose>
                 <when test="user!=null and user.orgCode!=null and user.orgCode!=''">
-            UNION
-            SELECT
-                    *
-            FROM exam
-            WHERE
-                open_type = 2
-                AND examiner like concat('%', #{user.orgCode}, '%')
+                UNION
+                    SELECT
+                            *
+                    FROM exam
+                    WHERE
+                        open_type = 2
+                        AND examiner like concat('%', #{user.orgCode}, '%')
+                </when>
+                <when test="user!=null and user.username!=null and user.username!=''">
+                UNION
+                    SELECT
+                        *
+                    FROM exam
+                    WHERE
+                        open_type = 3
+                        AND examiner like concat('%', #{user.username}, '%')
                 </when>
             </choose>
-            UNION
-            SELECT
-                *
-            FROM exam
-            WHERE
-                open_type = 3
-                AND examiner like concat('%', #{user.username}, '%')
         ) tmp1
         LEFT JOIN (
             SELECT