From 66f482d6b979f4988f425d029ea4be3c6ec52471 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期六, 21 六月 2025 16:14:13 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
index 8afbd6b..d59b241 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -8,15 +8,22 @@
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.system.controller.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
import java.util.Map;
import java.util.Objects;
+
+import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;
/**
* 澶у睆鎿嶄綔鍩烘湰鍔熻兘
*/
+@Slf4j
@RestController
@RequestMapping("/wave")
public class WaveManagentController extends BaseController {
@@ -74,7 +81,8 @@
*/
@GetMapping("/seed/locs")
public R getSeedLoc() {
- return waveManagentService.AllSeedLocs();
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return waveManagentService.AllSeedLocs(request);
}
/***
@@ -84,7 +92,8 @@
*/
@GetMapping("/sow/tasks")
public R getTasks() {
- return waveManagentService.getTask();
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return waveManagentService.getTask(request);
}
/**
@@ -135,17 +144,6 @@
}
- /**
- * 淇″彿鍥炰紶鎺ュ彛锛屽洖浼犵數瀛愭爣绛剧姸鎬佸彉鍖栧唴瀹圭粰涓婃父绯荤粺銆�
- * 褰撲汉涓烘搷浣滐紙姣斿鎷嶇伅锛屾洿鏀规暟瀛楋紝鏀剧绛夛級瀵艰嚧鐢靛瓙鏍囩鐨勭姸鎬佸拰淇″彿绛夊彂鐢熷彉鍖栥�佹垨璁惧鏈韩鍙戠敓寮傚父鏃讹紝ESS鎺ユ敹鍒颁俊鍙峰悗锛岄�氳繃璇ユ帴鍙ｅ皢淇″彿鍥炰紶缁欎笂娓哥郴缁熴��
- * @param request
- * @return
- */
- @PostMapping("/")
- public R rfidCallback(@RequestBody RfidSingalRequest request) {
-
- return R.ok();
- }
}
--
Gitblit v1.9.1