|
@@ -1,6 +1,12 @@
|
|
package cn.com.qmth.stmms.admin.user;
|
|
package cn.com.qmth.stmms.admin.user;
|
|
|
|
|
|
-import java.util.*;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.Date;
|
|
|
|
+import java.util.HashMap;
|
|
|
|
+import java.util.HashSet;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
+import java.util.Set;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
@@ -22,6 +28,8 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
|
import cn.com.qmth.stmms.admin.dto.MarkerDTO;
|
|
import cn.com.qmth.stmms.admin.dto.MarkerDTO;
|
|
import cn.com.qmth.stmms.admin.dto.SubjectUserDTO;
|
|
import cn.com.qmth.stmms.admin.dto.SubjectUserDTO;
|
|
import cn.com.qmth.stmms.admin.exam.BaseExamController;
|
|
import cn.com.qmth.stmms.admin.exam.BaseExamController;
|
|
|
|
+import cn.com.qmth.stmms.biz.config.model.SystemAuth;
|
|
|
|
+import cn.com.qmth.stmms.biz.config.service.SystemAuthService;
|
|
import cn.com.qmth.stmms.biz.exam.bean.AddStudentInfo;
|
|
import cn.com.qmth.stmms.biz.exam.bean.AddStudentInfo;
|
|
import cn.com.qmth.stmms.biz.exam.bean.UserStudentVo;
|
|
import cn.com.qmth.stmms.biz.exam.bean.UserStudentVo;
|
|
import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
|
|
import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
|
|
@@ -29,7 +37,15 @@ import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
|
|
import cn.com.qmth.stmms.biz.exam.model.Marker;
|
|
import cn.com.qmth.stmms.biz.exam.model.Marker;
|
|
import cn.com.qmth.stmms.biz.exam.model.SubjectUser;
|
|
import cn.com.qmth.stmms.biz.exam.model.SubjectUser;
|
|
import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
|
|
import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
|
|
-import cn.com.qmth.stmms.biz.exam.service.*;
|
|
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.service.ExamService;
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.service.MarkerService;
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.service.SubjectUserService;
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.service.UserExamService;
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.service.UserStudentService;
|
|
import cn.com.qmth.stmms.biz.user.model.User;
|
|
import cn.com.qmth.stmms.biz.user.model.User;
|
|
import cn.com.qmth.stmms.biz.user.service.UserService;
|
|
import cn.com.qmth.stmms.biz.user.service.UserService;
|
|
import cn.com.qmth.stmms.biz.user.service.query.UserSearchQuery;
|
|
import cn.com.qmth.stmms.biz.user.service.query.UserSearchQuery;
|
|
@@ -37,6 +53,7 @@ import cn.com.qmth.stmms.common.annotation.Logging;
|
|
import cn.com.qmth.stmms.common.annotation.RoleRequire;
|
|
import cn.com.qmth.stmms.common.annotation.RoleRequire;
|
|
import cn.com.qmth.stmms.common.enums.LogType;
|
|
import cn.com.qmth.stmms.common.enums.LogType;
|
|
import cn.com.qmth.stmms.common.enums.Role;
|
|
import cn.com.qmth.stmms.common.enums.Role;
|
|
|
|
+import cn.com.qmth.stmms.common.enums.SystemAuthType;
|
|
import cn.com.qmth.stmms.common.enums.UserSource;
|
|
import cn.com.qmth.stmms.common.enums.UserSource;
|
|
import cn.com.qmth.stmms.common.utils.EncryptUtils;
|
|
import cn.com.qmth.stmms.common.utils.EncryptUtils;
|
|
import cn.com.qmth.stmms.common.utils.ExportExcel;
|
|
import cn.com.qmth.stmms.common.utils.ExportExcel;
|
|
@@ -82,6 +99,9 @@ public class UserController extends BaseExamController {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private UserStudentService userStudentService;
|
|
private UserStudentService userStudentService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private SystemAuthService systemAuthService;
|
|
|
|
|
|
@Logging(menu = "查询用户", type = LogType.QUERY)
|
|
@Logging(menu = "查询用户", type = LogType.QUERY)
|
|
@RequestMapping("/list")
|
|
@RequestMapping("/list")
|
|
@@ -510,6 +530,9 @@ public class UserController extends BaseExamController {
|
|
view.addObject("roleList", roleList);
|
|
view.addObject("roleList", roleList);
|
|
int examId = getSessionExamId(request);
|
|
int examId = getSessionExamId(request);
|
|
view.addObject("exam", examService.findById(examId));
|
|
view.addObject("exam", examService.findById(examId));
|
|
|
|
+ systemAuthService.findOne();
|
|
|
|
+ SystemAuth systemAuth = systemAuthService.findOne();
|
|
|
|
+ view.addObject("authType", systemAuth.getType());
|
|
return view;
|
|
return view;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -518,16 +541,26 @@ public class UserController extends BaseExamController {
|
|
@RoleRequire(Role.SCHOOL_ADMIN)
|
|
@RoleRequire(Role.SCHOOL_ADMIN)
|
|
public String batchSave(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
|
|
public String batchSave(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
|
|
@RequestParam Role role, @RequestParam(required = false) String password, @RequestParam Integer number,
|
|
@RequestParam Role role, @RequestParam(required = false) String password, @RequestParam Integer number,
|
|
- @RequestParam String subjectCodeString, @RequestParam(required = false) Boolean random) {
|
|
|
|
|
|
+ @RequestParam String subjectCodeString, @RequestParam(required = false) Boolean random
|
|
|
|
+ ,@RequestParam(required = false) String prefix) {
|
|
|
|
+ SystemAuth systemAuth = systemAuthService.findOne();
|
|
|
|
+ if(SystemAuthType.OFFLINE.equals(systemAuth.getType())) {
|
|
|
|
+ if(StringUtils.isBlank(prefix)) {
|
|
|
|
+ addErrMessage(redirectAttributes,null, "请填写自定义前缀");
|
|
|
|
+ return "redirect:/admin/user/batchAdd";
|
|
|
|
+ }
|
|
|
|
+ }else {
|
|
|
|
+ prefix=null;
|
|
|
|
+ }
|
|
int examId = getSessionExamId(request);
|
|
int examId = getSessionExamId(request);
|
|
if (Role.MARKER.equals(role)) {
|
|
if (Role.MARKER.equals(role)) {
|
|
int successNum = userService.batchSaveMarker(examId, getSubjectCodeSet(subjectCodeString), number, password,
|
|
int successNum = userService.batchSaveMarker(examId, getSubjectCodeSet(subjectCodeString), number, password,
|
|
- random == null ? false : random);
|
|
|
|
|
|
+ random == null ? false : random,prefix);
|
|
String message = "已成功新增 " + successNum + " 条用户";
|
|
String message = "已成功新增 " + successNum + " 条用户";
|
|
addMessage(redirectAttributes, message);
|
|
addMessage(redirectAttributes, message);
|
|
} else {
|
|
} else {
|
|
int successNum = userService.batchSaveSubjectUser(examId, role, getSubjectCodeSet(subjectCodeString),
|
|
int successNum = userService.batchSaveSubjectUser(examId, role, getSubjectCodeSet(subjectCodeString),
|
|
- number, password, random == null ? false : random);
|
|
|
|
|
|
+ number, password, random == null ? false : random,prefix);
|
|
String message = "已成功新增 " + successNum + " 条用户";
|
|
String message = "已成功新增 " + successNum + " 条用户";
|
|
addMessage(redirectAttributes, message);
|
|
addMessage(redirectAttributes, message);
|
|
}
|
|
}
|