dev

src/main/java/com/its/cctv/api/service/CctvControlService.java

@@ -86,8 +86,7 @@ public class CctvControlService {
             return new CctvStatusDto.CctvStatusDtoRes(2, "CCTV 제어기와 통신연결이 되어 있지 않습니다.", null);
         }
 
-        CctvStatusDto.CctvStatusDtoRes result = new CctvStatusDto.CctvStatusDtoRes(0, "success", cctv.getStts().toDto());
-        return result;
+        return new CctvStatusDto.CctvStatusDtoRes(0, "success", cctv.getStts().toDto());
     }
 
     /**
@@ -127,7 +126,7 @@ public class CctvControlService {
             byte ptz = pkt.setPtzValue((byte) pan, (byte) tilt, (byte) zoom, (byte) focus, (byte) panSped, (byte) tiltSped, (byte) zoomSped, (byte) focusSped);
             log.info("PTZ Control: " + ByteUtils.byteToBitString(ptz));
             ByteBuffer sendBuffer = pkt.getByteBuffer();
-            if (cctv.sendData(sendBuffer, 0, "cctv_StateReq")) {
+            if (cctv.sendData(sendBuffer, 0, "cctv_PtzStart")) {
                 log.info("{} send success.", cmdDesc);
             } else {
                 result.setResult(4, "CCTV PTZ 시작 명령 전송이 실패하였습니다.");
@@ -137,7 +136,7 @@ public class CctvControlService {
             // stop
             CctvReqPtzCtrl pkt = new CctvReqPtzCtrl(cctv.getAddress());
             ByteBuffer sendBuffer = pkt.getByteBuffer();
-            if (cctv.sendData(sendBuffer, 0, "cctv_StateReq")) {
+            if (cctv.sendData(sendBuffer, 0, "cctv_PtzStop")) {
                 log.info("{} STOP send success.", cmdDesc);
             } else {
                 result.setResult(4, "CCTV PTZ 정지 명령 전송이 실패하였습니다.");
@@ -272,7 +271,7 @@ public class CctvControlService {
 //                ByteBuffer sendBuffer = pkt.getByteBuffer();
 //                if (cctv.sendData(sendBuffer, 0, "cctv_PresetQry")) {
                 ByteBuffer sendBuffer = cctv.getReqState().getByteBuffer();
-                if (cctv.sendData(sendBuffer, 0, "cctv_StateReq")) {
+                if (cctv.sendData(sendBuffer, 0, "cctv_PresetQry")) {
                     log.info("PRESET QRY send success.");
                     cctv.getPsetVal().wait(5000);
                     if (cctv.getPsetVal().isCompleted()) {

src/main/java/com/its/cctv/entity/TbCctvCtlr.java

@@ -173,7 +173,7 @@ public class TbCctvCtlr {
 				if (this.debugConfig != null && this.debugConfig.isSttsLog()) {
 					log.info("[{}]. sendData: OK. {}, {} Bytes.", this.CCTV_CTLR_ID, packetDesc, sendBuffer.array().length);
 				} else {
-					if (packetDesc != null && packetDesc.contains("cctv_Ptz")) {
+					if (packetDesc != null && !packetDesc.contains("cctv_State")) {
 						log.info("[{}]. sendData: OK. {}, {} Bytes.", this.CCTV_CTLR_ID, packetDesc, sendBuffer.array().length);
 					}
 				}
@@ -222,7 +222,7 @@ public class TbCctvCtlr {
 		CctvReqResetHw req = new CctvReqResetHw(getAddress());
 		req.makeCRC();
 		ByteBuffer sendBuffer = req.getByteBuffer();
-		if (!sendData(sendBuffer, 0, "cctv_ResetHw")) {
+		if (!sendData(sendBuffer, 0, "cctv_ResetSw")) {
 			log.error("Software Reset Data Send Failed: [{}]", this);
 			return false;
 		}

src/main/java/com/its/cctv/xnettcp/cctv/codec/CctvTcpClientDecoder.java

@@ -40,7 +40,8 @@ public class CctvTcpClientDecoder extends ByteToMessageDecoder {
             return;
         }
 
-        MDC.put("id", obj.getLogKey());
+        String logKey = String.valueOf(obj.getLogKey());
+        MDC.put("id", logKey);
         try {
             int readableBytes = byteBuf.readableBytes();
             //log.info("[{}]. RECV: ReadableBytes: {} Bytes, ReaderIndex: {}", obj.getCCTV_CTLR_ID(), readableBytes, byteBuf.readerIndex());
@@ -117,7 +118,7 @@ public class CctvTcpClientDecoder extends ByteToMessageDecoder {
         }
         finally {
             byteBuf.resetReaderIndex();
-            MDC.remove(obj.getLogKey());
+            MDC.remove(logKey);
             MDC.clear();
         }
 

src/main/java/com/its/cctv/xnettcp/cctv/codec/CctvTcpClientEncoder.java

@@ -2,7 +2,6 @@ package com.its.cctv.xnettcp.cctv.codec;
 
 import com.its.app.utils.NettyUtils;
 import com.its.app.utils.SysUtils;
-import com.its.cctv.config.DebugConfig;
 import com.its.cctv.entity.TbCctvCtlr;
 import com.its.cctv.global.AppRepository;
 import com.its.cctv.xnettcp.cctv.handler.CctvTcpClientIdleHandler;
@@ -52,18 +51,17 @@ public class CctvTcpClientEncoder extends MessageToByteEncoder<Object> {
         byte[] sendBytes = buffer.array();
         outByteBuf.writeBytes(sendBytes);
 
-        DebugConfig debugConfig = obj.getDebugConfig();
-        String opCodeDesc = CctvProtocol.getOpCodeName(sendBytes[CctvReqFrameHead.OPCODE_POS]);
-
-        if (debugConfig != null && debugConfig.isSttsLog()) {
-            log.info("[{}]. SEND: {}, {} Bytes.", obj.getCCTV_CTLR_ID(), opCodeDesc, sendBytes.length);
-        } else {
-            if (opCodeDesc != null && !opCodeDesc.contains("cctv_StateReq")) {
-                log.info("[{}]. SEND: {}, {} Bytes.", obj.getCCTV_CTLR_ID(), opCodeDesc, sendBytes.length);
-            }
-        }
+//        DebugConfig debugConfig = obj.getDebugConfig();
+//        String opCodeDesc = CctvProtocol.getOpCodeName(sendBytes[CctvReqFrameHead.OPCODE_POS]);
+//        if (debugConfig != null && debugConfig.isSttsLog()) {
+//            log.info("[{}]. SEND: {}, {} Bytes.", obj.getCCTV_CTLR_ID(), opCodeDesc, sendBytes.length);
+//        } else {
+//            if (opCodeDesc != null && !opCodeDesc.contains("cctv_StateReq")) {
+//                log.info("[{}]. SEND: {}, {} Bytes.", obj.getCCTV_CTLR_ID(), opCodeDesc, sendBytes.length);
+//            }
+//        }
         if (obj.isDump()) {
-            log.info("[{}]. SEND: {}, {} Bytes. {}", obj.getCCTV_CTLR_ID(), opCodeDesc, sendBytes.length, SysUtils.byteArrayToHex(sendBytes));
+            log.info("[{}]. SEND: {}, {} Bytes. {}", obj.getCCTV_CTLR_ID(), CctvProtocol.getOpCodeName(sendBytes[CctvReqFrameHead.OPCODE_POS]), sendBytes.length, SysUtils.byteArrayToHex(sendBytes));
         }
 
         MDC.remove(obj.getLogKey());