修改 定时

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/JcglTask.java

 package com.ruoyi.quartz.task;
 
-import com.ruoyi.system.domain.Fcry;
-import com.ruoyi.system.domain.Gldry;
-import com.ruoyi.system.domain.Jcglry;
-import com.ruoyi.system.domain.Yxry;
+import com.ruoyi.common.utils.DataUtils;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.*;
 import com.ruoyi.system.mapper.FcryMapper;
 import com.ruoyi.system.mapper.GldryMapper;
 import com.ruoyi.system.mapper.JcglryMapper;
@@ -40,7 +39,8 @@ public class JcglTask
         List<Jcglry> jcglries = new ArrayList<>();
         List<Yxry> yxrys = new ArrayList<>();
         for (Jcglry jcglry : list) {
-            List<Yxry> yxrieList = yxries.stream().filter(l->l.getCardNo().equals(jcglry.getCardNo())).collect(Collectors.toList());
+            List<Yxry> yxrieList = yxries.stream().filter(l->l.getCardNo()!=null&&l.getCardNo().equals(jcglry.getCardNo()))
+                    .collect(Collectors.toList());
             if (!yxrieList.isEmpty()){
                 jcglry.setStreet(yxries.get(0).getStreet());
                 jcglry.setCommittee(yxries.get(0).getCommittee());
@@ -57,24 +57,40 @@ public class JcglTask
         }
         //更新解除隔离人员地址
         if (!jcglries.isEmpty()){
-            jcglryMapper.updateBatch(jcglries);
+            int toIndex = 500;
+            for (int i = 0; i < jcglries.size(); i += 500) {
+                if (i + 500 > jcglries.size()) {
+                    toIndex = jcglries.size() - i;
+                }
+                List<Jcglry> list1 = jcglries.subList(i, i + toIndex);
+                jcglryMapper.updateBatch(list1);
+            }
         }
         //更新阳性是否解除隔离
         for (Yxry yxry : yxries) {
-            List<Jcglry> jcglryList = list.stream().filter(l->l.getCardNo().equals(yxry.getCardNo())).collect(Collectors.toList());
+            List<Jcglry> jcglryList = list.stream().filter(l->l.getCardNo()!=null&&l.getCardNo().equals(yxry.getCardNo()))
+                    .collect(Collectors.toList());
             if (!jcglryList.isEmpty())
                 yxry.setIsDeisolation("1");
             else
                 yxry.setIsDeisolation("0");
         }
         if (!yxries.isEmpty()){
-            yxryMapper.updateBatch(yxrys);
+            int toIndex = 500;
+            for (int i = 0; i < yxries.size(); i += 500) {
+                if (i + 500 > yxries.size()) {
+                    toIndex = yxries.size() - i;
+                }
+                List<Yxry> list1 = yxries.subList(i, i + toIndex);
+                yxryMapper.updateBatch(list1);
+            }
         }
         //更新方舱人员会否阳性
         List<Fcry> fcries = new ArrayList<>();
         List<Fcry> fcryList = fcryMapper.selectAll();
         for (Fcry fcry : fcryList) {
-            List<Yxry> yxrieList = yxries.stream().filter(l->l.getCardNo().equals(fcry.getCardNo())).collect(Collectors.toList());
+            List<Yxry> yxrieList = yxries.stream().filter(l->l.getCardNo()!=null&&l.getCardNo().equals(fcry.getCardNo()))
+                    .collect(Collectors.toList());
             if (!yxrieList.isEmpty())
                 fcry.setIsPositive("1");
             else
@@ -82,13 +98,21 @@ public class JcglTask
             fcries.add(fcry);
         }
         if (!fcries.isEmpty()){
-            fcryMapper.updateBatch(fcries);
+            int toIndex = 500;
+            for (int i = 0; i < fcries.size(); i += 500) {
+                if (i + 500 > fcries.size()) {
+                    toIndex = fcries.size() - i;
+                }
+                List<Fcry> list1 = fcries.subList(i, i + toIndex);
+                fcryMapper.updateBatch(list1);
+            }
         }
         //更新隔离点人员是否阳性
         List<Gldry> gldries = new ArrayList<>();
         List<Gldry> gldryList = gldryMapper.selectAll();
         for (Gldry gldry : gldryList) {
-            List<Yxry> yxrieList = yxries.stream().filter(l->l.getCardNo().equals(gldry.getCardNo())).collect(Collectors.toList());
+            List<Yxry> yxrieList = yxries.stream().filter(l->l.getCardNo()!=null&&l.getCardNo().equals(gldry.getCardNo()))
+                    .collect(Collectors.toList());
             if (!yxrieList.isEmpty())
                 gldry.setIsYx("1");
             else
@@ -96,7 +120,14 @@ public class JcglTask
             gldries.add(gldry);
         }
         if (!gldries.isEmpty()){
-            gldryMapper.updateBatch(gldries);
+            int toIndex = 500;
+            for (int i = 0; i < gldries.size(); i += 500) {
+                if (i + 500 > gldries.size()) {
+                    toIndex = gldries.size() - i;
+                }
+                List<Gldry> list1 = gldries.subList(i, i + toIndex);
+                gldryMapper.updateBatch(list1);
+            }
         }
     }
 }