调试

程嘉葳
1 parent 90677812
Showing 9 changed files with 89 additions and 18 deletions Show diff stats
src/main/java/com/example/mina/Application.java
src/main/java/com/example/mina/client/base/AbstractClientFactory.java
src/main/java/com/example/mina/client/base/AbstractMatrixIoHandler.java
src/main/java/com/example/mina/client/base/ClientManager.java
src/main/java/com/example/mina/client/base/MatrixClient.java
src/main/java/com/example/mina/client/box/aeroflex/AeroFlexClientFactory.java
src/main/java/com/example/mina/client/box/aeroflex/AeroFlexProtocolFactory.java
src/main/java/com/example/mina/client/box/aeroflex/AeroflexClientIoHandler.java
src/main/java/com/example/mina/server/box/aeroflex/AeroflexVirtualBoxHandler.java
 package com.example.mina;
  
+import com.example.mina.client.base.ClientManager;
+import com.example.mina.client.base.MatrixClient;
+import com.example.mina.client.base.MatrixCommand;
+import com.example.mina.client.base.MatrixConnectConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import java.util.HashMap;
+import java.util.Map;
  
 /**
  * @author 杜云山
@@ -11,7 +19,24 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class Application {
  
     public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
+//        SpringApplication.run(Application.class, args);
+
+        ConfigurableApplicationContext run = SpringApplication.run(Application.class, args);
+
+        ClientManager clientManager = run.getBean(ClientManager.class);
+
+        MatrixConnectConfig connectConfig = MatrixConnectConfig.builder()
+                .deviceId("15")
+                .deviceType("AEROFLEX")
+                .host("127.0.0.1")
+                .port(9100)
+                .build();
+
+        MatrixClient client = clientManager.getOrCreateClient(connectConfig);
+
+
+        client.setAttenuation(1,2,3);
+
     }
  
 }
@@ -26,9 +26,10 @@ public abstract class AbstractClientFactory {
  
             MatrixClient client = new MatrixClient(connectConfig);
  
+            client.setClientHandler(getClientHandler());
             //TODO initiate the client
             buildFilterChain(client.getFilterChain());
-            client.setClientHandler(getClientHandler());
+
             return client;
         }catch (Exception e) {
             log.error("Can not create the client, error: ", e);
@@ -50,6 +50,7 @@ public abstract class AbstractMatrixIoHandler extends IoHandlerAdapter {
  
     @Override
     public void messageSent(IoSession session, Object message) {
+        log.info("=======44444============");
     }
  
     @Override
 package com.example.mina.client.base;
  
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
  
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
  
@@ -14,12 +16,15 @@ public class ClientManager&lt;T extends AbstractClientFactory&gt; {
  
     private Map<String, T> clientFactories;
  
-    private Map<String, MatrixClient> clients;
+    private Map<String, MatrixClient> clients ;
  
     public ClientManager() {
-        this.clients = Collections.emptyMap();
+
+       // this.clients = Collections.emptyMap();
+        this.clients = new HashMap<>();
     }
  
+    @Autowired
     public void setClientFactories(Map<String, T> clientFactories) {
         this.clientFactories = clientFactories;
     }
@@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
 import org.apache.mina.core.filterchain.IoFilterChain;
 import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.WriteFuture;
 import org.apache.mina.core.service.IoConnector;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
@@ -84,10 +85,6 @@ public class MatrixClient {
     }
  
     public IoFilterChain getFilterChain() {
-        return ioSession.getFilterChain();
-    }
-
-    public void start() {
         //1、创建客户端IoService
         IoConnector connector = new NioSocketConnector();
         //客户端链接超时时间
@@ -106,6 +103,11 @@ public class MatrixClient {
         // 获取连接会话
         this.ioSession = connectFuture.getSession();
         this.ioSession.setAttribute(MatrixConstants.SESSION_CONFIG_NAME, matrixConnectConfig);
+
+        return ioSession.getFilterChain();
+    }
+
+    public void start() {
         //将数据发送线程启动
         this.sender.start();
     }
@@ -165,7 +167,11 @@ public class MatrixClient {
                 try {
                     MatrixCommand command = commands.poll(5, TimeUnit.SECONDS);
  
-                    client.ioSession.write(command);
+                    if(command != null){
+                        log.info("======================");
+                        WriteFuture a =client.ioSession.write(command);
+                    }
+
                 }catch (Exception e) {
                     log.error("error occurred when send the request to device, device: " + client.matrixConnectConfig, e);
                 }
 package com.example.mina.client.box.aeroflex;
  
 import com.example.mina.client.base.AbstractClientFactory;
-import com.example.mina.client.base.AbstractMatrixIoHandler;
 import com.example.mina.client.base.MatrixConstants;
+import com.example.mina.client.base.MatrixDataProxy;
 import org.apache.mina.core.filterchain.IoFilterChain;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.springframework.stereotype.Component;
@@ -11,8 +11,9 @@ import org.springframework.stereotype.Component;
 public class AeroFlexClientFactory extends AbstractClientFactory {
  
     @Override
-    public AbstractMatrixIoHandler getClientHandler() {
-        return null;
+    public AeroflexClientIoHandler getClientHandler() {
+        System.out.println("=============getClientHandler==================");
+        return new AeroflexClientIoHandler();
     }
  
     @Override
@@ -27,6 +27,20 @@ public class AeroFlexProtocolFactory implements ProtocolCodecFactory {
             if(! (msg instanceof MatrixCommand) ) {
                 log.error("error msg, msg is: {}", msg);
                 return;
+            }else{
+                MatrixCommand mc = (MatrixCommand) msg;
+                log.info("---发送数据参数!Attn = {},Col = {},Command = {},Row = {},MatrixId = {}", mc.getAttn(),mc.getCol(),mc.getCommand(),mc.getRow(),mc.getMatrixId());
+                IoBuffer buffer = IoBuffer.allocate(100, false).setAutoExpand(true);
+                buffer.putInt(mc.getCommand());
+                buffer.putInt(mc.getAttn());
+                buffer.putInt(mc.getCol());
+                buffer.putInt(mc.getRow());
+
+                //buffer.put(lm.getContent().getBytes(charset));
+
+                buffer.flip();
+                protocolEncoderOutput.write(buffer);
+                log.info("-=-=-=-=-=-=send finish==");
             }
         }
     }
@@ -36,10 +50,11 @@ public class AeroFlexProtocolFactory implements ProtocolCodecFactory {
  
         @Override
         public void decode(IoSession ioSession, IoBuffer ioBuffer, ProtocolDecoderOutput protocolDecoderOutput) throws Exception {
+            log.info("--server返回给----client ------IoBuffer{}" , ioBuffer);
             int cmd = ioBuffer.get();
-            MatrixResponse response = new MatrixResponse();
+            MatrixResponse response = new MatrixResponse();  // todo
  
-            protocolDecoderOutput.write(response);
+            protocolDecoderOutput.write(ioBuffer);
         }
     }
 }
@@ -2,21 +2,36 @@ package com.example.mina.client.box.aeroflex;
  
 import com.example.mina.client.base.AbstractMatrixIoHandler;
 import com.example.mina.client.base.MatrixDataProxy;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.mina.core.session.IoSession;
  
 /**
  * @author dy
  * @date 2021/3/10
  */
+@Slf4j
 public class AeroflexClientIoHandler extends AbstractMatrixIoHandler {
  
-    public AeroflexClientIoHandler(MatrixDataProxy matrixDataProxy) {
-        super(matrixDataProxy);
+    //public AeroflexClientIoHandler(MatrixDataProxy matrixDataProxy) {
+    //    super(matrixDataProxy);
+   // }
+
+    public AeroflexClientIoHandler() {
+        super(new MatrixDataProxy());
     }
  
+
     @Override
     public boolean handleCommandResponse(byte[] response) {
-
+        log.info("------AeroflexClientIoHandler-----{}",response);
         return false;
     }
  
+    @Override
+    public void sessionCreated(IoSession session) {
+        System.out.println("=========111========");
+    }
+
+
+
 }
 package com.example.mina.server.box.aeroflex;
  
+import com.example.mina.client.base.MatrixCommand;
 import com.example.mina.server.base.AbstractVirtualBoxHandler;
 import com.example.mina.server.entity.AeroflexDataBuffer;
 import lombok.extern.slf4j.Slf4j;
@@ -94,7 +95,8 @@ public class AeroflexVirtualBoxHandler
  
     @Override
     public void messageSent(IoSession session, Object message) {
-
+        //MatrixCommand mc=(MatrixCommand)message;
+        //log.info("--- abstractVirtual 发送数据成功!Attn = {},Col = {},Command = {},Row = {},MatrixId = {}", mc.getAttn(),mc.getCol(),mc.getCommand(),mc.getRow(),mc.getMatrixId());
         log.info("--- abstractVirtual 发送数据成功!{}", message);
     }
1	1	package com.example.mina;
2	2
	3	+import com.example.mina.client.base.ClientManager;
	4	+import com.example.mina.client.base.MatrixClient;
	5	+import com.example.mina.client.base.MatrixCommand;
	6	+import com.example.mina.client.base.MatrixConnectConfig;
3	7	import org.springframework.boot.SpringApplication;
4	8	import org.springframework.boot.autoconfigure.SpringBootApplication;
	9	+import org.springframework.context.ConfigurableApplicationContext;
	10	+
	11	+import java.util.HashMap;
	12	+import java.util.Map;
5	13
6	14	/**
7	15	* @author 杜云山
...	...	@@ -11,7 +19,24 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
11	19	public class Application {
12	20
13	21	public static void main(String[] args) {
14		- SpringApplication.run(Application.class, args);
	22	+// SpringApplication.run(Application.class, args);
	23	+
	24	+ ConfigurableApplicationContext run = SpringApplication.run(Application.class, args);
	25	+
	26	+ ClientManager clientManager = run.getBean(ClientManager.class);
	27	+
	28	+ MatrixConnectConfig connectConfig = MatrixConnectConfig.builder()
	29	+ .deviceId("15")
	30	+ .deviceType("AEROFLEX")
	31	+ .host("127.0.0.1")
	32	+ .port(9100)
	33	+ .build();
	34	+
	35	+ MatrixClient client = clientManager.getOrCreateClient(connectConfig);
	36	+
	37	+
	38	+ client.setAttenuation(1,2,3);
	39	+
15	40	}
16	41
17	42	}
...	...
...	...	@@ -26,9 +26,10 @@ public abstract class AbstractClientFactory {
26	26
27	27	MatrixClient client = new MatrixClient(connectConfig);
28	28
	29	+ client.setClientHandler(getClientHandler());
29	30	//TODO initiate the client
30	31	buildFilterChain(client.getFilterChain());
31		- client.setClientHandler(getClientHandler());
	32	+
32	33	return client;
33	34	}catch (Exception e) {
34	35	log.error("Can not create the client, error: ", e);
...	...
...	...	@@ -50,6 +50,7 @@ public abstract class AbstractMatrixIoHandler extends IoHandlerAdapter {
50	50
51	51	@Override
52	52	public void messageSent(IoSession session, Object message) {
	53	+ log.info("=======44444============");
53	54	}
54	55
55	56	@Override
...	...
1	1	package com.example.mina.client.base;
2	2
3	3	import lombok.extern.slf4j.Slf4j;
	4	+import org.springframework.beans.factory.annotation.Autowired;
4	5	import org.springframework.stereotype.Component;
5	6	import org.springframework.util.Assert;
6	7
7	8	import java.util.Collections;
	9	+import java.util.HashMap;
8	10	import java.util.Map;
9	11	import java.util.Set;
10	12
...	...	@@ -14,12 +16,15 @@ public class ClientManager<T extends AbstractClientFactory> {
14	16
15	17	private Map<String, T> clientFactories;
16	18
17		- private Map<String, MatrixClient> clients;
	19	+ private Map<String, MatrixClient> clients ;
18	20
19	21	public ClientManager() {
20		- this.clients = Collections.emptyMap();
	22	+
	23	+ // this.clients = Collections.emptyMap();
	24	+ this.clients = new HashMap<>();
21	25	}
22	26
	27	+ @Autowired
23	28	public void setClientFactories(Map<String, T> clientFactories) {
24	29	this.clientFactories = clientFactories;
25	30	}
...	...
...	...	@@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j;
4	4	import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
5	5	import org.apache.mina.core.filterchain.IoFilterChain;
6	6	import org.apache.mina.core.future.ConnectFuture;
	7	+import org.apache.mina.core.future.WriteFuture;
7	8	import org.apache.mina.core.service.IoConnector;
8	9	import org.apache.mina.core.session.IoSession;
9	10	import org.apache.mina.filter.codec.ProtocolCodecFilter;
...	...	@@ -84,10 +85,6 @@ public class MatrixClient {
84	85	}
85	86
86	87	public IoFilterChain getFilterChain() {
87		- return ioSession.getFilterChain();
88		- }
89		-
90		- public void start() {
91	88	//1、创建客户端IoService
92	89	IoConnector connector = new NioSocketConnector();
93	90	//客户端链接超时时间
...	...	@@ -106,6 +103,11 @@ public class MatrixClient {
106	103	// 获取连接会话
107	104	this.ioSession = connectFuture.getSession();
108	105	this.ioSession.setAttribute(MatrixConstants.SESSION_CONFIG_NAME, matrixConnectConfig);
	106	+
	107	+ return ioSession.getFilterChain();
	108	+ }
	109	+
	110	+ public void start() {
109	111	//将数据发送线程启动
110	112	this.sender.start();
111	113	}
...	...	@@ -165,7 +167,11 @@ public class MatrixClient {
165	167	try {
166	168	MatrixCommand command = commands.poll(5, TimeUnit.SECONDS);
167	169
168		- client.ioSession.write(command);
	170	+ if(command != null){
	171	+ log.info("======================");
	172	+ WriteFuture a =client.ioSession.write(command);
	173	+ }
	174	+
169	175	}catch (Exception e) {
170	176	log.error("error occurred when send the request to device, device: " + client.matrixConnectConfig, e);
171	177	}
...	...
1	1	package com.example.mina.client.box.aeroflex;
2	2
3	3	import com.example.mina.client.base.AbstractClientFactory;
4		-import com.example.mina.client.base.AbstractMatrixIoHandler;
5	4	import com.example.mina.client.base.MatrixConstants;
	5	+import com.example.mina.client.base.MatrixDataProxy;
6	6	import org.apache.mina.core.filterchain.IoFilterChain;
7	7	import org.apache.mina.filter.codec.ProtocolCodecFilter;
8	8	import org.springframework.stereotype.Component;
...	...	@@ -11,8 +11,9 @@ import org.springframework.stereotype.Component;
11	11	public class AeroFlexClientFactory extends AbstractClientFactory {
12	12
13	13	@Override
14		- public AbstractMatrixIoHandler getClientHandler() {
15		- return null;
	14	+ public AeroflexClientIoHandler getClientHandler() {
	15	+ System.out.println("=============getClientHandler==================");
	16	+ return new AeroflexClientIoHandler();
16	17	}
17	18
18	19	@Override
...	...
...	...	@@ -27,6 +27,20 @@ public class AeroFlexProtocolFactory implements ProtocolCodecFactory {
27	27	if(! (msg instanceof MatrixCommand) ) {
28	28	log.error("error msg, msg is: {}", msg);
29	29	return;
	30	+ }else{
	31	+ MatrixCommand mc = (MatrixCommand) msg;
	32	+ log.info("---发送数据参数!Attn = {},Col = {},Command = {},Row = {},MatrixId = {}", mc.getAttn(),mc.getCol(),mc.getCommand(),mc.getRow(),mc.getMatrixId());
	33	+ IoBuffer buffer = IoBuffer.allocate(100, false).setAutoExpand(true);
	34	+ buffer.putInt(mc.getCommand());
	35	+ buffer.putInt(mc.getAttn());
	36	+ buffer.putInt(mc.getCol());
	37	+ buffer.putInt(mc.getRow());
	38	+
	39	+ //buffer.put(lm.getContent().getBytes(charset));
	40	+
	41	+ buffer.flip();
	42	+ protocolEncoderOutput.write(buffer);
	43	+ log.info("-=-=-=-=-=-=send finish==");
30	44	}
31	45	}
32	46	}
...	...	@@ -36,10 +50,11 @@ public class AeroFlexProtocolFactory implements ProtocolCodecFactory {
36	50
37	51	@Override
38	52	public void decode(IoSession ioSession, IoBuffer ioBuffer, ProtocolDecoderOutput protocolDecoderOutput) throws Exception {
	53	+ log.info("--server返回给----client ------IoBuffer{}" , ioBuffer);
39	54	int cmd = ioBuffer.get();
40		- MatrixResponse response = new MatrixResponse();
	55	+ MatrixResponse response = new MatrixResponse(); // todo
41	56
42		- protocolDecoderOutput.write(response);
	57	+ protocolDecoderOutput.write(ioBuffer);
43	58	}
44	59	}
45	60	}
...	...
...	...	@@ -2,21 +2,36 @@ package com.example.mina.client.box.aeroflex;
2	2
3	3	import com.example.mina.client.base.AbstractMatrixIoHandler;
4	4	import com.example.mina.client.base.MatrixDataProxy;
	5	+import lombok.extern.slf4j.Slf4j;
	6	+import org.apache.mina.core.session.IoSession;
5	7
6	8	/**
7	9	* @author dy
8	10	* @date 2021/3/10
9	11	*/
	12	+@Slf4j
10	13	public class AeroflexClientIoHandler extends AbstractMatrixIoHandler {
11	14
12		- public AeroflexClientIoHandler(MatrixDataProxy matrixDataProxy) {
13		- super(matrixDataProxy);
	15	+ //public AeroflexClientIoHandler(MatrixDataProxy matrixDataProxy) {
	16	+ // super(matrixDataProxy);
	17	+ // }
	18	+
	19	+ public AeroflexClientIoHandler() {
	20	+ super(new MatrixDataProxy());
14	21	}
15	22
	23	+
16	24	@Override
17	25	public boolean handleCommandResponse(byte[] response) {
18		-
	26	+ log.info("------AeroflexClientIoHandler-----{}",response);
19	27	return false;
20	28	}
21	29
	30	+ @Override
	31	+ public void sessionCreated(IoSession session) {
	32	+ System.out.println("=========111========");
	33	+ }
	34	+
	35	+
	36	+
22	37	}
...	...
1	1	package com.example.mina.server.box.aeroflex;
2	2
	3	+import com.example.mina.client.base.MatrixCommand;
3	4	import com.example.mina.server.base.AbstractVirtualBoxHandler;
4	5	import com.example.mina.server.entity.AeroflexDataBuffer;
5	6	import lombok.extern.slf4j.Slf4j;
...	...	@@ -94,7 +95,8 @@ public class AeroflexVirtualBoxHandler
94	95
95	96	@Override
96	97	public void messageSent(IoSession session, Object message) {
97		-
	98	+ //MatrixCommand mc=(MatrixCommand)message;
	99	+ //log.info("--- abstractVirtual 发送数据成功!Attn = {},Col = {},Command = {},Row = {},MatrixId = {}", mc.getAttn(),mc.getCol(),mc.getCommand(),mc.getRow(),mc.getMatrixId());
98	100	log.info("--- abstractVirtual 发送数据成功!{}", message);
99	101	}
100	102
...	...