vif修改

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/vfj/VfjQryCardsManagerImpl.java

@@ -4,15 +4,14 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.core.entity.invw.InvwQryCards;
 import cn.com.taiji.core.model.comm.protocol.inss.VfjQryCardsRequest;
 import cn.com.taiji.core.model.comm.protocol.inss.VfjQryCardsResponse;
-import cn.com.taiji.core.model.comm.protocol.inss.model.VfjQryCardsModel;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryCardsRepo;
 import cn.com.taiji.iasq.manager.AbstractCommManager;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class VfjQryCardsManagerImpl extends AbstractCommManager implements VfjQryCardsManager {
@@ -25,6 +24,7 @@ public class VfjQryCardsManagerImpl extends AbstractCommManager implements VfjQr
     @Override
     public void execute() {
         logger.info("--卡片发行批次列查询开始--");
+        int num = 0;
         try {
             int start = Math.toIntExact(repo.countId());
             boolean hasMoreData = true;
@@ -40,20 +40,22 @@ public class VfjQryCardsManagerImpl extends AbstractCommManager implements VfjQr
                     break;
                 }
 
-                List<InvwQryCards> batchList = new ArrayList<>(BATCH_SIZE);
-                for (VfjQryCardsModel model : response.getDatas()) {
-                    InvwQryCards entity = new InvwQryCards();
-                    BeanUtils.copyProperties(model, entity);
-                    batchList.add(entity);
-                }
+                List<InvwQryCards> batchList = response.getDatas().stream()
+                    .map(model -> {
+                        InvwQryCards entity = new InvwQryCards();
+                        BeanUtils.copyProperties(model, entity);
+                        return entity;
+                    }).collect(Collectors.toList());
 
                 repo.saveAll(batchList);
-                start += BATCH_SIZE;
+                int size = batchList.size();
+                logger.info("--当前起始位置: {}，已处理 {} 条记录--", start, size);
 
-                hasMoreData = batchList.size() >= BATCH_SIZE;
-                logger.info("--已处理 {} 条记录，当前起始位置: {}--", batchList.size(), start);
+                start += size;
+                num += size;
+                hasMoreData = size >= BATCH_SIZE;
             }
-            logger.info("--卡片发行批次列查询结束，共处理 {} 条记录--", start);
+            logger.info("--卡片发行批次列查询结束，共处理 {} 条记录--", num);
         } catch (ManagerException e) {
             logger.error("--卡片发行批次列查询失败：", e);
             e.printStackTrace();

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/vfj/VfjQueryGmobusManagerImpl.java

@@ -4,15 +4,14 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.core.entity.invw.InvwQryObus;
 import cn.com.taiji.core.model.comm.protocol.inss.VfjQueryGmobusRequest;
 import cn.com.taiji.core.model.comm.protocol.inss.VfjQueryGmobusResponse;
-import cn.com.taiji.core.model.comm.protocol.inss.model.VfjQueryGmobusModel;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryObusRepo;
 import cn.com.taiji.iasq.manager.AbstractCommManager;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class VfjQueryGmobusManagerImpl extends AbstractCommManager implements VfjQueryGmobusManager {
@@ -25,6 +24,7 @@ public class VfjQueryGmobusManagerImpl extends AbstractCommManager implements Vf
     @Override
     public void execute() {
         logger.info("--双片国密OBU发行批次列表查询开始--");
+        int num = 0;
         try {
             int start = Math.toIntExact(repo.countByEncryptType("0"));
             boolean hasMoreData = true;
@@ -40,21 +40,23 @@ public class VfjQueryGmobusManagerImpl extends AbstractCommManager implements Vf
                     break;
                 }
 
-                List<InvwQryObus> batchList = new ArrayList<>(BATCH_SIZE);
-                for (VfjQueryGmobusModel model : response.getDatas()) {
-                    InvwQryObus entity = new InvwQryObus();
-                    BeanUtils.copyProperties(model, entity);
-                    entity.setEncryptType("0");
-                    batchList.add(entity);
-                }
+                List<InvwQryObus> batchList = response.getDatas().stream()
+                    .map(model -> {
+                        InvwQryObus entity = new InvwQryObus();
+                        BeanUtils.copyProperties(model, entity);
+                        entity.setEncryptType("0");
+                        return entity;
+                    }).collect(Collectors.toList());
 
                 repo.saveAll(batchList);
-                start += batchList.size();
+                int size = batchList.size();
+                logger.info("--当前起始位置: {}，已处理 {} 条记录--", start, size);
 
-                hasMoreData = batchList.size() >= BATCH_SIZE;
-                logger.info("--已处理 {} 条记录，当前起始位置: {}--", batchList.size(), start);
+                start += size;
+                num += size;
+                hasMoreData = size >= BATCH_SIZE;
             }
-            logger.info("--双片国密OBU发行批次列表查询结束，共处理 {} 条记录--", start);
+            logger.info("--双片国密OBU发行批次列表查询结束，共处理 {} 条记录--", num);
         } catch (ManagerException e) {
             logger.error("--双片国密OBU发行批次列表查询失败：", e);
             e.printStackTrace();

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/vfj/VfjQueryScobusManagerImpl.java

@@ -4,15 +4,14 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.core.entity.invw.InvwQryObus;
 import cn.com.taiji.core.model.comm.protocol.inss.VfjQueryScobusRequest;
 import cn.com.taiji.core.model.comm.protocol.inss.VfjQueryScobusResponse;
-import cn.com.taiji.core.model.comm.protocol.inss.model.VfjQueryScobusModel;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryObusRepo;
 import cn.com.taiji.iasq.manager.AbstractCommManager;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class VfjQueryScobusManagerImpl extends AbstractCommManager implements VfjQueryScobusManager {
@@ -25,6 +24,7 @@ public class VfjQueryScobusManagerImpl extends AbstractCommManager implements Vf
     @Override
     public void execute() {
         logger.info("--单片OBU发行批次列表查询开始--");
+        int num = 0;
         try {
             int start = Math.toIntExact(repo.countByEncryptType("1"));
             boolean hasMoreData = true;
@@ -40,21 +40,23 @@ public class VfjQueryScobusManagerImpl extends AbstractCommManager implements Vf
                     break;
                 }
 
-                List<InvwQryObus> batchList = new ArrayList<>(BATCH_SIZE);
-                for (VfjQueryScobusModel model : response.getDatas()) {
-                    InvwQryObus entity = new InvwQryObus();
-                    BeanUtils.copyProperties(model, entity);
-                    entity.setEncryptType("1");
-                    batchList.add(entity);
-                }
+                List<InvwQryObus> batchList = response.getDatas().stream()
+                    .map(model -> {
+                        InvwQryObus entity = new InvwQryObus();
+                        BeanUtils.copyProperties(model, entity);
+                        entity.setEncryptType("1");
+                        return entity;
+                    }).collect(Collectors.toList());
 
                 repo.saveAll(batchList);
-                start += batchList.size();
+                int size = batchList.size();
+                logger.info("--当前起始位置: {}，已处理 {} 条记录--", start, size);
 
-                hasMoreData = batchList.size() >= BATCH_SIZE;
-                logger.info("--已处理 {} 条记录，当前起始位置: {}--", batchList.size(), start);
+                start += size;
+                num += size;
+                hasMoreData = size >= BATCH_SIZE;
             }
-            logger.info("--单片OBU发行批次列表查询结束，共处理 {} 条记录--", start);
+            logger.info("--单片OBU发行批次列表查询结束，共处理 {} 条记录--", num);
         } catch (ManagerException e) {
             logger.error("--单片OBU发行批次列表查询失败：", e);
             e.printStackTrace();

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/vfj/VfjQueryTriDesObusManagerImpl.java

@@ -4,15 +4,14 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.core.entity.invw.InvwQryObus;
 import cn.com.taiji.core.model.comm.protocol.inss.VfjQueryTriDesObusRequest;
 import cn.com.taiji.core.model.comm.protocol.inss.VfjQueryTriDesObusResponse;
-import cn.com.taiji.core.model.comm.protocol.inss.model.VfjQueryTriDesObusModel;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryObusRepo;
 import cn.com.taiji.iasq.manager.AbstractCommManager;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class VfjQueryTriDesObusManagerImpl extends AbstractCommManager implements VfjQueryTriDesObusManager {
@@ -25,6 +24,7 @@ public class VfjQueryTriDesObusManagerImpl extends AbstractCommManager implement
     @Override
     public void execute() {
         logger.info("--3DESOBU发行批次列表查询开始--");
+        int num = 0;
         try {
             int start = Math.toIntExact(repo.countByEncryptType("2"));
             boolean hasMoreData = true;
@@ -40,21 +40,23 @@ public class VfjQueryTriDesObusManagerImpl extends AbstractCommManager implement
                     break;
                 }
 
-                List<InvwQryObus> batchList = new ArrayList<>(BATCH_SIZE);
-                for (VfjQueryTriDesObusModel model : response.getDatas()) {
-                    InvwQryObus entity = new InvwQryObus();
-                    BeanUtils.copyProperties(model, entity);
-                    entity.setEncryptType("2");
-                    batchList.add(entity);
-                }
+                List<InvwQryObus> batchList = response.getDatas().stream()
+                    .map(model -> {
+                        InvwQryObus entity = new InvwQryObus();
+                        BeanUtils.copyProperties(model, entity);
+                        entity.setEncryptType("2");
+                        return entity;
+                    }).collect(Collectors.toList());
 
                 repo.saveAll(batchList);
-                start += batchList.size();
+                int size = batchList.size();
+                logger.info("--当前起始位置: {}，已处理 {} 条记录--", start, size);
 
-                hasMoreData = batchList.size() >= BATCH_SIZE;
-                logger.info("--已处理 {} 条记录，当前起始位置: {}--", batchList.size(), start);
+                start += size;
+                num += size;
+                hasMoreData = size >= BATCH_SIZE;
             }
-            logger.info("--3DESOBU发行批次列表查询结束，共处理 {} 条记录--", start);
+            logger.info("--3DESOBU发行批次列表查询结束，共处理 {} 条记录--", num);
         } catch (ManagerException e) {
             logger.error("--3DESOBU发行批次列表查询失败：", e);
             e.printStackTrace();