From b2a6afe40aa6b50d686ef247c30a9a8cfc368071 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 19 五月 2023 10:01:44 +0800
Subject: [PATCH] 管理员任务websocket修改
---
src/main/java/com/whyc/webSocket/TaskManageAdminWebsocket.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/TaskManageAdminWebsocket.java b/src/main/java/com/whyc/webSocket/TaskManageAdminWebsocket.java
index 678afd3..185190d 100644
--- a/src/main/java/com/whyc/webSocket/TaskManageAdminWebsocket.java
+++ b/src/main/java/com/whyc/webSocket/TaskManageAdminWebsocket.java
@@ -2,7 +2,6 @@
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
-import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.pojo.FaultUpload;
import com.whyc.pojo.UserInf;
import com.whyc.service.FaultUploadService;
@@ -15,9 +14,6 @@
import javax.websocket.server.ServerEndpoint;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
@Component
@ServerEndpoint(value = "/taskMAdmin", encoders = WebSocketEncoder.class, configurator = WebSocketConfig.class)
@@ -93,6 +89,29 @@
//鑾峰彇绠＄悊鍛樼殑鏁版嵁
public Map getTaskMAdmin(int userId, FaultUpload upload) {
Map<String, Object> res = new HashMap<>();
+ //鏈湀
+ Response monRes = faultUploadService.groupNameCount(1, userId);
+ res.put("monRes", monRes);
+ //鏈搴�
+ Response quarterRes = faultUploadService.groupNameCount(2, userId);
+ res.put("quarterRes", quarterRes);
+ //鏈勾
+ Response yearRes = faultUploadService.groupNameCount(3, userId);
+ res.put("yearRes", yearRes);
+
+ //闅愭偅鏁呴殰涓婃姤杩涘害-鏈�杩戜竴鍛ㄥ強鏈�杩戜竴鏈�-绠＄悊
+ Response lastPeriodRes = faultUploadService.getListOfLastPeriod(1, userId);
+ res.put("lastPeriodRes", lastPeriodRes);
+
+ //鍒楄〃鍒嗛〉-绠＄悊
+ Response listRes = faultUploadService.listPage2(upload.getPageNum(), upload.getPageSize(), upload, userId);
+ res.put("listRes", listRes);
+
+ return res;
+ }
+ /* //鑾峰彇绠＄悊鍛樼殑鏁版嵁
+ public Map getTaskMAdmin(int userId, FaultUpload upload) {
+ Map<String, Object> res = new HashMap<>();
try {
ThreadPoolExecutor poolExecutor = ThreadPoolExecutorFactory.getPoolExecutor();
CountDownLatch latch = new CountDownLatch(3);
@@ -125,7 +144,7 @@
e.printStackTrace();
}
return res;
- }
+ }*/
@OnClose
public void onClose(CloseReason closeReason) {
--
Gitblit v1.9.1