From f307c16455bf1cfb11cd675d829c799e649fd05e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 14 五月 2025 13:00:40 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/OpenController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9a16f6c..87db6bc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -445,7 +445,8 @@
//璁惧鐘舵�佹煡璇㈡帴鍙�
@GetMapping("/deviceStatus")
@Transactional
- public R deviceStatus() {
+ public HashMap<String, Object> deviceStatus() {
+ HashMap<String,Object> map=new HashMap<>();
List<CrnStatusParam> crnStatusParams=new ArrayList<>();
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
for (BasCrnp basCrnp:basCrnps){
@@ -461,7 +462,11 @@
}
crnStatusParams.add(crnStatusParam);
}
- return R.ok(crnStatusParams);
+
+ map.put("ReturnStatus",0);
+ map.put("ErrorMessage","");
+ map.put("data",crnStatusParams);
+ return map;
}
public static <T> List<T> convertListMapToListObject(List<HashMap<String, Object>> listMap, Class<T> clazz) throws Exception {
--
Gitblit v1.9.1