MIMOG3修改

src/main/java/com/neotel/smfcore/core/device/handler/impl/MimoG3BoxHandler.java

@@ -167,6 +167,6 @@ public class MimoG3BoxHandler extends BaseDeviceHandler{
 
 
     @Override
     @Override
     public DeviceType getDeviceType() {
     public DeviceType getDeviceType() {
-        return DeviceType.SMD_MIMO_G2;
+        return DeviceType.SMD_MIMO_G3;
     }
     }
 }
 }

src/main/java/com/neotel/smfcore/core/storage/service/po/Storage.java

@@ -102,7 +102,8 @@ public class Storage extends BasePo implements Serializable {
      * @return
      * @return
      */
      */
     public boolean isMimoG2(){
     public boolean isMimoG2(){
-        return DeviceType.SMD_MIMO_G2.name().equals(type);
+        //MIMOG2和G3统一处理
+        return DeviceType.SMD_MIMO_G2.name().equals(type)||DeviceType.SMD_MIMO_G3.equals(type);
     }
     }
     /**
     /**
      * 是否是单台自动仓
      * 是否是单台自动仓

src/main/java/com/neotel/smfcore/custom/hanwha/client/MyWebSocketClient.java

@@ -12,16 +12,17 @@ import java.util.TimerTask;
 @Slf4j
 @Slf4j
 public class MyWebSocketClient extends WebSocketClient {
 public class MyWebSocketClient extends WebSocketClient {
 
 
+    private String url="";
     private WsMsgReceivedListener msgReceivedListener; // 消息接收监听器
     private WsMsgReceivedListener msgReceivedListener; // 消息接收监听器
     public MyWebSocketClient(URI serverUri, WsMsgReceivedListener listener) {
     public MyWebSocketClient(URI serverUri, WsMsgReceivedListener listener) {
         super(serverUri);
         super(serverUri);
+        url=serverUri.toString();
         this.msgReceivedListener =listener;
         this.msgReceivedListener =listener;
     }
     }
 
 
     @Override
     @Override
     public void onOpen(ServerHandshake serverHandshake) {
     public void onOpen(ServerHandshake serverHandshake) {
-        log.info("onOpen ");
-        log.info((new Date().toString()) + "connect webSServer ok  ");
+        log.info(url+":" +(new Date().toString()) + "connect webSServer ok  ");
         cancelReconnect();
         cancelReconnect();
         if(msgReceivedListener!=null) {
         if(msgReceivedListener!=null) {
             msgReceivedListener.onOpen();
             msgReceivedListener.onOpen();
@@ -41,20 +42,20 @@ public class MyWebSocketClient extends WebSocketClient {
     @Override
     @Override
     public void onClose(int i, String s, boolean b) {
     public void onClose(int i, String s, boolean b) {
 
 
-        log.info("onClose: code:{} reason:{} {}", i, s, b);
+        log.info(url+":" +"onClose: code:{} reason:{} {}", i, s, b);
         startReconnect();
         startReconnect();
     }
     }
 
 
     @Override
     @Override
     public void onError(Exception e) {
     public void onError(Exception e) {
-        log.error("web socket client onerror :"+e.toString());
+        log.error(url+":" +"web socket client onerror :"+e.toString());
 
 
         //关闭后重新连接
         //关闭后重新连接
         try {
         try {
             close();
             close();
         }catch (Exception ex){
         }catch (Exception ex){
 
 
-            log.error("web socket client onerror close error:"+e.toString());
+            log.error(url+":" +"web socket client onerror close error:"+e.toString());
         }
         }
         startReconnect();
         startReconnect();
     }
     }