|
@@ -8,9 +8,11 @@ import com.qmth.themis.business.annotation.ApiJsonProperty;
|
|
import com.qmth.themis.business.base.BasePage;
|
|
import com.qmth.themis.business.base.BasePage;
|
|
import com.qmth.themis.business.config.SystemConfig;
|
|
import com.qmth.themis.business.config.SystemConfig;
|
|
import com.qmth.themis.business.constant.SystemConstant;
|
|
import com.qmth.themis.business.constant.SystemConstant;
|
|
|
|
+import com.qmth.themis.business.dto.MqDto;
|
|
import com.qmth.themis.business.dto.response.TBExamInvigilateUserDto;
|
|
import com.qmth.themis.business.dto.response.TBExamInvigilateUserDto;
|
|
import com.qmth.themis.business.entity.*;
|
|
import com.qmth.themis.business.entity.*;
|
|
import com.qmth.themis.business.enums.*;
|
|
import com.qmth.themis.business.enums.*;
|
|
|
|
+import com.qmth.themis.business.service.MqDtoService;
|
|
import com.qmth.themis.business.service.TBAttachmentService;
|
|
import com.qmth.themis.business.service.TBAttachmentService;
|
|
import com.qmth.themis.business.service.TBExamInvigilateUserService;
|
|
import com.qmth.themis.business.service.TBExamInvigilateUserService;
|
|
import com.qmth.themis.business.service.TBTaskHistoryService;
|
|
import com.qmth.themis.business.service.TBTaskHistoryService;
|
|
@@ -20,10 +22,6 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
|
|
import com.qmth.themis.common.exception.BusinessException;
|
|
import com.qmth.themis.common.exception.BusinessException;
|
|
import com.qmth.themis.common.util.Result;
|
|
import com.qmth.themis.common.util.Result;
|
|
import com.qmth.themis.common.util.ResultUtil;
|
|
import com.qmth.themis.common.util.ResultUtil;
|
|
-import com.qmth.themis.business.dto.MqDto;
|
|
|
|
-import com.qmth.themis.business.enums.MqTagEnum;
|
|
|
|
-import com.qmth.themis.business.enums.MqTopicEnum;
|
|
|
|
-import com.qmth.themis.business.service.MqDtoService;
|
|
|
|
import io.swagger.annotations.*;
|
|
import io.swagger.annotations.*;
|
|
import org.springframework.dao.DuplicateKeyException;
|
|
import org.springframework.dao.DuplicateKeyException;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -76,24 +74,21 @@ public class TBExamInvigilateUserController {
|
|
@RequestMapping(value = "/save", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/save", method = RequestMethod.POST)
|
|
@Transactional
|
|
@Transactional
|
|
@ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
|
|
@ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
|
|
- public Result save(
|
|
|
|
- @ApiJsonObject(name = "saveInvigilateUser", value = {
|
|
|
|
- @ApiJsonProperty(key = "roomCode", description = "考场代码"),
|
|
|
|
- @ApiJsonProperty(key = "userId", type = "long", example = "1", description = "用户id")
|
|
|
|
- })
|
|
|
|
- @ApiParam(value = "监考员信息", required = true) @RequestBody Map<String, Object> mapParameter) {
|
|
|
|
|
|
+ public Result save(@ApiJsonObject(name = "saveInvigilateUser", value = {
|
|
|
|
+ @ApiJsonProperty(key = "roomCode", description = "考场代码"),
|
|
|
|
+ @ApiJsonProperty(key = "userIds", description = "用户id")
|
|
|
|
+ }) @ApiParam(value = "监考员信息", required = true) @RequestBody Map<String, Object> mapParameter) {
|
|
String roomCode = null;
|
|
String roomCode = null;
|
|
try {
|
|
try {
|
|
if (Objects.isNull(mapParameter.get("roomCode")) || Objects.equals(mapParameter.get("roomCode"), "")) {
|
|
if (Objects.isNull(mapParameter.get("roomCode")) || Objects.equals(mapParameter.get("roomCode"), "")) {
|
|
throw new BusinessException(ExceptionResultEnum.ROOMCODE_IS_NULL);
|
|
throw new BusinessException(ExceptionResultEnum.ROOMCODE_IS_NULL);
|
|
}
|
|
}
|
|
roomCode = String.valueOf(mapParameter.get("roomCode"));
|
|
roomCode = String.valueOf(mapParameter.get("roomCode"));
|
|
- if (Objects.isNull(mapParameter.get("userId")) || Objects.equals(mapParameter.get("userId"), "")) {
|
|
|
|
|
|
+ if (Objects.isNull(mapParameter.get("userIds")) || Objects.equals(mapParameter.get("userIds"), "")) {
|
|
throw new BusinessException(ExceptionResultEnum.USER_ID_IS_NULL);
|
|
throw new BusinessException(ExceptionResultEnum.USER_ID_IS_NULL);
|
|
}
|
|
}
|
|
- String userId = String.valueOf(mapParameter.get("userId"));
|
|
|
|
- String[] userIds = userId.split(",");
|
|
|
|
- if (userIds.length > 3) {
|
|
|
|
|
|
+ List<String> userIds = (List) mapParameter.get("userIds");
|
|
|
|
+ if (userIds.size() > 3) {
|
|
throw new BusinessException(ExceptionResultEnum.ERROR.getStatusCode(), ExceptionResultEnum.ERROR.getCode(), "一个考场最多设置3名监考员");
|
|
throw new BusinessException(ExceptionResultEnum.ERROR.getStatusCode(), ExceptionResultEnum.ERROR.getCode(), "一个考场最多设置3名监考员");
|
|
}
|
|
}
|
|
TBOrg tbOrg = (TBOrg) ServletUtil.getRequestOrg();
|
|
TBOrg tbOrg = (TBOrg) ServletUtil.getRequestOrg();
|
|
@@ -106,10 +101,10 @@ public class TBExamInvigilateUserController {
|
|
List<TBExamInvigilateUser> tbExamInvigilateUserList = tbExamInvigilateUserService.list(tbExamInvigilateUserQueryWrapper);
|
|
List<TBExamInvigilateUser> tbExamInvigilateUserList = tbExamInvigilateUserService.list(tbExamInvigilateUserQueryWrapper);
|
|
List<String> roomNameList = tbExamInvigilateUserList.stream().map(s -> s.getRoomName()).collect(Collectors.toList());
|
|
List<String> roomNameList = tbExamInvigilateUserList.stream().map(s -> s.getRoomName()).collect(Collectors.toList());
|
|
tbExamInvigilateUserService.remove(tbExamInvigilateUserQueryWrapper);
|
|
tbExamInvigilateUserService.remove(tbExamInvigilateUserQueryWrapper);
|
|
- if (userIds.length > 0) {
|
|
|
|
|
|
+ if (userIds.size() > 0) {
|
|
tbExamInvigilateUserList = new ArrayList<>();
|
|
tbExamInvigilateUserList = new ArrayList<>();
|
|
- for (int i = 0; i < userIds.length; i++) {
|
|
|
|
- TBExamInvigilateUser tbExamInvigilateUser = new TBExamInvigilateUser(orgId, Long.parseLong(userIds[i]), roomCode, roomNameList.get(0));
|
|
|
|
|
|
+ for (int i = 0; i < userIds.size(); i++) {
|
|
|
|
+ TBExamInvigilateUser tbExamInvigilateUser = new TBExamInvigilateUser(orgId, Long.parseLong(userIds.get(i)), roomCode, roomNameList.get(0));
|
|
tbExamInvigilateUserList.add(tbExamInvigilateUser);
|
|
tbExamInvigilateUserList.add(tbExamInvigilateUser);
|
|
}
|
|
}
|
|
tbExamInvigilateUserService.saveBatch(tbExamInvigilateUserList);
|
|
tbExamInvigilateUserService.saveBatch(tbExamInvigilateUserList);
|