浏览代码

ods调整

master
huminghao 1 天前
父节点
当前提交
28c2a619ee

+ 1
- 14
zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/CardQueryManagerImpl.java 查看文件

import cn.com.taiji.ods.entity.dsi.DsiCardInfo; import cn.com.taiji.ods.entity.dsi.DsiCardInfo;
import cn.com.taiji.ods.repo.jpa.dsi.DsiCardInfoRepo; import cn.com.taiji.ods.repo.jpa.dsi.DsiCardInfoRepo;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.eclipse.osgi.service.resolver.DisabledInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;


private OqsCardQueryResponse listByVehicleIdInUse(OqsCardQueryRequest req) { private OqsCardQueryResponse listByVehicleIdInUse(OqsCardQueryRequest req) {
List<DsiCardInfo> dsiCardInfos = dsiCardInfoRepo.listByVehicleIdInUse(req.getVehicleId()); 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}); 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; Boolean flag = true;
if (CollectionUtils.isEmpty(dsiCardInfos) && !CollectionUtils.isEmpty(qtkCardInfos)){ if (CollectionUtils.isEmpty(dsiCardInfos) && !CollectionUtils.isEmpty(qtkCardInfos)){
resHandle(qtkCardInfos);
flag = resHandle(qtkCardInfos);
} }
if (flag){ if (flag){
logger.info("--------------------------------------根据cardId查询老库有正常的---------------------");
return getResponse(dsiCardInfos, qtkCardInfos); return getResponse(dsiCardInfos, qtkCardInfos);
}else { }else {
return new OqsCardQueryResponse(); return new OqsCardQueryResponse();
private Boolean resHandle(List<QtkCardInfo> qtkCardInfos) { private Boolean resHandle(List<QtkCardInfo> qtkCardInfos) {
for (QtkCardInfo qtkCardInfo : qtkCardInfos) { for (QtkCardInfo qtkCardInfo : qtkCardInfos) {
DsiCardInfo dsiCardInfo = dsiCardInfoRepo.findByCardId(qtkCardInfo.getCardId()); DsiCardInfo dsiCardInfo = dsiCardInfoRepo.findByCardId(qtkCardInfo.getCardId());
logger.info("--------------------------------------开始根据({})查询老库cardinfo打印---------------------", qtkCardInfo.getCardId());
logger.info(dsiCardInfo.toJson()); logger.info(dsiCardInfo.toJson());
logger.info("--------------------------------------结束根据({})查询老库cardinfo打印---------------------", qtkCardInfo.getCardId());
if (dsiCardInfo != null && dsiCardInfo.getStatus() != 1 && dsiCardInfo.getStatus() != 6) { if (dsiCardInfo != null && dsiCardInfo.getStatus() != 1 && dsiCardInfo.getStatus() != 6) {
logger.info("--------------------------------------根据({})查询老库非1,6---------------------", qtkCardInfo.getCardId());
continue; continue;
} }
logger.info("--------------------------------------根据({})查询老库有正常的---------------------", qtkCardInfo.getCardId());
return true; return true;
} }
logger.info("--------------------------------------根据cardId查询老库没有正常的---------------------");
return false; return false;
} }



+ 1
- 1
zhywpt-service-ods/src/test/java/cn/com/taiji/oqs/client/oqs/TestOqsIssueServiceHandler.java 查看文件

@Test @Test
public void CardQueryManagerTest() throws ServiceHandleException { public void CardQueryManagerTest() throws ServiceHandleException {
OqsCardQueryRequest cardQueryRequest = new OqsCardQueryRequest(); OqsCardQueryRequest cardQueryRequest = new OqsCardQueryRequest();
cardQueryRequest.setVehicleId("豫A7273P_1");
cardQueryRequest.setVehicleId("冀A9G240_1");
OqsCardQueryResponse oqsCardQueryResponse = null; OqsCardQueryResponse oqsCardQueryResponse = null;
try { try {
// oqsCardQueryResponse = cardQueryManager.serviceHandle(cardQueryRequest); // oqsCardQueryResponse = cardQueryManager.serviceHandle(cardQueryRequest);

正在加载...
取消
保存