From 1ba343ab3a7cd5cbabfef6a27a5344051f526793 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 25 十一月 2025 16:49:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/StationController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StationController.java b/src/main/java/com/zy/asrs/controller/StationController.java
index 2542008..0a25edb 100644
--- a/src/main/java/com/zy/asrs/controller/StationController.java
+++ b/src/main/java/com/zy/asrs/controller/StationController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.core.model.StationObjModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -40,12 +41,12 @@
Integer taskNo = param.getTaskNo();
Integer targetStationId = param.getTargetStationId();
- JSONObject finalStation = null;
+ StationObjModel finalStation = null;
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
- List<JSONObject> list = JSON.parseArray(basDevp.getStationList(), JSONObject.class);
- for (JSONObject entity : list) {
- if(entity.getInteger("stationId").equals(stationId)){
+ List<StationObjModel> list = basDevp.getStationList$();
+ for (StationObjModel entity : list) {
+ if(entity.getStationId().equals(stationId)){
finalStation = entity;
break;
}
@@ -60,7 +61,7 @@
return R.error("绔欑偣涓嶅瓨鍦�");
}
- Integer devpNo = finalStation.getInteger("devpNo");
+ Integer devpNo = finalStation.getDeviceNo();
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, devpNo);
if (stationThread == null) {
--
Gitblit v1.9.1