上报错误方法改变

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

 package iot.sixiang.license.device;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -10,11 +11,14 @@ import iot.sixiang.license.auth.AuthManager;
 import iot.sixiang.license.consts.Constant;
 import iot.sixiang.license.event.CreateForwardClientEvent;
 import iot.sixiang.license.event.DeviceClientInactiveEvent;
+import iot.sixiang.license.event.DeviceClientLicenseEvent;
 import iot.sixiang.license.event.EventPublisher;
 import iot.sixiang.license.event.ForwardClientRequestEvent;
 import iot.sixiang.license.idreader.Safety;
 import iot.sixiang.license.model.SessionContext;
+import iot.sixiang.license.model.dto.ReportErrorMsgDTO;
 import iot.sixiang.license.service.PmsUseService;
+import iot.sixiang.license.service.TerminalDeviceService;
 import iot.sixiang.license.util.CommonUtil;
 import iot.sixiang.license.util.HexUtil;
 import iot.sixiang.license.util.SpringUtil;
@@ -24,17 +28,21 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.net.InetSocketAddress;
+import java.util.List;
 
 @Component
 @ChannelHandler.Sharable
 @Slf4j
 public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
+
     @Autowired
     EventPublisher eventPublisher;
     @Autowired
     Safety safety;
     @Resource
     private PmsUseService pmsUseService;
+    @Resource
+    TerminalDeviceService terminalDeviceService;
 
     public DeviceServerHandler() {
         super();
@@ -56,12 +64,17 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
 
         boolean auth = false;
         if (cmdInt == Constant.CMD_LICENSE) {
-            auth = handlerCheckAuth(channel, remoteIp, remotePort, protocol);
+            auth = handleCheckAuth(channel, remoteIp, remotePort, protocol);
+        } else if (cmdInt == Constant.CMD_UPLOAD_ERROR) {
+            auth = handleCheckAuthStatus(channel, remoteIp, remotePort, protocol);
+            if (auth) {
+                handleUploadError(channel, remoteIp, remotePort, protocol);
+            }
         } else {
-            auth = handlerCheckAuthStatus(channel, remoteIp, remotePort, protocol);
+            auth = handleCheckAuthStatus(channel, remoteIp, remotePort, protocol);
             if (auth) {
                 log.info("auth valid...");
-                handlerForward(channel, remoteIp, remotePort, protocol);
+                handleForward(channel, remoteIp, remotePort, protocol);
             }
         }
 
@@ -110,7 +123,7 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
         ctx.close();
     }
 
-    private boolean handlerCheckAuth(SocketChannel channel, String remoteIp, int remotePort, DeviceProtocol protocol) {
+    private boolean handleCheckAuth(SocketChannel channel, String remoteIp, int remotePort, DeviceProtocol protocol) {
         // 正式代码要放开
         byte[] bytes = safety.decodeExtendedPayload(protocol.getContent(), 0, protocol.getContent().length);
         if (bytes == null) {
@@ -163,17 +176,50 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
         return license;
     }
 
-    private boolean handlerCheckAuthStatus(SocketChannel channel, String remoteIp, int remotePort, DeviceProtocol protocol) {
+    private void handleUploadError(SocketChannel channel, String remoteIp, int remotePort, DeviceProtocol protocol) {
+        byte[] bytes = safety.decodeExtendedPayload(protocol.getContent(), 0, protocol.getContent().length);
+        if (bytes == null) {
+            return;
+        }
+        String decodeInfo = CommonUtil.bytesToStr(bytes);
+        log.info("upload error byte to string:" + decodeInfo);
+        if (decodeInfo == null) {
+            return;
+        }
+        List<ReportErrorMsgDTO> reportErrorMsgDTOS = JSONArray.parseArray(decodeInfo, ReportErrorMsgDTO.class);
+        terminalDeviceService.reportErrorMsg(reportErrorMsgDTOS);
+
+        short stx = 21930;
+        byte ack = 0x0;
+        int len = 3;
+        byte cmd = 0x2;
+        byte[] content = new byte[1];
+        content[0] = 0x7e;
+        byte end = 0x1;
+        DeviceProtocol theProtocol = new DeviceProtocol(stx, len, cmd, ack, content, end);
+        handleClient(channel, theProtocol);
+    }
+
+    private boolean handleCheckAuthStatus(SocketChannel channel, String remoteIp, int remotePort, DeviceProtocol protocol) {
         String channelId = channel.id().asLongText();
         DeviceManager deviceManager = SpringUtil.getBean(DeviceManager.class);
         return deviceManager.getAuthStatusByChannelId(channelId);
     }
 
-    private void handlerForward(SocketChannel channel, String remoteIp, int remotePort, DeviceProtocol protocol) {
+    private void handleForward(SocketChannel channel, String remoteIp, int remotePort, DeviceProtocol protocol) {
         String channelId = channel.id().asLongText();
         ForwardClientRequestEvent forwardClientRequestEvent = new ForwardClientRequestEvent();
         forwardClientRequestEvent.setDeviceChannelId(channelId);
         forwardClientRequestEvent.setProtocol(protocol);
         eventPublisher.publishEvent(forwardClientRequestEvent);
     }
+
+    private void handleClient(SocketChannel channel, DeviceProtocol protocol) {
+        String channelId = channel.id().asLongText();
+        DeviceClientLicenseEvent deviceClientLicenseEvent = new DeviceClientLicenseEvent();
+        deviceClientLicenseEvent.setDeviceChannelId(channelId);
+        deviceClientLicenseEvent.setProtocol(protocol);
+        eventPublisher.publishEvent(deviceClientLicenseEvent);
+    }
+
 }

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

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

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

@@ -17,15 +17,19 @@ public class DeviceClientLicenseEventHandler {
     EventPublisher eventPublisher;
 
     public DeviceClientLicenseEventHandler() {
-
     }
 
     @EventListener
     public void handlerEvent(DeviceClientLicenseEvent event) {
-        String appId = event.getSn();
+        String sn = event.getSn();
         DeviceProtocol protocol = event.getProtocol();
+        SessionContext session = null;
+        if (sn != null) {
+            session = deviceManager.getSessionContextBySN(sn);
+        } else if (event.getDeviceChannelId() != null) {
+            session = deviceManager.getSessionByChannelId(event.getDeviceChannelId());
+        }
 
-        SessionContext session = deviceManager.getSessionContextBySN(appId);
         if (session == null) {
             log.debug("device client license undo ...");
             return;