|
@@ -15,6 +15,7 @@ import io.netty.channel.socket.nio.NioSocketChannel;
|
|
|
import io.netty.util.concurrent.Future;
|
|
|
import io.netty.util.concurrent.GenericFutureListener;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
import java.net.InetSocketAddress;
|
|
|
import java.util.Date;
|
|
@@ -75,7 +76,7 @@ public class Iec104Session implements Runnable {
|
|
|
case 0x13:
|
|
|
state = SessionState.STOP104;
|
|
|
|
|
|
-
|
|
|
+ this.stop();
|
|
|
return BasicInstruction104.createSysMessage(UControlEnum.STOPDT_YES);
|
|
|
default:
|
|
|
return null;
|
|
@@ -134,12 +135,17 @@ public class Iec104Session implements Runnable {
|
|
|
public void run() {
|
|
|
try {
|
|
|
isRunning = true;
|
|
|
-
|
|
|
-
|
|
|
+ while(isRunning) {
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+ Thread.sleep(100);
|
|
|
+ }
|
|
|
|
|
|
-
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
|