dev

src/main/java/com/its/vds/VdsCommServerApplication.java

@@ -85,11 +85,11 @@ public class VdsCommServerApplication implements CommandLineRunner, ApplicationL
     @Override
     public void run(String... args) throws Exception {
         if (OS.isWindows()) {
+            String sysTime = SysUtils.getSysTimeStr();
+            //JFrame.setDefaultLookAndFeelDecorated(true);
+            JFrame frame = new JFrame("VDS 통신 서버 - [" + sysTime + "]");
+            MainUI UI = new MainUI(frame);
             SwingUtilities.invokeLater(() -> {
-                String sysTime = SysUtils.getSysTimeStr();
-                //JFrame.setDefaultLookAndFeelDecorated(true);
-                JFrame frame = new JFrame("VDS 통신 서버 - [" + sysTime + "]");
-                MainUI UI = new MainUI(frame);
                 try {
                     ClassPathResource file = new ClassPathResource("static/image/application.png");
                     URL imgURL = file.getURL();

src/main/java/com/its/vds/entity/TbVdsCtlr.java

@@ -301,7 +301,7 @@ public class TbVdsCtlr {
 		}
 	}
 
-	public boolean stopImage(byte cameraNo) {
+	public boolean requestStopImage(byte cameraNo) {
 		if (getChannel() == null || getNetState() == NET.CLOSED) {
 			log.error("StopImage Request: channel not connected: [{}]", this);
 			return false;

src/main/java/com/its/vds/ui/MainUI.java

@@ -258,7 +258,7 @@ public class MainUI {
                 result = selObj.initialize();
                 break;
             case 4:
-                result = selObj.stopImage((byte) 0x01);
+                result = selObj.requestStopImage((byte) 0x01);
                 break;
             default:
                 return;

src/main/java/com/its/vds/ui/SubUI.java

@@ -195,7 +195,7 @@ public abstract class SubUI {
                 result = selObj.initialize();
                 break;
             case 4:
-                result = selObj.stopImage((byte) 0x01);
+                result = selObj.requestStopImage((byte) 0x01);
                 break;
             default:
                 return;

src/main/java/com/its/vds/xnettcp/center/handler/CenterTcpServerInboundHandler.java

@@ -8,8 +8,6 @@ import com.its.vds.xnettcp.center.protocol.CenterReqFramePacket;
 import com.its.vds.xnettcp.center.protocol.CenterResProtocol;
 import com.its.vds.xnettcp.vds.protocol.VdsProtocol;
 import com.its.vds.xnettcp.vds.protocol.VdsReqFrameHead;
-import com.its.vds.xnettcp.vds.protocol.VdsReqImage;
-import com.its.vds.xnettcp.vds.protocol.VdsReqReset;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -73,11 +71,8 @@ public class CenterTcpServerInboundHandler extends ChannelInboundHandlerAdapter
 
         if (opCode == VdsProtocol.vds_Reset) {
             ByteBuffer resultBuffer;
-            VdsReqReset reqReset = new VdsReqReset((short)obj.getGROUP_NO(), (short)obj.getVDS_CTLR_LOCAL_NO());
-            reqReset.makeCRC();
-            ByteBuffer sendBuffer = reqReset.getByteBuffer();
-            if (!obj.sendData(sendBuffer, 0, "vds_Reset")) {
-                log.error("CenterTcpServerInboundHandler: Center Request VDS Reset Data Send Failed: [{}]", obj);
+            boolean result = obj.reset();
+            if (!result) {
                 resultBuffer = CenterResProtocol.getResponse(opCode, (byte)(0xFD));
             } else {
                 resultBuffer = CenterResProtocol.getResponse(opCode, (byte)(0x00));
@@ -89,20 +84,45 @@ public class CenterTcpServerInboundHandler extends ChannelInboundHandlerAdapter
             } else {
                 log.error("CenterTcpServerInboundHandler: Response Failed. VDS Reset: [{}]", ctlrNo);
             }
+//            ByteBuffer resultBuffer;
+//            VdsReqReset reqReset = new VdsReqReset((short)obj.getGROUP_NO(), (short)obj.getVDS_CTLR_LOCAL_NO());
+//            reqReset.makeCRC();
+//            ByteBuffer sendBuffer = reqReset.getByteBuffer();
+//            if (!obj.sendData(sendBuffer, 0, "vds_Reset")) {
+//                log.error("CenterTcpServerInboundHandler: Center Request VDS Reset Data Send Failed: [{}]", obj);
+//                resultBuffer = CenterResProtocol.getResponse(opCode, (byte)(0xFD));
+//            } else {
+//                resultBuffer = CenterResProtocol.getResponse(opCode, (byte)(0x00));
+//            }
+//            ChannelFuture f = ctx.channel().writeAndFlush(resultBuffer);
+//            f.awaitUninterruptibly();
+//            if (f.isDone() || f.isSuccess()) {
+//                log.info("CenterTcpServerInboundHandler: Response OK. VDS Reset: [{}]", ctlrNo);
+//            } else {
+//                log.error("CenterTcpServerInboundHandler: Response Failed. VDS Reset: [{}]", ctlrNo);
+//            }
         }
         else if (opCode == VdsProtocol.vds_Image) {
-            int frameNo = 0;    // first image request
-            byte cameraNo = (centerReqHead.getBody()[9] == (byte)0x00) ? (byte)0x01 : centerReqHead.getBody()[9];
+            byte cameraNo = 0x01;
+            int frameNo = 0;
             obj.setStopImageRequest(ctx.channel(), cameraNo, frameNo);
-            VdsReqImage reqImage = new VdsReqImage((short)obj.getGROUP_NO(), (short)obj.getVDS_CTLR_LOCAL_NO());
-            reqImage.setCameraNo(cameraNo);
-            reqImage.setFrameNo(frameNo);
-            reqImage.makeCRC();
-            ByteBuffer sendBuffer = reqImage.getByteBuffer();
-            if (!obj.sendData(sendBuffer, 0, "vds_Image")) {
+            boolean result = obj.requestStopImage((byte) 0x01);
+            if (!result) {
                 obj.setStopImageResponse();
                 log.error("CenterTcpServerInboundHandler: Center Request VDS Image Data Send Failed: [{}]", obj);
             }
+//            int frameNo = 0;    // first image request
+//            byte cameraNo = (centerReqHead.getBody()[9] == (byte)0x00) ? (byte)0x01 : centerReqHead.getBody()[9];
+//            obj.setStopImageRequest(ctx.channel(), cameraNo, frameNo);
+//            VdsReqImage reqImage = new VdsReqImage((short)obj.getGROUP_NO(), (short)obj.getVDS_CTLR_LOCAL_NO());
+//            reqImage.setCameraNo(cameraNo);
+//            reqImage.setFrameNo(frameNo);
+//            reqImage.makeCRC();
+//            ByteBuffer sendBuffer = reqImage.getByteBuffer();
+//            if (!obj.sendData(sendBuffer, 0, "vds_Image")) {
+//                obj.setStopImageResponse();
+//                log.error("CenterTcpServerInboundHandler: Center Request VDS Image Data Send Failed: [{}]", obj);
+//            }
         }
         else {
             log.error("CenterTcpServerInboundHandler: Center Request Not Support: [{}]", opCode);