Explorar el Código

调整

master
huminghao hace 4 días
padre
commit
87a7eb8faa

+ 2
- 1
zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/warehouse/InvwWarehouseController.java Ver fichero

package cn.com.taiji.invw.api.warehouse; package cn.com.taiji.invw.api.warehouse;


import cn.com.taiji.common.manager.ManagerException; 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.model.dao.Pagination;
import cn.com.taiji.common.web.ApiResponse; import cn.com.taiji.common.web.ApiResponse;
import cn.com.taiji.invw.api.MyValidController; import cn.com.taiji.invw.api.MyValidController;


@ApiOperation(value = "06-仓库ID名称集合") @ApiOperation(value = "06-仓库ID名称集合")
@PostMapping("/getWarehouseIdNames") @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)); return ApiResponse.of(manager.getWarehouseIdNames(req));
} }



+ 0
- 1
zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/AbstractInvwManager.java Ver fichero

package cn.com.taiji.invw.manager; 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.IPTools;
import cn.com.taiji.common.pub.TimeTools; import cn.com.taiji.common.pub.TimeTools;
import cn.com.taiji.core.entity.dict.basic.SourceType; import cn.com.taiji.core.entity.dict.basic.SourceType;

+ 4
- 1
zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/renewalInst/RenewalInstApplyManager.java Ver fichero

import cn.com.taiji.core.repo.jpa.ass.AssRenewalCosRecordRepo; 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.QtkCardInfoRepo;
import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo; 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.MyFinals;
import cn.com.taiji.inss.manager.model.inst.CmdType; import cn.com.taiji.inss.manager.model.inst.CmdType;
import cn.com.taiji.inss.manager.model.inst.InstConstant; import cn.com.taiji.inss.manager.model.inst.InstConstant;
private QtkObuInfoRepo obuInfoRepo; private QtkObuInfoRepo obuInfoRepo;
@Autowired @Autowired
private AssRenewalCosRecordRepo cosRecordRepo; private AssRenewalCosRecordRepo cosRecordRepo;
@Autowired
private InssInterfaceLogRepo logRepo;


public RenewalInstApplyResponse serviceHandle(RenewalInstApplyRequest request) throws ServiceHandleException { public RenewalInstApplyResponse serviceHandle(RenewalInstApplyRequest request) throws ServiceHandleException {
try { try {


@Override @Override
public void doSaveLog(RenewalInstApplyRequest request, RenewalInstApplyResponse response, InssInterfaceLog log) { public void doSaveLog(RenewalInstApplyRequest request, RenewalInstApplyResponse response, InssInterfaceLog log) {
logRepo.persist(log);
} }
} }

+ 12
- 1
zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/CardQueryManagerImpl.java Ver fichero



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)){
flag = 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 Ver fichero

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

Cargando…
Cancelar
Guardar