修改UID生成工具包装为bean，从配置读取datacenterId，向redis注册machineId，并定时续租machineId；去掉原有所有获取uid代码，改为从新的工具bean获取；配置文件增加sys.config.datacenterId配置；backend与exam模块增加额外的TaskSchedule配置

themis-backend/src/main/java/com/qmth/themis/backend/ThemisBackendApplication.java

@@ -7,18 +7,20 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 //import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
 @SpringBootApplication
-@ComponentScan(basePackages = {"com.qmth.themis"})
+@ComponentScan(basePackages = { "com.qmth.themis" })
 @MapperScan("com.qmth.themis.business.dao")
 //主要就是定义扫描的路径从中找出标识了需要装配的类自动装配到spring的bean容器中,做过web开发的同学一定都有用过@Controller，@Service，@Repository注解，查看其源码你会发现，他们中有一个共同的注解@Component，没错@ComponentScan注解默认就会装配标识了@Controller，@Service，@Repository，@Component注解的类到spring容器中
-@EntityScan(basePackages = {"com.qmth.themis.business.entity"}) // 用来扫描和发现指定包及其子包中的Entity定义
+@EntityScan(basePackages = { "com.qmth.themis.business.entity" }) // 用来扫描和发现指定包及其子包中的Entity定义
 @EnableTransactionManagement // spring开启事务支持
 @EnableAsync // 开启异步任务
 @EnableCaching // 开启缓存注解
