ods调整

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/CardQueryManagerImpl.java

@@ -11,6 +11,7 @@ import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
 import cn.com.taiji.ods.entity.dsi.DsiCardInfo;
 import cn.com.taiji.ods.repo.jpa.dsi.DsiCardInfoRepo;
 import org.apache.commons.compress.utils.Lists;
+import org.eclipse.osgi.service.resolver.DisabledInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -44,12 +45,19 @@ public class CardQueryManagerImpl  extends AbstractManager implements CardQueryM
 
     private OqsCardQueryResponse listByVehicleIdInUse(OqsCardQueryRequest req) {
         List<DsiCardInfo> dsiCardInfos = dsiCardInfoRepo.listByVehicleIdInUse(req.getVehicleId());
+        logger.info("--------------------------------------开始老库cardinfo打印---------------------");
+        dsiCardInfos.forEach(card -> logger.info("卡片信息: {}", card.toJson()));
+        logger.info("--------------------------------------结束老库cardinfo打印---------------------");
         List<QtkCardInfo> qtkCardInfos = qtkCardInfoRepo.listByVehicleIdInUse(req.getVehicleId(), new CardStatus[]{CardStatus.ZC,CardStatus.KGS});
+        logger.info("--------------------------------------开始新库cardinfo打印---------------------");
+        qtkCardInfos.forEach(card -> logger.info("卡片信息: {}", card.toJson()));
+        logger.info("--------------------------------------结束新库cardinfo打印---------------------");
         Boolean flag = true;
         if (CollectionUtils.isEmpty(dsiCardInfos) && !CollectionUtils.isEmpty(qtkCardInfos)){
             resHandle(qtkCardInfos);
         }
         if (flag){
+            logger.info("--------------------------------------根据cardId查询老库有正常的---------------------");
             return getResponse(dsiCardInfos, qtkCardInfos);
         }else {
             return new OqsCardQueryResponse();
@@ -60,11 +68,17 @@ public class CardQueryManagerImpl  extends AbstractManager implements CardQueryM
     private Boolean resHandle(List<QtkCardInfo> qtkCardInfos) {
         for (QtkCardInfo qtkCardInfo : qtkCardInfos) {
             DsiCardInfo dsiCardInfo = dsiCardInfoRepo.findByCardId(qtkCardInfo.getCardId());
+            logger.info("--------------------------------------开始根据({})查询老库cardinfo打印---------------------", qtkCardInfo.getCardId());
+            logger.info(dsiCardInfo.toJson());
+            logger.info("--------------------------------------结束根据({})查询老库cardinfo打印---------------------", qtkCardInfo.getCardId());
             if (dsiCardInfo != null && dsiCardInfo.getStatus() != 1 && dsiCardInfo.getStatus() != 6) {
+                logger.info("--------------------------------------根据({})查询老库非1，6---------------------", qtkCardInfo.getCardId());
                 continue;
             }
+            logger.info("--------------------------------------根据({})查询老库有正常的---------------------", qtkCardInfo.getCardId());
             return true;
         }
+        logger.info("--------------------------------------根据cardId查询老库没有正常的---------------------");
         return false;
     }
 

zhywpt-service-ods/src/test/java/cn/com/taiji/oqs/client/oqs/TestOqsIssueServiceHandler.java

@@ -6,6 +6,7 @@ import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.*;
 import cn.com.taiji.ods.Application;
 import cn.com.taiji.ods.manager.AbstractCommManager;
 import cn.com.taiji.ods.manager.oqs.issue.CardBlackQueryManager;
+import cn.com.taiji.ods.manager.oqs.issue.CardQueryManager;
 import cn.com.taiji.ods.manager.oqs.issue.UserQueryManager;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,25 @@ public class TestOqsIssueServiceHandler extends AbstractCommManager {
     private UserQueryManager userQueryManager;
     @Autowired
     private CardBlackQueryManager cardBlackQueryManager;
+    @Autowired
+    private CardQueryManager cardQueryManager;
+
+
+
+    @Test
+    public void CardQueryManagerTest() throws ServiceHandleException {
+        OqsCardQueryRequest cardQueryRequest = new OqsCardQueryRequest();
+        cardQueryRequest.setVehicleId("豫A7273P_1");
+        OqsCardQueryResponse oqsCardQueryResponse = null;
+        try {
+//            oqsCardQueryResponse =  cardQueryManager.serviceHandle(cardQueryRequest);
+            oqsCardQueryResponse =  jsonPostRepeat(cardQueryRequest);
+        } catch (ManagerException e) {
+            throw new RuntimeException(e);
+        }
+        System.out.println(oqsCardQueryResponse);
+    }
+
 
     @Test
     public void userQueryManagerTest() throws ServiceHandleException {