代码优化

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamAuditController.java

@@ -26,7 +26,6 @@ import cn.com.qmth.examcloud.reports.commons.bean.AdminOperateReport;
 import cn.com.qmth.examcloud.reports.commons.util.ReportsUtil;
 import cn.com.qmth.examcloud.support.enums.ExamProperties;
 import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.support.helper.IdentityNumberHelper;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.security.DataRule;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
@@ -75,19 +74,12 @@ public class ExamAuditController extends ControllerSupport {
     @PostMapping("/list")
     @ApiOperation(value = "查询“监考已审”列表(分页)")
     public Page<ExamAuditInfo> getExamAuditList(@RequestBody ExamAuditQuery query) {
-        User user = getAccessUser();
         UserDataRule courseRule = super.getUserDataRule(DataRuleType.COURSE);
         UserDataRule orgRule = super.getUserDataRule(DataRuleType.ORG);
 
-        Page<ExamAuditInfo> page = examRecordAlreadyAuditService.getExamRecordAlreadyAuditList(query, courseRule, orgRule);
-
-        page.getContent().forEach(p -> {
-            p.setIdentityNumber(IdentityNumberHelper.conceal(user.getRootOrgId(), p.getIdentityNumber()));
-        });
-        return page;
+        return examRecordAlreadyAuditService.getExamRecordAlreadyAuditList(query, courseRule, orgRule);
     }
 
-
     @GetMapping("export/async")
     @ApiOperation(value = "导出“监考已审”(异步)")
     public void exportExamAuditList(@RequestParam String query) {
@@ -101,16 +93,10 @@ public class ExamAuditController extends ControllerSupport {
     @PostMapping("/discipline/list")
     @ApiOperation(value = "查询“违纪名单”列表(分页)")
     public Page<ExamAuditInfo> getExamAuditUnPassList(@RequestBody ExamAuditQuery query) {
-        User user = getAccessUser();
         UserDataRule courseRule = super.getUserDataRule(DataRuleType.COURSE);
         UserDataRule orgRule = super.getUserDataRule(DataRuleType.ORG);
 
-        Page<ExamAuditInfo> page = examRecordIllegallyService.getExamRecordIllegallyList(query, courseRule, orgRule);
-
-        page.getContent().forEach(p -> {
-            p.setIdentityNumber(IdentityNumberHelper.conceal(user.getRootOrgId(), p.getIdentityNumber()));
-        });
-        return page;
+        return examRecordIllegallyService.getExamRecordIllegallyList(query, courseRule, orgRule);
     }
 
     @DataRule(type = {DataRuleType.COURSE, DataRuleType.ORG})

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamRecordController.java

@@ -16,7 +16,6 @@ import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordQue
 import cn.com.qmth.examcloud.core.oe.admin.service.util.AsyncExportConcurrentUtil;
 import cn.com.qmth.examcloud.reports.commons.bean.AdminOperateReport;
 import cn.com.qmth.examcloud.reports.commons.util.ReportsUtil;
-import cn.com.qmth.examcloud.support.helper.IdentityNumberHelper;
 import cn.com.qmth.examcloud.web.security.DataRule;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;
@@ -60,12 +59,7 @@ public class ExamRecordController extends ControllerSupport {
         UserDataRule courseRule = super.getUserDataRule(DataRuleType.COURSE);
         UserDataRule orgRule = super.getUserDataRule(DataRuleType.ORG);
 
-        Page<ExamRecordInfo> page = examRecordWaitingAuditService.getExamRecordWaitingAuditList(query, courseRule, orgRule);
-
-        page.getContent().forEach(p -> {
-            p.setIdentityNumber(IdentityNumberHelper.conceal(p.getRootOrgId(), p.getIdentityNumber()));
-        });
-        return page;
+        return examRecordWaitingAuditService.getExamRecordWaitingAuditList(query, courseRule, orgRule);
     }
 
     @DataRule(type = {DataRuleType.COURSE, DataRuleType.ORG})
@@ -83,12 +77,7 @@ public class ExamRecordController extends ControllerSupport {
         UserDataRule courseRule = super.getUserDataRule(DataRuleType.COURSE);
         UserDataRule orgRule = super.getUserDataRule(DataRuleType.ORG);
 
-        Page<ExamRecordInfo> page = examRecordDetailService.getExamRecordDetailList(query, courseRule, orgRule);
-
-        page.getContent().forEach(p -> {
-            p.setIdentityNumber(IdentityNumberHelper.conceal(p.getRootOrgId(), p.getIdentityNumber()));
-        });
-        return page;
+        return examRecordDetailService.getExamRecordDetailList(query, courseRule, orgRule);
     }
 
     @GetMapping("/detail/list/export/async")

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/AsyncExportServiceImpl.java

@@ -52,7 +52,6 @@ import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.ExamStageCacheBean;
 import cn.com.qmth.examcloud.support.excel.ExcelExportUtil;
-import cn.com.qmth.examcloud.support.helper.IdentityNumberHelper;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.config.SystemProperties;
 import cn.com.qmth.examcloud.web.security.ResourceManager;
@@ -363,12 +362,6 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "当前条件暂无数据，任务终止");
 				return;
 			}
-
-			for (ExamAuditInfo examAuditInfo : auditInfos) {
-				examAuditInfo.setIdentityNumber(
-						IdentityNumberHelper.conceal(req.getRootOrgId(), examAuditInfo.getIdentityNumber()));
-			}
-
 		} catch (ExportTaskStopException e) {
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.TERMINATE);
 			return;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordAlreadyAuditServiceImpl.java

