diff --git a/src/main/java/com/sczx/sync/controller/SendDataController.java b/src/main/java/com/sczx/sync/controller/SendDataController.java index 1ecf074..7b19322 100644 --- a/src/main/java/com/sczx/sync/controller/SendDataController.java +++ b/src/main/java/com/sczx/sync/controller/SendDataController.java @@ -75,12 +75,12 @@ public class SendDataController { return sendDataService.sendStoreInfoToBattery(Long.parseLong(id)); } - @ApiOperation(value = "接收充电同步数据接口") - @GetMapping("/subOrder/{id}") - public Map sendSubOrderToBattery(@PathVariable String id){ - log.info("/subOrder 接收充电数据:{}",id); - return sendDataService.sendSubOrderToBattery(Long.parseLong(id)); - } +// @ApiOperation(value = "接收充电同步数据接口") +// @GetMapping("/subOrder/{id}") +// public Map sendSubOrderToBattery(@PathVariable String id){ +// log.info("/subOrder 接收充电数据:{}",id); +// return sendDataService.sendSubOrderToBattery(Long.parseLong(id)); +// } @ApiOperation(value = "接收充电同步数据接口") @GetMapping("/OrderMeal/{id}") @@ -90,34 +90,34 @@ public class SendDataController { } -// @ApiOperation(value = "异步接收充电同步数据接口") -// @GetMapping("/subOrder/{id}") -// public CompletableFuture>> sendSubOrderToBattery(@PathVariable String id){ -// log.info("/subOrder 接收充电数据:{}",id); -// return CompletableFuture -// .supplyAsync(() -> { -// try { -// return sendDataService.sendSubOrderToBattery(Long.parseLong(id)); -// } catch (Exception e) { -// log.error("处理用户数据时发生异常", e); -// Map errorResponse = new HashMap<>(); -// errorResponse.put("code", "9999"); -// errorResponse.put("msg", "处理失败: " + e.getMessage()); -// return errorResponse; -// } -// }, taskExecutor) -// .thenApply(result -> { -// log.info("用户数据处理完成,返回结果: {}", result); -// return ResponseEntity.ok(result); -// }) -// .exceptionally(throwable -> { -// log.error("异步处理用户数据时发生异常", throwable); -// Map errorResponse = new HashMap<>(); -// errorResponse.put("code", "9999"); -// errorResponse.put("msg", "系统异常"); -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse); -// }); -// } + @ApiOperation(value = "异步接收充电同步数据接口") + @GetMapping("/subOrder/{id}") + public CompletableFuture>> sendSubOrderToBattery(@PathVariable String id){ + log.info("/subOrder 接收充电数据:{}",id); + return CompletableFuture + .supplyAsync(() -> { + try {sleep(5000); + return sendDataService.sendSubOrderToBattery(Long.parseLong(id)); + } catch (Exception e) { + log.error("处理用户数据时发生异常", e); + Map errorResponse = new HashMap<>(); + errorResponse.put("code", "9999"); + errorResponse.put("msg", "处理失败: " + e.getMessage()); + return errorResponse; + } + }, taskExecutor) + .thenApply(result -> { + log.info("用户数据处理完成,返回结果: {}", result); + return ResponseEntity.ok(result); + }) + .exceptionally(throwable -> { + log.error("异步处理用户数据时发生异常", throwable); + Map errorResponse = new HashMap<>(); + errorResponse.put("code", "9999"); + errorResponse.put("msg", "系统异常"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse); + }); + } diff --git a/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java b/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java index 932383c..94592ae 100644 --- a/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java +++ b/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java @@ -356,8 +356,6 @@ public class SendDataServiceImpl implements SendDataService { map.put("msg",jsonObject.get("msg").toString()); return map; }else if (status.equals("200")){ - String bOrdNo = jsonObject.get("order_no").toString(); - companyStoreMapper.updateOdId(bOrdNo,id); map.put("code",status); map.put("msg","发送成功"); return map;