From add29c9dfe37a3147ee1a426e1dba2f42ad741e6 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 18:11:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/SiteController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index e04adf5..b97dffd 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -8,8 +8,8 @@
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.utils.CommandUtils;
import com.zy.core.DevpThread;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -18,6 +18,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.SiemensDevpThread;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +33,7 @@
*/
@RestController
@RequestMapping("/site")
+@Slf4j
public class SiteController {
@Autowired
@@ -48,8 +50,8 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<String, Object> map2 = new HashMap<>();
map2.put("floor", 2);
- map2.put("modeVal", devpThread.ioModeOf2F.id);
- map2.put("modeDesc", devpThread.ioModeOf2F.desc);
+ map2.put("modeVal", devpThread.ioModeOf1F1.id);
+ map2.put("modeDesc", devpThread.ioModeOf1F1.desc);
res.add(map2);
}
return R.ok().add(res);
@@ -227,7 +229,8 @@
basDevp.setOutEnable(outEnable ? "Y" : "N");
}
basDevpService.updateById(basDevp);
- boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ log.info("淇敼绔欑偣淇℃伅鍛戒护鎺ㄩ�佽緭閫佺嚎闃熷垪鎴愬姛:{}",staProtocol);
if (result) {
return R.ok();
} else {
@@ -277,7 +280,7 @@
staProtocol.setWorkNo((short) 0);
staProtocol.setStaNo((short) 0);
basDevpService.updateById(basDevp);
- boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if (result) {
return R.ok();
} else {
@@ -318,7 +321,7 @@
}
staProtocol.setWorkNo((short) 9999);
staProtocol.setStaNo(inSta.getStaNo().shortValue());
- boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if (result) {
return R.ok();
} else {
--
Gitblit v1.9.1