批量更新新开事务修改

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

@@ -75,7 +75,9 @@ public class TEExamActivityController {
                 }
             });
             examId = teExamActivityList.get(0).getExamId();
-            teExamActivityService.saveOrUpdateBatch(teExamActivityList);
+            for(TEExamActivity ac:teExamActivityList){
+            	teExamActivityService.saveOrUpdate(ac);
+            }
             TEExam teExam = teExamService.getById(teExamActivityList.get(0).getExamId());
             if (Objects.nonNull(teExam.getForceFinish()) && teExam.getForceFinish().intValue() == 1) {
                 //新增quartz任务,发送mq消息start

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

@@ -150,7 +150,9 @@ public class TEExamController {
                         s.setFinishTime(finalTeExam.getEndTime());
                         s.setUpdateId(tbUser.getId());
                     });
-                    teExamActivityService.saveOrUpdateBatch(teExamActivityList);
+                    for(TEExamActivity ac:teExamActivityList){
+                    	teExamActivityService.saveOrUpdate(ac);
+                    }
                     if (Objects.nonNull(teExam.getForceFinish()) && teExam.getForceFinish().intValue() == 1) {
                         //新增quartz任务,发送mq消息start
                         Map<String, Object> prop = new HashMap<>();
@@ -316,7 +318,9 @@ public class TEExamController {
                     s.setUpdateTime(null);
                     s.setCode(String.valueOf(redisUtil.getRedisActivityCodeSequence(teExam.getId())));
                 });
-                teExamActivityService.saveOrUpdateBatch(teExamActivityList);
+                for(TEExamActivity ac:teExamActivityList){
+                	teExamActivityService.saveOrUpdate(ac);
+                }
             }
         } catch (Exception e) {
             log.error("请求出错", e);

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

@@ -28,6 +28,7 @@ import com.qmth.themis.business.entity.TBAttachment;
 import com.qmth.themis.business.entity.TBTaskHistory;
 import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.entity.TEExam;
+import com.qmth.themis.business.entity.TEExamActivity;
 import com.qmth.themis.business.entity.TEExamPaper;
 import com.qmth.themis.business.enums.FieldUniqueEnum;
 import com.qmth.themis.business.enums.MqTagEnum;
@@ -114,7 +115,9 @@ public class TEExamPaperController {
             teExamPaperList.forEach(s -> {
                 s.setUpdateId(tbUser.getId());
             });
-            teExamPaperService.saveOrUpdateBatch(teExamPaperList);
+            for(TEExamPaper ep:teExamPaperList){
+            	teExamPaperService.saveOrUpdate(ep);
+            }
         } catch (Exception e) {
             log.error("请求出错", e);
             if (e instanceof DuplicateKeyException) {

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

@@ -231,7 +231,9 @@ public class TEExamStudentController {
                 s.setRoomName(roomCodeQueryDtoMap.get(s.getRoomCode()).getRoomName());
             }
         });
-        teExamStudentService.saveOrUpdateBatch(teExamStudentList);
+        for(TEExamStudent es:teExamStudentList){
+        	teExamStudentService.saveOrUpdate(es);
+        }
         teExamStudentList.forEach(s -> {
             teExamStudentService.updateExamStudentCacheBean(s.getId());
         });

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

@@ -432,7 +432,9 @@ public class TIeInvigilateController {
                     ExamRecordCacheUtil.setBreachStatus(s.getExamRecordId(), 1, true);
                 });
             }
-            teExamBreachLogService.saveOrUpdateBatch(teExamBreachLogList);
+            for(TEExamBreachLog eb:teExamBreachLogList){
+            	teExamBreachLogService.saveOrUpdate(eb);
+            }
         }
         return ResultUtil.ok(Collections.singletonMap("success", true));
     }

themis-common/src/main/java/com/qmth/themis/common/util/IpUtil.java

@@ -1,8 +1,5 @@
 package com.qmth.themis.common.util;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
@@ -58,14 +55,4 @@ public class IpUtil {
         return ip;
     }
     
-    public static void main(String[] args) {
-    	String rex="20.20.9.*";
-    	String reg="^"+rex.replaceAll("\\*", "[0-9]{1,3}").replaceAll("\\.", "\\\\.")+"$";
-    	System.out.println(reg);
-    	String textValue="20.20.9a999";
-    	Pattern p = Pattern.compile(reg);
-        Matcher matcher = p.matcher(textValue);
-        System.out.println(matcher.matches());
-	}
-
 }