From 7a852f6db3d9bb3908d55f0a49ff9e92b4062621 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 22 Feb 2022 21:00:28 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/webscoket/service/IPushMsgService.java | 2 +-
src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java | 3 ++-
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 4 ++--
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 4 ++--
4 files changed, 7 insertions(+), 6 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 8530aa1..922d147 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -264,11 +264,11 @@
public R<Map> startTask(String rid, String serid,String type,String data) {
//获取组员id并进行通知
Map<String, Object> map = new HashMap<>();
- int msg = pushMsgService.startTask(serid, rid,type);
+ int msg = pushMsgService.startTask(serid, rid,type,data);
map.put("res", msg);
map.put("type", type);
map.put("data",data);
- if (type != "stop"){
+ if (!type.equals("stop")){
taskqdService.updateRtype("0",rid);
}
return R.data(map);
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
index ef86d1c..e1b8270 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -67,7 +67,7 @@
</if>
<if test="type==1">
<if test="jurisdiction!='1372091709474910209'">
- qd.jnum!=qd.num
+ qd.jnum!=qd.num AND qd.rtype = "2"
and (!find_in_set(#{serid}, serid) OR serid IS NULL )
and (j.id =#{jurisdiction} or
j.parent_id = #{jurisdiction})
@@ -82,7 +82,7 @@
SELECT COUNT(*) as num
FROM sys_taskqd qd
LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction
- WHERE jnum!=num AND
+ WHERE jnum!=num AND qd.rtype = "2" AND
(!find_in_set(#{serid}, serid) OR serid IS NULL )
and (j.id =#{jurisdiction}
or
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 4f9d6a5..5780d5b 100644
--- a/src/main/java/org/springblade/modules/webscoket/service/IPushMsgService.java
+++ b/src/main/java/org/springblade/modules/webscoket/service/IPushMsgService.java
@@ -31,7 +31,7 @@
* @param rid
* @return
*/
- int startTask(String serid, String rid,String type);
+ int startTask(String serid, String rid,String type,String data);
/**
* 关闭视频请求
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 f88aa88..517c549 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
@@ -49,7 +49,7 @@
}
@Override
- public int startTask(String serid, String rid,String type) {
+ public int startTask(String serid, String rid,String type,String data) {
//返回值
int res = 0;
String[] list = serid.split(",");
@@ -59,6 +59,7 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("type", type);
jsonObject.put("rid", rid);
+ jsonObject.put("data", data);
if (channel != null) {
channel.writeAndFlush(new TextWebSocketFrame(String.valueOf(jsonObject)));
res = 1;
--
Gitblit v1.9.3