From 5ee338a5e19319386f2f6298d22a8e4ac96dc7cb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 15:24:42 +0800
Subject: [PATCH] 1.设备故障状态合并到设备状态中，设备状态接口修改 2.警情处理完成后修改设备状态为正常，修改警情处理接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
index 9aa3a84..05dd031 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
@@ -21,8 +21,10 @@
import org.springblade.jfpt.nettyServer.Server;
import org.springblade.jfpt.nettyTcpServer.TcpServer;
import org.springblade.jfpt.nettyUdpServer.server.UdpServer;
+import org.springblade.jfpt.webscoket.WebSocketServer;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
/**
* Desk启动器
@@ -40,10 +42,11 @@
@Override
public void run(String... args) throws Exception {
- //Server server=new Server(8088);
- TcpServer server=new TcpServer(8088);
- //UdpServer udpServer=new UdpServer(8099);
+ Server server=new Server(8088);
+ TcpServer tcpServer = new TcpServer(8099);
+ WebSocketServer webSocketServer= new WebSocketServer(9034);
+// UdpServer udpServer = new UdpServer(9534);
+// Server serverTwo = new Server(9534);
}
-
}
--
Gitblit v1.9.3