From 36448cf2894af5b211b92feef6e33e706f1d6efe Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 16 六月 2022 11:21:42 +0800
Subject: [PATCH] A059的的时候stateFlag文本信息“第几次放/充电”
---
src/main/java/com/whyc/webSocket/UserWorkSocket.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/UserWorkSocket.java b/src/main/java/com/whyc/webSocket/UserWorkSocket.java
index 70f690c..db1be4d 100644
--- a/src/main/java/com/whyc/webSocket/UserWorkSocket.java
+++ b/src/main/java/com/whyc/webSocket/UserWorkSocket.java
@@ -97,8 +97,8 @@
}
//鏍规嵁admin灞炴�у垽鏂槸鐢ㄧ鐞嗗憳灞炴�ц繕鏄痶rue鏅�氱敤鎴穎alse
- public Map getData(UserWork uWork) {
- Map map = new HashMap();
+ public Response getData(UserWork uWork) {
+ Map<String, Response> res = new HashMap<>();
Response admin = new Response();
Response guest = new Response();
if (uWork.isAdmin()) {
@@ -106,8 +106,8 @@
} else {
guest = service.searchByUserIdAndStatus(uWork.getPageNum(), uWork.getPageSize(), uWork.getUserId(), Integer.valueOf(uWork.getNote()));
}
- map.put("admin", admin);
- map.put("guest", guest);
- return map;
+ res.put("admin", admin);
+ res.put("guest", guest);
+ return new Response().set(1, res);
}
}
--
Gitblit v1.9.1