fix:打开下载管理和教学学生权限

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -1684,6 +1684,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 
         // 所有试卷信息
         List<ExamTaskPaperFileDto> examTaskPaperFileDtoList = examTaskPaperDto.getExamTaskPaperFileDtoList();
+        if (examTaskPaperFileDtoList.size() == 0){
+            throw ExceptionResultEnum.ERROR.exception("没有找到任何试卷信息");
+        }
         switch (paperFileDownloadExposureStatus) {
             case EXPOSED_PAPER: // 曝光的
                 excelName = excelName + "(" + paperFileDownloadExposureStatus.getDesc() + ")";

distributed-print/src/main/java/com/qmth/distributed/print/api/DownloadController.java

@@ -1,18 +1,13 @@
 package com.qmth.distributed.print.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.params.DownloadPaperFileParam;
-import com.qmth.distributed.print.business.bean.params.PrintPlanParams;
 import com.qmth.distributed.print.business.service.DownloadService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.templete.execute.AsyncDownloadPaperFileBatchService;
-import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.teachcloud.common.bean.result.TaskListResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.TBTask;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
@@ -20,12 +15,12 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.validation.Valid;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 下载管理
@@ -62,7 +57,8 @@ public class DownloadController {
                        @ApiParam(value = "课程名称", required = false) @RequestParam(required = false) String courseName,
                        @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return downloadService.page(semesterId, examId, orgId, courseName, pageNumber, pageSize);
+
+        return ResultUtil.ok(downloadService.page(semesterId, examId, orgId, courseName, pageNumber, pageSize));
     }
 
     /**
@@ -80,7 +76,6 @@ public class DownloadController {
     @ApiOperation(value = "批量下载")
     @RequestMapping(value = "/download_batch", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "批量下载", response = TaskListResult.class)})
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
     public Object downloadBatch(@Valid @RequestBody DownloadPaperFileParam downloadPaperFileParam, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());

distributed-print/src/main/java/com/qmth/distributed/print/api/TeachStudentController.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.api;
 
+import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.params.TeachStudentBatchParam;
 import com.qmth.distributed.print.business.bean.params.TeachStudentParams;
@@ -74,7 +75,7 @@ public class TeachStudentController {
             throw ExceptionResultEnum.ERROR.exception("请选择要删除的对象");
         }
         Long teachClazzId = teachStudentBatchParam.getTeachClazzId();
-        Long schoolId = (Long) ServletUtil.getRequestHeaderSchoolId();
+        Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
         teachStudentService.createTeachStudentBatch(basicStudentIdSet, teachClazzId, schoolId, requestUser);
         return ResultUtil.ok();
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/AttachmentCommonServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -244,7 +245,7 @@ public class AttachmentCommonServiceImpl implements AttachmentCommonService {
             byte[] buf = new byte[1024];
             int len = 0;
 
-            String fName = new String(fileName.getBytes(), "ISO-8859-1");
+            String fName = new String(fileName.getBytes(), StandardCharsets.UTF_8);
 
             response.reset();
             response.setContentType("application/x-msdownload");