@@ -17,6 +17,7 @@ import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.ExamStageCacheBean;
+import cn.com.qmth.examcloud.support.helper.IdentityNumberHelper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -122,7 +123,7 @@ public class ExamRecordAlreadyAuditServiceImpl implements ExamRecordAlreadyAudit
         Map<Long, String> orgMaps = new HashMap<>();
         Map<Long, CourseCacheBean> courseMaps = new HashMap<>();
         Map<Long, ExamStageCacheBean> examStageMaps = new HashMap<>();
-
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(examCache.getRootOrgId());
         Map<String, String> illegallyTypeMaps = illegallyTypeService.getIllegallyTypes(examCache.getRootOrgId());
 
         for (ExamAuditInfo info : list) {
@@ -169,6 +170,10 @@ public class ExamRecordAlreadyAuditServiceImpl implements ExamRecordAlreadyAudit
             if (result != null) {
                 info.setFaceVerifyResult(result.getDesc());
             }
+
+            if (hidden) {
+                info.setIdentityNumber(IdentityNumberHelper.conceal(info.getIdentityNumber()));
+            }
         }
     }
 

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordDetailServiceImpl.java

@@ -21,6 +21,7 @@ import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.*;
 import cn.com.qmth.examcloud.support.enums.ExamProperties;
 import cn.com.qmth.examcloud.support.fss.FssHelper;
+import cn.com.qmth.examcloud.support.helper.IdentityNumberHelper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -127,6 +128,7 @@ public class ExamRecordDetailServiceImpl implements ExamRecordDetailService {
         Map<Long, CourseCacheBean> courseMaps = new HashMap<>();
         Map<Long, ExamStageCacheBean> examStageMaps = new HashMap<>();
         Map<Long, StudentCacheBean> studentMaps = new HashMap<>();
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(examCache.getRootOrgId());
 
         //考试 是否开启身份检测
         boolean faceEnable = false;
@@ -226,6 +228,10 @@ public class ExamRecordDetailServiceImpl implements ExamRecordDetailService {
                 List<ExamRecordFileAnswerEntity> fileAnswers = examRecordFileAnswerRepo.findByExamRecordDataId(info.getId());
                 info.setOfflineFiles(this.ofFileAnswer(fileAnswers));
             }
+
+            if (hidden) {
+                info.setIdentityNumber(IdentityNumberHelper.conceal(info.getIdentityNumber()));
+            }
         }
     }
 

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordIllegallyServiceImpl.java

@@ -15,6 +15,7 @@ import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.ExamStageCacheBean;
+import cn.com.qmth.examcloud.support.helper.IdentityNumberHelper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -100,7 +101,7 @@ public class ExamRecordIllegallyServiceImpl implements ExamRecordIllegallyServic
         Map<Long, String> orgMaps = new HashMap<>();
         Map<Long, CourseCacheBean> courseMaps = new HashMap<>();
         Map<Long, ExamStageCacheBean> examStageMaps = new HashMap<>();
-
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(examCache.getRootOrgId());
         Map<String, String> illegallyTypeMaps = illegallyTypeService.getIllegallyTypes(examCache.getRootOrgId());
 
         for (ExamAuditInfo info : list) {
@@ -142,6 +143,10 @@ public class ExamRecordIllegallyServiceImpl implements ExamRecordIllegallyServic
 
             // 违规类型名称
             info.setDisciplineType(illegallyTypeMaps.get(info.getDisciplineType()));
+
+            if (hidden) {
+                info.setIdentityNumber(IdentityNumberHelper.conceal(info.getIdentityNumber()));
+            }
         }
     }
 

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordWaitingAuditServiceImpl.java

@@ -11,6 +11,7 @@ import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordQue
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
+import cn.com.qmth.examcloud.support.helper.IdentityNumberHelper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -71,6 +72,7 @@ public class ExamRecordWaitingAuditServiceImpl implements ExamRecordWaitingAudit
         ExamSettingsCacheBean examCache = CacheHelper.getExamSettings(examId);
         Map<Long, String> orgMaps = new HashMap<>();
         Map<Long, CourseCacheBean> courseMaps = new HashMap<>();
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(examCache.getRootOrgId());
 
         for (ExamRecordInfo info : list) {
             // 考试名称
@@ -107,6 +109,10 @@ public class ExamRecordWaitingAuditServiceImpl implements ExamRecordWaitingAudit
             } else {
                 info.setPaperSubmitTime("");
             }
+
+            if (hidden) {
+                info.setIdentityNumber(IdentityNumberHelper.conceal(info.getIdentityNumber()));
+            }
         }
     }