+@EnableScheduling//开启定时任务
 //@EnableMongoRepositories("com.qmth.themis.backend.mongodb.repository")
 public class ThemisBackendApplication {
 

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

@@ -11,7 +11,7 @@ import com.qmth.themis.business.enums.FieldUniqueEnum;
 import com.qmth.themis.business.service.TBOrgService;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.business.util.ServletUtil;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
@@ -39,6 +39,7 @@ import java.util.Objects;
 @RestController
 @RequestMapping("/${prefix.url.admin}/org")
 public class TBOrgController {
+
     private final static Logger log = LoggerFactory.getLogger(TBOrgController.class);
 
     @Resource
@@ -47,12 +48,19 @@ public class TBOrgController {
     @Resource
     RedisUtil redisUtil;
 
+    @Resource
+    UidUtil uidUtil;
+
     //    @CachePut(value = "org_cache", key = "'orgCacheQuery'")
-//    @Cacheable(value = "org_cache", key = "#p0")
+    //    @Cacheable(value = "org_cache", key = "#p0")
     @ApiOperation(value = "机构查询分页接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrgDto.class)})
-    public Result queryByPage(@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 = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+    @ApiResponses({ @ApiResponse(code = 200, message = "机构信息", response = TBOrgDto.class) })
+    public Result queryByPage(@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 = true) @RequestParam int pageNumber,
+            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         return ResultUtil.ok(tbOrgService.queryByPage(new Page<>(pageNumber, pageSize), code, name, enable));
     }
 
@@ -60,7 +68,7 @@ public class TBOrgController {
     @ApiOperation(value = "机构新增/编辑接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @Transactional
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     public Result save(@ApiParam(value = "机构信息", required = true) @RequestBody TBOrg tbOrg) {
         if (Objects.isNull(tbOrg)) {
             throw new BusinessException(ExceptionResultEnum.ORG_INFO_IS_NULL);
@@ -71,7 +79,7 @@ public class TBOrgController {
         try {
             TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
             if (Objects.isNull(tbOrg.getId())) {
-                tbOrg.setId(Constants.idGen.next());
+                tbOrg.setId(uidUtil.getId());
                 tbOrg.setCreateId(tbUser.getId());
             } else {
                 tbOrg.setUpdateId(tbUser.getId());
@@ -83,7 +91,8 @@ public class TBOrgController {
             log.error("请求出错", e);
             if (e instanceof DuplicateKeyException) {
                 String errorColumn = e.getCause().toString();
-                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length()).replaceAll("'", "");
+                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length())
+                        .replaceAll("'", "");
                 throw new BusinessException(FieldUniqueEnum.convertToCode(columnStr) + "数据不允许重复插入");
             } else if (e instanceof BusinessException) {
                 throw new BusinessException(e.getMessage());
@@ -97,11 +106,10 @@ public class TBOrgController {
     @ApiOperation(value = "机构停用/启用接口")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     @Transactional
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     public Result enableOrg(@ApiJsonObject(name = "enableOrg", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "机构id"),
-            @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "停用/启用")
-    }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> user) {
+            @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "停用/启用") }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> user) {
         if (Objects.isNull(user.get("id")) || Objects.equals(user.get("id"), "")) {
             throw new BusinessException(ExceptionResultEnum.ORG_ID_IS_NULL);
         }

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

@@ -19,17 +19,15 @@ import com.qmth.themis.business.enums.MqTagEnum;
 import com.qmth.themis.business.enums.MqTopicEnum;
 import com.qmth.themis.business.enums.SystemOperationEnum;
 import com.qmth.themis.business.service.*;
-import com.qmth.themis.business.util.OssUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.business.util.SessionUtil;
+import com.qmth.themis.business.util.UidUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.enums.Platform;
 import com.qmth.themis.common.enums.Source;
 import com.qmth.themis.common.exception.BusinessException;
-import com.qmth.themis.common.signature.SignatureInfo;
-import com.qmth.themis.common.signature.SignatureType;
 import com.qmth.themis.common.util.AesUtil;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
@@ -56,6 +54,7 @@ import java.util.*;
 @RestController
 @RequestMapping("/${prefix.url.admin}/user")
 public class TBUserController {
+
     private final static Logger log = LoggerFactory.getLogger(TBUserController.class);
 
     @Resource
@@ -76,14 +75,17 @@ public class TBUserController {
     @Resource
     TBOrgService tbOrgService;
 
+    @Resource
+    UidUtil uidUtil;
+
     @ApiOperation(value = "用户登录接口")
     @RequestMapping(value = "/login/account", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = TBUser.class)})
-    public Result login(@ApiJsonObject(name = "loginAccount", value = {
-            @ApiJsonProperty(key = "loginName", description = "登录名"),
-            @ApiJsonProperty(key = "password", description = "密码"),
-            @ApiJsonProperty(key = "code", description = "机构代码")
-    }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter) throws NoSuchAlgorithmException {
+    @ApiResponses({ @ApiResponse(code = 200, message = "用户信息", response = TBUser.class) })
+    public Result login(
+            @ApiJsonObject(name = "loginAccount", value = { @ApiJsonProperty(key = "loginName", description = "登录名"),
+                    @ApiJsonProperty(key = "password", description = "密码"),
+                    @ApiJsonProperty(key = "code", description = "机构代码") }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter)
+            throws NoSuchAlgorithmException {
         if (Objects.isNull(mapParameter)) {
             throw new BusinessException(ExceptionResultEnum.USER_INFO_IS_NULL);
         }
@@ -152,8 +154,9 @@ public class TBUserController {
 
     @ApiOperation(value = "短信验证码登陆接口")
     @RequestMapping(value = "/login/verifyCode", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = TBUser.class)})
-    public Result verifyCode(@ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter) throws NoSuchAlgorithmException {
+    @ApiResponses({ @ApiResponse(code = 200, message = "用户信息", response = TBUser.class) })
+    public Result verifyCode(@ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter)
+            throws NoSuchAlgorithmException {
         if (Objects.isNull(mapParameter.get("loginName")) || Objects.equals(mapParameter.get("loginName"), "")) {
             throw new BusinessException(ExceptionResultEnum.LOGIN_NAME_IS_NULL);
         }
@@ -195,30 +198,36 @@ public class TBUserController {
         //添加用户缓存
         redisUtil.setUser(user.getId(), user);
         String source = null;
-        if (Objects.equals(platform.name(), Platform.WIN.name()) || Objects.equals(platform.name(), Platform.MAC.name()) || Objects.equals(platform.name(), Platform.IOS.name()) || Objects.equals(platform.name(), Platform.ANDROID.name())) {
+        if (Objects.equals(platform.name(), Platform.WIN.name()) || Objects.equals(platform.name(), Platform.MAC.name())
+                || Objects.equals(platform.name(), Platform.IOS.name()) || Objects
+                .equals(platform.name(), Platform.ANDROID.name())) {
             source = platform.getSource().split(",")[0];
         } else {
             source = platform.getSource();
         }
         //添加用户会话缓存
-        String sessionId = SessionUtil.digest(user.getId(), Math.abs(authDto.getRoleCodes().toString().hashCode()), source);
+        String sessionId = SessionUtil
+                .digest(user.getId(), Math.abs(authDto.getRoleCodes().toString().hashCode()), source);
 
         Map<String, Object> expireMap = SystemConstant.getExpireTime(platform);
         Date expire = (Date) expireMap.get("date");
         Long redisExpire = Long.parseLong(String.valueOf(expireMap.get("redisExpire")));
-        TBSession tbSession = new TBSession(sessionId, String.valueOf(user.getId()), authDto.getRoleCodes().toString(), source, platform.name(), deviceId, ServletUtil.getRequest().getLocalAddr(), token, expire.getTime());
+        TBSession tbSession = new TBSession(sessionId, String.valueOf(user.getId()), authDto.getRoleCodes().toString(),
+                source, platform.name(), deviceId, ServletUtil.getRequest().getLocalAddr(), token, expire.getTime());
         redisUtil.setUserSession(sessionId, tbSession, redisExpire);
         //mq发送消息start
-        MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), platform.name(), tbSession, MqTagEnum.valueOf(platform.name()), tbSession.getId(), user.getLoginName());
+        MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), platform.name(), tbSession,
+                MqTagEnum.valueOf(platform.name()), tbSession.getId(), user.getLoginName());
         mqDtoService.assembleSendOneWayMsg(mqDto);
-        MqDto mqDtoLog = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.USER.name(), SystemOperationEnum.LOGIN, MqTagEnum.USER, String.valueOf(user.getId()), user.getLoginName());
+        MqDto mqDtoLog = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.USER.name(), SystemOperationEnum.LOGIN,
+                MqTagEnum.USER, String.valueOf(user.getId()), user.getLoginName());
         mqDtoService.assembleSendOneWayMsg(mqDtoLog);
         //mq发送消息end
         //测试
-//        String test = SignatureInfo.build(SignatureType.TOKEN, sessionId, token);
+        //        String test = SignatureInfo.build(SignatureType.TOKEN, sessionId, token);
         Map<String, Object> map = new HashMap<>();
         map.put(SystemConstant.ACCESS_TOKEN, token);
-//        map.put(SystemConstant.ACCESS_TOKEN, test);
+        //        map.put(SystemConstant.ACCESS_TOKEN, test);
         map.put(SystemConstant.ACCOUNT, user);
         map.put(SystemConstant.SESSION_ID, sessionId);
         map.put("roleCodes", authDto.getRoleCodes());
@@ -233,303 +242,303 @@ public class TBUserController {
         return ResultUtil.ok(map);
     }
 
-//    @ApiOperation(value = "es查询接口")
-//    @RequestMapping(value = "/websocketPush", method = RequestMethod.POST)
-//    public Result websocketPush(@RequestBody String message) throws IOException {
-//        TBUser tbUser = (TBUser) ServletUtil.getRequestAccount(request);
-//        WebSocketServer.sendInfo(message, String.valueOf(tbUser.getId()));
-//        return ResultUtil.ok(SystemConstant.SUCCESS);
-//    }
+    //    @ApiOperation(value = "es查询接口")
+    //    @RequestMapping(value = "/websocketPush", method = RequestMethod.POST)
+    //    public Result websocketPush(@RequestBody String message) throws IOException {
+    //        TBUser tbUser = (TBUser) ServletUtil.getRequestAccount(request);
+    //        WebSocketServer.sendInfo(message, String.valueOf(tbUser.getId()));
+    //        return ResultUtil.ok(SystemConstant.SUCCESS);
+    //    }
 
-//    @Resource
-//    TEExamActivityService teExamActivityService;
-//
-//    @Resource
-//    TEExamService teExamService;
-//
-//    @Resource
-//    TEStudentService teStudentService;
-//
-//    @Resource
-//    TEExamStudentService teExamStudentService;
-//
-//    @Resource
-//    TEExamCourseService teExamCourseService;
-//
-//    @Resource
-//    TEExamPaperService teExamPaperService;
-//
-//    @Value("${db.name}")
-//    String dbName;
-//
-//    @Resource
-//    MongoTemplate mongoTemplate;
-//
-//    @Resource
-//    ETEStudentService eteStudentService;
-//
-//    @Resource
-//    ETEStudentRepo eteStudentRepo;
+    //    @Resource
+    //    TEExamActivityService teExamActivityService;
+    //
+    //    @Resource
+    //    TEExamService teExamService;
+    //
+    //    @Resource
+    //    TEStudentService teStudentService;
+    //
+    //    @Resource
+    //    TEExamStudentService teExamStudentService;
+    //
+    //    @Resource
+    //    TEExamCourseService teExamCourseService;
+    //
+    //    @Resource
+    //    TEExamPaperService teExamPaperService;
+    //
+    //    @Value("${db.name}")
+    //    String dbName;
+    //
+    //    @Resource
+    //    MongoTemplate mongoTemplate;
+    //
+    //    @Resource
+    //    ETEStudentService eteStudentService;
+    //
+    //    @Resource
+    //    ETEStudentRepo eteStudentRepo;
 
-//    @ApiOperation(value = "es查询接口")
-//    @RequestMapping(value = "/es/list", method = RequestMethod.POST)
-//    @Transactional
-//    public Result esList() {
-////        eteStudentService.createIndex();
-////        List<ETEStudentEntity> list = new ArrayList<>();
-////        for (int i = 0; i < 10; i++) {
-////            //学生档案
-////            ETEStudentEntity eteStudentEntity = new ETEStudentEntity();
-////            eteStudentEntity.setId(Constants.idGen.next());
-////            eteStudentEntity.setOrgId(1L);
-////            eteStudentEntity.setIdentity("test" + i);
-////            eteStudentEntity.setPassword("123456");
-////            eteStudentEntity.setIdcardNumber(RandomStringUtils.randomAlphanumeric(18));
-////            eteStudentEntity.setMobileNumber(RandomStringUtils.randomNumeric(11));
-////            eteStudentEntity.setName("java" + i + RandomStringUtils.randomAlphanumeric(30));
-////            eteStudentEntity.setGender(1);
-////            eteStudentEntity.setBasePhotoPath("http://11111");
-////            eteStudentEntity.setCreateTime(new Date());
-////            list.add(eteStudentEntity);
-////        }
-////        eteStudentService.saveAll(list);
-//////        Iterator<ETEStudentEntity> iterator = eteStudentService.findAll();
-////        org.springframework.data.domain.Page<ETEStudentEntity> eteStudentEntityPage1 = (org.springframework.data.domain.Page<ETEStudentEntity>) eteStudentService.queryName("2");
-//////        List<ETEStudentEntity> eteStudentEntityList = eteStudentService.findByNameLike("java");
-////        org.springframework.data.domain.Page<ETEStudentEntity> eteStudentEntityPage2 = (org.springframework.data.domain.Page<ETEStudentEntity>) eteStudentService.queryMobileNumber("2");
-//////        Optional<ETEStudentEntity> eteStudentEntity = eteStudentRepo.findById(eteStudentEntityPage.getContent().get(0).getId());
-////        Map map = new HashMap();
-////        map.put(SystemConstant.RECORDS, eteStudentEntityPage1);
-////        map.put(SystemConstant.RECORDS + 2, eteStudentEntityPage2);
-//////        map.put("bean", eteStudentEntity.get());
-////        return ResultUtil.ok(map);
-//
-////        for (int i = 0; i < 5; i++) {
-//
-////        mqDtoService.assembleSendOneWayMsg("imTopic", "teacher", "老师发送的一条消息1", MqEnum.MESSAGE_LOG.name(), "1", "2");
-////        mqDtoService.assembleSendOneWayMsg("imTopic", "user", "用户发送的一条消息2", MqEnum.MESSAGE_LOG.name(), "1", "2");
-////        mqDtoService.assembleSendOneWayMsg("imTopic", "user", "学生发送的一条消息3", MqEnum.MESSAGE_LOG.name(), "1", "2");
-//        Map map = new HashMap();
-//        map.put("sendUserId", "10");
-//        map.put("toUserId", "20");
-//        map.put("model", MessageModel.BROADCASTING);
-////        map.put("model", MessageModel.CLUSTERING);
-//        MqDto mqDto = new MqDto("websocketImTopic", "im", "学生发送的一条消息4", MqEnum.MESSAGE_LOG, "1", map, "2");
-////        mqDtoService.assembleSendOneWayMsg("imTopic", "user", "学生发送的一条消息3", MqEnum.MESSAGE_LOG.name(), "1", "2");
-//        mqDtoService.assembleSendOneWayMsg(mqDto);
-//        //        }
-//        return ResultUtil.ok(SystemConstant.SUCCESS);
-//    }
+    //    @ApiOperation(value = "es查询接口")
+    //    @RequestMapping(value = "/es/list", method = RequestMethod.POST)
+    //    @Transactional
+    //    public Result esList() {
+    ////        eteStudentService.createIndex();
+    ////        List<ETEStudentEntity> list = new ArrayList<>();
+    ////        for (int i = 0; i < 10; i++) {
+    ////            //学生档案
+    ////            ETEStudentEntity eteStudentEntity = new ETEStudentEntity();
+    ////            eteStudentEntity.setId(Constants.idGen.next());
+    ////            eteStudentEntity.setOrgId(1L);
+    ////            eteStudentEntity.setIdentity("test" + i);
+    ////            eteStudentEntity.setPassword("123456");
+    ////            eteStudentEntity.setIdcardNumber(RandomStringUtils.randomAlphanumeric(18));
+    ////            eteStudentEntity.setMobileNumber(RandomStringUtils.randomNumeric(11));
+    ////            eteStudentEntity.setName("java" + i + RandomStringUtils.randomAlphanumeric(30));
+    ////            eteStudentEntity.setGender(1);
+    ////            eteStudentEntity.setBasePhotoPath("http://11111");
+    ////            eteStudentEntity.setCreateTime(new Date());
+    ////            list.add(eteStudentEntity);
+    ////        }
+    ////        eteStudentService.saveAll(list);
+    //////        Iterator<ETEStudentEntity> iterator = eteStudentService.findAll();
+    ////        org.springframework.data.domain.Page<ETEStudentEntity> eteStudentEntityPage1 = (org.springframework.data.domain.Page<ETEStudentEntity>) eteStudentService.queryName("2");
+    //////        List<ETEStudentEntity> eteStudentEntityList = eteStudentService.findByNameLike("java");
+    ////        org.springframework.data.domain.Page<ETEStudentEntity> eteStudentEntityPage2 = (org.springframework.data.domain.Page<ETEStudentEntity>) eteStudentService.queryMobileNumber("2");
+    //////        Optional<ETEStudentEntity> eteStudentEntity = eteStudentRepo.findById(eteStudentEntityPage.getContent().get(0).getId());
+    ////        Map map = new HashMap();
+    ////        map.put(SystemConstant.RECORDS, eteStudentEntityPage1);
+    ////        map.put(SystemConstant.RECORDS + 2, eteStudentEntityPage2);
+    //////        map.put("bean", eteStudentEntity.get());
+    ////        return ResultUtil.ok(map);
+    //
+    ////        for (int i = 0; i < 5; i++) {
+    //
+    ////        mqDtoService.assembleSendOneWayMsg("imTopic", "teacher", "老师发送的一条消息1", MqEnum.MESSAGE_LOG.name(), "1", "2");
+    ////        mqDtoService.assembleSendOneWayMsg("imTopic", "user", "用户发送的一条消息2", MqEnum.MESSAGE_LOG.name(), "1", "2");
+    ////        mqDtoService.assembleSendOneWayMsg("imTopic", "user", "学生发送的一条消息3", MqEnum.MESSAGE_LOG.name(), "1", "2");
+    //        Map map = new HashMap();
+    //        map.put("sendUserId", "10");
+    //        map.put("toUserId", "20");
+    //        map.put("model", MessageModel.BROADCASTING);
+    ////        map.put("model", MessageModel.CLUSTERING);
+    //        MqDto mqDto = new MqDto("websocketImTopic", "im", "学生发送的一条消息4", MqEnum.MESSAGE_LOG, "1", map, "2");
+    ////        mqDtoService.assembleSendOneWayMsg("imTopic", "user", "学生发送的一条消息3", MqEnum.MESSAGE_LOG.name(), "1", "2");
+    //        mqDtoService.assembleSendOneWayMsg(mqDto);
+    //        //        }
+    //        return ResultUtil.ok(SystemConstant.SUCCESS);
+    //    }
 
-//    @ApiOperation(value = "用户查询接口")
-//    @RequestMapping(value = "/list", method = RequestMethod.POST)
-//    @Transactional
-//    public Result list() {
-//        String tableName = "t_e_exam_activity_test1";
-//        Integer count = teExamActivityService.existTable(tableName, dbName);
-//        log.info("count:{}", count);
-//        if (count == 0) {
-//            teExamActivityService.createNewTable(tableName);
-//        }
-//        //学生档案
-//        TEStudent teStudent = new TEStudent();
-//        teStudent.setId(Constants.idGen.next());
-//        teStudent.setOrgId(1L);
-//        teStudent.setIdentity(RandomStringUtils.randomAlphanumeric(30));
-//        teStudent.setPassword("123456");
-//        teStudent.setIdcardNumber(RandomStringUtils.randomAlphanumeric(18));
-//        teStudent.setMobileNumber(RandomStringUtils.randomNumeric(11));
-//        teStudent.setName("aaa");
-//        teStudent.setGender(1);
-//        teStudent.setBasePhotoPath("http://11111");
-//        teStudent.setEnable(1);
-//        teStudentService.save(teStudent);
-//
-//        //考试批次
-//        TEExam teExam = new TEExam();
-//        teExam.setId(Constants.idGen.next());
-//        teExam.setOrgId(1L);
-//        teExam.setCode(RandomStringUtils.randomAlphanumeric(20));
-//        teExam.setName("123");
-//        teExam.setTag("test1");
-//        teExam.setStartTime(new Date());
-//        teExam.setEndTime(new Date());
-//        teExam.setStatus(0);
-//        teExam.setShortCode("123456");
-//        teExam.setPrepareSeconds(30);
-//        teExam.setMinDurationSeconds(30);
-//        teExam.setPreNotice("99999");
-//        teExam.setPreNoticeStaySeconds(30);
-//        teExam.setPostNotice("88888");
-//        teExam.setExamCount(5);
-//        teExam.setBreakResumeCount(3);
-//        teExam.setBreakExpireSeconds(30);
-//        teExam.setCameraPhotoUpload(1);
-//        teExam.setReexamAuditing(1);
-//        teExam.setShowObjectiveScore(1);
-//        teExam.setMode(0);
-//        teExam.setEnable(1);
-//        teExam.setArchived(0);
-//        teExam.setOpeningSeconds(30);
-//        teExam.setMaxDurationSeconds(30);
-//        teExam.setForceFinish(1);
-//        teExam.setEntryAuthenticationPolicy(1);
-//        teExam.setInProcessFaceVerify(1);
-//        teExam.setInProcessFaceStrangerIgnore(1);
-//        teExam.setInProcessLivenessVerify(1);
-//        teExam.setInProcessLivenessIntervalSeconds(30);
-//        teExam.setInProcessLivenessJudgePolicy(1);
-//        teExam.setRecordSelectStrategy(1);
-//        teExam.setEnableIpLimit(1);
-//        teExam.setIpAllow("1");
-//        teExam.setScoreStatus(1);
-//        teExamService.save(teExam);
-//
-//        //考试场次
-//        TEExamActivity teExamActivity = new TEExamActivity();
-//        teExamActivity.setId(Constants.idGen.next());
-//        teExamActivity.setExamId(teExam.getId());
-//        teExamActivity.setCode(RandomStringUtils.randomAlphanumeric(20));
-//        teExamActivity.setPrepareSeconds(30);
-//        teExamActivity.setMaxDurationSeconds(30);
-//        teExamActivity.setEnable(1);
-//        teExamActivity.setOpeningSeconds(30);
-//        teExamActivity.setStartTime(new Date());
-//        teExamActivity.setFinishTime(new Date());
-//        teExamActivity.setCreateTime(new Date());
-//        teExamActivityService.insertInfo(tableName, teExamActivity);
-//
-//        //考试科目
-//        TEExamCourse teExamCourse = new TEExamCourse();
-//        teExamCourse.setId(Constants.idGen.next());
-//        teExamCourse.setExamId(teExam.getId());
-//        teExamCourse.setCourseCode(RandomStringUtils.randomAlphanumeric(5));
-//        teExamCourse.setCourseName("测试科目1");
-//        teExamCourse.setObjectiveShuffle(1);
-//        teExamCourse.setOptionShuffle(1);
-//        teExamCourse.setPaperCount(1);
-//        teExamCourse.setHasAnswer(1);
-//        teExamCourse.setAudioPlayCount(1);
-//        teExamCourseService.save(teExamCourse);
-//
-//        //考试试卷
-//        TEExamPaper teExamPaper = new TEExamPaper();
-//        teExamPaper.setId(Constants.idGen.next());
-//        teExamPaper.setName("test1");
-//        teExamPaper.setTotalScore(100D);
-//        teExamPaper.setPaperPath("123");
-//        teExamPaper.setDecryptSecret("345");
-//        teExamPaper.setEncryptMode(1);
-//        teExamPaper.setNeedVoiceAnswer(1);
-//        teExamPaper.setExamId(teExam.getId());
-//        teExamPaper.setCode("test1");
-//        teExamPaper.setCourseCode(teExamCourse.getCourseCode());
-//        teExamPaper.setAnswerPath("123");
-//        teExamPaper.setHasAudio(1);
-//        teExamPaper.setWeight(1D);
-//        teExamPaper.setAudioPlayCount(1);
-//        teExamPaperService.save(teExamPaper);
-//
-//        //考生
-//        TEExamStudent teExamStudent = new TEExamStudent();
-//        teExamStudent.setId(Constants.idGen.next());
-//        teExamStudent.setExamId(teExam.getId());
-//        teExamStudent.setExamActivityId(teExamActivity.getId());
-//        teExamStudent.setStudentId(teStudent.getId());
-//        teExamStudent.setCourseCode(teExamCourse.getCourseCode());
-//        teExamStudent.setRoomCode("1");
-//        teExamStudent.setIdentity(RandomStringUtils.randomAlphanumeric(20));
-//        teExamStudent.setName("132");
-//        Map stuMap = new HashMap();
-//        stuMap.put("examTest1", "aaa");
-//        stuMap.put("examTest2", "bbb");
-//        teExamStudent.setParameter(JacksonUtil.parseJson(stuMap));
-//        teExamStudent.setLeftExamCount(1);
-//        teExamStudent.setRoomName("test1");
-//        teExamStudent.setEnable(1);
-//        teExamStudentService.save(teExamStudent);
-//
-//        //todo
-////        Gson gson = new Gson();
-////        MTEStudentEntity mteStudentEntity = gson.fromJson(gson.toJson(teStudent), MTEStudentEntity.class);
-////        MTEExamEntity mteExamEntity = gson.fromJson(gson.toJson(teExam), MTEExamEntity.class);
-////        MTEExamActivityEntity mteExamActivityEntity = gson.fromJson(gson.toJson(teExamActivity), MTEExamActivityEntity.class);
-////        MTEExamPaperEntity mteExamPaperEntity = gson.fromJson(gson.toJson(teExamPaper), MTEExamPaperEntity.class);
-////        MTEExamCourseEntity mteExamCourseEntity = gson.fromJson(gson.toJson(teExamCourse), MTEExamCourseEntity.class);
-////        MTEExamStudentEntity mteExamStudentEntity = gson.fromJson(gson.toJson(teExamStudent), MTEExamStudentEntity.class);
-//        //todo
-//
-////        List list = Arrays.asList(mteExamPaperEntity);
-////        mteExamCourseEntity.setMteExamPaperEntityList(list);
-//
-////        list = Arrays.asList(mteExamActivityEntity);
-////        mteExamEntity.setMteExamActivityEntityList(list);
-//
-////        list = Arrays.asList(mteExamCourseEntity);
-////        mteExamStudentEntity.setMteExamEntity(mteExamEntity);
-////        mteExamStudentEntity.setMteExamActivityEntity(mteExamActivityEntity);
-////        mteExamStudentEntity.setMteStudentEntity(mteStudentEntity);
-////        mteExamStudentEntity.setMteExamCourseEntityList(list);
-//
-//        //todo
-////        mongoTemplate.save(mteStudentEntity);
-////        mongoTemplate.save(mteExamEntity);
-////        mongoTemplate.save(mteExamActivityEntity);
-////        mongoTemplate.save(mteExamPaperEntity);
-////        mongoTemplate.save(mteExamCourseEntity);
-////        mongoTemplate.save(mteExamStudentEntity);
-////
-////        IPage<TEExamActivity> map = teExamActivityService.selectListPage(new Page<>(0, 10), tableName);
-////        log.info("mysql map:{}", JacksonUtil.parseJson(map));
-////
-////        Query query = new Query();
-//////        query.addCriteria(Criteria.where("questionId").in(setQuestionId).andOperator(Criteria.where("examRecordDataId").is(examSessionInfo.getExamRecordDataId())));
-////        query.skip((1 - 1) * 10).limit(10);//设置起始数和查询条数
-////        List<MTEStudentEntity> mteStudentEntityList = mongoTemplate.find(query, MTEStudentEntity.class);
-////        log.info("mongodb mteStudentEntityList:{}", JacksonUtil.parseJson(mteStudentEntityList));
-//////        List<MTEStudentEntity> mteStudentEntityList = mongoTemplate.findAll(MTEStudentEntity.class);
-//////        log.info("mongodb mteStudentEntityList:{}", JacksonUtil.parseJson(mteStudentEntityList));
-////
-////        List<MTEExamEntity> mteExamEntityList = mongoTemplate.findAll(MTEExamEntity.class);
-////        log.info("mongodb mteExamEntityList:{}", JacksonUtil.parseJson(mteExamEntityList));
-////
-////        List<MTEExamActivityEntity> mteExamActivityEntityList = mongoTemplate.findAll(MTEExamActivityEntity.class);
-////        log.info("mongodb mteExamActivityEntityList:{}", JacksonUtil.parseJson(mteExamActivityEntityList));
-//////        List<TEExamActivity> ps = new ArrayList<>();
-//////        mteExamActivityEntityList.forEach(s -> {
-//////            TEExamActivity t = gson.fromJson(gson.toJson(s), TEExamActivity.class);
-//////            ps.add(t);
-//////        });
-////////      List<TEExamActivity> ps = gson.fromJson(JacksonUtil.parseJson(mteExamActivityEntityList), new TypeToken<List<TEExamActivity>>(){}.getType());
-//////        map.setRecords(ps);
-////
-////        List<MTEExamPaperEntity> mteExamPaperEntityList = mongoTemplate.findAll(MTEExamPaperEntity.class);
-////        log.info("mongodb mteExamPaperEntityList:{}", JacksonUtil.parseJson(mteExamPaperEntityList));
-////
-////        List<MTEExamCourseEntity> mteExamCourseEntityList = mongoTemplate.findAll(MTEExamCourseEntity.class);
-////        log.info("mongodb mteExamCourseEntityList:{}", JacksonUtil.parseJson(mteExamCourseEntityList));
-////
-////        List<MTEExamStudentEntity> mteExamStudentEntityList = mongoTemplate.findAll(MTEExamStudentEntity.class);
-////        log.info("mongodb mteExamStudentEntityList:{}", JacksonUtil.parseJson(mteExamStudentEntityList));
-////        List<TEExamStudent> ps = new ArrayList<>();
-////        mteExamStudentEntityList.forEach(s -> {
-////            TEExamStudent t = gson.fromJson(gson.toJson(s), TEExamStudent.class);
-////            ps.add(t);
-////        });
-////        List<MTEExamStudentEntity> ps1 = new ArrayList<>();
-////        List<TEExamStudent> list1 = teExamStudentService.list();
-////        list1.forEach(s -> {
-////            MTEExamStudentEntity t = gson.fromJson(gson.toJson(s), MTEExamStudentEntity.class);
-////            ps1.add(t);
-////        });
-//        //todo
-////        teExamActivityService.dropTable(tableName);
-//        return ResultUtil.ok(SystemConstant.SUCCESS);
-//    }
+    //    @ApiOperation(value = "用户查询接口")
+    //    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    //    @Transactional
+    //    public Result list() {
+    //        String tableName = "t_e_exam_activity_test1";
+    //        Integer count = teExamActivityService.existTable(tableName, dbName);
+    //        log.info("count:{}", count);
+    //        if (count == 0) {
+    //            teExamActivityService.createNewTable(tableName);
+    //        }
+    //        //学生档案
+    //        TEStudent teStudent = new TEStudent();
+    //        teStudent.setId(Constants.idGen.next());
+    //        teStudent.setOrgId(1L);
+    //        teStudent.setIdentity(RandomStringUtils.randomAlphanumeric(30));
+    //        teStudent.setPassword("123456");
+    //        teStudent.setIdcardNumber(RandomStringUtils.randomAlphanumeric(18));
+    //        teStudent.setMobileNumber(RandomStringUtils.randomNumeric(11));
+    //        teStudent.setName("aaa");
+    //        teStudent.setGender(1);
+    //        teStudent.setBasePhotoPath("http://11111");
+    //        teStudent.setEnable(1);
+    //        teStudentService.save(teStudent);
+    //
+    //        //考试批次
+    //        TEExam teExam = new TEExam();
+    //        teExam.setId(Constants.idGen.next());
+    //        teExam.setOrgId(1L);
+    //        teExam.setCode(RandomStringUtils.randomAlphanumeric(20));
+    //        teExam.setName("123");
+    //        teExam.setTag("test1");
+    //        teExam.setStartTime(new Date());
+    //        teExam.setEndTime(new Date());
+    //        teExam.setStatus(0);
+    //        teExam.setShortCode("123456");
+    //        teExam.setPrepareSeconds(30);
+    //        teExam.setMinDurationSeconds(30);
+    //        teExam.setPreNotice("99999");
+    //        teExam.setPreNoticeStaySeconds(30);
+    //        teExam.setPostNotice("88888");
+    //        teExam.setExamCount(5);
+    //        teExam.setBreakResumeCount(3);
+    //        teExam.setBreakExpireSeconds(30);
+    //        teExam.setCameraPhotoUpload(1);
+    //        teExam.setReexamAuditing(1);
+    //        teExam.setShowObjectiveScore(1);
+    //        teExam.setMode(0);
+    //        teExam.setEnable(1);
+    //        teExam.setArchived(0);
+    //        teExam.setOpeningSeconds(30);
+    //        teExam.setMaxDurationSeconds(30);
+    //        teExam.setForceFinish(1);
+    //        teExam.setEntryAuthenticationPolicy(1);
+    //        teExam.setInProcessFaceVerify(1);
+    //        teExam.setInProcessFaceStrangerIgnore(1);
+    //        teExam.setInProcessLivenessVerify(1);
+    //        teExam.setInProcessLivenessIntervalSeconds(30);
+    //        teExam.setInProcessLivenessJudgePolicy(1);
+    //        teExam.setRecordSelectStrategy(1);
+    //        teExam.setEnableIpLimit(1);
+    //        teExam.setIpAllow("1");
+    //        teExam.setScoreStatus(1);
+    //        teExamService.save(teExam);
+    //
+    //        //考试场次
+    //        TEExamActivity teExamActivity = new TEExamActivity();
+    //        teExamActivity.setId(Constants.idGen.next());
+    //        teExamActivity.setExamId(teExam.getId());
+    //        teExamActivity.setCode(RandomStringUtils.randomAlphanumeric(20));
+    //        teExamActivity.setPrepareSeconds(30);
+    //        teExamActivity.setMaxDurationSeconds(30);
+    //        teExamActivity.setEnable(1);
+    //        teExamActivity.setOpeningSeconds(30);
+    //        teExamActivity.setStartTime(new Date());
+    //        teExamActivity.setFinishTime(new Date());
+    //        teExamActivity.setCreateTime(new Date());
+    //        teExamActivityService.insertInfo(tableName, teExamActivity);
+    //
+    //        //考试科目
+    //        TEExamCourse teExamCourse = new TEExamCourse();
+    //        teExamCourse.setId(Constants.idGen.next());
+    //        teExamCourse.setExamId(teExam.getId());
+    //        teExamCourse.setCourseCode(RandomStringUtils.randomAlphanumeric(5));
+    //        teExamCourse.setCourseName("测试科目1");
+    //        teExamCourse.setObjectiveShuffle(1);
+    //        teExamCourse.setOptionShuffle(1);
+    //        teExamCourse.setPaperCount(1);
+    //        teExamCourse.setHasAnswer(1);
+    //        teExamCourse.setAudioPlayCount(1);
+    //        teExamCourseService.save(teExamCourse);
+    //
+    //        //考试试卷
+    //        TEExamPaper teExamPaper = new TEExamPaper();
+    //        teExamPaper.setId(Constants.idGen.next());
+    //        teExamPaper.setName("test1");
+    //        teExamPaper.setTotalScore(100D);
+    //        teExamPaper.setPaperPath("123");
+    //        teExamPaper.setDecryptSecret("345");
+    //        teExamPaper.setEncryptMode(1);
+    //        teExamPaper.setNeedVoiceAnswer(1);
+    //        teExamPaper.setExamId(teExam.getId());
+    //        teExamPaper.setCode("test1");
+    //        teExamPaper.setCourseCode(teExamCourse.getCourseCode());
+    //        teExamPaper.setAnswerPath("123");
+    //        teExamPaper.setHasAudio(1);
+    //        teExamPaper.setWeight(1D);
+    //        teExamPaper.setAudioPlayCount(1);
+    //        teExamPaperService.save(teExamPaper);
+    //
+    //        //考生
+    //        TEExamStudent teExamStudent = new TEExamStudent();
+    //        teExamStudent.setId(Constants.idGen.next());
+    //        teExamStudent.setExamId(teExam.getId());
+    //        teExamStudent.setExamActivityId(teExamActivity.getId());
+    //        teExamStudent.setStudentId(teStudent.getId());
+    //        teExamStudent.setCourseCode(teExamCourse.getCourseCode());
+    //        teExamStudent.setRoomCode("1");
+    //        teExamStudent.setIdentity(RandomStringUtils.randomAlphanumeric(20));
+    //        teExamStudent.setName("132");
+    //        Map stuMap = new HashMap();
+    //        stuMap.put("examTest1", "aaa");
+    //        stuMap.put("examTest2", "bbb");
+    //        teExamStudent.setParameter(JacksonUtil.parseJson(stuMap));
+    //        teExamStudent.setLeftExamCount(1);
+    //        teExamStudent.setRoomName("test1");
+    //        teExamStudent.setEnable(1);
+    //        teExamStudentService.save(teExamStudent);
+    //
+    //        //todo
+    ////        Gson gson = new Gson();
+    ////        MTEStudentEntity mteStudentEntity = gson.fromJson(gson.toJson(teStudent), MTEStudentEntity.class);
+    ////        MTEExamEntity mteExamEntity = gson.fromJson(gson.toJson(teExam), MTEExamEntity.class);
+    ////        MTEExamActivityEntity mteExamActivityEntity = gson.fromJson(gson.toJson(teExamActivity), MTEExamActivityEntity.class);
+    ////        MTEExamPaperEntity mteExamPaperEntity = gson.fromJson(gson.toJson(teExamPaper), MTEExamPaperEntity.class);
+    ////        MTEExamCourseEntity mteExamCourseEntity = gson.fromJson(gson.toJson(teExamCourse), MTEExamCourseEntity.class);
+    ////        MTEExamStudentEntity mteExamStudentEntity = gson.fromJson(gson.toJson(teExamStudent), MTEExamStudentEntity.class);
+    //        //todo
+    //
+    ////        List list = Arrays.asList(mteExamPaperEntity);
+    ////        mteExamCourseEntity.setMteExamPaperEntityList(list);
+    //
+    ////        list = Arrays.asList(mteExamActivityEntity);
+    ////        mteExamEntity.setMteExamActivityEntityList(list);
+    //
+    ////        list = Arrays.asList(mteExamCourseEntity);
+    ////        mteExamStudentEntity.setMteExamEntity(mteExamEntity);
+    ////        mteExamStudentEntity.setMteExamActivityEntity(mteExamActivityEntity);
+    ////        mteExamStudentEntity.setMteStudentEntity(mteStudentEntity);
+    ////        mteExamStudentEntity.setMteExamCourseEntityList(list);
+    //
+    //        //todo
+    ////        mongoTemplate.save(mteStudentEntity);
+    ////        mongoTemplate.save(mteExamEntity);
+    ////        mongoTemplate.save(mteExamActivityEntity);
+    ////        mongoTemplate.save(mteExamPaperEntity);
+    ////        mongoTemplate.save(mteExamCourseEntity);
+    ////        mongoTemplate.save(mteExamStudentEntity);
+    ////
+    ////        IPage<TEExamActivity> map = teExamActivityService.selectListPage(new Page<>(0, 10), tableName);
+    ////        log.info("mysql map:{}", JacksonUtil.parseJson(map));
+    ////
+    ////        Query query = new Query();
+    //////        query.addCriteria(Criteria.where("questionId").in(setQuestionId).andOperator(Criteria.where("examRecordDataId").is(examSessionInfo.getExamRecordDataId())));
+    ////        query.skip((1 - 1) * 10).limit(10);//设置起始数和查询条数
+    ////        List<MTEStudentEntity> mteStudentEntityList = mongoTemplate.find(query, MTEStudentEntity.class);
+    ////        log.info("mongodb mteStudentEntityList:{}", JacksonUtil.parseJson(mteStudentEntityList));
+    //////        List<MTEStudentEntity> mteStudentEntityList = mongoTemplate.findAll(MTEStudentEntity.class);
+    //////        log.info("mongodb mteStudentEntityList:{}", JacksonUtil.parseJson(mteStudentEntityList));
+    ////
+    ////        List<MTEExamEntity> mteExamEntityList = mongoTemplate.findAll(MTEExamEntity.class);
+    ////        log.info("mongodb mteExamEntityList:{}", JacksonUtil.parseJson(mteExamEntityList));
+    ////
+    ////        List<MTEExamActivityEntity> mteExamActivityEntityList = mongoTemplate.findAll(MTEExamActivityEntity.class);
+    ////        log.info("mongodb mteExamActivityEntityList:{}", JacksonUtil.parseJson(mteExamActivityEntityList));
+    //////        List<TEExamActivity> ps = new ArrayList<>();
+    //////        mteExamActivityEntityList.forEach(s -> {
+    //////            TEExamActivity t = gson.fromJson(gson.toJson(s), TEExamActivity.class);
+    //////            ps.add(t);
+    //////        });
+    ////////      List<TEExamActivity> ps = gson.fromJson(JacksonUtil.parseJson(mteExamActivityEntityList), new TypeToken<List<TEExamActivity>>(){}.getType());
+    //////        map.setRecords(ps);
+    ////
+    ////        List<MTEExamPaperEntity> mteExamPaperEntityList = mongoTemplate.findAll(MTEExamPaperEntity.class);
+    ////        log.info("mongodb mteExamPaperEntityList:{}", JacksonUtil.parseJson(mteExamPaperEntityList));
+    ////
+    ////        List<MTEExamCourseEntity> mteExamCourseEntityList = mongoTemplate.findAll(MTEExamCourseEntity.class);
+    ////        log.info("mongodb mteExamCourseEntityList:{}", JacksonUtil.parseJson(mteExamCourseEntityList));
+    ////
+    ////        List<MTEExamStudentEntity> mteExamStudentEntityList = mongoTemplate.findAll(MTEExamStudentEntity.class);
+    ////        log.info("mongodb mteExamStudentEntityList:{}", JacksonUtil.parseJson(mteExamStudentEntityList));
+    ////        List<TEExamStudent> ps = new ArrayList<>();
+    ////        mteExamStudentEntityList.forEach(s -> {
+    ////            TEExamStudent t = gson.fromJson(gson.toJson(s), TEExamStudent.class);
+    ////            ps.add(t);
+    ////        });
+    ////        List<MTEExamStudentEntity> ps1 = new ArrayList<>();
+    ////        List<TEExamStudent> list1 = teExamStudentService.list();
+    ////        list1.forEach(s -> {
+    ////            MTEExamStudentEntity t = gson.fromJson(gson.toJson(s), MTEExamStudentEntity.class);
+    ////            ps1.add(t);
+    ////        });
+    //        //todo
+    ////        teExamActivityService.dropTable(tableName);
+    //        return ResultUtil.ok(SystemConstant.SUCCESS);
+    //    }
 
     @ApiOperation(value = "登出接口")
     @RequestMapping(value = "/logout", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     public Result logout() throws NoSuchAlgorithmException {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         TBSession tbSession = (TBSession) ServletUtil.getRequestSession();
@@ -541,7 +550,8 @@ public class TBUserController {
         //循环检查该用户下其他平台是否存在session,不存在则删除用户缓存和鉴权缓存
         boolean delete = true;
         for (Source s : Source.values()) {
-            String sessionId = SessionUtil.digest(tbUser.getId(), Math.abs(authDto.getRoleCodes().toString().hashCode()), s.name());
+            String sessionId = SessionUtil
+                    .digest(tbUser.getId(), Math.abs(authDto.getRoleCodes().toString().hashCode()), s.name());
             if (Objects.nonNull(redisUtil.getUserSession(sessionId))) {
                 delete = false;
                 break;
@@ -552,7 +562,8 @@ public class TBUserController {
             cacheService.removeAccountCache(tbUser.getId());
         }
         //mq发送消息start
-        MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.USER.name(), SystemOperationEnum.LOGOUT, MqTagEnum.USER, String.valueOf(tbUser.getId()), tbUser.getLoginName());
+        MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.USER.name(), SystemOperationEnum.LOGOUT,
+                MqTagEnum.USER, String.valueOf(tbUser.getId()), tbUser.getLoginName());
         mqDtoService.assembleSendOneWayMsg(mqDto);
         //mq发送消息end
         return ResultUtil.ok(Collections.singletonMap(SystemConstant.SUCCESS, true));
@@ -561,10 +572,17 @@ public class TBUserController {
     //    @CachePut(value = "user_cache", key = "'userCacheQuery'")
     @ApiOperation(value = "用户查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = TBUserDto.class)})
-    public Result query(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "登录名", required = false) @RequestParam(required = false) String loginName, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "角色", required = false) @RequestParam(required = false) String roleCode, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+    @ApiResponses({ @ApiResponse(code = 200, message = "用户信息", response = TBUserDto.class) })
+    public Result query(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long id,
+            @ApiParam(value = "登录名", required = false) @RequestParam(required = false) String loginName,
+            @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name,
+            @ApiParam(value = "角色", required = false) @RequestParam(required = false) String roleCode,
+            @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable,
+            @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
+            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
-        IPage<TBUserDto> tbUserIPage = tbUserService.userQuery(new Page<>(pageNumber, pageSize), id, loginName, name, roleCode, enable, tbUser.getOrgId());
+        IPage<TBUserDto> tbUserIPage = tbUserService
+                .userQuery(new Page<>(pageNumber, pageSize), id, loginName, name, roleCode, enable, tbUser.getOrgId());
         tbUserIPage.getRecords().forEach(s -> {
             if (Objects.nonNull(s.getRoleNameStr())) {
                 s.setRoleName(Arrays.asList(s.getRoleNameStr().split(",")));
@@ -579,7 +597,7 @@ public class TBUserController {
     //    @CacheEvict(value = "user_cache", key = "'userCacheQuery'")
     @ApiOperation(value = "用户新增/编辑接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     @Transactional
     public Result save(@ApiJsonObject(name = "userSave", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "新增不需要主键"),
@@ -589,8 +607,7 @@ public class TBUserController {
             @ApiJsonProperty(key = "password", description = "密码，新增必须"),
             @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "是否启用"),
             @ApiJsonProperty(key = "mobileNumber", description = "手机号"),
-            @ApiJsonProperty(key = "roleCode", description = "角色")
-    }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter) {
+            @ApiJsonProperty(key = "roleCode", description = "角色") }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter) {
         if (Objects.isNull(mapParameter)) {
             throw new BusinessException(ExceptionResultEnum.USER_INFO_IS_NULL);
         }
@@ -611,7 +628,7 @@ public class TBUserController {
                 throw new BusinessException("暂不支持多个角色");
             }
             if (Objects.isNull(tbUser.getId())) {
-                tbUser.setId(Constants.idGen.next());
+                tbUser.setId(uidUtil.getId());
                 tbUser.setOrgId(orgId);
                 tbUser.setCreateId(loginUser.getId());
                 if (Objects.nonNull(roleSet) && roleSet.size() > 0) {
@@ -640,7 +657,9 @@ public class TBUserController {
                 AuthDto authDto = (AuthDto) redisUtil.get(SystemConstant.userOauth + "::" + tbUser.getId());
                 if (Objects.nonNull(authDto)) {
                     for (Source s : Source.values()) {
-                        String sessionId = SessionUtil.digest(tbUser.getId(), Math.abs(authDto.getRoleCodes().toString().hashCode()), s.name());
+                        String sessionId = SessionUtil
+                                .digest(tbUser.getId(), Math.abs(authDto.getRoleCodes().toString().hashCode()),
+                                        s.name());
                         redisUtil.deleteUserSession(sessionId);
                     }
                 }
@@ -651,8 +670,10 @@ public class TBUserController {
             log.error("请求出错", e);
             if (e instanceof DuplicateKeyException) {
                 String errorColumn = e.getCause().toString();
-                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length()).replaceAll("'", "");
-                throw new BusinessException("机构id[" + orgId + "]下的" + FieldUniqueEnum.convertToCode(columnStr) + "数据不允许重复插入");
+                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length())
+                        .replaceAll("'", "");
+                throw new BusinessException(
+                        "机构id[" + orgId + "]下的" + FieldUniqueEnum.convertToCode(columnStr) + "数据不允许重复插入");
             } else if (e instanceof BusinessException) {
                 throw new BusinessException(e.getMessage());
             } else {
@@ -664,7 +685,7 @@ public class TBUserController {
 
     @ApiOperation(value = "获取短信验证码接口")
     @RequestMapping(value = "/getVerifyCode", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"verifyCode\":123456}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"verifyCode\":123456}", response = Result.class) })
     public Result getVerifyCode(@ApiParam(value = "登录名", required = true) @RequestParam String loginName) {
         if (Objects.isNull(loginName) || Objects.equals(loginName, "")) {
             throw new BusinessException(ExceptionResultEnum.LOGIN_NAME_IS_NULL);
@@ -674,7 +695,7 @@ public class TBUserController {
 
     @ApiOperation(value = "获取短信验证码接口")
     @RequestMapping(value = "/validate/verifyCode", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     public Result validateVerifyCode(@ApiParam(value = "验证码", required = true) @RequestParam String verifyCode) {
         if (Objects.isNull(verifyCode) || Objects.equals(verifyCode, "")) {
             throw new BusinessException(ExceptionResultEnum.VERIFYCODE_IS_NULL);
@@ -684,7 +705,7 @@ public class TBUserController {
 
     @ApiOperation(value = "二次验证获取短信验证码接口")
     @RequestMapping(value = "/validate/getVerifyCode", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     public Result validateGetVerifyCode() {
         return ResultUtil.ok(Collections.singletonMap(SystemConstant.SUCCESS, true));
     }
@@ -692,11 +713,10 @@ public class TBUserController {
     @ApiOperation(value = "用户停用/启用接口")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     @Transactional
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     public Result enableUser(@ApiJsonObject(name = "enableUser", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "用户id"),
-            @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "停用/启用")
-    }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> user) {
+            @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "停用/启用") }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> user) {
         if (Objects.isNull(user.get("id")) || Objects.equals(user.get("id"), "")) {
             throw new BusinessException(ExceptionResultEnum.USER_ID_IS_NULL);
         }
@@ -718,12 +738,11 @@ public class TBUserController {
 
     @ApiOperation(value = "用户修改密码接口")
     @RequestMapping(value = "/updatePwd", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     @Transactional
     public Result userUpdatePwd(@ApiJsonObject(name = "userUpdatePwd", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "用户ID"),
-            @ApiJsonProperty(key = "password", description = "新密码")
-    }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter) {
+            @ApiJsonProperty(key = "password", description = "新密码") }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter) {
         if (Objects.isNull(mapParameter.get("id")) || Objects.equals(mapParameter.get("id"), "")) {
             throw new BusinessException(ExceptionResultEnum.USER_ID_IS_NULL);
         }

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

@@ -16,7 +16,7 @@ import com.qmth.themis.business.service.TEExamService;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.business.util.ServletUtil;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
@@ -42,6 +42,7 @@ import java.util.*;
 @RestController
 @RequestMapping("/${prefix.url.admin}/activity")
 public class TEExamActivityController {
+
     private final static Logger log = LoggerFactory.getLogger(TEExamActivityController.class);
 
     @Resource
@@ -56,11 +57,15 @@ public class TEExamActivityController {
     @Resource
     RedisUtil redisUtil;
 
+    @Resource
+    UidUtil uidUtil;
+
     @ApiOperation(value = "考试场次修改/新增接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @Transactional
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    public Result save(@ApiParam(value = "考试场次信息", required = true) @RequestBody List<TEExamActivity> teExamActivityList) {
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
+    public Result save(
+            @ApiParam(value = "考试场次信息", required = true) @RequestBody List<TEExamActivity> teExamActivityList) {
         if (Objects.isNull(teExamActivityList) || teExamActivityList.size() == 0) {
             throw new BusinessException(ExceptionResultEnum.EXAM_INFO_IS_NULL);
         }
@@ -71,7 +76,7 @@ public class TEExamActivityController {
                 if (Objects.nonNull(s.getId())) {
                     s.setUpdateId(tbUser.getId());
                 } else {
-                    s.setId(Constants.idGen.next());
+                    s.setId(uidUtil.getId());
                     s.setCreateId(tbUser.getId());
                     s.setCode(String.valueOf(redisUtil.getRedisActivityCodeSequence(s.getExamId())));
                 }
@@ -79,7 +84,8 @@ public class TEExamActivityController {
             });
             examId = teExamActivityList.get(0).getExamId();
             TEExam teExam = teExamService.getById(teExamActivityList.get(0).getExamId());
-            if (Objects.nonNull(teExam.getMonitorStatus()) && Objects.equals(teExam.getMonitorStatus(), InvigilateMonitorStatusEnum.FINISHED)) {
+            if (Objects.nonNull(teExam.getMonitorStatus()) && Objects
+                    .equals(teExam.getMonitorStatus(), InvigilateMonitorStatusEnum.FINISHED)) {
                 throw new BusinessException("监考结束的考试场次不可以修改");
             }
             for (TEExamActivity ac : teExamActivityList) {
@@ -90,19 +96,25 @@ public class TEExamActivityController {
                 Map<String, Object> prop = new HashMap<>();
                 prop.put("oper", "insert");
                 prop.put("exam", teExam);
-                MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_ACTIVITY.name(), JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY, String.valueOf(teExam.getId()), prop, tbUser.getName());
+                MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_ACTIVITY.name(),
+                        JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
+                        String.valueOf(teExam.getId()), prop, tbUser.getName());
                 mqDtoService.assembleSendOneWayMsg(mqDto);
                 //新增quartz任务,发送mq消息end
             }
         } catch (Exception e) {
             log.error("请求出错", e);
-            if (Objects.nonNull(examId) && Objects.nonNull(teExamActivityList) && (Objects.nonNull(teExamActivityList) && teExamActivityList.size() > 0 && Objects.nonNull(teExamActivityList.get(0)))) {
-                redisUtil.setRedisActivityCodeSequence(examId, Integer.parseInt(teExamActivityList.get(0).getCode()) - 1);
+            if (Objects.nonNull(examId) && Objects.nonNull(teExamActivityList) && (Objects.nonNull(teExamActivityList)
+                    && teExamActivityList.size() > 0 && Objects.nonNull(teExamActivityList.get(0)))) {
+                redisUtil.setRedisActivityCodeSequence(examId,
+                        Integer.parseInt(teExamActivityList.get(0).getCode()) - 1);
             }
             if (e instanceof DuplicateKeyException) {
                 String errorColumn = e.getCause().toString();
-                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length()).replaceAll("'", "");
-                throw new BusinessException("机构id[" + teExamActivityList.get(0).getExamId() + "]下的" + FieldUniqueEnum.convertToCode(columnStr) + "数据不允许重复插入");
+                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length())
+                        .replaceAll("'", "");
+                throw new BusinessException("机构id[" + teExamActivityList.get(0).getExamId() + "]下的" + FieldUniqueEnum
+                        .convertToCode(columnStr) + "数据不允许重复插入");
             } else if (e instanceof BusinessException) {
                 throw new BusinessException(e.getMessage());
             } else {
@@ -114,8 +126,15 @@ public class TEExamActivityController {
 
     @ApiOperation(value = "考试场次查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考试场次信息", response = TEExamActivity.class)})
-    public Result query(@ApiParam(value = "主键", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long examId, @ApiParam(value = "考试场次编码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "开始日期", required = false) @RequestParam(required = false) Long startDate, @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) Long finishDate, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        return ResultUtil.ok(teExamActivityService.examActivityQuery(new Page<>(pageNumber, pageSize), id, examId, code, startDate, finishDate));
+    @ApiResponses({ @ApiResponse(code = 200, message = "考试场次信息", response = TEExamActivity.class) })
+    public Result query(@ApiParam(value = "主键", required = false) @RequestParam(required = false) Long id,
+            @ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long examId,
+            @ApiParam(value = "考试场次编码", required = false) @RequestParam(required = false) String code,
+            @ApiParam(value = "开始日期", required = false) @RequestParam(required = false) Long startDate,
+            @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) Long finishDate,
+            @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
+            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+        return ResultUtil.ok(teExamActivityService
+                .examActivityQuery(new Page<>(pageNumber, pageSize), id, examId, code, startDate, finishDate));
     }
 }

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

@@ -19,7 +19,7 @@ import com.qmth.themis.business.service.*;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.business.util.ServletUtil;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
@@ -48,6 +48,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/${prefix.url.admin}/exam")
 public class TEExamController {
+
     private final static Logger log = LoggerFactory.getLogger(TEExamController.class);
 
     @Resource
@@ -68,13 +69,16 @@ public class TEExamController {
     @Resource
     RedisUtil redisUtil;
 
+    @Resource
+    UidUtil uidUtil;
+
     @Resource
     TBTaskHistoryService taskHistoryService;
 
     @ApiOperation(value = "考试批次修改/新增接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @Transactional
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     public Result save(@ApiParam(value = "考试批次信息", required = true) @RequestBody TEExamDto teExamDto) {
         if (Objects.isNull(teExamDto) || Objects.equals(teExamDto, "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_INFO_IS_NULL);
@@ -106,7 +110,7 @@ public class TEExamController {
                 teExamDto.setUpdateId(tbUser.getId());
                 oldTeExam = teExamService.getById(oldId);
             } else {
-                teExamDto.setId(Constants.idGen.next());
+                teExamDto.setId(uidUtil.getId());
                 teExamDto.setCreateId(tbUser.getId());
             }
             teExam = new TEExam(teExamDto);
@@ -115,11 +119,13 @@ public class TEExamController {
             } else {
                 teExam.setMonitorStatus(InvigilateMonitorStatusEnum.NOT_START);
             }
-            if (Objects.nonNull(teExam.getMonitorStatus()) && Objects.equals(teExam.getMonitorStatus(), InvigilateMonitorStatusEnum.FINISHED)) {
+            if (Objects.nonNull(teExam.getMonitorStatus()) && Objects
+                    .equals(teExam.getMonitorStatus(), InvigilateMonitorStatusEnum.FINISHED)) {
                 throw new BusinessException("监考结束的考试批次不可以修改");
             }
             teExamService.saveOrUpdate(teExam);
-            if (Objects.nonNull(oldTeExam) && !Objects.equals(oldTeExam.getMode().name(), teExamDto.getMode().name())) {//如果模式改变，则删除之前模式的全部quartz
+            if (Objects.nonNull(oldTeExam) && !Objects
+                    .equals(oldTeExam.getMode().name(), teExamDto.getMode().name())) {//如果模式改变，则删除之前模式的全部quartz
                 QueryWrapper<TEExamActivity> teExamActivityQueryWrapper = new QueryWrapper<>();
                 teExamActivityQueryWrapper.lambda().eq(TEExamActivity::getExamId, oldId);
                 List<TEExamActivity> teExamActivityList = teExamActivityService.list(teExamActivityQueryWrapper);
@@ -128,7 +134,9 @@ public class TEExamController {
                     Map<String, Object> prop = new HashMap<>();
                     prop.put("oper", "delete");
                     if (Objects.nonNull(teExamActivityList.get(0)) && teExamActivityList.get(0).getEnable() == 1) {
-                        MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_ACTIVITY.name(), JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY, String.valueOf(teExam.getId()), prop, tbUser.getName());
+                        MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_ACTIVITY.name(),
+                                JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
+                                String.valueOf(teExam.getId()), prop, tbUser.getName());
                         mqDtoService.assembleSendOneWayMsg(mqDto);
                     }
                     //删除quartz任务,发送mq消息end
@@ -161,23 +169,31 @@ public class TEExamController {
                         Map<String, Object> prop = new HashMap<>();
                         prop.put("oper", "insert");
                         prop.put("exam", teExam);
-                        MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_ACTIVITY.name(), JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY, String.valueOf(teExam.getId()), prop, tbUser.getName());
+                        MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_ACTIVITY.name(),
+                                JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
+                                String.valueOf(teExam.getId()), prop, tbUser.getName());
                         mqDtoService.assembleSendOneWayMsg(mqDto);
                         //新增quartz任务,发送mq消息end
                     }
                 } else {
-                    TEExamActivity teExamActivity = new TEExamActivity(teExam.getId(), teExam.getPrepareSeconds(), teExam.getMaxDurationSeconds(), (int) ((teExam.getEndTime() - teExam.getStartTime()) / 1000), teExam.getStartTime(), teExam.getEndTime(), tbUser.getId());
+                    TEExamActivity teExamActivity = new TEExamActivity(teExam.getId(), teExam.getPrepareSeconds(),
+                            teExam.getMaxDurationSeconds(),
+                            (int) ((teExam.getEndTime() - teExam.getStartTime()) / 1000), teExam.getStartTime(),
+                            teExam.getEndTime(), tbUser.getId());
                     teExamActivity.setCode(String.valueOf(redisUtil.getRedisActivityCodeSequence(teExam.getId())));
                     activityCode = teExamActivity.getCode();
                     teExamActivity.setEnable(1);
                     teExamActivityService.saveOrUpdate(teExamActivity);
                     teExamActivityService.updateExamActivityCacheBean(teExamActivity.getId());
-                    if (Objects.nonNull(teExam.getForceFinish()) && teExam.getForceFinish().intValue() == 1 && Objects.nonNull(teExamActivity) && teExamActivity.getEnable().intValue() == 1) {
+                    if (Objects.nonNull(teExam.getForceFinish()) && teExam.getForceFinish().intValue() == 1 && Objects
+                            .nonNull(teExamActivity) && teExamActivity.getEnable().intValue() == 1) {
                         //新增quartz任务,发送mq消息start
                         Map<String, Object> prop = new HashMap<>();
                         prop.put("oper", "insert");
                         prop.put("exam", teExam);
-                        MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_ACTIVITY.name(), JacksonUtil.parseJson(Arrays.asList(teExamActivity)), MqTagEnum.EXAM_ACTIVITY, String.valueOf(teExam.getId()), prop, tbUser.getName());
+                        MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_ACTIVITY.name(),
+                                JacksonUtil.parseJson(Arrays.asList(teExamActivity)), MqTagEnum.EXAM_ACTIVITY,
+                                String.valueOf(teExam.getId()), prop, tbUser.getName());
                         mqDtoService.assembleSendOneWayMsg(mqDto);
                     }
                 }
@@ -189,8 +205,10 @@ public class TEExamController {
             }
             if (e instanceof DuplicateKeyException) {
                 String errorColumn = e.getCause().toString();
-                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length()).replaceAll("'", "");
-                throw new BusinessException("机构id[" + teExam.getOrgId() + "]下的" + FieldUniqueEnum.convertToCode(columnStr) + "数据不允许重复插入");
+                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length())
+                        .replaceAll("'", "");
+                throw new BusinessException(
+                        "机构id[" + teExam.getOrgId() + "]下的" + FieldUniqueEnum.convertToCode(columnStr) + "数据不允许重复插入");
             } else if (e instanceof BusinessException) {
                 throw new BusinessException(e.getMessage());
             } else {
@@ -203,8 +221,10 @@ public class TEExamController {
 
     @ApiOperation(value = "考试批次统计接口")
     @RequestMapping(value = "/count", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"count\":1}", response = Result.class)})
-    public Result count(@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 mode) {
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"count\":1}", response = Result.class) })
+    public Result count(@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 mode) {
         QueryWrapper<TEExam> teExamQueryWrapper = new QueryWrapper<>();
         if (Objects.nonNull(code)) {
             teExamQueryWrapper.lambda().eq(TEExam::getCode, code);
@@ -221,24 +241,33 @@ public class TEExamController {
 
     @ApiOperation(value = "考试批次查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考试批次信息", response = TEExam.class)})
-    public Result query(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId, @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) String mode, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "类型(区分实时监考台和考务)", required = false) @RequestParam(required = false) String type, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+    @ApiResponses({ @ApiResponse(code = 200, message = "考试批次信息", response = TEExam.class) })
+    public Result query(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId,
+            @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) String mode,
+            @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable,
+            @ApiParam(value = "类型(区分实时监考台和考务)", required = false) @RequestParam(required = false) String type,
+            @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
+            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         AuthDto authDto = (AuthDto) redisUtil.get(SystemConstant.userOauth + "::" + tbUser.getId());
         if (authDto.getRoleCodes().toString().contains(RoleEnum.INSPECTION.name())) {
             userId = null;
         }
-        return ResultUtil.ok(teExamService.examQuery(new Page<>(pageNumber, pageSize), userId, id, code, name, mode, enable, tbUser.getOrgId(), type));
+        return ResultUtil.ok(teExamService
+                .examQuery(new Page<>(pageNumber, pageSize), userId, id, code, name, mode, enable, tbUser.getOrgId(),
+                        type));
     }
 
     @ApiOperation(value = "考试批次停用/启用接口")
     @RequestMapping(value = "/toggle", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     @Transactional
     public Result examToggle(@ApiJsonObject(name = "examToggle", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "考试批次ID"),
-            @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "是否启用")
-    }) @ApiParam(value = "考试批次信息", required = true) @RequestBody Map<String, Object> mapParameter) {
+            @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "是否启用") }) @ApiParam(value = "考试批次信息", required = true) @RequestBody Map<String, Object> mapParameter) {
         if (Objects.isNull(mapParameter.get("id")) || Objects.equals(mapParameter.get("id"), "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
         }
@@ -261,7 +290,7 @@ public class TEExamController {
 
     @ApiOperation(value = "考试批次详情接口")
     @RequestMapping(value = "/detail", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考试批次信息", response = TEExam.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "考试批次信息", response = TEExam.class) })
     public Result detail(@ApiParam(value = "考试批次id", required = true) @RequestParam Long id) {
         if (Objects.isNull(id) || Objects.equals(id, "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
@@ -275,13 +304,12 @@ public class TEExamController {
 
     @ApiOperation(value = "考试批次复制接口")
     @RequestMapping(value = "/copy", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
     @Transactional
     public Result copy(@ApiJsonObject(name = "examCopy", value = {
             @ApiJsonProperty(key = "sourceId", type = "long", example = "1", description = "来源批次ID"),
             @ApiJsonProperty(key = "code", description = "代码"),
-            @ApiJsonProperty(key = "name", description = "名称")
-    }) @ApiParam(value = "考试批次信息", required = true) @RequestBody Map<String, Object> mapParameter) {
+            @ApiJsonProperty(key = "name", description = "名称") }) @ApiParam(value = "考试批次信息", required = true) @RequestBody Map<String, Object> mapParameter) {
         if (Objects.isNull(mapParameter.get("sourceId")) || Objects.equals(mapParameter.get("sourceId"), "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
         }
@@ -329,13 +357,17 @@ public class TEExamController {
             }
         } catch (Exception e) {
             log.error("请求出错", e);
-            if (Objects.nonNull(examId) && Objects.nonNull(teExam.getId()) && (Objects.nonNull(teExamActivityList) && teExamActivityList.size() > 0 && Objects.nonNull(teExamActivityList.get(0)))) {
-                redisUtil.setRedisActivityCodeSequence(examId, Integer.parseInt(teExamActivityList.get(0).getCode()) - 1);
+            if (Objects.nonNull(examId) && Objects.nonNull(teExam.getId()) && (Objects.nonNull(teExamActivityList)
+                    && teExamActivityList.size() > 0 && Objects.nonNull(teExamActivityList.get(0)))) {
+                redisUtil.setRedisActivityCodeSequence(examId,
+                        Integer.parseInt(teExamActivityList.get(0).getCode()) - 1);
             }
             if (e instanceof DuplicateKeyException) {
                 String errorColumn = e.getCause().toString();
-                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length()).replaceAll("'", "");
-                throw new BusinessException("机构id[" + teExam.getOrgId() + "]下的" + FieldUniqueEnum.convertToCode(columnStr) + "数据不允许重复插入");
+                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length())
+                        .replaceAll("'", "");
+                throw new BusinessException(
+                        "机构id[" + teExam.getOrgId() + "]下的" + FieldUniqueEnum.convertToCode(columnStr) + "数据不允许重复插入");
             } else if (e instanceof BusinessException) {
                 throw new BusinessException(e.getMessage());
             } else {
@@ -347,7 +379,7 @@ public class TEExamController {
 
     @ApiOperation(value = "监考端获取考试批次提醒接口")
     @RequestMapping(value = "/list/count", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考试批次信息", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "考试批次信息", response = Result.class) })
     public Result listCount(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         return ResultUtil.ok(teExamService.examList(userId, tbUser.getOrgId()));
@@ -355,7 +387,7 @@ public class TEExamController {
 
     @ApiOperation(value = "考试属性统计接口")
     @RequestMapping(value = "/prop/count", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考试属性信息", response = ExamPropCountDto.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "考试属性信息", response = ExamPropCountDto.class) })
     public Result propCount(@ApiParam(value = "考试id", required = true) @RequestParam Long examId) {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
@@ -374,12 +406,14 @@ public class TEExamController {
         if (authDto.getRoleCodes().toString().contains(RoleEnum.INVIGILATE.name())) {
             examInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getUserId, tbUser.getId());
         }
-        List<TBExamInvigilateUser> tbExamInvigilateUserList = tbExamInvigilateUserService.list(examInvigilateUserQueryWrapper);
+        List<TBExamInvigilateUser> tbExamInvigilateUserList = tbExamInvigilateUserService
+                .list(examInvigilateUserQueryWrapper);
         Set<String> roomCodeSet = null;
         if (Objects.nonNull(tbExamInvigilateUserList) && tbExamInvigilateUserList.size() > 0) {
             roomCodeSet = tbExamInvigilateUserList.stream().map(s -> s.getRoomCode()).collect(Collectors.toSet());
         }
-        if (authDto.getRoleCodes().toString().contains(RoleEnum.INVIGILATE.name()) && (Objects.isNull(roomCodeSet) || roomCodeSet.size() == 0)) {
+        if (authDto.getRoleCodes().toString().contains(RoleEnum.INVIGILATE.name()) && (Objects.isNull(roomCodeSet)
+                || roomCodeSet.size() == 0)) {
             throw new BusinessException("当前监考老师未设置任何监考考场");
         }
         ExamPropCountDto examPropCountDto = null;
@@ -415,31 +449,46 @@ public class TEExamController {
                 //获取已待考、考试中、已完成学生
                 Set<Long> finalAlreadyComplete = alreadyComplete;
                 examActivityIdSet.forEach(s -> {
-                    Map<String, Object> objectMap = redisUtil.getHashEntries(RedisKeyHelper.examActivityRecordCacheKey(s));
+                    Map<String, Object> objectMap = redisUtil
+                            .getHashEntries(RedisKeyHelper.examActivityRecordCacheKey(s));
                     if (Objects.nonNull(objectMap) && objectMap.size() > 0) {
                         objectMap.forEach((k, v) -> {
                             Long recordId = Long.parseLong(k);
                             ExamActivityRecordCacheBean examActivityRecordCacheBean = (ExamActivityRecordCacheBean) v;
                             ExamRecordStatusEnum examRecordStatusEnum = examActivityRecordCacheBean.getStatus();
-                            ExamStudentCacheBean examStudentCacheBean = teExamStudentService.getExamStudentCacheBean(examActivityRecordCacheBean.getExamStudentId());
-                            if (Objects.nonNull(examStudentCacheBean) && examStudentCacheBean.getEnable().intValue() == 1 && Objects.nonNull(examRecordStatusEnum) && !Objects.equals(examRecordStatusEnum, ExamRecordStatusEnum.PERSISTED) && !Objects.equals(examRecordStatusEnum, ExamRecordStatusEnum.FINISHED)) {
+                            ExamStudentCacheBean examStudentCacheBean = teExamStudentService
+                                    .getExamStudentCacheBean(examActivityRecordCacheBean.getExamStudentId());
+                            if (Objects.nonNull(examStudentCacheBean)
+                                    && examStudentCacheBean.getEnable().intValue() == 1 && Objects
+                                    .nonNull(examRecordStatusEnum) && !Objects
+                                    .equals(examRecordStatusEnum, ExamRecordStatusEnum.PERSISTED) && !Objects
+                                    .equals(examRecordStatusEnum, ExamRecordStatusEnum.FINISHED)) {
                                 //客户端通讯状态
-                                WebsocketStatusEnum clientStatus = Objects.isNull(ExamRecordCacheUtil.getClientWebsocketStatus(recordId)) ? null : ExamRecordCacheUtil.getClientWebsocketStatus(recordId);
-                                if (Objects.nonNull(clientStatus) && Objects.equals(clientStatus, WebsocketStatusEnum.OFF_LINE)) {
+                                WebsocketStatusEnum clientStatus = Objects
+                                        .isNull(ExamRecordCacheUtil.getClientWebsocketStatus(recordId)) ?
+                                        null :
+                                        ExamRecordCacheUtil.getClientWebsocketStatus(recordId);
+                                if (Objects.nonNull(clientStatus) && Objects
+                                        .equals(clientStatus, WebsocketStatusEnum.OFF_LINE)) {
                                     clientWebsocketStatusCount.getAndSet(clientWebsocketStatusCount.get() + 1);
                                 }
                                 //监控端通讯状态
                                 MonitorVideoSourceEnum source = null;
                                 if (Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrlClientCamera(recordId))) {
                                     source = MonitorVideoSourceEnum.CLIENT_CAMERA;
-                                } else if (Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrlClientScreen(recordId))) {
+                                } else if (Objects
+                                        .nonNull(ExamRecordCacheUtil.getMonitorLiveUrlClientScreen(recordId))) {
                                     source = MonitorVideoSourceEnum.CLIENT_SCREEN;
-                                } else if (Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrlMobileFirst(recordId))) {
+                                } else if (Objects
+                                        .nonNull(ExamRecordCacheUtil.getMonitorLiveUrlMobileFirst(recordId))) {
                                     source = MonitorVideoSourceEnum.MOBILE_FIRST;
-                                } else if (Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrlMobileSecond(recordId))) {
+                                } else if (Objects
+                                        .nonNull(ExamRecordCacheUtil.getMonitorLiveUrlMobileSecond(recordId))) {
                                     source = MonitorVideoSourceEnum.MOBILE_SECOND;
                                 }
-                                MonitorStatusSourceEnum status = Objects.isNull(source) ? null : ExamRecordCacheUtil.getMonitorStatus(recordId, source);
+                                MonitorStatusSourceEnum status = Objects.isNull(source) ?
+                                        null :
+                                        ExamRecordCacheUtil.getMonitorStatus(recordId, source);
                                 if (Objects.nonNull(status) && Objects.equals(status, MonitorStatusSourceEnum.STOP)) {
                                     monitorStatusSourceCount.getAndSet(monitorStatusSourceCount.get() + 1);
                                 }
@@ -453,7 +502,8 @@ public class TEExamController {
                                 examCount.getAndSet(examCount.get() + 1);
                             }
                             //已完成
-                            else if (Objects.equals(examRecordStatusEnum, ExamRecordStatusEnum.FINISHED) || Objects.equals(examRecordStatusEnum, ExamRecordStatusEnum.PERSISTED)) {
+                            else if (Objects.equals(examRecordStatusEnum, ExamRecordStatusEnum.FINISHED) || Objects
+                                    .equals(examRecordStatusEnum, ExamRecordStatusEnum.PERSISTED)) {
                                 finalAlreadyComplete.add(examActivityRecordCacheBean.getExamStudentId());
                             }
                         });
@@ -461,8 +511,12 @@ public class TEExamController {
                 });
             }
             notComplete = allCount - alreadyComplete.size();
-            BigDecimal completionRate = new BigDecimal(alreadyComplete.size()).divide(new BigDecimal(allCount), 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP);
-            examPropCountDto = new ExamPropCountDto(examId, allCount, prepareCount.get(), examCount.get(), clientWebsocketStatusCount.get(), monitorStatusSourceCount.get(), alreadyComplete.size(), notComplete, completionRate);
+            BigDecimal completionRate = new BigDecimal(alreadyComplete.size())
+                    .divide(new BigDecimal(allCount), 2, BigDecimal.ROUND_HALF_UP)
+                    .setScale(2, BigDecimal.ROUND_HALF_UP);
+            examPropCountDto = new ExamPropCountDto(examId, allCount, prepareCount.get(), examCount.get(),
+                    clientWebsocketStatusCount.get(), monitorStatusSourceCount.get(), alreadyComplete.size(),
+                    notComplete, completionRate);
         } else {
             examPropCountDto = new ExamPropCountDto(examId, 0, 0, 0, 0, 0, 0, 0, new BigDecimal(0));
         }
@@ -472,7 +526,7 @@ public class TEExamController {
     @ApiOperation(value = "考试重新算分")
     @RequestMapping(value = "/score/calculate", method = RequestMethod.POST)
     @Transactional
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"taskId\":0}", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "{\"taskId\":0}", response = Result.class) })
     public Result scoreCalculate(@ApiParam(value = "批次ID", required = true) @RequestParam Long id) {
         //先查询考试相关信息
         TEExam teExam = teExamService.getById(id);
@@ -484,7 +538,8 @@ public class TEExamController {
         try {
             TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
             //往任务表里插一条数据
-            tbTaskHistory = new TBTaskHistory(TaskTypeEnum.CALCULATE_EXAM_SCORE, TaskStatusEnum.INIT, "重新算分", 0d, tbUser.getId(), tbUser.getOrgId());
+            tbTaskHistory = new TBTaskHistory(TaskTypeEnum.CALCULATE_EXAM_SCORE, TaskStatusEnum.INIT, "重新算分", 0d,
+                    tbUser.getId(), tbUser.getOrgId());
             tbTaskHistory.setEntityId(id);
             tbTaskHistory.setExamId(id);
             taskHistoryService.save(tbTaskHistory);
@@ -492,7 +547,8 @@ public class TEExamController {
             transMap.put("orgId", tbUser.getOrgId());
             transMap.put(SystemConstant.TASK_ID, tbTaskHistory.getId());
             //mq发送消息start
-            MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_SCORE_CALCULATE.name(), transMap, MqTagEnum.EXAM_SCORE_CALCULATE, String.valueOf(tbTaskHistory.getId()), tbUser.getName());
+            MqDto mqDto = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_SCORE_CALCULATE.name(), transMap,
+                    MqTagEnum.EXAM_SCORE_CALCULATE, String.valueOf(tbTaskHistory.getId()), tbUser.getName());
             mqDtoService.assembleSendOneWayMsg(mqDto);
             //mq发送消息end
         } catch (Exception e) {

themis-backend/src/main/java/com/qmth/themis/backend/config/ScheduleTaskConfig.java

@@ -0,0 +1,20 @@
+package com.qmth.themis.backend.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+@Configuration
+@EnableScheduling
+public class ScheduleTaskConfig {
+
+    @Bean
+    public TaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(10);
+        scheduler.setThreadNamePrefix("scheduled-task-");
+        return scheduler;
+    }
+}

themis-backend/src/main/java/com/qmth/themis/backend/config/WebMvcConfig.java

@@ -5,13 +5,10 @@ import com.qmth.themis.backend.interceptor.AuthThirdInterceptor;
 import com.qmth.themis.business.constant.SystemConstant;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import javax.annotation.Resource;
-import java.awt.*;
-import java.util.List;
 
 /**
  * @Description: 路径拦截器
@@ -38,37 +35,40 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(AuthInterceptor()).addPathPatterns(SystemConstant.ADMIN_ALL_PATH).excludePathPatterns(dictionaryConfig.authNoUrlDomain().getUrls());
-        registry.addInterceptor(AuthThirdInterceptor()).addPathPatterns(SystemConstant.THIRD_ALL_PATH).excludePathPatterns(dictionaryConfig.authNoUrlDomain().getUrls());;
+        registry.addInterceptor(AuthInterceptor()).addPathPatterns(SystemConstant.ADMIN_ALL_PATH)
+                .excludePathPatterns(dictionaryConfig.authNoUrlDomain().getUrls());
+        registry.addInterceptor(AuthThirdInterceptor()).addPathPatterns(SystemConstant.THIRD_ALL_PATH)
+                .excludePathPatterns(dictionaryConfig.authNoUrlDomain().getUrls());
+        ;
     }
 
-//    @Override
-//    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-//        ObjectMapper objectMapper = new ObjectMapper();
-//        objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-//        objectMapper.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-//
-//        objectMapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
-//        //objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
-//
-//        // 处理数字位数超过JS默认最大数字时精度差异问题
-//        SimpleModule simpleModule = new SimpleModule();
-//        simpleModule.addSerializer(BigInteger.class, ToStringSerializer.instance);
-//        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
-//        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
-//
-//        objectMapper.registerModule(simpleModule);
-//
-//        for (HttpMessageConverter<?> c : converters) {
-//            if (c instanceof MappingJackson2HttpMessageConverter) {
-//                ((MappingJackson2HttpMessageConverter) c).setObjectMapper(objectMapper);
-//            }
-//        }
-//    }
+    //    @Override
+    //    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+    //        ObjectMapper objectMapper = new ObjectMapper();
+    //        objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    //        objectMapper.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+    //
+    //        objectMapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+    //        //objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+    //
+    //        // 处理数字位数超过JS默认最大数字时精度差异问题
+    //        SimpleModule simpleModule = new SimpleModule();
+    //        simpleModule.addSerializer(BigInteger.class, ToStringSerializer.instance);
+    //        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+    //        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
+    //
+    //        objectMapper.registerModule(simpleModule);
+    //
+    //        for (HttpMessageConverter<?> c : converters) {
+    //            if (c instanceof MappingJackson2HttpMessageConverter) {
+    //                ((MappingJackson2HttpMessageConverter) c).setObjectMapper(objectMapper);
+    //            }
+    //        }
+    //    }
 
-//    @Override
-//    public void addCorsMappings(CorsRegistry registry) {
-//        registry.addMapping("/**").allowedOrigins("*").allowCredentials(true)
-//                .allowedMethods("GET", "POST", "DELETE", "PUT").maxAge(3600);
-//    }
+    //    @Override
+    //    public void addCorsMappings(CorsRegistry registry) {
+    //        registry.addMapping("/**").allowedOrigins("*").allowCredentials(true)
+    //                .allowedMethods("GET", "POST", "DELETE", "PUT").maxAge(3600);
+    //    }
 }

themis-backend/src/main/resources/application.properties

@@ -128,6 +128,7 @@ tencentyun.sdk.key=d78004c94473cb1cf78af33d333e18b731132e527e829e44e2ab133945243
 tencentyun.sdk.urls=https://live1.qmth.com.cn,https://live2.qmth.com.cn,https://live3.qmth.com.cn,https://live4.qmth.com.cn,https://live5.qmth.com.cn,https://live6.qmth.com.cn
 
 #\u7CFB\u7EDF\u914D\u7F6E
+sys.config.datacenterId=1
 sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav
 sys.config.serverUpload=/Users/king/git/themis-files/

themis-business/src/main/java/com/qmth/themis/business/domain/SysDomain.java

@@ -12,22 +12,34 @@ import java.util.List;
  */
 public class SysDomain implements Serializable {
 
-    boolean oss;
+    private static final long serialVersionUID = 7510626406622200443L;
 
-    List<String> attachmentType;
+    private int datacenterId;
 
-    String serverUpload;
+    private boolean oss;
 
-    String fileHost;
+    private List<String> attachmentType;
 
-    String serverHost;
+    private String serverUpload;
+
+    private String fileHost;
+
+    private String serverHost;
+
+    private String adminLogoUrl;
 
-    String adminLogoUrl;
-    
     /**
      * 本地临时文件目录
      */
-    String tempDataDir;
+    private String tempDataDir;
+
+    public int getDatacenterId() {
+        return datacenterId;
+    }
+
+    public void setDatacenterId(int datacenterId) {
+        this.datacenterId = datacenterId;
+    }
 
     public String getAdminLogoUrl() {
         return adminLogoUrl;
@@ -77,13 +89,12 @@ public class SysDomain implements Serializable {
         this.serverUpload = serverUpload;
     }
 
-	public String getTempDataDir() {
-		return tempDataDir;
-	}
+    public String getTempDataDir() {
+        return tempDataDir;
+    }
+
+    public void setTempDataDir(String tempDataDir) {
+        this.tempDataDir = tempDataDir;
+    }
 
-	public void setTempDataDir(String tempDataDir) {
-		this.tempDataDir = tempDataDir;
-	}
-    
-    
 }

themis-business/src/main/java/com/qmth/themis/business/entity/TBAttachment.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @Description: 附件表
@@ -22,6 +21,7 @@ import java.util.Date;
  */
 @ApiModel(value = "t_b_attachment", description = "附件表")
 public class TBAttachment implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
     @JsonSerialize(using = ToStringSerializer.class)
@@ -62,12 +62,12 @@ public class TBAttachment implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private Long createTime; //创建时间
 
-    public TBAttachment(){
+    public TBAttachment() {
 
     }
 
-    public TBAttachment(String path,String name,String type,BigDecimal size,String md5){
-        this.id = Constants.idGen.next();
+    public TBAttachment(String path, String name, String type, BigDecimal size, String md5) {
+        this.id = UidUtil.nextId();
         this.path = path;
         this.name = name;
         this.type = type;

themis-business/src/main/java/com/qmth/themis/business/entity/TBExamInvigilateUser.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.enums.InvigilateMonitorStatusEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -21,6 +21,7 @@ import java.io.Serializable;
  */
 @ApiModel(value = "t_b_exam_invigilate_user", description = "监考员设置")
 public class TBExamInvigilateUser implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
     @JsonSerialize(using = ToStringSerializer.class)
@@ -60,7 +61,7 @@ public class TBExamInvigilateUser implements Serializable {
     }
 
     public TBExamInvigilateUser(Long examId, Long orgId, String roomCode, String roomName) {
-        this.id = Constants.idGen.next();
+        this.id = UidUtil.nextId();
         this.examId = examId;
         this.orgId = orgId;
         this.roomCode = roomCode;
@@ -68,7 +69,7 @@ public class TBExamInvigilateUser implements Serializable {
     }
 
     public TBExamInvigilateUser(Long examId, Long orgId, Long userId, String roomCode, String roomName) {
-        this.id = Constants.idGen.next();
+        this.id = UidUtil.nextId();
         this.examId = examId;
         this.orgId = orgId;
         this.userId = userId;

themis-business/src/main/java/com/qmth/themis/business/entity/TBTaskHistory.java

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.enums.TaskTypeEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -22,6 +22,7 @@ import java.io.Serializable;
  */
 @ApiModel(value = "t_b_task_history", description = "异步任务")
 public class TBTaskHistory implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
     @JsonSerialize(using = ToStringSerializer.class)
@@ -37,7 +38,7 @@ public class TBTaskHistory implements Serializable {
     @ApiModelProperty(value = "关联业务对象ID")
     @TableField("entity_id")
     private Long entityId;
-    
+
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "考试批次ID")
     @TableField("exam_id")
@@ -97,8 +98,9 @@ public class TBTaskHistory implements Serializable {
 
     }
 
-    public TBTaskHistory(TaskTypeEnum type, Long entityId, TaskStatusEnum status, String summary, Double progress, String importFileName, String importFilePath, Long createId, Long orgId) {
-        this.id = Constants.idGen.next();
+    public TBTaskHistory(TaskTypeEnum type, Long entityId, TaskStatusEnum status, String summary, Double progress,
+            String importFileName, String importFilePath, Long createId, Long orgId) {
+        this.id = UidUtil.nextId();
         this.type = type;
         this.entityId = entityId;
         this.status = status;
@@ -111,8 +113,9 @@ public class TBTaskHistory implements Serializable {
         this.orgId = orgId;
     }
 
-    public TBTaskHistory(TaskTypeEnum type, TaskStatusEnum status, String summary, Double progress, Long createId, Long orgId) {
-        this.id = Constants.idGen.next();
+    public TBTaskHistory(TaskTypeEnum type, TaskStatusEnum status, String summary, Double progress, Long createId,
+            Long orgId) {
+        this.id = UidUtil.nextId();
         this.type = type;
         this.status = status;
         this.summary = summary;
@@ -246,13 +249,12 @@ public class TBTaskHistory implements Serializable {
         this.finishTime = finishTime;
     }
 
-	public Long getExamId() {
-		return examId;
-	}
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
 
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-    
-    
 }

themis-business/src/main/java/com/qmth/themis/business/entity/TBUser.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.base.BaseEntity;
 import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -52,8 +52,8 @@ public class TBUser extends BaseEntity {
 
     }
 
-    public TBUser(Long orgId, String loginName, String name,Long createId) {
-        setId(Constants.idGen.next());
+    public TBUser(Long orgId, String loginName, String name, Long createId) {
+        setId(UidUtil.nextId());
         this.orgId = orgId;
         this.loginName = loginName;
         this.name = name;

themis-business/src/main/java/com/qmth/themis/business/entity/TBUserRole.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -41,7 +41,7 @@ public class TBUserRole implements Serializable {
     }
 
     public TBUserRole(Long userId, String roleCode) {
-        this.id = Constants.idGen.next();
+        this.id = UidUtil.nextId();
         this.userId = userId;
         this.roleCode = roleCode;
     }

themis-business/src/main/java/com/qmth/themis/business/entity/TEExamActivity.java

@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.base.BaseEntity;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.util.Date;
-
 /**
  * @Description: 考试场次
  * @Param:
@@ -57,10 +55,11 @@ public class TEExamActivity extends BaseEntity {
 
     }
 
-    public TEExamActivity(Long examId, Integer prepareSeconds, Integer maxDurationSeconds, Integer openingSeconds, Long startTime, Long finishTime, Long createId) {
-        setId(Constants.idGen.next());
+    public TEExamActivity(Long examId, Integer prepareSeconds, Integer maxDurationSeconds, Integer openingSeconds,
+            Long startTime, Long finishTime, Long createId) {
+        setId(UidUtil.nextId());
         this.examId = examId;
-        this.code = "examActivity" + Constants.idGen.next();
+        this.code = "examActivity" + getId();
         this.prepareSeconds = prepareSeconds;
         this.maxDurationSeconds = maxDurationSeconds;
         this.openingSeconds = openingSeconds;

themis-business/src/main/java/com/qmth/themis/business/entity/TEExamBreachLog.java

@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.base.BaseEntity;
-import com.qmth.themis.business.enums.BreachTypeEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -55,8 +54,9 @@ public class TEExamBreachLog extends BaseEntity {
     @TableField(value = "remark")
     private String remark;
 
-    public TEExamBreachLog(Long examId, Long examActivityId, Long examRecordId, Long examStudentId, String type, String description, Integer status) {
-        setId(Constants.idGen.next());
+    public TEExamBreachLog(Long examId, Long examActivityId, Long examRecordId, Long examStudentId, String type,
+            String description, Integer status) {
+        setId(UidUtil.nextId());
         this.examId = examId;
         this.examActivityId = examActivityId;
         this.examRecordId = examRecordId;

themis-business/src/main/java/com/qmth/themis/business/entity/TEExamCourse.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.base.BaseEntity;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "t_e_exam_course", description = "考试科目")
 public class TEExamCourse extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     @JsonSerialize(using = ToStringSerializer.class)
@@ -61,7 +62,7 @@ public class TEExamCourse extends BaseEntity {
     }
 
     public TEExamCourse(Long examId, String courseCode, String courseName, Long createId) {
-        setId(Constants.idGen.next());
+        setId(UidUtil.nextId());
         this.examId = examId;
         this.courseCode = courseCode;
         this.courseName = courseName;

themis-business/src/main/java/com/qmth/themis/business/entity/TEExamReexam.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.base.BaseEntity;
 import com.qmth.themis.business.enums.ReexamReasonEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -73,8 +73,9 @@ public class TEExamReexam extends BaseEntity {
 
     }
 
-    public TEExamReexam(Long examId, Long examActivityId, Long examStudentId, Integer model, ReexamReasonEnum reason, Integer status, String remark) {
-        setId(Constants.idGen.next());
+    public TEExamReexam(Long examId, Long examActivityId, Long examStudentId, Integer model, ReexamReasonEnum reason,
+            Integer status, String remark) {
+        setId(UidUtil.nextId());
         this.examId = examId;
         this.examActivityId = examActivityId;
         this.examStudentId = examStudentId;

themis-business/src/main/java/com/qmth/themis/business/entity/TEExamReexamAuditing.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -42,7 +42,7 @@ public class TEExamReexamAuditing implements Serializable {
     }
 
     public TEExamReexamAuditing(Long reexamId, Long auditingId) {
-        this.id = Constants.idGen.next();
+        this.id = UidUtil.nextId();
         this.reexamId = reexamId;
         this.auditingId = auditingId;
     }

themis-business/src/main/java/com/qmth/themis/business/entity/TEExamStudentLog.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -77,15 +77,16 @@ public class TEExamStudentLog implements Serializable {
     }
 
     public TEExamStudentLog(String type, String info, String remark, Long studentId) {
-        this.id = Constants.idGen.next();
+        this.id = UidUtil.nextId();
         this.type = type;
         this.info = info;
         this.remark = remark;
         this.studentId = studentId;
     }
 
-    public TEExamStudentLog(String type, String info, String remark, Long studentId, Long examStudentId, Long examRecordId, String title) {
-        this.id = Constants.idGen.next();
+    public TEExamStudentLog(String type, String info, String remark, Long studentId, Long examStudentId,
+            Long examRecordId, String title) {
+        this.id = UidUtil.nextId();
         this.type = type;
         this.info = info;
         this.remark = remark;
@@ -95,8 +96,9 @@ public class TEExamStudentLog implements Serializable {
         this.title = title;
     }
 
-    public TEExamStudentLog(String type, String info, String remark, Long studentId, Long examStudentId, Long examRecordId, Long objId, String title) {
-        this.id = Constants.idGen.next();
+    public TEExamStudentLog(String type, String info, String remark, Long studentId, Long examStudentId,
+            Long examRecordId, Long objId, String title) {
+        this.id = UidUtil.nextId();
         this.type = type;
         this.info = info;
         this.remark = remark;

themis-business/src/main/java/com/qmth/themis/business/entity/TEStudent.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.base.BaseEntity;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.enums.GenderEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -62,7 +62,7 @@ public class TEStudent extends BaseEntity {
     }
 
     public TEStudent(Long orgId, String identity, String name, Long createId) {
-        setId(Constants.idGen.next());
+        setId(UidUtil.nextId());
         this.orgId = orgId;
         this.identity = identity;
         this.name = name;

themis-business/src/main/java/com/qmth/themis/business/entity/TEUserLog.java

@@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description: 用户轨迹
@@ -55,7 +54,7 @@ public class TEUserLog implements Serializable {
     }
 
     public TEUserLog(String type, String info, String remark, Long userId) {
-        this.id = Constants.idGen.next();
+        this.id = UidUtil.nextId();
         this.type = type;
         this.info = info;
         this.remark = remark;

themis-business/src/main/java/com/qmth/themis/business/entity/TIeExamInvigilateCall.java

@@ -1,6 +1,5 @@
 package com.qmth.themis.business.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -9,7 +8,7 @@ import com.qmth.themis.business.enums.ExceptionEnum;
 import com.qmth.themis.business.enums.MonitorCallStatusSourceEnum;
 import com.qmth.themis.business.enums.MonitorStatusSourceEnum;
 import com.qmth.themis.business.enums.MonitorVideoSourceEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -83,8 +82,9 @@ public class TIeExamInvigilateCall extends BaseEntity {
 
     }
 
-    public TIeExamInvigilateCall(Long examRecordId, MonitorVideoSourceEnum source, String liveUrl, MonitorStatusSourceEnum status, String monitorKey) {
-        setId(Constants.idGen.next());
+    public TIeExamInvigilateCall(Long examRecordId, MonitorVideoSourceEnum source, String liveUrl,
+            MonitorStatusSourceEnum status, String monitorKey) {
+        setId(UidUtil.nextId());
         this.examRecordId = examRecordId;
         this.source = source;
         this.liveUrl = liveUrl;

themis-business/src/main/java/com/qmth/themis/business/entity/TIeExamInvigilateCallLog.java

@@ -8,7 +8,7 @@ import com.qmth.themis.business.enums.ExceptionEnum;
 import com.qmth.themis.business.enums.MonitorCallStatusSourceEnum;
 import com.qmth.themis.business.enums.MonitorStatusSourceEnum;
 import com.qmth.themis.business.enums.MonitorVideoSourceEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -82,8 +82,9 @@ public class TIeExamInvigilateCallLog extends BaseEntity {
 
     }
 
-    public TIeExamInvigilateCallLog(Long examRecordId, MonitorVideoSourceEnum source, String liveUrl, MonitorStatusSourceEnum status, String monitorKey) {
-        setId(Constants.idGen.next());
+    public TIeExamInvigilateCallLog(Long examRecordId, MonitorVideoSourceEnum source, String liveUrl,
+            MonitorStatusSourceEnum status, String monitorKey) {
+        setId(UidUtil.nextId());
         setExamRecordId(examRecordId);
         setSource(source);
         setLiveUrl(liveUrl);
@@ -91,8 +92,9 @@ public class TIeExamInvigilateCallLog extends BaseEntity {
         setMonitorKey(monitorKey);
     }
 
-    public TIeExamInvigilateCallLog(Long examRecordId, MonitorVideoSourceEnum source, String liveUrl, MonitorStatusSourceEnum status, String monitorKey, MonitorCallStatusSourceEnum callStatus) {
-        setId(Constants.idGen.next());
+    public TIeExamInvigilateCallLog(Long examRecordId, MonitorVideoSourceEnum source, String liveUrl,
+            MonitorStatusSourceEnum status, String monitorKey, MonitorCallStatusSourceEnum callStatus) {
+        setId(UidUtil.nextId());
         setExamRecordId(examRecordId);
         setSource(source);
         setLiveUrl(liveUrl);

themis-business/src/main/java/com/qmth/themis/business/entity/TIeExamInvigilateNotice.java

@@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.enums.MessageTypeEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description: 监考通知消息记录
@@ -75,7 +74,7 @@ public class TIeExamInvigilateNotice implements Serializable {
     }
 
     public TIeExamInvigilateNotice(Long examId, Long examActivityId, Long examRecordId, Long formUserId,Long receiveUserId, MessageTypeEnum type, String content) {
-        this.id = Constants.idGen.next();
+        this.id = UidUtil.nextId();
         this.examId = examId;
         this.examActivityId = examActivityId;
         this.examRecordId = examRecordId;

themis-business/src/main/java/com/qmth/themis/business/entity/TIeInvigilateExceptionInfo.java

@@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.enums.ExceptionEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description: 监考异常信息
@@ -90,8 +89,9 @@ public class TIeInvigilateExceptionInfo implements Serializable {
 
     }
 
-    public TIeInvigilateExceptionInfo(Long examId, Long examActivityId, Long examRecordId, Long examStudentId, String info, ExceptionEnum type,Integer difference,Long objId) {
-        this.id = Constants.idGen.next();
+    public TIeInvigilateExceptionInfo(Long examId, Long examActivityId, Long examRecordId, Long examStudentId,
+            String info, ExceptionEnum type, Integer difference, Long objId) {
+        this.id = UidUtil.nextId();
         this.examId = examId;
         this.examActivityId = examActivityId;
         this.examRecordId = examRecordId;

themis-business/src/main/java/com/qmth/themis/business/entity/TIeInvigilateWarnInfo.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.enums.VerifyExceptionEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -93,8 +93,9 @@ public class TIeInvigilateWarnInfo implements Serializable {
 
     }
 
-    public TIeInvigilateWarnInfo(Long examId, Long examActivityId, Long examRecordId, Long examStudentId, String level, String info, VerifyExceptionEnum type, Integer remindStatus) {
-        this.id = Constants.idGen.next();
+    public TIeInvigilateWarnInfo(Long examId, Long examActivityId, Long examRecordId, Long examStudentId, String level,
+            String info, VerifyExceptionEnum type, Integer remindStatus) {
+        this.id = UidUtil.nextId();
         this.examId = examId;
         this.examActivityId = examActivityId;
         this.examRecordId = examRecordId;
@@ -106,8 +107,9 @@ public class TIeInvigilateWarnInfo implements Serializable {
         this.remindStatus = remindStatus;
     }
 
-    public TIeInvigilateWarnInfo(Long examId, Long examActivityId, Long examRecordId, Long examStudentId, String level, String info, VerifyExceptionEnum type, String photoUrl, Integer remindStatus) {
-        this.id = Constants.idGen.next();
+    public TIeInvigilateWarnInfo(Long examId, Long examActivityId, Long examRecordId, Long examStudentId, String level,
+            String info, VerifyExceptionEnum type, String photoUrl, Integer remindStatus) {
+        this.id = UidUtil.nextId();
         this.examId = examId;
         this.examActivityId = examActivityId;
         this.examRecordId = examRecordId;

themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamBreakHistory.java

@@ -6,13 +6,11 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.enums.ExceptionEnum;
 import com.qmth.themis.business.enums.VerifyExceptionEnum;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.Calendar;
-import java.util.Date;
 
 /**
  * @Description: 考试断点记录
@@ -23,6 +21,7 @@ import java.util.Date;
  */
 @ApiModel(value = "t_oe_exam_break_history", description = "考试断点记录")
 public class TOeExamBreakHistory implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
     @JsonSerialize(using = ToStringSerializer.class)
@@ -69,14 +68,15 @@ public class TOeExamBreakHistory implements Serializable {
     }
 
     public TOeExamBreakHistory(Long examRecordId, Long breakTime, ExceptionEnum breakReason, String resumeReason) {
-        this.id = Constants.idGen.next();
+        this.id = UidUtil.nextId();
         this.examRecordId = examRecordId;
         this.breakTime = breakTime;
         this.breakReason = breakReason;
         this.resumeReason = resumeReason;
     }
 
-    public TOeExamBreakHistory(Long id, Long examRecordId, Long breakTime, ExceptionEnum breakReason, String resumeReason) {
+    public TOeExamBreakHistory(Long id, Long examRecordId, Long breakTime, ExceptionEnum breakReason,
+            String resumeReason) {
         this.id = id;
         this.examRecordId = examRecordId;
         this.breakTime = breakTime;

themis-business/src/main/java/com/qmth/themis/business/service/impl/TOeExamRecordServiceImpl.java

@@ -21,7 +21,7 @@ import com.qmth.themis.business.enums.*;
 import com.qmth.themis.business.service.*;
 import com.qmth.themis.business.util.OssUtil;
 import com.qmth.themis.business.util.RedisUtil;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.FileUtil;
 import com.qmth.themis.common.util.SimpleBeanUtil;
@@ -82,6 +82,9 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
     @Resource
     OssUtil ossUtil;
 
+    @Resource
+    UidUtil uidUtil;
+
     /**
      * 获取考试未完列表
      *
@@ -139,7 +142,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
         ExamActivityCacheBean ac = examActivityService.getExamActivityCacheBean(examActivityId);
         ExamCacheBean exam = examService.getExamCacheBean(examId);
         TOeExamRecord er = new TOeExamRecord();
-        er.setId(Constants.idGen.next());
+        er.setId(uidUtil.getId());
         er.setExamId(examId);
         er.setExamActivityId(examActivityId);
         er.setExamStudentId(examStudentId);
@@ -411,7 +414,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
             for (ExamStudentAnswerCacheBean answerCache : answerMap.values()) {
                 TOeExamAnswer answer = new TOeExamAnswer();
                 BeanUtils.copyProperties(answerCache, answer);
-                answer.setId(Constants.idGen.next());
+                answer.setId(uidUtil.getId());
                 answer.setExamRecordId(recordId);
                 examAnswerService.saveOrUpdate(answer);
             }
@@ -1016,7 +1019,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
                         ExamRecordCacheUtil.getAlreadyBreakCount(recordId);
                 alreadyBreakCount++;
                 Long examActivityId = ExamRecordCacheUtil.getExamActivityId(recordId);
-                Long breakId = Constants.idGen.next();
+                Long breakId = uidUtil.getId();
                 ExamRecordCacheUtil.setLastBreakId(recordId, breakId, false);
                 ExamRecordCacheUtil.setStatus(recordId, ExamRecordStatusEnum.BREAK_OFF, false);
                 Long lastBreakTimeNow = System.currentTimeMillis();

themis-business/src/main/java/com/qmth/themis/business/service/impl/TOeFaceVerifyHistoryServiceImpl.java

@@ -11,7 +11,7 @@ import com.qmth.themis.business.enums.VerifyExceptionEnum;
 import com.qmth.themis.business.service.TOeExamBreakHistoryService;
 import com.qmth.themis.business.service.TOeExamRecordService;
 import com.qmth.themis.business.service.TOeFaceVerifyHistoryService;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,7 +26,8 @@ import java.util.Map;
  * @Date: 2020/6/25
  */
 @Service
-public class TOeFaceVerifyHistoryServiceImpl extends ServiceImpl<TOeFaceVerifyHistoryMapper, TOeFaceVerifyHistory> implements TOeFaceVerifyHistoryService {
+public class TOeFaceVerifyHistoryServiceImpl extends ServiceImpl<TOeFaceVerifyHistoryMapper, TOeFaceVerifyHistory>
+        implements TOeFaceVerifyHistoryService {
 
     @Resource
     TOeExamBreakHistoryService examBreakHistoryService;
@@ -37,11 +38,14 @@ public class TOeFaceVerifyHistoryServiceImpl extends ServiceImpl<TOeFaceVerifyHi
     @Resource
     TOeFaceVerifyHistoryMapper tOeFaceVerifyHistoryMapper;
 
+    @Resource
+    UidUtil uidUtil;
+
     @Override
     public FaceVerifyBean verify(Long recordId, String type, String photoUrl, Integer faceCount, Double similarity,
-                                 Double realness, Long time, String exception) {
+            Double realness, Long time, String exception) {
         FaceVerifyCacheBean cache = new FaceVerifyCacheBean();
-        cache.setId(Constants.idGen.next());
+        cache.setId(uidUtil.getId());
         cache.setExamRecordId(recordId);
         cache.setFaceCount(faceCount);
         cache.setException(VerifyExceptionEnum.valueOf(exception));
@@ -65,7 +69,7 @@ public class TOeFaceVerifyHistoryServiceImpl extends ServiceImpl<TOeFaceVerifyHi
     @Transactional
     @Override
     public void save(Long id, Long recordId, String type, String photoUrl, Integer faceCount, Double similarity,
-                     Double realness, Long time, String exception, String batchNo) {
+            Double realness, Long time, String exception, String batchNo) {
         TOeFaceVerifyHistory entity = new TOeFaceVerifyHistory();
         entity.setId(id);
         entity.setExamRecordId(recordId);
@@ -92,7 +96,8 @@ public class TOeFaceVerifyHistoryServiceImpl extends ServiceImpl<TOeFaceVerifyHi
      * @return
      */
     @Override
-    public Map<String, Object> faceCountError(Long recordId, String exception, Integer faceCount, Boolean multipleFace, String type, String batchNo) {
+    public Map<String, Object> faceCountError(Long recordId, String exception, Integer faceCount, Boolean multipleFace,
+            String type, String batchNo) {
         return tOeFaceVerifyHistoryMapper.faceCountError(recordId, exception, faceCount, multipleFace, type, batchNo);
     }
 

themis-business/src/main/java/com/qmth/themis/business/service/impl/TOeLivenessVerifyHistoryServiceImpl.java

@@ -11,7 +11,7 @@ import com.qmth.themis.business.enums.VerifyExceptionEnum;
 import com.qmth.themis.business.service.TOeExamBreakHistoryService;
 import com.qmth.themis.business.service.TOeExamRecordService;
 import com.qmth.themis.business.service.TOeLivenessVerifyHistoryService;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -25,7 +25,9 @@ import javax.annotation.Resource;
  * @Date: 2020/6/25
  */
 @Service
-public class TOeLivenessVerifyHistoryServiceImpl extends ServiceImpl<TOeLivenessVerifyHistoryMapper, TOeLivenessVerifyHistory> implements TOeLivenessVerifyHistoryService {
+public class TOeLivenessVerifyHistoryServiceImpl
+        extends ServiceImpl<TOeLivenessVerifyHistoryMapper, TOeLivenessVerifyHistory>
+        implements TOeLivenessVerifyHistoryService {
 
     @Resource
     TOeExamBreakHistoryService examBreakHistoryService;
@@ -33,11 +35,14 @@ public class TOeLivenessVerifyHistoryServiceImpl extends ServiceImpl<TOeLiveness
     @Resource
     TOeExamRecordService examRecordService;
 
+    @Resource
+    UidUtil uidUtil;
+
     @Override
     public LivenessVerifyBean verify(Long recordId, String type, String actions, Integer retry, Long startTime,
-                                     Long finishTime, String exception) {
+            Long finishTime, String exception) {
         LivenessVerifyCacheBean cache = new LivenessVerifyCacheBean();
-        cache.setId(Constants.idGen.next());
+        cache.setId(uidUtil.getId());
         cache.setExamRecordId(recordId);
         cache.setType(LivenessTypeEnum.valueOf(type));
         cache.setActions(actions);
@@ -60,7 +65,7 @@ public class TOeLivenessVerifyHistoryServiceImpl extends ServiceImpl<TOeLiveness
     @Transactional
     @Override
     public void save(Long id, Long recordId, String type, String actions, Integer retry, Long startTime,
-                     Long finishTime, String exception, String batchNo) {
+            Long finishTime, String exception, String batchNo) {
         TOeLivenessVerifyHistory entity = new TOeLivenessVerifyHistory();
         entity.setId(id);
         entity.setExamRecordId(recordId);

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamPaperImportTemplete.java

@@ -20,7 +20,7 @@ import com.qmth.themis.business.templete.TaskImportCommon;
 import com.qmth.themis.business.templete.TaskImportTemplete;
 import com.qmth.themis.business.util.OssUtil;
 import com.qmth.themis.business.util.RedisUtil;
-import com.qmth.themis.common.contanst.Constants;
+import com.qmth.themis.business.util.UidUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.FileUtil;
@@ -73,6 +73,9 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
     @Resource
     RedisUtil redisUtil;
 
+    @Resource
+    UidUtil uidUtil;
+
     @Override
     @Transactional
     public Result importTask(Map<String, Object> map) throws IOException {
@@ -229,7 +232,7 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
     }
 
     private void disposePaperDir(String rootDir, TEExam teExam, TEExamCourse course, File paperDir,
-                                 Map<String, Object> map) throws IOException {
+            Map<String, Object> map) throws IOException {
         String paperCode = paperDir.getName();
         File[] childs = paperDir.listFiles();
 
@@ -255,7 +258,7 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
             paper = new TEExamPaper();
             String createId = map.get("createId").toString();
             JSONObject paperJson = JSONObject.parseObject(FileUtil.readFileContent(paperFile));
-            paper.setId(Constants.idGen.next());
+            paper.setId(uidUtil.getId());
             paper.setName(paperJson.getString("name"));
             paper.setTotalScore(paperJson.getDouble("totalScore"));
             paper.setDecryptSecret(RandomStringUtils.randomAlphanumeric(16));
@@ -637,7 +640,7 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
     }
 
     private void checkAnswerFile(String rootDir, File[] paperDirChilds, Long examId, String courseCode,
-                                 String paperCode) {
+            String paperCode) {
         File paperFile = null;
         File answerFile = null;
         for (File cfile : paperDirChilds) {// 校验试卷下的答案

themis-business/src/main/java/com/qmth/themis/business/util/UidUtil.java

@@ -0,0 +1,96 @@
+package com.qmth.themis.business.util;
+
+import com.qmth.themis.business.constant.SpringContextHolder;
+import com.qmth.themis.business.domain.SysDomain;
+import com.qmth.themis.common.uid.UidGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
+import java.util.concurrent.TimeUnit;
+
+@Component
+@EnableScheduling
+public class UidUtil {
+
+    private static final Logger log = LoggerFactory.getLogger(UidUtil.class);
+
+    @Resource
+    private SysDomain sysDomain;
+
+    @Resource
+    RedisTemplate<String, Object> redisTemplate;
+
+    private static final String MACHINE_ID_KEY = "machine_id_%d";
+
+    private static final int MACHINE_ID_EXPIRE_MINUTES = 60;
+
+    private int machineId;
+
+    private UidGenerator uid;
+
+    @PostConstruct
+    public void init() {
+        int datacenterId = sysDomain.getDatacenterId();
+        if (datacenterId <= 0 || datacenterId > UidGenerator.MAX_DATACENTER_ID) {
+            throw new IllegalArgumentException(
+                    "Invalid datacenterId, should between 1 and " + UidGenerator.MAX_DATACENTER_ID);
+        }
+        machineId = 0;
+        for (int i = 1; i <= UidGenerator.MAX_MACHINE_ID; i++) {
+            if (registerMachineId(i)) {
+                machineId = i;
+                break;
+            }
+        }
+        if (machineId == 0) {
+            throw new IllegalArgumentException("Register machineId faile");
+        }
+        uid = new UidGenerator(datacenterId, machineId);
+        log.info("Uid init success, datacenterId=" + datacenterId + ", machineId=" + machineId);
+    }
+
+    private boolean registerMachineId(int machineId) {
+        String key = String.format(MACHINE_ID_KEY, machineId);
+        Boolean result = redisTemplate.opsForValue()
+                .setIfAbsent(key, System.currentTimeMillis(), MACHINE_ID_EXPIRE_MINUTES, TimeUnit.MINUTES);
+        return result != null && result;
+    }
+
+    /**
+     * 定时续租machineId
+     */
+    @Scheduled(cron = "0 0/15 * * * ?")
+    private void renewMachineId() {
+        log.info("Start renew machindId");
+        String key = String.format(MACHINE_ID_KEY, machineId);
+        Boolean result = redisTemplate.expire(key, MACHINE_ID_EXPIRE_MINUTES, TimeUnit.MINUTES);
+        if (result == null || !result) {
+            log.warn("Renew machineId faile, machineId=" + machineId);
+        }
+    }
+
+    @PreDestroy
+    public void destroy() {
+        log.info("Start release machindId");
+        String key = String.format(MACHINE_ID_KEY, machineId);
+        Boolean result = redisTemplate.delete(key);
+        if (result == null || !result) {
+            log.warn("Release machineId faile, machineId=" + machineId);
+        }
+    }
+
+    public long getId() {
+        return uid.next();
+    }
+
+    public static long nextId() {
+        return SpringContextHolder.getBean(UidUtil.class).getId();
+    }
+}

themis-common/src/main/java/com/qmth/themis/common/contanst/Constants.java

@@ -1,7 +1,5 @@
 package com.qmth.themis.common.contanst;
 
-import com.qmth.themis.common.uid.UidGenerator;
-
 import java.nio.charset.Charset;
 
 public interface Constants {
@@ -40,5 +38,4 @@ public interface Constants {
 
     public static final String MD5 = "MD5";
 
-    public UidGenerator idGen = new UidGenerator(0L, 0L);
 }

themis-common/src/main/java/com/qmth/themis/common/uid/UidGenerator.java

@@ -22,10 +22,10 @@ public class UidGenerator {
     private final static long MACHINE_BIT = 7;
 
     // 最大数据中心编号
-    private final static long MAX_DATACENTER_ID = ~(-1L << DATACENTER_BIT);
+    public final static long MAX_DATACENTER_ID = ~(-1L << DATACENTER_BIT);
 
     // 最大机器编号
-    private final static long MAX_MACHINE_ID = ~(-1L << MACHINE_BIT);
+    public final static long MAX_MACHINE_ID = ~(-1L << MACHINE_BIT);
 
     // 最大序列号
     private final static long MAX_SEQUENCE = ~(-1L << SEQUENCE_BIT);
@@ -53,7 +53,8 @@ public class UidGenerator {
 
     public UidGenerator(long datacenterId, long machineId) {
         if (datacenterId > MAX_DATACENTER_ID || datacenterId < 0) {
-            throw new IllegalArgumentException("datacenterId can't be greater than " + MAX_DATACENTER_ID + " or less than 0");
+            throw new IllegalArgumentException(
+                    "datacenterId can't be greater than " + MAX_DATACENTER_ID + " or less than 0");
         }
         if (machineId > MAX_MACHINE_ID || machineId < 0) {
             throw new IllegalArgumentException("machineId can't be greater than " + MAX_MACHINE_ID + " or less than 0");
@@ -132,18 +133,17 @@ public class UidGenerator {
         System.out.println(UidGenerator.MAX_MACHINE_ID);
         System.out.println(UidGenerator.MAX_SEQUENCE);
 
-        UidGenerator[] uids = new UidGenerator[15];
-        for (int i = 0; i < 15; i++) {
-            uids[i] = new UidGenerator(0, i);
-        }
-        for (int i = 0; i < 100; i++) {
-            System.out.println("index:" + i);
-            for (UidGenerator uid : uids) {
-                long id = uid.next();
-                System.out.println(id + ":" + toFullBinaryString(id));
-                //System.out.println(id + ":" + Long.toBinaryString(id));
-            }
-        }
+        //        UidGenerator[] uids = new UidGenerator[15];
+        //        for (int i = 0; i < 15; i++) {
+        //            uids[i] = new UidGenerator(0, i);
+        //        }
+        //        for (int i = 0; i < 100; i++) {
+        //            System.out.println("index:" + i);
+        //            for (UidGenerator uid : uids) {
+        //                long id = uid.next();
+        //                System.out.println(id + ":" + toFullBinaryString(id));
+        //            }
+        //        }
         //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         //System.out.println(format.parse("2020-06-01 00:00:00").getTime());
     }

themis-exam/src/main/java/com/qmth/themis/exam/ThemisExamApplication.java

@@ -10,10 +10,10 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
-@ComponentScan(basePackages = {"com.qmth.themis"})
+@ComponentScan(basePackages = { "com.qmth.themis" })
 @MapperScan("com.qmth.themis.business.dao")
 //主要就是定义扫描的路径从中找出标识了需要装配的类自动装配到spring的bean容器中,做过web开发的同学一定都有用过@Controller，@Service，@Repository注解，查看其源码你会发现，他们中有一个共同的注解@Component，没错@ComponentScan注解默认就会装配标识了@Controller，@Service，@Repository，@Component注解的类到spring容器中
-@EntityScan(basePackages = {"com.qmth.themis.business.entity"})//用来扫描和发现指定包及其子包中的Entity定义
+@EntityScan(basePackages = { "com.qmth.themis.business.entity" })//用来扫描和发现指定包及其子包中的Entity定义
 @EnableTransactionManagement //spring开启事务支持
 @EnableAsync //开启异步任务
 @EnableCaching//开启缓存注解

themis-exam/src/main/java/com/qmth/themis/exam/config/ScheduleTaskConfig.java

@@ -0,0 +1,20 @@
+package com.qmth.themis.exam.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+@Configuration
+@EnableScheduling
+public class ScheduleTaskConfig {
+
+    @Bean
+    public TaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(10);
+        scheduler.setThreadNamePrefix("scheduled-task-");
+        return scheduler;
+    }
+}

themis-exam/src/main/java/com/qmth/themis/exam/config/WebMvcConfig.java

@@ -29,36 +29,37 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(AuthInterceptor()).addPathPatterns(SystemConstant.ALL_PATH).excludePathPatterns(dictionaryConfig.authNoUrlDomain().getUrls());
+        registry.addInterceptor(AuthInterceptor()).addPathPatterns(SystemConstant.ALL_PATH)
+                .excludePathPatterns(dictionaryConfig.authNoUrlDomain().getUrls());
     }
 
-//    @Override
-//    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-//        ObjectMapper objectMapper = new ObjectMapper();
-//        objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-//        objectMapper.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-//
-//        objectMapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
-//        //objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
-//
-//        // 处理数字位数超过JS默认最大数字时精度差异问题
-//        SimpleModule simpleModule = new SimpleModule();
-//        simpleModule.addSerializer(BigInteger.class, ToStringSerializer.instance);
-//        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
-//        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
-//
-//        objectMapper.registerModule(simpleModule);
-//
-//        for (HttpMessageConverter<?> c : converters) {
-//            if (c instanceof MappingJackson2HttpMessageConverter) {
-//                ((MappingJackson2HttpMessageConverter) c).setObjectMapper(objectMapper);
-//            }
-//        }
-//    }
+    //    @Override
+    //    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+    //        ObjectMapper objectMapper = new ObjectMapper();
+    //        objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    //        objectMapper.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+    //
+    //        objectMapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+    //        //objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+    //
+    //        // 处理数字位数超过JS默认最大数字时精度差异问题
+    //        SimpleModule simpleModule = new SimpleModule();
+    //        simpleModule.addSerializer(BigInteger.class, ToStringSerializer.instance);
+    //        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+    //        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
+    //
+    //        objectMapper.registerModule(simpleModule);
+    //
+    //        for (HttpMessageConverter<?> c : converters) {
+    //            if (c instanceof MappingJackson2HttpMessageConverter) {
+    //                ((MappingJackson2HttpMessageConverter) c).setObjectMapper(objectMapper);
+    //            }
+    //        }
+    //    }
 
-//    @Override
-//    public void addCorsMappings(CorsRegistry registry) {
-//        registry.addMapping("/**").allowedOrigins("*").allowCredentials(true)
-//                .allowedMethods("GET", "POST", "DELETE", "PUT").maxAge(3600);
-//    }
+    //    @Override
+    //    public void addCorsMappings(CorsRegistry registry) {
+    //        registry.addMapping("/**").allowedOrigins("*").allowCredentials(true)
+    //                .allowedMethods("GET", "POST", "DELETE", "PUT").maxAge(3600);
+    //    }
 }

themis-exam/src/main/resources/application.properties

@@ -140,6 +140,7 @@ tencentyun.sdk.key=d78004c94473cb1cf78af33d333e18b731132e527e829e44e2ab133945243
 tencentyun.sdk.urls=https://live1.qmth.com.cn,https://live2.qmth.com.cn,https://live3.qmth.com.cn,https://live4.qmth.com.cn,https://live5.qmth.com.cn,https://live6.qmth.com.cn
 
 #\u7CFB\u7EDF\u914D\u7F6E
+sys.config.datacenterId=1
 sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav
 sys.config.serverUpload=/Users/king/git/themis-files/

themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

@@ -21,6 +21,7 @@ import com.qmth.themis.business.templete.impl.*;
 import com.qmth.themis.business.threadPool.MyThreadPool;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
+import com.qmth.themis.business.util.UidUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.util.SimpleBeanUtil;
 import com.qmth.themis.mq.service.MqLogicService;
@@ -49,6 +50,7 @@ import java.util.UUID;
  */
 @Service
 public class MqLogicServiceImpl implements MqLogicService {
+
     private final static Logger log = LoggerFactory.getLogger(MqLogicServiceImpl.class);
 
     @Resource
@@ -108,6 +110,9 @@ public class MqLogicServiceImpl implements MqLogicService {
     @Resource
     TEConfigService teConfigService;
 
+    @Resource
+    UidUtil uidUtil;
+
     /**
      * mq最大重试次数逻辑
      *
@@ -138,14 +143,28 @@ public class MqLogicServiceImpl implements MqLogicService {
         Gson gson = new Gson();
         String tag = mqDto.getTag();
         if (Objects.equals(MqTagEnum.USER.name(), tag)) {
-            TEUserLog teUserLog = new TEUserLog(String.valueOf(mqDto.getBody()), SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(), SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(), Long.parseLong(String.valueOf(mqDto.getObjId())));
+            TEUserLog teUserLog = new TEUserLog(String.valueOf(mqDto.getBody()),
+                    SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(),
+                    SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(),
+                    Long.parseLong(String.valueOf(mqDto.getObjId())));
             teUserLogService.save(teUserLog);
         } else if (Objects.equals(MqTagEnum.STUDENT.name(), tag)) {
             TEExamStudentLog teExamStudentLog = null;
             if (Objects.nonNull(mqDto.getProperties())) {
-                teExamStudentLog = new TEExamStudentLog(String.valueOf(mqDto.getBody()), Objects.nonNull(mqDto.getProperties().get("type")) ? String.valueOf(mqDto.getProperties().get("type")) : SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(), String.valueOf(mqDto.getProperties().get("remark")), Long.parseLong(String.valueOf(mqDto.getObjId())), Long.parseLong(String.valueOf(mqDto.getProperties().get("examStudentId"))), Long.parseLong(String.valueOf(mqDto.getProperties().get("examRecordId"))), SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getTitle());
+                teExamStudentLog = new TEExamStudentLog(String.valueOf(mqDto.getBody()),
+                        Objects.nonNull(mqDto.getProperties().get("type")) ?
+                                String.valueOf(mqDto.getProperties().get("type")) :
+                                SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(),
+                        String.valueOf(mqDto.getProperties().get("remark")),
+                        Long.parseLong(String.valueOf(mqDto.getObjId())),
+                        Long.parseLong(String.valueOf(mqDto.getProperties().get("examStudentId"))),
+                        Long.parseLong(String.valueOf(mqDto.getProperties().get("examRecordId"))),
+                        SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getTitle());
             } else {
-                teExamStudentLog = new TEExamStudentLog(String.valueOf(mqDto.getBody()), SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(), SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(), Long.parseLong(String.valueOf(mqDto.getObjId())));
+                teExamStudentLog = new TEExamStudentLog(String.valueOf(mqDto.getBody()),
+                        SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(),
+                        SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(),
+                        Long.parseLong(String.valueOf(mqDto.getObjId())));
             }
             teExamStudentLogService.save(teExamStudentLog);
         }
@@ -166,7 +185,8 @@ public class MqLogicServiceImpl implements MqLogicService {
     @Transactional
     public void execMqSessionLogic(MqDto mqDto, String key) {
         Gson gson = new Gson();
-        tbSessionService.saveSessionInfo(JacksonUtil.readJson(JacksonUtil.parseJson(mqDto.getBody()), TBSession.class), mqDto.getTimestamp());
+        tbSessionService.saveSessionInfo(JacksonUtil.readJson(JacksonUtil.parseJson(mqDto.getBody()), TBSession.class),
+                mqDto.getTimestamp());
         mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
         TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);
         tmRocketMessage.setBody(JacksonUtil.parseJson(tmRocketMessage.getBody()));
@@ -242,20 +262,30 @@ public class MqLogicServiceImpl implements MqLogicService {
         Long recordId = Long.parseLong(String.valueOf(tranMap.get("recordId")));
         ExamRecordStatusEnum status = ExamRecordCacheUtil.getStatus(recordId);
         WebsocketStatusEnum websocketStatusEnum = ExamRecordCacheUtil.getClientWebsocketStatus(recordId);
-        if (Objects.nonNull(websocketStatusEnum) && !Objects.equals(websocketStatusEnum, WebsocketStatusEnum.ON_LINE) && (!Objects.equals(status, ExamRecordStatusEnum.FIRST_PREPARE) || !Objects.equals(status, ExamRecordStatusEnum.FINISHED) || !Objects.equals(status, ExamRecordStatusEnum.PERSISTED))) {
+        if (Objects.nonNull(websocketStatusEnum) && !Objects.equals(websocketStatusEnum, WebsocketStatusEnum.ON_LINE)
+                && (!Objects.equals(status, ExamRecordStatusEnum.FIRST_PREPARE) || !Objects
+                .equals(status, ExamRecordStatusEnum.FINISHED) || !Objects
+                .equals(status, ExamRecordStatusEnum.PERSISTED))) {
             examRecordService.sendExamBreakMsg(recordId, true);
             //更新客户端摄像头推流状态为stop
-            MonitorStatusSourceEnum cameraStatusSourceEnum = ExamRecordCacheUtil.getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA);
+            MonitorStatusSourceEnum cameraStatusSourceEnum = ExamRecordCacheUtil
+                    .getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA);
             if (Objects.nonNull(cameraStatusSourceEnum)) {
-                ExamRecordCacheUtil.setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA, MonitorStatusSourceEnum.STOP, true);
+                ExamRecordCacheUtil
+                        .setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA, MonitorStatusSourceEnum.STOP,
+                                true);
             }
             //更新客户端屏幕推流状态为stop
-            MonitorStatusSourceEnum screenStatusSourceEnum = ExamRecordCacheUtil.getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN);
+            MonitorStatusSourceEnum screenStatusSourceEnum = ExamRecordCacheUtil
+                    .getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN);
             if (Objects.nonNull(screenStatusSourceEnum)) {
-                ExamRecordCacheUtil.setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN, MonitorStatusSourceEnum.STOP, true);
+                ExamRecordCacheUtil
+                        .setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN, MonitorStatusSourceEnum.STOP,
+                                true);
             }
             //发送移动端监考退出考试mq消息 start
-            MqDto mqDtoExamStop = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_STOP.name(), recordId, MqTagEnum.EXAM_STOP, String.valueOf(recordId), String.valueOf(recordId));
+            MqDto mqDtoExamStop = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_STOP.name(), recordId,
+                    MqTagEnum.EXAM_STOP, String.valueOf(recordId), String.valueOf(recordId));
             mqDtoService.assembleSendOneWayMsg(mqDtoExamStop);
             //发送移动端监考退出考试mq消息 end
         }
@@ -307,11 +337,15 @@ public class MqLogicServiceImpl implements MqLogicService {
         TEConfig teConfig = teConfigService.getGlobalConfig();
         Long examStudentId = ExamRecordCacheUtil.getExamStudentId(recordId);
         ExamStudentCacheBean examStudentCacheBean = teExamStudentService.getExamStudentCacheBean(examStudentId);
-        if (Objects.nonNull(photoUrl) && (Objects.equals(type.toUpperCase(), ExamTypeEnum.FIRST_START.name()) || Objects.equals(type.toUpperCase(), ExamTypeEnum.RESUME_START.name()))) {
+        if (Objects.nonNull(photoUrl) && (Objects.equals(type.toUpperCase(), ExamTypeEnum.FIRST_START.name()) || Objects
+                .equals(type.toUpperCase(), ExamTypeEnum.RESUME_START.name()))) {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put(PhotoTypeEnum.FACE_VERIFY_PHOTO.name(), photoUrl);
-            TEExamStudentLog teExamStudentLog = new TEExamStudentLog(type, ExamTypeEnum.valueOf(type).getCode(), jsonObject.toJSONString(), examStudentCacheBean.getStudentId(), examStudentCacheBean.getId(), recordId, ExamTypeEnum.valueOf(type).getTitle());
-            faceVerifyHistoryService.save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, null);
+            TEExamStudentLog teExamStudentLog = new TEExamStudentLog(type, ExamTypeEnum.valueOf(type).getCode(),
+                    jsonObject.toJSONString(), examStudentCacheBean.getStudentId(), examStudentCacheBean.getId(),
+                    recordId, ExamTypeEnum.valueOf(type).getTitle());
+            faceVerifyHistoryService
+                    .save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, null);
             teExamStudentLogService.saveOrUpdate(teExamStudentLog);
         } else if (Objects.equals(type.toUpperCase(), ExamTypeEnum.IN_PROCESS.name())) {
             VerifyExceptionEnum warningEnum = VerifyExceptionEnum.valueOf(exception);
@@ -323,17 +357,22 @@ public class MqLogicServiceImpl implements MqLogicService {
                         realnessErrorRandom = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
                         ExamRecordCacheUtil.setRealnessErrorRandom(recordId, realnessErrorRandom);
                     }
-                    ExamRecordCacheUtil.setRealnessErrorNum(recordId, ExamRecordCacheUtil.getRealnessErrorNum(recordId) + 1);
+                    ExamRecordCacheUtil
+                            .setRealnessErrorNum(recordId, ExamRecordCacheUtil.getRealnessErrorNum(recordId) + 1);
                     warningDto.setRandom(realnessErrorRandom);
-                    faceVerifyHistoryService.save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, realnessErrorRandom);
+                    faceVerifyHistoryService
+                            .save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception,
+                                    realnessErrorRandom);
                     Integer count = ExamRecordCacheUtil.getRealnessErrorNum(recordId);
                     if (count > teConfig.getRealnessCount()) {
-                        ExamRecordCacheUtil.setRealnessErrorRandom(recordId, String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
+                        ExamRecordCacheUtil.setRealnessErrorRandom(recordId,
+                                String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
                         ExamRecordCacheUtil.setRealnessErrorNum(recordId, 0);
                         warningService.realnessError(warningDto);
                     }
                 } else {
-                    faceVerifyHistoryService.save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, null);
+                    faceVerifyHistoryService
+                            .save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, null);
                 }
             } else {
                 if (Objects.equals(VerifyExceptionEnum.FACE_COUNT_ERROR, warningEnum)) {//人脸数量异常
@@ -343,12 +382,16 @@ public class MqLogicServiceImpl implements MqLogicService {
                             multipleFaceRandom = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
                             ExamRecordCacheUtil.setMultipleFaceCountErrorRandom(recordId, multipleFaceRandom);
                         }
-                        ExamRecordCacheUtil.setMultipleFaceCountErrorNum(recordId, ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId) + 1);
+                        ExamRecordCacheUtil.setMultipleFaceCountErrorNum(recordId,
+                                ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId) + 1);
                         warningDto.setRandom(multipleFaceRandom);
-                        faceVerifyHistoryService.save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, multipleFaceRandom);
+                        faceVerifyHistoryService
+                                .save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception,
+                                        multipleFaceRandom);
                         Integer count = ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId);
                         if (count > teConfig.getMultipleFaceCountError()) {
-                            ExamRecordCacheUtil.setMultipleFaceCountErrorRandom(recordId, String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
+                            ExamRecordCacheUtil.setMultipleFaceCountErrorRandom(recordId,
+                                    String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
                             ExamRecordCacheUtil.setMultipleFaceCountErrorNum(recordId, 0);
                             warningService.faceCountError(warningDto);
                         }
@@ -358,12 +401,16 @@ public class MqLogicServiceImpl implements MqLogicService {
                             noFaceRandom = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
                             ExamRecordCacheUtil.setNoFaceCountErrorRandom(recordId, noFaceRandom);
                         }
-                        ExamRecordCacheUtil.setNoFaceCountErrorNum(recordId, ExamRecordCacheUtil.getNoFaceCountErrorNum(recordId) + 1);
+                        ExamRecordCacheUtil.setNoFaceCountErrorNum(recordId,
+                                ExamRecordCacheUtil.getNoFaceCountErrorNum(recordId) + 1);
                         warningDto.setRandom(noFaceRandom);
-                        faceVerifyHistoryService.save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, noFaceRandom);
+                        faceVerifyHistoryService
+                                .save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception,
+                                        noFaceRandom);
                         Integer count = ExamRecordCacheUtil.getNoFaceCountErrorNum(recordId);
                         if (count > teConfig.getNoFaceCountError()) {
-                            ExamRecordCacheUtil.setNoFaceCountErrorRandom(recordId, String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
+                            ExamRecordCacheUtil.setNoFaceCountErrorRandom(recordId,
+                                    String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
                             ExamRecordCacheUtil.setNoFaceCountErrorNum(recordId, 0);
                             warningService.faceCountError(warningDto);
                         }
@@ -374,12 +421,16 @@ public class MqLogicServiceImpl implements MqLogicService {
                         faceCompareErrorRandom = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
                         ExamRecordCacheUtil.setFaceCompareErrorRandom(recordId, faceCompareErrorRandom);
                     }
-                    ExamRecordCacheUtil.setFaceCompareErrorNum(recordId, ExamRecordCacheUtil.getFaceCompareErrorNum(recordId) + 1);
+                    ExamRecordCacheUtil
+                            .setFaceCompareErrorNum(recordId, ExamRecordCacheUtil.getFaceCompareErrorNum(recordId) + 1);
                     warningDto.setRandom(faceCompareErrorRandom);
-                    faceVerifyHistoryService.save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, faceCompareErrorRandom);
+                    faceVerifyHistoryService
+                            .save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception,
+                                    faceCompareErrorRandom);
                     Integer count = ExamRecordCacheUtil.getFaceCompareErrorNum(recordId);
                     if (count > teConfig.getTotalFaceCompareErrorCount()) {
-                        ExamRecordCacheUtil.setFaceCompareErrorRandom(recordId, String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
+                        ExamRecordCacheUtil.setFaceCompareErrorRandom(recordId,
+                                String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
                         ExamRecordCacheUtil.setFaceCompareErrorNum(recordId, 0);
                         warningService.faceCompareError(warningDto);
                     }
@@ -389,19 +440,24 @@ public class MqLogicServiceImpl implements MqLogicService {
                         eyeCloseErrorRandom = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
                         ExamRecordCacheUtil.setEyeCloseErrorRandom(recordId, eyeCloseErrorRandom);
                     }
-                    ExamRecordCacheUtil.setEyeCloseErrorNum(recordId, ExamRecordCacheUtil.getEyeCloseErrorNum(recordId) + 1);
+                    ExamRecordCacheUtil
+                            .setEyeCloseErrorNum(recordId, ExamRecordCacheUtil.getEyeCloseErrorNum(recordId) + 1);
                     warningDto.setRandom(eyeCloseErrorRandom);
-                    faceVerifyHistoryService.save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, eyeCloseErrorRandom);
+                    faceVerifyHistoryService
+                            .save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception,
+                                    eyeCloseErrorRandom);
                     Integer count = ExamRecordCacheUtil.getEyeCloseErrorNum(recordId);
                     if (count > teConfig.getTotalEyeCloseErrorCount()) {
-                        ExamRecordCacheUtil.setEyeCloseErrorRandom(recordId, String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
+                        ExamRecordCacheUtil.setEyeCloseErrorRandom(recordId,
+                                String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
                         ExamRecordCacheUtil.setEyeCloseErrorNum(recordId, 0);
                         warningService.eyeCloseError(warningDto);
                     }
                 }
             }
         } else {
-            faceVerifyHistoryService.save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, null);
+            faceVerifyHistoryService
+                    .save(id, recordId, type, photoUrl, faceCount, similarity, realness, time, exception, null);
         }
         mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
         TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);
@@ -432,17 +488,27 @@ public class MqLogicServiceImpl implements MqLogicService {
         TEConfig teConfig = teConfigService.getGlobalConfig();
         Long examStudentId = ExamRecordCacheUtil.getExamStudentId(recordId);
         ExamStudentCacheBean examStudentCacheBean = teExamStudentService.getExamStudentCacheBean(examStudentId);
-        if (Objects.equals(type.toUpperCase(), ExamTypeEnum.FIRST_START.name()) || Objects.equals(type.toUpperCase(), ExamTypeEnum.RESUME_START.name())) {
+        if (Objects.equals(type.toUpperCase(), ExamTypeEnum.FIRST_START.name()) || Objects
+                .equals(type.toUpperCase(), ExamTypeEnum.RESUME_START.name())) {
             JSONArray jsonArray = JSONArray.parseArray(actions);
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject jsonObject = jsonArray.getJSONObject(i);
-                String photoType = Objects.nonNull(jsonObject.get("type")) ? String.valueOf(jsonObject.get("type")) : null;
-                String photoUrl = Objects.nonNull(jsonObject.get("photoUrl")) ? String.valueOf(jsonObject.get("photoUrl")) : null;
-                if (Objects.nonNull(photoType) && Objects.nonNull(photoUrl) && Objects.equals(photoType.toLowerCase(), "startup")) {
+                String photoType = Objects.nonNull(jsonObject.get("type")) ?
+                        String.valueOf(jsonObject.get("type")) :
+                        null;
+                String photoUrl = Objects.nonNull(jsonObject.get("photoUrl")) ?
+                        String.valueOf(jsonObject.get("photoUrl")) :
+                        null;
+                if (Objects.nonNull(photoType) && Objects.nonNull(photoUrl) && Objects
+                        .equals(photoType.toLowerCase(), "startup")) {
                     JSONObject object = new JSONObject();
                     object.put(PhotoTypeEnum.LIVENESS_VERIFY_PHOTO.name(), photoUrl);
-                    TEExamStudentLog teExamStudentLog = new TEExamStudentLog(type, LivenessTypeEnum.valueOf(type).getCode(), object.toJSONString(), examStudentCacheBean.getStudentId(), examStudentCacheBean.getId(), recordId, LivenessTypeEnum.valueOf(type).getTitle());
-                    livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
+                    TEExamStudentLog teExamStudentLog = new TEExamStudentLog(type,
+                            LivenessTypeEnum.valueOf(type).getCode(), object.toJSONString(),
+                            examStudentCacheBean.getStudentId(), examStudentCacheBean.getId(), recordId,
+                            LivenessTypeEnum.valueOf(type).getTitle());
+                    livenessVerifyHistoryService
+                            .save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
                     teExamStudentLogService.saveOrUpdate(teExamStudentLog);
                     break;
                 }
@@ -453,23 +519,29 @@ public class MqLogicServiceImpl implements MqLogicService {
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject jsonObject = jsonArray.getJSONObject(i);
                 if (Objects.equals(VerifyExceptionEnum.NONE, warningEnum)) {//无异常，往考生日志表里插一条
-                    livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
+                    livenessVerifyHistoryService
+                            .save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
                 } else {
                     if (Objects.equals(VerifyExceptionEnum.FACE_COUNT_ERROR, warningEnum)) {//人脸数量异常
                         Integer faceCount = Integer.parseInt(String.valueOf(jsonObject.get("faceCount")));
-                        WarningDto warningDto = new WarningDto(warningEnum, faceCount, null, recordId, String.valueOf(jsonObject.get("photoUrl")));
+                        WarningDto warningDto = new WarningDto(warningEnum, faceCount, null, recordId,
+                                String.valueOf(jsonObject.get("photoUrl")));
                         if (faceCount > 1) {//多张人脸
                             String multipleFaceRandom = ExamRecordCacheUtil.getMultipleFaceCountErrorRandom(recordId);
                             if (Objects.isNull(multipleFaceRandom)) {
                                 multipleFaceRandom = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
                                 ExamRecordCacheUtil.setMultipleFaceCountErrorRandom(recordId, multipleFaceRandom);
                             }
-                            ExamRecordCacheUtil.setMultipleFaceCountErrorNum(recordId, ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId) + 1);
+                            ExamRecordCacheUtil.setMultipleFaceCountErrorNum(recordId,
+                                    ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId) + 1);
                             warningDto.setRandom(multipleFaceRandom);
-                            livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, multipleFaceRandom);
+                            livenessVerifyHistoryService
+                                    .save(id, recordId, type, actions, retry, startTime, finishTime, exception,
+                                            multipleFaceRandom);
                             Integer count = ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId);
                             if (count > teConfig.getMultipleFaceCountError()) {
-                                ExamRecordCacheUtil.setMultipleFaceCountErrorRandom(recordId, String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
+                                ExamRecordCacheUtil.setMultipleFaceCountErrorRandom(recordId,
+                                        String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
                                 ExamRecordCacheUtil.setMultipleFaceCountErrorNum(recordId, 0);
                                 warningService.faceCountError(warningDto);
                             }
@@ -479,29 +551,38 @@ public class MqLogicServiceImpl implements MqLogicService {
                                 noFaceRandom = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
                                 ExamRecordCacheUtil.setNoFaceCountErrorRandom(recordId, noFaceRandom);
                             }
-                            ExamRecordCacheUtil.setNoFaceCountErrorNum(recordId, ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId) + 1);
+                            ExamRecordCacheUtil.setNoFaceCountErrorNum(recordId,
+                                    ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId) + 1);
                             warningDto.setRandom(noFaceRandom);
-                            livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, noFaceRandom);
+                            livenessVerifyHistoryService
+                                    .save(id, recordId, type, actions, retry, startTime, finishTime, exception,
+                                            noFaceRandom);
                             Integer count = ExamRecordCacheUtil.getNoFaceCountErrorNum(recordId);
                             if (count > teConfig.getNoFaceCountError()) {
-                                ExamRecordCacheUtil.setNoFaceCountErrorRandom(recordId, String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
+                                ExamRecordCacheUtil.setNoFaceCountErrorRandom(recordId,
+                                        String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
                                 ExamRecordCacheUtil.setNoFaceCountErrorNum(recordId, 0);
                                 warningService.faceCountError(warningDto);
                             }
                         }
                     } else if (Objects.equals(VerifyExceptionEnum.FACE_COMPARE_ERROR, warningEnum)) {//人脸比对异常
-                        WarningDto warningDto = new WarningDto(warningEnum, null, null, recordId, String.valueOf(jsonObject.get("photoUrl")));
+                        WarningDto warningDto = new WarningDto(warningEnum, null, null, recordId,
+                                String.valueOf(jsonObject.get("photoUrl")));
                         String faceCompareErrorRandom = ExamRecordCacheUtil.getFaceCompareErrorRandom(recordId);
                         if (Objects.isNull(faceCompareErrorRandom)) {
                             faceCompareErrorRandom = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
                             ExamRecordCacheUtil.setFaceCompareErrorRandom(recordId, faceCompareErrorRandom);
                         }
-                        ExamRecordCacheUtil.setFaceCompareErrorNum(recordId, ExamRecordCacheUtil.getFaceCompareErrorNum(recordId) + 1);
+                        ExamRecordCacheUtil.setFaceCompareErrorNum(recordId,
+                                ExamRecordCacheUtil.getFaceCompareErrorNum(recordId) + 1);
                         warningDto.setRandom(faceCompareErrorRandom);
-                        livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, faceCompareErrorRandom);
+                        livenessVerifyHistoryService
+                                .save(id, recordId, type, actions, retry, startTime, finishTime, exception,
+                                        faceCompareErrorRandom);
                         Integer count = ExamRecordCacheUtil.getFaceCompareErrorNum(recordId);
                         if (count > teConfig.getTotalFaceCompareErrorCount()) {
-                            ExamRecordCacheUtil.setFaceCompareErrorRandom(recordId, String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
+                            ExamRecordCacheUtil.setFaceCompareErrorRandom(recordId,
+                                    String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
                             ExamRecordCacheUtil.setFaceCompareErrorNum(recordId, 0);
                             warningService.faceCompareError(warningDto);
                         }
@@ -509,7 +590,8 @@ public class MqLogicServiceImpl implements MqLogicService {
                 }
             }
         } else {
-            livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
+            livenessVerifyHistoryService
+                    .save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
         }
         mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
         TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);
@@ -595,7 +677,8 @@ public class MqLogicServiceImpl implements MqLogicService {
         Gson gson = new Gson();
         String tag = mqDto.getTag();
         if (Objects.equals(MqTagEnum.MONITOR_LOG.name(), tag)) {//监考日志
-            TIeExamInvigilateCallLog tIeExamInvigilateCallLog = JacksonUtil.readJson(JacksonUtil.parseJson(mqDto.getBody()), TIeExamInvigilateCallLog.class);
+            TIeExamInvigilateCallLog tIeExamInvigilateCallLog = JacksonUtil
+                    .readJson(JacksonUtil.parseJson(mqDto.getBody()), TIeExamInvigilateCallLog.class);
             Long recordId = tIeExamInvigilateCallLog.getExamRecordId();
             Long examId = null, examActivityId = null, examStudentId = null;
             if (Objects.nonNull(ExamRecordCacheUtil.getExamActivityId(recordId))) {
@@ -613,11 +696,15 @@ public class MqLogicServiceImpl implements MqLogicService {
             tIeExamInvigilateCallLog.setExamStudentId(examStudentId);
 
             QueryWrapper<TIeExamInvigilateCall> tIeExamInvigilateCallQueryWrapper = new QueryWrapper<>();
-            tIeExamInvigilateCallQueryWrapper.lambda().eq(TIeExamInvigilateCall::getExamRecordId, tIeExamInvigilateCallLog.getExamRecordId()).eq(TIeExamInvigilateCall::getSource, tIeExamInvigilateCallLog.getSource());
-            TIeExamInvigilateCall tIeExamInvigilateCall = tIeExamInvigilateCallService.getOne(tIeExamInvigilateCallQueryWrapper);
+            tIeExamInvigilateCallQueryWrapper.lambda()
+                    .eq(TIeExamInvigilateCall::getExamRecordId, tIeExamInvigilateCallLog.getExamRecordId())
+                    .eq(TIeExamInvigilateCall::getSource, tIeExamInvigilateCallLog.getSource());
+            TIeExamInvigilateCall tIeExamInvigilateCall = tIeExamInvigilateCallService
+                    .getOne(tIeExamInvigilateCallQueryWrapper);
             if (Objects.isNull(tIeExamInvigilateCall)) {
-                tIeExamInvigilateCall = gson.fromJson(gson.toJson(tIeExamInvigilateCallLog), TIeExamInvigilateCall.class);
-                tIeExamInvigilateCall.setId(Constants.idGen.next());
+                tIeExamInvigilateCall = gson
+                        .fromJson(gson.toJson(tIeExamInvigilateCallLog), TIeExamInvigilateCall.class);
+                tIeExamInvigilateCall.setId(uidUtil.getId());
             } else {
                 tIeExamInvigilateCall.setLiveUrl(tIeExamInvigilateCallLog.getLiveUrl());
                 tIeExamInvigilateCall.setStatus(tIeExamInvigilateCallLog.getStatus());
@@ -631,7 +718,9 @@ public class MqLogicServiceImpl implements MqLogicService {
                 }
             }
             if (Objects.nonNull(tIeExamInvigilateCall.getUpdateTime())) {
-                Long dbtimestamp = Objects.nonNull(tIeExamInvigilateCall.getUpdateTime()) ? tIeExamInvigilateCall.getUpdateTime() : 0L;
+                Long dbtimestamp = Objects.nonNull(tIeExamInvigilateCall.getUpdateTime()) ?
+                        tIeExamInvigilateCall.getUpdateTime() :
+                        0L;
                 if (mqDto.getTimestamp() > dbtimestamp) {
                     tIeExamInvigilateCallService.updateById(tIeExamInvigilateCall);
                 }
@@ -641,7 +730,8 @@ public class MqLogicServiceImpl implements MqLogicService {
             tIeExamInvigilateCallLogService.saveOrUpdate(tIeExamInvigilateCallLog);
         } else if (Objects.equals(MqTagEnum.EXCEPTION_LOG.name(), tag)) {//考试断点异常日志
             JSONObject jsonObject = JSONObject.parseObject(String.valueOf(mqDto.getBody()));
-            ExceptionEnum exceptionEnum = ExceptionEnum.valueOf(ExceptionEnum.convertToName(String.valueOf(jsonObject.getJSONObject("reason").get("type"))));
+            ExceptionEnum exceptionEnum = ExceptionEnum.valueOf(
+                    ExceptionEnum.convertToName(String.valueOf(jsonObject.getJSONObject("reason").get("type"))));
             Long recordId = Long.parseLong(mqDto.getObjId());
             Long breakId = ExamRecordCacheUtil.getLastBreakId(recordId);
             if (Objects.nonNull(breakId)) {
@@ -733,7 +823,8 @@ public class MqLogicServiceImpl implements MqLogicService {
         //先查询之前的断点记录
         QueryWrapper<TOeExamBreakHistory> tOeExamBreakHistoryQueryWrapper = new QueryWrapper<>();
         tOeExamBreakHistoryQueryWrapper.lambda().eq(TOeExamBreakHistory::getExamRecordId, recordId);
-        List<TOeExamBreakHistory> tOeExamBreakHistoryList = tOeExamBreakHistoryService.list(tOeExamBreakHistoryQueryWrapper);
+        List<TOeExamBreakHistory> tOeExamBreakHistoryList = tOeExamBreakHistoryService
+                .list(tOeExamBreakHistoryQueryWrapper);
         //删除历史断点缓存
         if (Objects.nonNull(tOeExamBreakHistoryList) && tOeExamBreakHistoryList.size() > 0) {
             tOeExamBreakHistoryList.forEach(s -> {
@@ -741,43 +832,57 @@ public class MqLogicServiceImpl implements MqLogicService {
             });
         }
         //增加断点记录
-        TOeExamBreakHistory tOeExamBreakHistory = new TOeExamBreakHistory(ExamRecordCacheUtil.getLastBreakId(recordId), recordId, System.currentTimeMillis(), exceptionEnum, exceptionEnum.name());
+        TOeExamBreakHistory tOeExamBreakHistory = new TOeExamBreakHistory(ExamRecordCacheUtil.getLastBreakId(recordId),
+                recordId, System.currentTimeMillis(), exceptionEnum, exceptionEnum.name());
         tOeExamBreakHistoryService.saveOrUpdate(tOeExamBreakHistory);
-        redisUtil.setForHash(RedisKeyHelper.examBreakCacheKey(tOeExamBreakHistory.getId()), SimpleBeanUtil.objectToMap(tOeExamBreakHistory));
-
-//        Long clientLastSyncTime = ExamRecordCacheUtil.getClientLastSyncTime(recordId);
-//        Integer diff = 0;
-//        Long startTime = System.currentTimeMillis();
-//        if (Objects.nonNull(clientLastSyncTime)) {//大于等于当前时间，说明未重连或重登录
-//            Long l = (startTime - clientLastSyncTime) / 1000;
-//            diff = l.intValue();
-//        }
+        redisUtil.setForHash(RedisKeyHelper.examBreakCacheKey(tOeExamBreakHistory.getId()),
+                SimpleBeanUtil.objectToMap(tOeExamBreakHistory));
+
+        //        Long clientLastSyncTime = ExamRecordCacheUtil.getClientLastSyncTime(recordId);
+        //        Integer diff = 0;
+        //        Long startTime = System.currentTimeMillis();
+        //        if (Objects.nonNull(clientLastSyncTime)) {//大于等于当前时间，说明未重连或重登录
+        //            Long l = (startTime - clientLastSyncTime) / 1000;
+        //            diff = l.intValue();
+        //        }
         Long examId = ExamRecordCacheUtil.getExamId(recordId);
         Long examActivityId = ExamRecordCacheUtil.getExamActivityId(recordId);
         Long examStudentId = ExamRecordCacheUtil.getExamStudentId(recordId);
         ExamStudentCacheBean examStudentCacheBean = teExamStudentService.getExamStudentCacheBean(examStudentId);
         //增加异常日志
-        TIeInvigilateExceptionInfo tIeInvigilateExceptionInfo = new TIeInvigilateExceptionInfo(examId, examActivityId, recordId, examStudentId, ExceptionEnum.NET_TIME_OUT.getCode(), ExceptionEnum.NET_TIME_OUT, null, ExamRecordCacheUtil.getLastBreakId(recordId));
-//        if (Objects.nonNull(diff)) {
-//            tIeInvigilateExceptionInfo.setCreateTime(clientLastSyncTime);
-//            tIeInvigilateExceptionInfo.setUpdateTime(startTime);
-//        }
+        TIeInvigilateExceptionInfo tIeInvigilateExceptionInfo = new TIeInvigilateExceptionInfo(examId, examActivityId,
+                recordId, examStudentId, ExceptionEnum.NET_TIME_OUT.getCode(), ExceptionEnum.NET_TIME_OUT, null,
+                ExamRecordCacheUtil.getLastBreakId(recordId));
+        //        if (Objects.nonNull(diff)) {
+        //            tIeInvigilateExceptionInfo.setCreateTime(clientLastSyncTime);
+        //            tIeInvigilateExceptionInfo.setUpdateTime(startTime);
+        //        }
         tIeInvigilateExceptionInfoService.saveOrUpdate(tIeInvigilateExceptionInfo);
-        TEExamStudentLog teExamStudentLog = new TEExamStudentLog(SystemOperationEnum.BREAK_OFF.name(), SystemOperationEnum.BREAK_OFF.getCode(), SystemOperationEnum.BREAK_OFF.getCode(), examStudentCacheBean.getStudentId(), examStudentId, recordId, ExamRecordCacheUtil.getLastBreakId(recordId), SystemOperationEnum.BREAK_OFF.getTitle());
+        TEExamStudentLog teExamStudentLog = new TEExamStudentLog(SystemOperationEnum.BREAK_OFF.name(),
+                SystemOperationEnum.BREAK_OFF.getCode(), SystemOperationEnum.BREAK_OFF.getCode(),
+                examStudentCacheBean.getStudentId(), examStudentId, recordId,
+                ExamRecordCacheUtil.getLastBreakId(recordId), SystemOperationEnum.BREAK_OFF.getTitle());
         teExamStudentLogService.save(teExamStudentLog);
 
         //更新客户端摄像头推流状态为stop
-        MonitorStatusSourceEnum cameraStatusSourceEnum = ExamRecordCacheUtil.getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA);
+        MonitorStatusSourceEnum cameraStatusSourceEnum = ExamRecordCacheUtil
+                .getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA);
         if (Objects.nonNull(cameraStatusSourceEnum)) {
-            ExamRecordCacheUtil.setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA, MonitorStatusSourceEnum.STOP, true);
+            ExamRecordCacheUtil
+                    .setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_CAMERA, MonitorStatusSourceEnum.STOP,
+                            true);
         }
         //更新客户端屏幕推流状态为stop
-        MonitorStatusSourceEnum screenStatusSourceEnum = ExamRecordCacheUtil.getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN);
+        MonitorStatusSourceEnum screenStatusSourceEnum = ExamRecordCacheUtil
+                .getMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN);
         if (Objects.nonNull(screenStatusSourceEnum)) {
-            ExamRecordCacheUtil.setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN, MonitorStatusSourceEnum.STOP, true);
+            ExamRecordCacheUtil
+                    .setMonitorStatus(recordId, MonitorVideoSourceEnum.CLIENT_SCREEN, MonitorStatusSourceEnum.STOP,
+                            true);
         }
         //发送移动端监考退出考试mq消息 start
-        MqDto mqDtoExamStop = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_STOP.name(), recordId, MqTagEnum.EXAM_STOP, String.valueOf(recordId), String.valueOf(recordId));
+        MqDto mqDtoExamStop = new MqDto(MqTopicEnum.THEMIS_TOPIC.getCode(), MqTagEnum.EXAM_STOP.name(), recordId,
+                MqTagEnum.EXAM_STOP, String.valueOf(recordId), String.valueOf(recordId));
         mqDtoService.assembleSendOneWayMsg(mqDtoExamStop);
         //发送移动端监考退出考试mq消息 end
 
@@ -803,11 +908,16 @@ public class MqLogicServiceImpl implements MqLogicService {
         Map<String, Object> tranMap = mqDto.getProperties();
         Long recordId = Long.parseLong(String.valueOf(tranMap.get("recordId")));
         ExamRecordStatusEnum statusEnum = ExamRecordCacheUtil.getStatus(recordId);
-        if (Objects.nonNull(statusEnum) && !Objects.equals(statusEnum, ExamRecordStatusEnum.FINISHED) && !Objects.equals(statusEnum, ExamRecordStatusEnum.PERSISTED) && !Objects.equals(statusEnum, ExamRecordStatusEnum.ANSWERING)) {
+        if (Objects.nonNull(statusEnum) && !Objects.equals(statusEnum, ExamRecordStatusEnum.FINISHED) && !Objects
+                .equals(statusEnum, ExamRecordStatusEnum.PERSISTED) && !Objects
+                .equals(statusEnum, ExamRecordStatusEnum.ANSWERING)) {
             Long examStudentId = ExamRecordCacheUtil.getExamStudentId(recordId);
-            Integer durationSeconds = Objects.isNull(ExamRecordCacheUtil.getDurationSeconds(recordId)) ? 0 : ExamRecordCacheUtil.getDurationSeconds(recordId);
+            Integer durationSeconds = Objects.isNull(ExamRecordCacheUtil.getDurationSeconds(recordId)) ?
+                    0 :
+                    ExamRecordCacheUtil.getDurationSeconds(recordId);
             ExamStudentCacheBean examStudentCacheBean = teExamStudentService.getExamStudentCacheBean(examStudentId);
-            teExamService.finish(examStudentCacheBean.getStudentId(), recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
+            teExamService
+                    .finish(examStudentCacheBean.getStudentId(), recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
         }
         TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);
         tmRocketMessage.setBody(JacksonUtil.parseJson(tmRocketMessage.getBody()));
@@ -824,7 +934,8 @@ public class MqLogicServiceImpl implements MqLogicService {
      * @return
      */
     @Override
-    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext, MqExecTypeEnum mqExecTypeEnum) {
+    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs,
+            ConsumeConcurrentlyContext consumeConcurrentlyContext, MqExecTypeEnum mqExecTypeEnum) {
         MqDto mqDto = null;
         try {
             long threadId = Thread.currentThread().getId();
@@ -837,11 +948,16 @@ public class MqLogicServiceImpl implements MqLogicService {
                 if (reconsumeTime >= SystemConstant.MAXRECONSUMETIMES) {
                     this.execMqMaxReconsumeTime(mqDto, SystemConstant.MQ_TOPIC_BUFFER_LIST);
                 } else {
-                    if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE && Objects.nonNull(redisUtil.get(SystemConstant.MQ_TOPIC_BUFFER_LIST, mqDto.getId())) && redisUtil.lock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId(), SystemConstant.REDIS_LOCK_MQ_TIME_OUT)) {
+                    if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE
+                            && Objects.nonNull(redisUtil.get(SystemConstant.MQ_TOPIC_BUFFER_LIST, mqDto.getId()))
+                            && redisUtil.lock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId(),
+                            SystemConstant.REDIS_LOCK_MQ_TIME_OUT)) {
                         try {
-                            Method method = this.getClass().getDeclaredMethod(mqExecTypeEnum.getDesc(), MqDto.class, String.class);
+                            Method method = this.getClass()
+                                    .getDeclaredMethod(mqExecTypeEnum.getDesc(), MqDto.class, String.class);
                             log.info(":{}-:{} 准备执行mq exec:{}逻辑", threadId, threadName, method.getName());
-                            method.invoke(SpringContextHolder.getBean(MqLogicService.class), mqDto, SystemConstant.MQ_TOPIC_BUFFER_LIST);
+                            method.invoke(SpringContextHolder.getBean(MqLogicService.class), mqDto,
+                                    SystemConstant.MQ_TOPIC_BUFFER_LIST);
                             return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
                         } finally {
                             if (Objects.nonNull(mqDto)) {
@@ -867,7 +983,8 @@ public class MqLogicServiceImpl implements MqLogicService {
      * @return
      */
     @Override
-    public ConsumeConcurrentlyStatus consumeMessageDelay(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext, MqExecTypeEnum mqExecTypeEnum) {
+    public ConsumeConcurrentlyStatus consumeMessageDelay(List<MessageExt> msgs,
+            ConsumeConcurrentlyContext consumeConcurrentlyContext, MqExecTypeEnum mqExecTypeEnum) {
         MqDto mqDto = null;
         try {
             long threadId = Thread.currentThread().getId();
@@ -880,11 +997,16 @@ public class MqLogicServiceImpl implements MqLogicService {
                 if (reconsumeTime >= SystemConstant.MAXRECONSUMETIMES) {
                     this.execMqMaxReconsumeTime(mqDto, SystemConstant.MQ_DELAY_TOPIC_BUFFER_LIST);
                 } else {
-                    if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE && Objects.nonNull(SystemConstant.MQ_DELAY_TOPIC_BUFFER_LIST) && redisUtil.lock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId(), SystemConstant.REDIS_LOCK_MQ_TIME_OUT)) {
+                    if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE
+                            && Objects.nonNull(SystemConstant.MQ_DELAY_TOPIC_BUFFER_LIST) && redisUtil
+                            .lock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId(),
+                                    SystemConstant.REDIS_LOCK_MQ_TIME_OUT)) {
                         try {
-                            Method method = this.getClass().getDeclaredMethod(mqExecTypeEnum.getDesc(), MqDto.class, String.class);
+                            Method method = this.getClass()
+                                    .getDeclaredMethod(mqExecTypeEnum.getDesc(), MqDto.class, String.class);
                             log.info(":{}-:{} 准备执行mq exec:{}逻辑", threadId, threadName, method.getName());
-                            method.invoke(SpringContextHolder.getBean(MqLogicService.class), mqDto, SystemConstant.MQ_DELAY_TOPIC_BUFFER_LIST);
+                            method.invoke(SpringContextHolder.getBean(MqLogicService.class), mqDto,
+                                    SystemConstant.MQ_DELAY_TOPIC_BUFFER_LIST);
                             return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
                         } finally {
                             if (Objects.nonNull(mqDto)) {

themis-task/src/main/resources/application.properties

@@ -94,6 +94,7 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 
 #\u7CFB\u7EDF\u914D\u7F6E
+sys.config.datacenterId=1
 sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav
 sys.config.serverUpload=/Users/king/git/themis-files/