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