调整

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/warehouse/InvwWarehouseController.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.invw.api.warehouse;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.invw.api.MyValidController;
@@ -60,7 +61,7 @@ public class InvwWarehouseController extends MyValidController {
 
     @ApiOperation(value = "06-仓库ID名称集合")
     @PostMapping("/getWarehouseIdNames")
-    public ApiResponse<InvwWarehouseIdNameResponseDTO> getWarehouseIdNames(@Valid @RequestBody InvwWarehouseIdNameRequestDTO req) {
+    public ApiResponse<InvwWarehouseIdNameResponseDTO> getWarehouseIdNames(@Valid @RequestBody InvwWarehouseIdNameRequestDTO req) throws ServiceHandleException {
         return ApiResponse.of(manager.getWarehouseIdNames(req));
     }
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/AbstractInvwManager.java

@@ -1,6 +1,5 @@
 package cn.com.taiji.invw.manager;
 
-import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.pub.IPTools;
 import cn.com.taiji.common.pub.TimeTools;
 import cn.com.taiji.core.entity.dict.basic.SourceType;

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/renewalInst/RenewalInstApplyManager.java

@@ -15,6 +15,7 @@ import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.core.repo.jpa.ass.AssRenewalCosRecordRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo;
+import cn.com.taiji.core.repo.jpa.log.InssInterfaceLogRepo;
 import cn.com.taiji.inss.manager.model.MyFinals;
 import cn.com.taiji.inss.manager.model.inst.CmdType;
 import cn.com.taiji.inss.manager.model.inst.InstConstant;
@@ -43,6 +44,8 @@ public class RenewalInstApplyManager extends RedisCacheManager implements LogMan
     private QtkObuInfoRepo obuInfoRepo;
     @Autowired
     private AssRenewalCosRecordRepo cosRecordRepo;
+    @Autowired
+    private InssInterfaceLogRepo logRepo;
 
     public RenewalInstApplyResponse serviceHandle(RenewalInstApplyRequest request) throws ServiceHandleException {
         try {
@@ -157,6 +160,6 @@ public class RenewalInstApplyManager extends RedisCacheManager implements LogMan
 
     @Override
     public void doSaveLog(RenewalInstApplyRequest request, RenewalInstApplyResponse response, InssInterfaceLog log) {
-
+        logRepo.persist(log);
     }
 }

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

@@ -44,28 +44,39 @@ 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)){
             flag = resHandle(qtkCardInfos);
         }
         if (flag){
+            logger.info("--------------------------------------根据cardId查询老库有正常的---------------------");
             return getResponse(dsiCardInfos, qtkCardInfos);
         }else {
             return new OqsCardQueryResponse();
         }
-
     }
 
     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

@@ -28,7 +28,7 @@ public class TestOqsIssueServiceHandler extends AbstractCommManager {
     @Test
     public void CardQueryManagerTest() throws ServiceHandleException {
         OqsCardQueryRequest cardQueryRequest = new OqsCardQueryRequest();
-        cardQueryRequest.setVehicleId("冀A9G240_1");
+        cardQueryRequest.setVehicleId("川AL29A3_0");
         OqsCardQueryResponse oqsCardQueryResponse = null;
         try {
 //            oqsCardQueryResponse =  cardQueryManager.serviceHandle(cardQueryRequest);