学生导入去掉空格bugfix

themis-admin/src/main/java/com/qmth/themis/admin/aspect/ApiControllerAspect.java

@@ -12,10 +12,12 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Objects;
 
 /**
@@ -58,18 +60,11 @@ public class ApiControllerAspect {
             log.info("============类=============:{}", className);
             log.info("============方法===========:{}", methodName);
             if (Objects.nonNull(args) && args.length > 0) {
-                boolean jsonOut = true;
-                for (Object o : args) {
-                    if (o instanceof CommonsMultipartFile || o instanceof MultipartFile) {
-                        jsonOut = false;
-                        break;
-                    }
-                }
-                if (jsonOut) {
-                    log.info("============参数key:{},参数value===========:{}", JacksonUtil.parseJson(paramsName), JacksonUtil.parseJson(args));
-                } else {
-                    for (int i = 0; i < args.length; i++) {
-                        log.info("============参数key:{},参数value===========:{}", paramsName[i], args[i]);
+                for (int i = 0; i < args.length; i++) {
+                    if (Objects.nonNull(args[i]) && (args[i] instanceof HttpServletRequest || args[i] instanceof HttpServletResponse || args[i] instanceof CommonsMultipartFile || args[i] instanceof MultipartFile || args[i] instanceof BeanPropertyBindingResult)) {
+                        continue;
+                    } else {
+                        log.info("============参数key:{},参数value===========:{}", JacksonUtil.parseJson(paramsName[i]), JacksonUtil.parseJson(args[i]));
                     }
                 }
             }

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

@@ -125,19 +125,19 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                     }
                     //先根据证件号+科目代码查询考生是否存在，存在则更新，不存在则插入
                     QueryWrapper<TEExamStudent> teExamStudentQueryWrapper = new QueryWrapper<>();
-                    teExamStudentQueryWrapper.lambda().eq(TEExamStudent::getIdentity, examStudentImportDto.getIdentity())
+                    teExamStudentQueryWrapper.lambda().eq(TEExamStudent::getIdentity, examStudentImportDto.getIdentity().trim())
                             .eq(TEExamStudent::getCourseCode, examStudentImportDto.getCourseCode())
                             .eq(TEExamStudent::getExamId, examId)
                             .eq(TEExamStudent::getExamActivityId, teExamActivity.getId());
                     TEExamStudent teExamStudent = teExamStudentService.getOne(teExamStudentQueryWrapper);
                     //如果为空则插入考生数据，插入考生前先插入学生档案数据
                     QueryWrapper<TEStudent> teStudentQueryWrapper = new QueryWrapper<>();
-                    teStudentQueryWrapper.lambda().eq(TEStudent::getIdentity, examStudentImportDto.getIdentity()).eq(TEStudent::getOrgId, orgId);
+                    teStudentQueryWrapper.lambda().eq(TEStudent::getIdentity, examStudentImportDto.getIdentity().trim()).eq(TEStudent::getOrgId, orgId);
                     TEStudent teStudent = teStudentService.getOne(teStudentQueryWrapper);
                     if (Objects.isNull(teExamStudent)) {
                         if (Objects.isNull(teStudent)) {//如果学生数据为空则插入学生数据
                             //先插入学生档案数据
-                            teStudent = new TEStudent(orgId, examStudentImportDto.getIdentity(), examStudentImportDto.getName(), createId);
+                            teStudent = new TEStudent(orgId, examStudentImportDto.getIdentity().trim(), examStudentImportDto.getName(), createId);
                         }
                         teExamStudent = gson.fromJson(gson.toJson(examStudentImportDto), TEExamStudent.class);
                         teExamStudent.setExamId(examId);

themis-exam/src/main/java/com/qmth/themis/exam/aspect/ApiControllerAspect.java

@@ -12,9 +12,12 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Objects;
 
 /**
@@ -58,19 +61,11 @@ public class ApiControllerAspect {
             log.info("============class name=============:{}", className);
             log.info("============invoke method===========:{}", methodName);
             if (Objects.nonNull(args) && args.length > 0) {
-                boolean jsonOut = true;
-                for (Object o : args) {
-                    if (o instanceof CommonsMultipartFile) {
-                        jsonOut = false;
-                        break;
-                    }
-                }
-                if (jsonOut) {
-                    log.info("============parameter key:{},value:{}===========", JacksonUtil.parseJson(paramsName),
-                            JacksonUtil.parseJson(args));
-                } else {
-                    for (int i = 0; i < args.length; i++) {
-                        log.info("============parameter key:{},value:{}===========", paramsName[i], args[i]);
+                for (int i = 0; i < args.length; i++) {
+                    if (Objects.nonNull(args[i]) && (args[i] instanceof HttpServletRequest || args[i] instanceof HttpServletResponse || args[i] instanceof CommonsMultipartFile || args[i] instanceof MultipartFile || args[i] instanceof BeanPropertyBindingResult)) {
+                        continue;
+                    } else {
+                        log.info("============参数key:{},参数value===========:{}", JacksonUtil.parseJson(paramsName[i]), JacksonUtil.parseJson(args[i]));
                     }
                 }
             }