From 47ff9c863e736ff06c39ba44ddfd736c8329a9b7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 12 三月 2025 19:34:26 +0800
Subject: [PATCH] 完成检验下单接口联调及自测
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 074496d..44a6ab4 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -73,26 +73,23 @@
@ApiOperation(value = "涓嬪崟鎸夐挳")
@PostMapping("/addInsOrder")
@Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.INSERT)
- public Result<?> addInsOrder(String str) {
- Map<String, Object> map = JSON.parseObject(str, Map.class);
- JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
- List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
- InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
- List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
- List<List<Integer>> fiberPairing = JSON.parseArray(map.get("fiberPairing")+"");//鍏夌氦閰嶇疆閲岀殑鐔旀帴閰嶅
- return Result.success(insOrderService.addInsOrder(list, insOrder, pairing,fiberPairing));
+ public Result<?> addInsOrder(@RequestBody AddInsOrderDTO addInsOrderDTO) {
+ return Result.success(insOrderService.addInsOrder(
+ addInsOrderDTO.getList(),
+ addInsOrderDTO.getInsOrder(),
+ addInsOrderDTO.getPairing(),
+ addInsOrderDTO.getFiberPairing()));
}
@ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@GetMapping("/selectOrderManDay")
public Result<?> selectOrderManDay(Integer id) {
int day = insProductService.selectOrderManDay(id);
- return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ return Result.success(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),"鎴愬姛");
}
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
@GetMapping("/getInsOrder")
- @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.OTHER)
public Result<?> getInsOrder(Integer orderId) {
return Result.success(insOrderService.getInsOrder(orderId));
}
--
Gitblit v1.9.3