From ee2500aac8c1933c7c553904ba4df5baf44702f5 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 29 一月 2024 18:40:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ba92e46..cbf0609 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.sql.ResultSetMetaData;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -45,7 +46,8 @@
private BasDevpService basDevpService;
@Autowired
private ApiLogService apiLogService;
-
+ @Autowired
+ private BasCrnpService basCrnpService;
@Autowired
private StaDescService staDescService;
@@ -310,6 +312,7 @@
public R taskCancel(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -365,6 +368,35 @@
}
}
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/deviceStatus")
+ @Transactional
+ public R deviceStatus(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (BasDevp basDevp:basDevps){
+ Map<String, Object> map = new HashMap<>();
+ map.put("devNo", basDevp.getDevNo());
+ map.put("devType", "杈撻�佺嚎");
+ map.put("devStatus", basDevp.getAutoing().equals("Y")? 1:0);
+ map.put("errorCode", 0);
+ map.put("errorMsg", "");
+ list.add(map);
+ }
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ for (BasCrnp basCrnp:basCrnps){
+ Map<String, Object> map = new HashMap<>();
+ map.put("devNo", basCrnp.getCrnNo());
+ map.put("devType", "鍫嗗灈鏈�");
+ map.put("devStatus", basCrnp.getCrnSts());
+ map.put("errorCode", 0);
+ map.put("errorMsg", "");
+ list.add(map);
+ }
+ return R.ok(list);
+ }
}
--
Gitblit v1.9.1