Commit aeb91d74 authored by AfirSraftGarrier's avatar AfirSraftGarrier

格式

parent c6980c81
...@@ -22,12 +22,10 @@ public class DeviceChannelInitializer extends BaseChannelInitializer { ...@@ -22,12 +22,10 @@ public class DeviceChannelInitializer extends BaseChannelInitializer {
@Override @Override
protected void initChannel(SocketChannel ch) throws Exception { protected void initChannel(SocketChannel ch) throws Exception {
// 服务端心跳检测 // 服务端心跳检测
ch.pipeline().addLast(new IdleStateHandler(3, 0, 0, TimeUnit.SECONDS)); ch.pipeline().addLast(new IdleStateHandler(3, 0, 0, TimeUnit.SECONDS));
ch.pipeline().addLast("decoder", new DeviceDecoder()); ch.pipeline().addLast("decoder", new DeviceDecoder());
ch.pipeline().addLast("encoder", new DeviceEncoder()); ch.pipeline().addLast("encoder", new DeviceEncoder());
ch.pipeline().addLast(workGroup, "handler", handler); ch.pipeline().addLast(workGroup, "handler", handler);
} }
} }
...@@ -12,16 +12,18 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -12,16 +12,18 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@Component @Component
@Slf4j @Slf4j
public class DeviceManager { public class DeviceManager {
private Map<String, SessionContext> sessionContexts = null; private Map<String, SessionContext> sessionContexts = null;
private DeviceChannelInitializer channelInitializer; private DeviceChannelInitializer channelInitializer;
// private TcpServer server = null; // private TcpServer server = null;
private int port = 18889; private int port = 18889;
private Map<String, DeviceVo> allDevice = null; private Map<String, DeviceVo> allDevice = null;
@Autowired @Autowired
...@@ -32,8 +34,8 @@ public class DeviceManager { ...@@ -32,8 +34,8 @@ public class DeviceManager {
private AsyncTcpServer asyncTcpServer; private AsyncTcpServer asyncTcpServer;
public DeviceManager() { public DeviceManager() {
sessionContexts = new HashMap<String, SessionContext>(); sessionContexts = new HashMap<>();
allDevice = new HashMap<String, DeviceVo>(); allDevice = new HashMap<>();
} }
@PostConstruct @PostConstruct
...@@ -44,7 +46,7 @@ public class DeviceManager { ...@@ -44,7 +46,7 @@ public class DeviceManager {
private void startTcpService() { private void startTcpService() {
sessionContexts = new HashMap<String, SessionContext>(); sessionContexts = new HashMap<>();
channelInitializer = new DeviceChannelInitializer(handler); channelInitializer = new DeviceChannelInitializer(handler);
asyncTcpServer.start(port, channelInitializer); asyncTcpServer.start(port, channelInitializer);
} }
...@@ -132,7 +134,6 @@ public class DeviceManager { ...@@ -132,7 +134,6 @@ public class DeviceManager {
} }
public boolean changeSessionOffline(String channelId) { public boolean changeSessionOffline(String channelId) {
Iterator<Map.Entry<String, SessionContext>> it = sessionContexts.entrySet().iterator(); Iterator<Map.Entry<String, SessionContext>> it = sessionContexts.entrySet().iterator();
while (it.hasNext()) { while (it.hasNext()) {
Map.Entry<String, SessionContext> entry = it.next(); Map.Entry<String, SessionContext> entry = it.next();
...@@ -154,7 +155,6 @@ public class DeviceManager { ...@@ -154,7 +155,6 @@ public class DeviceManager {
PageInfoModel<DeviceDetailVo> detailVoPageInfoModel = new PageInfoModel<>(); PageInfoModel<DeviceDetailVo> detailVoPageInfoModel = new PageInfoModel<>();
List<DeviceDetailVo> detailVos = new ArrayList<>(); List<DeviceDetailVo> detailVos = new ArrayList<>();
for (DeviceVo vo : deviceVos) { for (DeviceVo vo : deviceVos) {
DeviceDetailVo detailVo = new DeviceDetailVo(); DeviceDetailVo detailVo = new DeviceDetailVo();
detailVo.setDeviceId(vo.getDeviceId()); detailVo.setDeviceId(vo.getDeviceId());
detailVo.setAppName(vo.getAppName()); detailVo.setAppName(vo.getAppName());
...@@ -171,8 +171,6 @@ public class DeviceManager { ...@@ -171,8 +171,6 @@ public class DeviceManager {
detailVo.setStatus(status); detailVo.setStatus(status);
detailVo.setOnline(online); detailVo.setOnline(online);
detailVo.setOffline(offline); detailVo.setOffline(offline);
} }
detailVos.add(detailVo); detailVos.add(detailVo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment