Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
耿迪迪
gassafety
Commits
6552ef81
Commit
6552ef81
authored
Aug 10, 2021
by
耿迪迪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
websocket 接口修改 gengdidi
parent
ea9efa47
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
16 deletions
+0
-16
WebSocketController.java
.../zehong/web/controller/websocket/WebSocketController.java
+0
-16
No files found.
gassafety-admin/src/main/java/com/zehong/web/controller/websocket/WebSocketController.java
View file @
6552ef81
...
...
@@ -3,8 +3,6 @@ package com.zehong.web.controller.websocket;
import
com.alibaba.fastjson.JSONObject
;
import
com.zehong.system.domain.vo.DeviceAlarmVo
;
import
com.zehong.system.service.ITDeviceAlarmService
;
import
com.zehong.system.service.ITDeviceInfoService
;
import
com.zehong.system.service.ITPipeService
;
import
com.zehong.system.service.WebSocketServer
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -25,25 +23,11 @@ public class WebSocketController {
@Autowired
private
ITDeviceAlarmService
itDeviceAlarmService
;
@Autowired
private
ITDeviceInfoService
itDeviceInfoService
;
@Autowired
private
ITPipeService
itPipeService
;
private
final
static
String
PIPE_TYPE
=
"0"
;
@GetMapping
(
"/send"
)
public
void
send
(
int
alarmId
){
try
{
DeviceAlarmVo
alarm
=
itDeviceAlarmService
.
selectTDeviceAlarmById
(
alarmId
);
/*JSONObject json = new JSONObject();
json.put("alarmInfo",alarm);*/
/*if(PIPE_TYPE.equals(alarm.getAlarmType())){
json.put("deviceInfo",itPipeService.selectTPipeById(alarm.getDeviceId()));
}else{
json.put("deviceInfo",itDeviceInfoService.selectTDeviceInfoById(alarm.getDeviceId()));
}*/
webSocketServer
.
batchSendMessage
(
JSONObject
.
toJSONString
(
alarm
));
}
catch
(
Exception
e
)
{
log
.
error
(
"wesocket发送失败!"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment