From bf617a84938f6b6c6facb9fa77889f53fc0c27e6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 19 Feb 2022 11:17:35 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/webscoket/service/IPushMsgService.java | 8 ++++++++
src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java | 15 +++++++++++++++
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 26 +++++++++++++++++++++++---
3 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index 3e2f23e..5d421c4 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -36,11 +36,16 @@
import org.springblade.modules.taskqd.service.impl.TaskqdServiceImpl;
import org.springblade.modules.taskqd.vo.TaskqdVO;
import org.springblade.modules.taskqd.wrapper.TaskqdWrapper;
+import org.springblade.modules.webscoket.service.IPushMsgService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 控制器
@@ -55,6 +60,9 @@
public class TaskqdController extends BladeController {
private final TaskqdServiceImpl taskqdService;
+
+ @Autowired
+ private IPushMsgService pushMsgService;
/**
* 详情
@@ -161,7 +169,7 @@
String ser = taskqd.getSerid();
String ser2 = list.get(0).getSerid();
String sub = ser.substring(0, serid.length() - 1);
- String ss = ser2 + sub ;
+ String ss = ser2 + sub;
String team = taskqd.getCaptain();
boolean isteam = StringUtil.isEmpty(list.get(0).getTeam());
@@ -216,8 +224,8 @@
* @return
*/
@PostMapping("/selectLi")
- public R selectLi(String type, String serid,String jurisdiction) {
- List<TaskqdVO> list = taskqdService.selectLi(type, serid,jurisdiction);
+ public R selectLi(String type, String serid, String jurisdiction) {
+ List<TaskqdVO> list = taskqdService.selectLi(type, serid, jurisdiction);
for (int i = 0; i < list.size(); i++) {
Integer nums = list.get(i).getNums();
@@ -240,4 +248,16 @@
}
return R.data(list);
}
+
+ @GetMapping("/startTask")
+ public R<Map> startTask(String rid, String serid,String type) {
+ //获取组员id并进行通知
+ Map<String, Object> map = new HashMap<>();
+ int msg = pushMsgService.startTask(serid, rid,type);
+ map.put("res", msg);
+ map.put("type", type);
+ return R.data(map);
+ }
+
+
}
diff --git a/src/main/java/org/springblade/modules/webscoket/service/IPushMsgService.java b/src/main/java/org/springblade/modules/webscoket/service/IPushMsgService.java
index 36e9283..4f9d6a5 100644
--- a/src/main/java/org/springblade/modules/webscoket/service/IPushMsgService.java
+++ b/src/main/java/org/springblade/modules/webscoket/service/IPushMsgService.java
@@ -26,6 +26,14 @@
int inviteVideoCall(String userid, String time, String type, String name,String faqiid);
/**
+ * 抢单任务定位开始
+ * @param serid
+ * @param rid
+ * @return
+ */
+ int startTask(String serid, String rid,String type);
+
+ /**
* 关闭视频请求
*
* @return
diff --git a/src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java b/src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java
index be23bff..325b5ab 100644
--- a/src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java
+++ b/src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java
@@ -53,6 +53,21 @@
}
@Override
+ public int startTask(String serid, String rid,String type) {
+ //返回值
+ int res = 0;
+ Channel channel = NettyConfig.getUserChannelMap().get(serid);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("type", type);
+ jsonObject.put("rid", rid);
+ if (channel != null) {
+ channel.writeAndFlush(new TextWebSocketFrame(String.valueOf(jsonObject)));
+ res = 1;
+ }
+ return res;
+ }
+
+ @Override
public void closeVideoCall(String sentId, String acceptId) {
Channel channel1 = NettyConfig.getUserChannelMap().get(sentId);
Channel channel2 = NettyConfig.getUserChannelMap().get(acceptId);
--
Gitblit v1.9.3