增加设备使用记录

license/src/main/java/iot/sixiang/license/device/DeviceManager.java

@@ -13,7 +13,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 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
@@ -71,12 +75,12 @@ public class DeviceManager {
         return allDevice;
     }
 
-    public synchronized void putSession(String appId, SessionContext session) {
-        sessionContexts.put(appId, session);
+    public synchronized void putSession(String sn, SessionContext session) {
+        sessionContexts.put(sn, session);
     }
 
-    public SessionContext getSessionContextByAppId(String appId) {
-        return sessionContexts.get(appId);
+    public SessionContext getSessionContextBySN(String sn) {
+        return sessionContexts.get(sn);
     }
 
     public SessionContext getSessionByChannelId(String channelId) {

license/src/main/java/iot/sixiang/license/device/DeviceServerHandler.java

@@ -151,12 +151,14 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
             session.setOnline(CommonUtil.getSystemTime());
 
             DeviceManager deviceManager = SpringUtil.getBean(DeviceManager.class);
-            deviceManager.putSession(appId, session);
+            deviceManager.putSession(sn, session);
 
             // 创建透传的客户端
             CreateForwardClientEvent event = new CreateForwardClientEvent();
-            event.setAppId(appId);
+            event.setSn(sn);
             eventPublisher.publishEvent(event);
+        } else {
+            pmsUseService.createFailUseLog(sn, "鉴权失败");
         }
         return license;
     }

license/src/main/java/iot/sixiang/license/event/CreateForwardClientEvent.java

@@ -5,5 +5,5 @@ import lombok.Data;
 
 @Data
 public class CreateForwardClientEvent extends BaseEvent {
-    private String appId;
+    private String sn;
 }

license/src/main/java/iot/sixiang/license/event/CreateForwardClientEventHandler.java

@@ -24,14 +24,14 @@ public class CreateForwardClientEventHandler {
 
     @EventListener
     public void handlerEvent(CreateForwardClientEvent event) {
-        String appId = event.getAppId();
+        String sn = event.getSn();
         Server balanceServer = balanceManager.getBalanceServer();
         if (balanceServer != null) {
             String serverIp = balanceServer.getServerIp();
             Integer port = balanceServer.getPort();
-            forwardManager.startTcpClient(serverIp, port, appId);
+            forwardManager.startTcpClient(serverIp, port, sn);
         } else {
-            log.error("balanceServer is null");
+            log.error("balanceServer is null...");
         }
     }
 }

license/src/main/java/iot/sixiang/license/event/DeviceClientBeForcedOfflineEvent.java

@@ -4,7 +4,6 @@ import lombok.Data;
 
 @Data
 public class DeviceClientBeForcedOfflineEvent extends BaseEvent {
-    private String appId;
-
+    private String sn;
 }
 

license/src/main/java/iot/sixiang/license/event/DeviceClientBeForcedOfflineEventHandler.java

@@ -20,17 +20,17 @@ public class DeviceClientBeForcedOfflineEventHandler {
 
     @EventListener
     public void handlerEvent(DeviceClientBeForcedOfflineEvent event) {
-        String appId = event.getAppId();
+        String sn = event.getSn();
 
-        SessionContext deviceSessionContext = deviceManager.getSessionContextByAppId(appId);
+        SessionContext deviceSessionContext = deviceManager.getSessionContextBySN(sn);
         if (deviceSessionContext != null) {
             SocketChannel deviceClientChannel = deviceSessionContext.getClientChannel();
             if (deviceClientChannel != null) {
                 deviceClientChannel.close();
-                log.debug("device client be forced offline success ..." + appId);
+                log.debug("device client be forced offline success ..." + sn);
             }
         } else {
-            log.debug("device client be forced offline undo ..." + appId);
+            log.debug("device client be forced offline undo ..." + sn);
         }
     }
 

license/src/main/java/iot/sixiang/license/event/DeviceClientInactiveEventHandler.java

@@ -34,7 +34,7 @@ public class DeviceClientInactiveEventHandler {
             if (result) {
                 // TODO device client 离线需要强制中断该设备对应的forward client
                 ForwardClientBeForcedOfflineEvent forwardClientBeForcedOfflineEvent = new ForwardClientBeForcedOfflineEvent();
-                forwardClientBeForcedOfflineEvent.setAppId(appId);
+                forwardClientBeForcedOfflineEvent.setSn(appId);
                 eventPublisher.publishEvent(forwardClientBeForcedOfflineEvent);
                 log.debug("device client inactive success ...");
             }

license/src/main/java/iot/sixiang/license/event/DeviceClientLicenseEvent.java

@@ -5,6 +5,6 @@ import lombok.Data;
 
 @Data
 public class DeviceClientLicenseEvent extends BaseEvent {
-    private String appId;
+    private String sn;
     private DeviceProtocol protocol;
 }

license/src/main/java/iot/sixiang/license/event/DeviceClientLicenseEventHandler.java

@@ -22,10 +22,10 @@ public class DeviceClientLicenseEventHandler {
 
     @EventListener
     public void handlerEvent(DeviceClientLicenseEvent event) {
-        String appId = event.getAppId();
+        String appId = event.getSn();
         DeviceProtocol protocol = event.getProtocol();
 
-        SessionContext session = deviceManager.getSessionContextByAppId(appId);
+        SessionContext session = deviceManager.getSessionContextBySN(appId);
         if (session == null) {
             log.debug("device client license undo ...");
             return;

license/src/main/java/iot/sixiang/license/event/ForwardClientBeForcedOfflineEvent.java

@@ -4,6 +4,6 @@ import lombok.Data;
 
 @Data
 public class ForwardClientBeForcedOfflineEvent extends BaseEvent {
-    private String appId;
+    private String sn;
 }
 

license/src/main/java/iot/sixiang/license/event/ForwardClientBeForcedOfflineEventHandler.java

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Component;
 @Component
 @Slf4j
 public class ForwardClientBeForcedOfflineEventHandler {
-
     @Autowired
     ForwardManager forwardManager;
 
@@ -22,18 +21,16 @@ public class ForwardClientBeForcedOfflineEventHandler {
 
     @EventListener
     public void handlerEvent(ForwardClientBeForcedOfflineEvent event) {
-        String appId = event.getAppId();
-        SessionContext forwardSessionContext = forwardManager.getSessionContextByAppId(appId);
+        String sn = event.getSn();
+        SessionContext forwardSessionContext = forwardManager.getSessionContextBySN(sn);
         if (forwardSessionContext != null) {
             SocketChannel forwardClientChannel = forwardSessionContext.getClientChannel();
             if (forwardClientChannel != null) {
                 forwardClientChannel.close();
-                log.debug("forward client be forced offline success ..." + appId);
+                log.debug("forward client be forced offline success ..." + sn);
             }
         } else {
-            log.debug("forward client be forced offline undo ..." + appId);
+            log.debug("forward client be forced offline undo ..." + sn);
         }
-
-
     }
 }

license/src/main/java/iot/sixiang/license/event/ForwardClientConnectEvent.java

@@ -5,9 +5,8 @@ import lombok.Data;
 
 @Data
 public class ForwardClientConnectEvent extends BaseEvent {
-    private String appId;
+    private String sn;
     private String channelId;
     private SocketChannel channel;
-
 }
 

license/src/main/java/iot/sixiang/license/event/ForwardClientConnectEventHandler.java

@@ -16,25 +16,22 @@ public class ForwardClientConnectEventHandler {
     @Autowired
     EventPublisher eventPublisher;
 
-
     public ForwardClientConnectEventHandler() {
-
     }
 
     @EventListener
     public void handlerEvent(ForwardClientConnectEvent event) {
-
-        String appId = event.getAppId();
+        String appId = event.getSn();
         String channelId = event.getChannelId();
         SocketChannel channel = event.getChannel();
 
 
         SessionContext session = new SessionContext();
-//        session.setRemoteIp(remoteIp);
-//        session.setRemotePort(remotePort);
+        //        session.setRemoteIp(remoteIp);
+        //        session.setRemotePort(remotePort);
         session.setAppId(appId);
-//        session.setAppKey(appKey);
-//        session.setToken(token);
+        //        session.setAppKey(appKey);
+        //        session.setToken(token);
         session.setChannelId(channelId);
         session.setClientChannel(channel);
 
@@ -42,9 +39,5 @@ public class ForwardClientConnectEventHandler {
         forwardManager.putSession(appId, session);
 
         log.debug("forward client connect:" + event);
-
-
     }
-
-
 }

license/src/main/java/iot/sixiang/license/event/ForwardClientInactiveEventHandler.java

@@ -30,12 +30,12 @@ public class ForwardClientInactiveEventHandler {
             log.debug("forward client inactive undo ...");
             return;
         } else {
-            String appId = session.getAppId();
+            String sn = session.getSn();
             boolean result = forwardManager.removeSessionByChannelId(channelId);
             if (result) {
                 // forward client 离线需要强制中断该设备对应的 device client
                 DeviceClientBeForcedOfflineEvent deviceClientBeForcedOfflineEvent = new DeviceClientBeForcedOfflineEvent();
-                deviceClientBeForcedOfflineEvent.setAppId(appId);
+                deviceClientBeForcedOfflineEvent.setSn(sn);
                 eventPublisher.publishEvent(deviceClientBeForcedOfflineEvent);
                 log.debug("forward client inactive success ...");
             }

license/src/main/java/iot/sixiang/license/event/ForwardClientRequestEventHandler.java

@@ -33,7 +33,7 @@ public class ForwardClientRequestEventHandler {
         SessionContext deviceSessionContext = deviceManager.getSessionByChannelId(deviceChannelId);
         String appId = deviceSessionContext.getAppId();
 
-        SessionContext forwardSessionContext = forwardManager.getSessionContextByAppId(appId);
+        SessionContext forwardSessionContext = forwardManager.getSessionContextBySN(appId);
         log.debug("forward client request:" + appId + "," + forwardSessionContext);
         SocketChannel clientChannel = forwardSessionContext.getClientChannel();
         clientChannel.writeAndFlush(protocol);

license/src/main/java/iot/sixiang/license/event/ForwardMessageResponseEventHandler.java

@@ -22,29 +22,24 @@ public class ForwardMessageResponseEventHandler {
 
 
     public ForwardMessageResponseEventHandler() {
-
     }
 
     @EventListener
     public void handlerEvent(ForwardMessageResponseEvent event) {
         String channelId = event.getChannelId();
-        SocketChannel channel = event.getChannel();
+        //SocketChannel channel = event.getChannel();
         DeviceProtocol protocol = event.getProtocol();
 
         SessionContext forwardSessionContext = forwardManager.getSessionByChannelId(channelId);
         String appId = forwardSessionContext.getAppId();
 
-        SessionContext deviceSessionContext = deviceManager.getSessionContextByAppId(appId);
+        SessionContext deviceSessionContext = deviceManager.getSessionContextBySN(appId);
         if (deviceSessionContext != null) {
             SocketChannel deviceClientChannel = deviceSessionContext.getClientChannel();
-            log.debug("forward client response..." + appId + ",forward session:" + deviceSessionContext);
+            log.info("forward client response..." + appId + ",forward session:" + deviceSessionContext);
             deviceClientChannel.writeAndFlush(protocol);
         } else {
-            log.debug("forward client response undo ..." + appId);
+            log.info("forward client response undo ..." + appId);
         }
-
-
     }
-
-
 }

license/src/main/java/iot/sixiang/license/forward/ForwardClient.java

 package iot.sixiang.license.forward;
 
+import iot.sixiang.license.device.DeviceManager;
 import iot.sixiang.license.net.TcpClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 @Component
 @Slf4j
 public class ForwardClient {
@@ -13,16 +16,19 @@ public class ForwardClient {
 
     @Autowired
     ForwardClientHandler handler;
+    @Resource
+    private DeviceManager deviceManager;
 
     public ForwardClient() {
     }
 
-    public void startTcp(String host, int port, String appId) {
-        log.debug("桥接客户端，开始连接桥接服务:{},{},{}", host, port, appId);
+    public void startTcp(String host, int port, String sn) {
+        log.debug("桥接客户端，开始连接桥接服务:{},{},{}", host, port, sn);
         ForwardConnectionListener listener = new ForwardConnectionListener();
-        listener.setAppId(appId);
+        listener.setSn(sn);
         listener.setHost(host);
         listener.setPort(port);
+        listener.setDeviceManager(this.deviceManager);
 
         channelInitializer = new ForwardChannelInitializer(handler);
         client = new TcpClient(host, port, channelInitializer, listener);

license/src/main/java/iot/sixiang/license/forward/ForwardConnectionListener.java

@@ -2,11 +2,13 @@ package iot.sixiang.license.forward;
 
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.socket.SocketChannel;
+import iot.sixiang.license.device.DeviceManager;
 import iot.sixiang.license.device.DeviceProtocol;
 import iot.sixiang.license.event.DeviceClientBeForcedOfflineEvent;
 import iot.sixiang.license.event.DeviceClientLicenseEvent;
 import iot.sixiang.license.event.EventPublisher;
 import iot.sixiang.license.event.ForwardClientConnectEvent;
+import iot.sixiang.license.model.SessionContext;
 import iot.sixiang.license.net.BaseConnectionListener;
 import iot.sixiang.license.operate.OperateManager;
 import iot.sixiang.license.service.AlarmService;
@@ -15,13 +17,18 @@ import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class ForwardConnectionListener extends BaseConnectionListener {
+    private DeviceManager deviceManager;
+
+    public void setDeviceManager(DeviceManager deviceManager) {
+        this.deviceManager = deviceManager;
+    }
 
     @Override
     public void operationComplete(ChannelFuture channelFuture) {
         AlarmService alarmService = SpringUtil.getBean(AlarmService.class);
         if (!channelFuture.isSuccess()) {
             // 失败进行告警
-            log.debug("桥接客户端，连接服务器失败:{},{},{}", this.host, this.port, this.appId);
+            log.debug("桥接客户端，连接服务器失败:{},{},{}", this.host, this.port, this.sn);
 
             int typeId = 1;
             String title = "连接服器失败";
@@ -30,37 +37,43 @@ public class ForwardConnectionListener extends BaseConnectionListener {
 
             // forward client连接失败，则强制踢掉设备客户端
             DeviceClientBeForcedOfflineEvent deviceClientBeForcedOfflineEvent = new DeviceClientBeForcedOfflineEvent();
-            deviceClientBeForcedOfflineEvent.setAppId(this.appId);
+            deviceClientBeForcedOfflineEvent.setSn(this.sn);
             EventPublisher eventPublisher = SpringUtil.getBean(EventPublisher.class);
             eventPublisher.publishEvent(deviceClientBeForcedOfflineEvent);
         } else {
-            log.debug("桥接客户端，连接服务器成功:{},{},{}", this.host, this.port, this.appId);
+            log.debug("桥接客户端，连接服务器成功:{},{},{}", this.host, this.port, this.sn);
             OperateManager operateManager = SpringUtil.getBean(OperateManager.class);
             operateManager.autoIncrement();
             SocketChannel channel = (SocketChannel) channelFuture.channel();
 
             String channelId = channel.id().asLongText();
             ForwardClientConnectEvent forwardClientConnectEvent = new ForwardClientConnectEvent();
-            forwardClientConnectEvent.setAppId(this.appId);
+            forwardClientConnectEvent.setSn(this.sn);
             forwardClientConnectEvent.setChannelId(channelId);
             forwardClientConnectEvent.setChannel(channel);
 
             EventPublisher eventPublisher = SpringUtil.getBean(EventPublisher.class);
             eventPublisher.publishEvent(forwardClientConnectEvent);
 
+            SessionContext deviceSessionContext = deviceManager.getSessionContextBySN(this.sn);
+            int useLogId = deviceSessionContext.getUseLogId();
+
             short stx = 21930;
             byte ack = 0x0;
             int len = 3;
             byte cmd = 0x1;
-            byte[] content = new byte[1];
+            byte[] content = new byte[4];
             content[0] = 0x7e;
+            content[1] = (byte) useLogId;
+            content[2] = (byte) (useLogId >> 8);
+            content[3] = (byte) (useLogId >> 16);
             byte end = 0x1;
 
             DeviceProtocol protocol = new DeviceProtocol(stx, len, cmd, ack, content, end);
 
 
             DeviceClientLicenseEvent deviceClientLicenseEvent = new DeviceClientLicenseEvent();
-            deviceClientLicenseEvent.setAppId(appId);
+            deviceClientLicenseEvent.setSn(sn);
             deviceClientLicenseEvent.setProtocol(protocol);
 
             eventPublisher.publishEvent(deviceClientLicenseEvent);

license/src/main/java/iot/sixiang/license/forward/ForwardManager.java

@@ -22,20 +22,19 @@ public class ForwardManager {
 
 
     public ForwardManager() {
-        sessionContexts = new HashMap<String, SessionContext>();
-
+        sessionContexts = new HashMap<>();
     }
 
-    public void startTcpClient(String serviceIP,int port,String appId) {
-        client.startTcp(serviceIP, port,appId);
+    public void startTcpClient(String serviceIP, int port, String sn) {
+        client.startTcp(serviceIP, port, sn);
     }
 
-    public synchronized void putSession(String appId, SessionContext session) {
-        sessionContexts.put(appId, session);
+    public synchronized void putSession(String sn, SessionContext session) {
+        sessionContexts.put(sn, session);
     }
 
-    public SessionContext getSessionContextByAppId(String appId) {
-        return sessionContexts.get(appId);
+    public SessionContext getSessionContextBySN(String sn) {
+        return sessionContexts.get(sn);
     }
 
     public SessionContext getSessionByChannelId(String channelId) {

license/src/main/java/iot/sixiang/license/net/BaseConnectionListener.java

@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 @Data
 @Slf4j
 public class BaseConnectionListener implements ChannelFutureListener {
-    public String appId;
+    public String sn;
     public String host;
     public int port;
 

license/src/main/java/iot/sixiang/license/service/PmsUseService.java

@@ -7,4 +7,6 @@ package iot.sixiang.license.service;
  */
 public interface PmsUseService {
     int createUseLog(String sn);
+
+    void createFailUseLog(String sn, String message);
 }

license/src/main/java/iot/sixiang/license/service/impl/PmsUseServiceImpl.java

@@ -20,11 +20,23 @@ public class PmsUseServiceImpl implements PmsUseService {
 
     @Override
     public int createUseLog(String sn) {
+        PmsUseLog pmsUseLog = getPmsUseLog(sn);
+        return pmsUseLogMapper.insert(pmsUseLog);
+    }
+
+    @Override
+    public void createFailUseLog(String sn, String message) {
+        PmsUseLog pmsUseLog = getPmsUseLog(sn);
+        pmsUseLog.setMessage(message);
+        pmsUseLogMapper.insert(pmsUseLog);
+    }
+
+    private PmsUseLog getPmsUseLog(String sn) {
         PmsUseLog pmsUseLog = new PmsUseLog();
         Date date = new Date();
         pmsUseLog.setCreateTime(date);
         pmsUseLog.setUpdateTime(date);
         pmsUseLog.setSn(sn);
-        return pmsUseLogMapper.insert(pmsUseLog);
+        return pmsUseLog;
     }
 }