From e305c2c64ae1dc96d471c68b1f595b62da32de69 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 13 十一月 2025 11:55:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index ddcd109..bb89573 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -30,17 +30,17 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
-import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.MelsecCrnThread;
-import com.zy.core.thread.ScaleThread;
+import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
@@ -269,7 +269,8 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ SiemensCrnThread crnThread=(SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+// MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
@@ -321,6 +322,18 @@
}
return R.error();
}
+ @PostMapping("/loc/detail2")
+ @ManagerAuth(memo = "0101804搴撲綅鏁版嵁璇︽儏")
+ public R locDetail2(@RequestParam String locNo) {
+ if (Cools.isEmpty(locNo)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",locNo));
+ LocDetailVo vo = new LocDetailVo();
+ vo.setChannel(locMast.getChannel());
+ vo.setPackStatus(PackStatusType.process(locMast.getLocSts(),locMast.getPackStatus(),locMast.getFireStatus()));
+ return R.ok().add(vo);
+ }
@Deprecated
@PostMapping("/site/update")
@@ -350,4 +363,15 @@
return R.ok().add(JSON.toJSONString(jsonObjects));
}
+ @GetMapping("/getLedInfos")
+ public R getLedInfos(HttpServletRequest request) {
+ String remoteAddr = request.getRemoteAddr();
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getIp().equals(remoteAddr)) {
+ return R.ok().add(slave);
+ }
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1