From ea7481482261cfcbf2f7544f8c96f20c574ec674 Mon Sep 17 00:00:00 2001 From: yqy Date: Fri, 17 Mar 2023 15:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0websocket?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/service/impl/TaskServiceImpl.java | 17 +++++++++++------ .../java/com/baiye/task/FileAnalysisTask.java | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java index e94dfff3..563f9a5b 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java @@ -410,15 +410,20 @@ public class TaskServiceImpl implements TaskService { @Override public void sendMessage(String message, Long userId, String type) { + Map map = new HashMap<>(); map.put("message", message); - map.put("code", 500); - if (type.equals("create")) map.put("code", 200); map.put("type", type); - - JSONObject jsonData = new JSONObject(); - jsonData.putOpt("data", map); - String messageJSON = JSONUtil.toJsonStr(jsonData); + map.put("code", 500); + String messageJSON; + if (type.equals("create")){ + map.put("code", 200); + messageJSON = JSONUtil.toJsonStr(map); + } else { + JSONObject jsonData = new JSONObject(); + jsonData.putOpt("data", map); + messageJSON = JSONUtil.toJsonStr(jsonData); + } webSocketServer.sendMessage(messageJSON, userId); } diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/FileAnalysisTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/FileAnalysisTask.java index ecfabb32..1487deaf 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/FileAnalysisTask.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/FileAnalysisTask.java @@ -96,7 +96,7 @@ public class FileAnalysisTask { taskClient.updateTask(task); // 任务自动分配(未开启就不分配) clueService.dynamicTaskDistribution(taskId, uploadType); - taskClient.sendMessage("上传成功", clueRecords.get(0).getCreateBy(), "create"); + taskClient.sendMessage("文件上传成功", clueRecords.get(0).getCreateBy(), "create"); return; } //创建任务 @@ -106,7 +106,7 @@ public class FileAnalysisTask { BaseExcelListenerDto baseExcelListenerDto = new BaseExcelListenerDto(userId, uploadType, taskId, oneFileName); clueService.saveTask(baseExcelListenerDto); } - taskClient.sendMessage("上传成功", clueRecords.get(0).getCreateBy(), "create"); + taskClient.sendMessage("文件上传成功", clueRecords.get(0).getCreateBy(), "create"); } }