diff --git a/src/main/java/com/example/mina/client/base/AbstractClient.java b/src/main/java/com/example/mina/client/base/AbstractClient.java index 6af297a..8b2db12 100644 --- a/src/main/java/com/example/mina/client/base/AbstractClient.java +++ b/src/main/java/com/example/mina/client/base/AbstractClient.java @@ -54,15 +54,17 @@ public abstract class AbstractClient { // 等待建立连接 connectFuture.awaitUninterruptibly(); // 获取连接会话 - int a = getAttenuation(3); + //int a = getAttenuation(3); this.ioSession = connectFuture.getSession(); + setAttenuation(clientDTO); + test(clientDTO); - //setAttenuation(clientDTO); - - int b = getAttenuation(3); + //int b = getAttenuation(3); } + abstract public void test(ClientDTO clientDTO); + abstract public int getAttenuation(int col); /*public boolean isConnected() { diff --git a/src/main/java/com/example/mina/client/box/aeroflex/AeroflexClient.java b/src/main/java/com/example/mina/client/box/aeroflex/AeroflexClient.java index 0b86e5b..0b17e82 100644 --- a/src/main/java/com/example/mina/client/box/aeroflex/AeroflexClient.java +++ b/src/main/java/com/example/mina/client/box/aeroflex/AeroflexClient.java @@ -28,6 +28,11 @@ public class AeroflexClient extends AbstractClient { } + @Override + public void test(ClientDTO clientDTO) { + + } + /*@Override public boolean setAttenuation(int row, int col, int attenuation) { return false; diff --git a/src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java b/src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java index 4e6879d..583d9d8 100644 --- a/src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java +++ b/src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java @@ -36,6 +36,21 @@ public class Lte3000Client extends AbstractClient { } @Override + public void test(ClientDTO clientDTO) { + + boolean a = isCrossPointOn(clientDTO.getRow(),clientDTO.getCol()); + int c = getAttenuation(clientDTO.getCol()); + byte[] bytes = genCloseCommand(); + Entry[][] entries =getMatrix(); + Entry[] entry =getOffsetData(); + + int q = getAttenuation(clientDTO.getCol()); + clientDTO.setRow(0); + setAttenuation(clientDTO); + int w = getAttenuation(clientDTO.getCol()); + } + + @Override public void setAttenuation(ClientDTO clientDTO) { byte[] cmd; if (clientDTO.getRow() == 0) { diff --git a/src/main/java/com/example/mina/client/test/MinaClient.java b/src/main/java/com/example/mina/client/test/MinaClient.java index 1a1c1b6..a3c717e 100644 --- a/src/main/java/com/example/mina/client/test/MinaClient.java +++ b/src/main/java/com/example/mina/client/test/MinaClient.java @@ -31,7 +31,7 @@ public class MinaClient { // cf.getSession().getCloseFuture().awaitUninterruptibly(); // // connector.dispose(); - new Lte3000Client().start(ClientDTO.builder().row(0).col(3).maxAttn(5).build()); + new Lte3000Client().start(ClientDTO.builder().row(2).col(3).maxAttn(5).build()); } diff --git a/src/main/java/com/example/mina/server/base/AbstractHardwareDataBuffer.java b/src/main/java/com/example/mina/server/base/AbstractHardwareDataBuffer.java index b4c5772..b4bc21d 100644 --- a/src/main/java/com/example/mina/server/base/AbstractHardwareDataBuffer.java +++ b/src/main/java/com/example/mina/server/base/AbstractHardwareDataBuffer.java @@ -51,7 +51,7 @@ public abstract class AbstractHardwareDataBuffer { } public int getAttenuation(int row, int col) { - return matrixData[row - 1][col - 1].getValue(); + return matrixData[row - 1][col - 1].getValue() ; } public synchronized void setOffset(int row, int val) { -- libgit2 0.21.2