bug修复

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseOpenMapper.xml

@@ -93,7 +93,7 @@
                 LEFT JOIN COURSE_INFO b ON
                 a.COURSE_ID = b.COURSE_ID
         WHERE
-            a.SEMESTER_ID = #{semesterId} AND  b.PUTAWAY_STATUS=1
+            a.SEMESTER_ID = #{semesterId} AND  b.PUTAWAY_STATUS=1 and a.DELETE_FLAG ='NOT_DELETE'
         ORDER BY
             a.id
     </select>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/ResourceCollectMapper.xml

@@ -32,12 +32,11 @@
        LEFT JOIN RESOURCE_USERFILE c ON c.USER_FILE_ID = b.USERFILE_ID
        LEFT JOIN resource_type d ON b.RESOURCE_TYPE=d.id
        LEFT JOIN sys_user e ON e.id = a."user_id"
-       <where>
-           a."user_id"=#{resourceCollectPageParam.userId}
-           <if test="resourceCollectPageParam.fileName != null and resourceCollectPageParam.fileName != ''">
-               AND c.file_name like concat('%',#{resourceCollectPageParam.fileName},'%')
-           </if>
-       </where>
+       where a.DELETE_FLAG ='NOT_DELETE'
+       and a."user_id"=#{resourceCollectPageParam.userId}
+       <if test="resourceCollectPageParam.fileName != null and resourceCollectPageParam.fileName != ''">
+           AND c.file_name like concat('%',#{resourceCollectPageParam.fileName},'%')
+       </if>
        order by a.CREATE_TIME desc
    </select>
     <select id="queryResourceCollectVoList" resultType="vip.xiaonuo.disk.vo.collect.ResourceCollectVo">

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/TeachingActivityMapper.xml

@@ -41,7 +41,7 @@
 
     <select id="documentJumpStatistic" resultType="map">
         SELECT
-        ifnull(ROUND(AVG(ctb.END_TIME), 2),0) AS jumpAvgTime,
+        ifnull(ROUND(AVG(ctb.END_TIME)/1000, 2),0) AS jumpAvgTime,
         COUNT(DISTINCT cch.ID) AS allHourCount,
         CASE
         WHEN COUNT(DISTINCT cch.ID) > 0 THEN

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/StudyBehaviorProgressServiceImpl.java

@@ -110,7 +110,28 @@ public class StudyBehaviorProgressServiceImpl implements StudyBehaviorProgressSe
         Page<Map<String,Object>> page=studyBehaviorProgressMapper.getCollegeList(param, CommonPageRequest.defaultPage());
         List<Map<String,Object>> collegeList=page.getRecords();
         //获取院系id集合
-        List<String> collegeIdList = collegeList.stream().map(map -> (String) map.get("collegeId")).collect(Collectors.toList());
+        List<Long> collegeIdList = collegeList.stream()
+                .map(map -> {
+                    Object value = map.get("collegeId");
+                    if (value == null) {
+                        return null; // 或者根据业务需求处理null值
+                    }
+                    if (value instanceof Long) {
+                        return (Long) value;
+                    } else if (value instanceof String) {
+                        try {
+                            return Long.valueOf((String) value);
+                        } catch (NumberFormatException e) {
+                            // 处理无法转换的字符串
+                            throw new IllegalArgumentException("Invalid collegeId value: " + value, e);
+                        }
+                    } else {
+                        throw new IllegalArgumentException("Unexpected type for collegeId: " + value.getClass());
+                    }
+                })
+                .collect(Collectors.toList());
+
+
         param.put("collegeIdList",collegeIdList);
         //2.获取课程数量
         List<Map<String,Object>> courseCountList=studyBehaviorProgressMapper.getCourseCountListCollegeCourse(param);

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/admin/QuestionController.java

@@ -89,7 +89,7 @@ public class QuestionController extends BaseApiController {
 
     @RequestMapping(value = "/loadExcel", method = RequestMethod.POST)
     public CommonResult loadExcel(@RequestParam("file") MultipartFile file) {
-        return CommonResult.data(questionService.loadExcel(file,getCurrentUser()));
+        return questionService.loadExcel(file,getCurrentUser());
     }
 
 

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/QuestionService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.web.multipart.MultipartFile;
 import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
+import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.exam.domain.Question;
 import vip.xiaonuo.exam.viewmodel.admin.question.QuestionEditRequestVM;
 import vip.xiaonuo.exam.viewmodel.admin.question.QuestionPageRequestVM;
@@ -27,7 +28,7 @@ public interface QuestionService extends BaseService<Question> {
 
     List<Integer> selectMothCount();
 
-    JSONObject checkExcel(MultipartFile file, SaBaseLoginUser currentUser);
+    CommonResult checkExcel(MultipartFile file, SaBaseLoginUser currentUser);
 
-    JSONObject loadExcel(MultipartFile file, SaBaseLoginUser currentUser);
+    CommonResult loadExcel(MultipartFile file, SaBaseLoginUser currentUser);
 }

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/QuestionServiceImpl.java

@@ -14,6 +14,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
+import vip.xiaonuo.common.exception.CommonException;
+import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.dev.api.DevDictApi;
 import vip.xiaonuo.disk.domain.Semester;
 import vip.xiaonuo.disk.mapper.MajorMapper;
@@ -235,58 +237,64 @@ public class QuestionServiceImpl extends BaseServiceImpl<Question> implements Qu
      * 检查导入的Excel文件
      */
     @Override
-    public JSONObject checkExcel(MultipartFile file, SaBaseLoginUser currentUser) {
+    public CommonResult checkExcel(MultipartFile file, SaBaseLoginUser currentUser) {
         JSONObject result = new JSONObject();
         try {
             if(currentUser == null || currentUser.getId() == null){
-                throw new RuntimeException("未登录！！！");
+                return CommonResult.error("未登录！！！");
             }
-            return checkExcelData(file, result, false);
+            return CommonResult.data(checkExcelData(file, result, false));
         } catch (Exception e) {
             System.err.println("检查导入的Excel文件失败！！！");
             e.printStackTrace();
         }
-        return result;
+        return CommonResult.data(result);
     }
 
     /**
      * 导入Excel文件
      */
     @Override
-    public JSONObject loadExcel(MultipartFile file, SaBaseLoginUser currentUser) {
+    public CommonResult loadExcel(MultipartFile file, SaBaseLoginUser currentUser) {
         JSONObject result = new JSONObject();
         try {
             if(currentUser == null || currentUser.getId() == null){
-                throw new RuntimeException("未登录！！！");
+                return  CommonResult.error("未登录！！！");
+            }
+            CommonResult checkResult = checkExcelData(file, result, true);
+            if(checkResult.getCode().equals(500)){
+                return CommonResult.error(checkResult.getMsg());
             }
-            JSONObject checkResult = checkExcelData(file, result, true);
-            if (checkResult.getIntValue("questionErrorCount") !=0 || checkResult.getJSONArray("questionOKList").isEmpty()) {
+
+
+            JSONObject jsonObject=(JSONObject)checkResult.getData();
+            if (jsonObject.getIntValue("questionErrorCount") !=0 || jsonObject.getJSONArray("questionOKList").isEmpty()) {
                 // 有错误的数据返回检查结果
-                return checkResult.getJSONObject("data");
+                return CommonResult.data(jsonObject.getJSONObject("data"));
             }else{
                 // 无错误执行导入
-                List<QuestionExcel> questionOKList = checkResult.getJSONArray("questionOKList").toJavaList(QuestionExcel.class);
-                return saveFromLoad(questionOKList,currentUser.getId(),result);
+                List<QuestionExcel> questionOKList = jsonObject.getJSONArray("questionOKList").toJavaList(QuestionExcel.class);
+                return CommonResult.data(saveFromLoad(questionOKList,currentUser.getId(),result));
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return result;
+        return CommonResult.data(result);
     }
 
     /**
      * 检查导入的数据
      * backAllData 是否返回所有数据
      */
-    public JSONObject checkExcelData(MultipartFile file, JSONObject result, boolean backAllData) {
+    public CommonResult checkExcelData(MultipartFile file, JSONObject result, boolean backAllData) {
         try {
             String fileName = file.getOriginalFilename();
             if (fileName == null){
-                throw new RuntimeException("请上传xlsx导入数据文件！！！");
+                return CommonResult.error("请上传xlsx导入数据文件！！！");
             }
             String suffix = FileUtil.getSuffix(fileName);
             if (!suffix.equals("xlsx")) {
-                throw new RuntimeException("请上传xlsx导入数据文件！！！");
+                return CommonResult.error("请上传xlsx导入数据文件！！！");
             }
 
             // 创建临时文件
@@ -440,15 +448,15 @@ public class QuestionServiceImpl extends BaseServiceImpl<Question> implements Qu
                     result.put("allData", questionList);
                     result.put("questionOKList", questionOKList);
                 }
-                return result;
+                return CommonResult.data(result);
             }else{
-                throw new RuntimeException("导入的Excel文件内容为空！！！");
+                return CommonResult.error("导入的Excel文件内容为空！！！");
             }
         } catch (Exception e) {
             System.err.println("checkExcelData 检查导入的Excel文件失败！！！");
             e.printStackTrace();
         }
-        return result;
+        return CommonResult.data(result);
     }