From 4c19ddd36bdfb43b5ef4e8df3c9a98cd4d356d6c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:55:04 +0800
Subject: [PATCH] 1、资讯模糊匹配修改
---
src/main/java/org/springblade/modules/webscoket/controller/PushMsgController.java | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/webscoket/controller/PushMsgController.java b/src/main/java/org/springblade/modules/webscoket/controller/PushMsgController.java
index ff69925..2a3e9a6 100644
--- a/src/main/java/org/springblade/modules/webscoket/controller/PushMsgController.java
+++ b/src/main/java/org/springblade/modules/webscoket/controller/PushMsgController.java
@@ -1,30 +1,59 @@
package org.springblade.modules.webscoket.controller;
+import org.springblade.core.tool.api.R;
import org.springblade.modules.webscoket.service.IPushMsgService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* @author lq
* @date 2020/4/1 11:22
*/
@RestController
+@RequestMapping("pushMsg")
public class PushMsgController {
- @Autowired
- private IPushMsgService pushMsgService;
+ @Autowired
+ private IPushMsgService pushMsgService;
- @PostMapping("/pushUser")
- public String pushUser(String userId,String msg){
- pushMsgService.pushMsg(userId, msg);
- return "消息发送成功："+msg;
- }
+ @PostMapping("/pushUser")
+ public String pushUser(String userId, String msg) {
+ pushMsgService.pushMsg(userId, msg);
+ return "消息发送成功：" + msg;
+ }
- @PostMapping("/pushAll")
- public String pushAll(String msg){
- pushMsgService.pushMsg(msg);
- return "消息发送成功："+msg;
- }
+ @PostMapping("/pushAll")
+ public String pushAll(String msg) {
+ pushMsgService.pushMsg(msg);
+ return "消息发送成功：" + msg;
+ }
+
+ @GetMapping("/inviteVideoCall")
+ public R<Map> inviteVideoCall(String userId, String type, String name,String faqiid) {
+ //获取当前时间戳作为房间号
+ String roomId = "";
+ Map<String, Object> map = new HashMap<String, Object>();
+ String time = String.valueOf(new Date().getTime());
+ int msg = pushMsgService.inviteVideoCall(userId, time, type, name,faqiid);
+ map.put("type", type);
+ map.put("roomId", time);
+ map.put("res", msg);
+
+ return R.data(map);
+ }
+
+ @GetMapping("/closeVideoCall")
+ public void closeVideoCall(String sentId, String acceptId) {
+
+ pushMsgService.closeVideoCall(sentId, acceptId);
+
+ }
}
--
Gitblit v1.9.3