diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java index caf4785d7..86d6b1aeb 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java @@ -90,38 +90,37 @@ public class ZbFactoryDataController { // 增加对请求日志的数据存储 + if(zbFactoryProperties.getSendSystem().contains("old")){ + ZbFactoryLogEntity zbFactoryLogEntity = new ZbFactoryLogEntity(); + zbFactoryLogEntity.setType(1); + zbFactoryLogEntity.setSaxStatus(0); + + String url = uploadFile(JSONObject.toJSONString(zbReceiptDTO)); + + zbFactoryLogEntity.setLogUrl(url); + // 上传文件 + zbFactoryLogService.save(zbFactoryLogEntity); + + + // orderStatusLogService.save(orderStatusLog); + + // //判断数据是否已存入 + Long orderId = null; + try { + orderId = zbFactoryDataService.saveData(zbReceiptDTO); + // orderStatusLog.setStatus(0); + zbFactoryLogEntity.setSaxStatus(1); + } catch (Exception e) { + log.error("############data: 保存数据失败", e); + //修改保存数据的状态 + // orderStatusLog.setStatus(2); + zbFactoryLogEntity.setSaxStatus(2); + } + // orderStatusLogService.saveOrUpdate(orderStatusLog); + zbFactoryLogService.saveOrUpdate(zbFactoryLogEntity); - ZbFactoryLogEntity zbFactoryLogEntity = new ZbFactoryLogEntity(); - zbFactoryLogEntity.setType(1); - zbFactoryLogEntity.setSaxStatus(0); - - String url = uploadFile(JSONObject.toJSONString(zbReceiptDTO)); - - zbFactoryLogEntity.setLogUrl(url); - // 上传文件 - zbFactoryLogService.save(zbFactoryLogEntity); - - -// orderStatusLogService.save(orderStatusLog); - -// //判断数据是否已存入 - Long orderId = null; - try { - orderId = zbFactoryDataService.saveData(zbReceiptDTO); -// orderStatusLog.setStatus(0); - zbFactoryLogEntity.setSaxStatus(1); - } catch (Exception e) { - log.error("############data: 保存数据失败", e); - //修改保存数据的状态 -// orderStatusLog.setStatus(2); - zbFactoryLogEntity.setSaxStatus(2); - } -// orderStatusLogService.saveOrUpdate(orderStatusLog); - zbFactoryLogService.saveOrUpdate(zbFactoryLogEntity); - - //开启异步线程处理数据 - if (!Objects.isNull(orderId)) { - if(zbFactoryProperties.getSendSystem().contains("old")){ + //开启异步线程处理数据 + if (!Objects.isNull(orderId)) { syncDataService.handlerZbDataToHt(orderId); } }