Merge branch 'master' into dev

# Conflicts:
#	themis-business/src/main/java/com/qmth/themis/business/service/impl/TEOpenServiceImpl.java
#	themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamPaperImportTemplete.java

themis-backend/src/main/java/com/qmth/themis/backend/api/SysController.java

@@ -87,7 +87,7 @@ public class SysController {
 
     @ApiOperation(value = "菜单查询接口")
     @RequestMapping(value = "/getMenu", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "菜单信息", response = TBPrivilege.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "菜单信息", response = TBPrivilege.class)})
     public Result getMenu() {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         if (Objects.isNull(tbUser)) {
@@ -98,7 +98,7 @@ public class SysController {
 
     @ApiOperation(value = "获取环境接口")
     @RequestMapping(value = "/env", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "环境信息", response = Result.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "环境信息", response = Result.class)})
     public Result env(@ApiParam(value = "机构id", required = true) @RequestParam Long orgId) {
         if (Objects.isNull(orgId) || Objects.equals(orgId, "")) {
             throw new BusinessException(ExceptionResultEnum.ORG_ID_IS_NULL);
@@ -113,9 +113,9 @@ public class SysController {
     @ApiOperation(value = "上传文件接口")
     @RequestMapping(value = "/file/upload", method = RequestMethod.POST)
     @Transactional
-    @ApiResponses({ @ApiResponse(code = 200, message = "{\"id\":0}", response = Result.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "{\"id\":0}", response = Result.class)})
     public Result fileUpload(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
-            @ApiParam(value = "上传文件类型", required = true) @RequestParam UploadFileEnum type) throws IOException {
+                             @ApiParam(value = "上传文件类型", required = true) @RequestParam UploadFileEnum type) throws IOException {
         if (Objects.isNull(file) || Objects.equals(file, "")) {
             throw new BusinessException(ExceptionResultEnum.ATTACHMENT_IS_NULL);
         }
@@ -124,11 +124,10 @@ public class SysController {
         }
         Map<String, Object> mapParameter = null;
         if (type.getId() == UploadFileEnum.file.getId()) {
-            mapParameter = ossUtil.getAliYunOssPrivateDomain().getMap();
-        } else {
-            mapParameter = ossUtil.getAliYunOssPublicDomain().getMap();
+            throw new BusinessException("只能上传upload附件");
         }
-        mapParameter.put(SystemConstant.UPLOAD_TYPE, type.name());
+        mapParameter = ossUtil.getAliYunOssPublicDomain().getMap();
+        mapParameter.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.upload.name());
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         TBAttachment tbAttachment = tbAttachmentService
                 .saveAttachment(file, ServletUtil.getRequestMd5(), ServletUtil.getRequestPath(), mapParameter, type,
@@ -162,9 +161,9 @@ public class SysController {
 
     @ApiOperation(value = "文件下载接口")
     @RequestMapping(value = "/file/download", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "{\"url\":string}", response = Result.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "{\"url\":string}", response = Result.class)})
     public Result fileDownload(@ApiParam(value = "任务id", required = true) @RequestParam Long id,
-            @ApiParam(value = "下载文件类型", required = true) @RequestParam DownloadFileEnum type) {
+                               @ApiParam(value = "下载文件类型", required = true) @RequestParam DownloadFileEnum type) {
         if (Objects.isNull(id) || Objects.equals(id, "")) {
             throw new BusinessException(ExceptionResultEnum.TASK_ID_IS_NULL);
         }
@@ -181,15 +180,15 @@ public class SysController {
         boolean oss = dictionaryConfig.sysDomain().isOss();
         JSONObject jsonObject = null;
         switch (type.getId()) {
-        case 0:
-            jsonObject = JSONObject.parseObject(tbTaskHistory.getImportFilePath());
-            break;
-        case 1:
-            jsonObject = JSONObject.parseObject(tbTaskHistory.getReportFilePath());
-            break;
-        default:
-            jsonObject = JSONObject.parseObject(tbTaskHistory.getResultFilePath());
-            break;
+            case 0:
+                jsonObject = JSONObject.parseObject(tbTaskHistory.getImportFilePath());
+                break;
+            case 1:
+                jsonObject = JSONObject.parseObject(tbTaskHistory.getReportFilePath());
+                break;
+            default:
+                jsonObject = JSONObject.parseObject(tbTaskHistory.getResultFilePath());
+                break;
         }
         if (Objects.isNull(jsonObject) || Objects.isNull(jsonObject.get("path"))) {
             throw new BusinessException("下载文件地址不存在");
@@ -214,7 +213,7 @@ public class SysController {
 
     @ApiOperation(value = "根据机构代码查询机构信息接口")
     @RequestMapping(value = "/org/queryByOrgCode", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "机构信息", response = TBOrg.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrg.class)})
     public Result queryByOrgCode(@ApiParam(value = "机构code", required = true) @RequestParam String code) {
         if (Objects.isNull(code) || Objects.equals(code, "")) {
             throw new BusinessException(ExceptionResultEnum.ORG_CODE_IS_NULL);
@@ -240,11 +239,11 @@ public class SysController {
 
     @ApiOperation(value = "机构查询接口")
     @RequestMapping(value = "/org/query", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "机构信息", response = TBOrg.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrg.class)})
     public Result query(@ApiParam(value = "机构id", required = false) @RequestParam(required = false) Long id,
-            @ApiParam(value = "机构代码", required = false) @RequestParam(required = false) String code,
-            @ApiParam(value = "机构名称", required = false) @RequestParam(required = false) String name,
-            @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable) {
+                        @ApiParam(value = "机构代码", required = false) @RequestParam(required = false) String code,
+                        @ApiParam(value = "机构名称", required = false) @RequestParam(required = false) String name,
+                        @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable) {
         QueryWrapper<TBOrg> tbOrgQueryWrapper = new QueryWrapper<>();
         if (Objects.nonNull(id)) {
             tbOrgQueryWrapper.lambda().eq(TBOrg::getId, id);
@@ -263,7 +262,7 @@ public class SysController {
 
     @ApiOperation(value = "角色查询接口")
     @RequestMapping(value = "/role/query", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "角色信息", response = TBRole.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "角色信息", response = TBRole.class)})
     public Result roleList() {
         List<TBRole> tbRoleList = (List<TBRole>) redisUtil.getRole();
         if (Objects.nonNull(tbRoleList) && tbRoleList.size() > 0) {
@@ -282,17 +281,17 @@ public class SysController {
 
     @ApiOperation(value = "考试场次查询接口")
     @RequestMapping(value = "/examActivity/query", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "角色信息", response = TEExamActivity.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "角色信息", response = TEExamActivity.class)})
     public Result examActivityQuery() {
         return ResultUtil.ok(teExamActivityService.list());
     }
 
     @ApiOperation(value = "考试批次查询接口")
     @RequestMapping(value = "/exam/query", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "角色信息", response = TEExamQueryDto.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "角色信息", response = TEExamQueryDto.class)})
     public Result examQuery(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId,
-            @ApiParam(value = "批次名称", required = false) @RequestParam(required = false) String name,
-            @ApiParam(value = "类型(区分实时监考台和考务)", required = false) @RequestParam(required = false) String type) {
+                            @ApiParam(value = "批次名称", required = false) @RequestParam(required = false) String name,
+                            @ApiParam(value = "类型(区分实时监考台和考务)", required = false) @RequestParam(required = false) String type) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         AuthDto authDto = (AuthDto) redisUtil.get(SystemConstant.userOauth + "::" + tbUser.getId());
         List<TEExam> teExamList = null;
@@ -334,7 +333,7 @@ public class SysController {
 
     @ApiOperation(value = "考场查询接口")
     @RequestMapping(value = "/examRoom/query", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "角色信息", response = RoomCodeQueryDto.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "角色信息", response = RoomCodeQueryDto.class)})
     public Result examRoomQuery(
             @ApiParam(value = "考场名称", required = false) @RequestParam(required = false) String roomName) {
         return ResultUtil.ok(teExamStudentService.examRoomQuery(roomName));
@@ -342,7 +341,7 @@ public class SysController {
 
     @ApiOperation(value = "根据权限获取场次和考场接口")
     @RequestMapping(value = "/exam/privilegeQuery", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "场次和考场信息", response = Result.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "场次和考场信息", response = Result.class)})
     public Result examPrivilegeQuery(@ApiParam(value = "考试id", required = true) @RequestParam Long examId) {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
@@ -410,7 +409,7 @@ public class SysController {
 
     @ApiOperation(value = "获取播放域接口")
     @RequestMapping(value = "/getPlayUrls", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "播放域接口", response = Result.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "播放域接口", response = Result.class)})
     public Result getPlayUrls() {
         return ResultUtil.ok(dictionaryConfig.tencentYunDomain().getUrls());
     }