dev

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

@@ -1,6 +1,7 @@
 package com.its.cctv.entity;
 
 import com.its.app.utils.SysUtils;
+import com.its.cctv.config.DebugConfig;
 import com.its.cctv.domain.NET;
 import com.its.cctv.xnettcp.cctv.handler.CctvTcpClientIdleHandler;
 import com.its.cctv.xnettcp.cctv.protocol.CctvProtocol;
@@ -22,6 +23,7 @@ import java.nio.ByteBuffer;
 @Setter
 @ToString
 public class TbCctvCtlr {
+	private DebugConfig debugConfig;
 	private int    index;
 	private String CCTV_CTLR_NMBR;
 	private String CCTV_CTLR_ID;
@@ -65,6 +67,7 @@ public class TbCctvCtlr {
 	}
 
 	public TbCctvCtlr() {
+		this.debugConfig = null;
 		this.stts = new TbCctvCtlrStts();
 		this.psetVal = new CctvPresetValue();
 		this.paramVal = new CctvParamValue();
@@ -78,7 +81,7 @@ public class TbCctvCtlr {
 		initNet();
 	}
 
-	public String getLogKey() {
+ 	public String getLogKey() {
 		return this.CCTV_CTLR_ID;
 	}
 
@@ -167,7 +170,13 @@ public class TbCctvCtlr {
 			f.awaitUninterruptibly();
 			if (f.isDone() || f.isSuccess()) {
 				result = true;
-				log.info("[{}]. sendData: OK. {}, {} Bytes.", this.CCTV_CTLR_ID, packetDesc, sendBuffer.array().length);
+				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")) {
+						log.info("[{}]. sendData: OK. {}, {} Bytes.", this.CCTV_CTLR_ID, packetDesc, sendBuffer.array().length);
+					}
+				}
 				if (delayMilliSeconds > 0) {
 					CctvProtocol.sleep(delayMilliSeconds);
 				}

src/main/java/com/its/cctv/service/CctvCtlrService.java

@@ -2,6 +2,7 @@ package com.its.cctv.service;
 
 import com.its.app.AppUtils;
 import com.its.app.utils.SysUtils;
+import com.its.cctv.config.DebugConfig;
 import com.its.cctv.dao.mapper.CctvCtlrMapper;
 import com.its.cctv.domain.NET;
 import com.its.cctv.entity.TbCctvCtlr;
@@ -26,6 +27,7 @@ import java.util.*;
 @Transactional(rollbackFor = {Exception.class})
 public class CctvCtlrService {
 
+    private final DebugConfig debugConfig;
     private final CctvCtlrMapper cctvCtlrMapper;
     private int historyMin;
 
@@ -54,10 +56,13 @@ public class CctvCtlrService {
     }
 
     public void loadCtlr() {
+
         initCtrl();
+
         try {
             List<TbCctvCtlr> infoList = this.cctvCtlrMapper.selectAll();
             for (TbCctvCtlr obj : infoList) {
+                obj.setDebugConfig(this.debugConfig);
                 obj.setCCTV_CTLR_IP(obj.getCCTV_CTLR_IP().trim());
                 if (obj.getCCTV_CTLR_IP() != null && obj.getCCTV_CTLR_IP().length() > 0) {
                     long ipAddr = SysUtils.ipToLong(obj.getCCTV_CTLR_IP());
@@ -90,7 +95,7 @@ public class CctvCtlrService {
     }
 
     public void updateCtlrStts(boolean isRun) {
-        String keyData = "unit";
+//        String keyData = "unit";
         boolean insHs = false;
         Calendar cal = Calendar.getInstance();
         int min = cal.get(Calendar.MINUTE);
@@ -143,8 +148,7 @@ public class CctvCtlrService {
      * 제어기 상태정보 및 파라미터 정보 요청
      */
     public void requestState() {
-        long curTime = System.currentTimeMillis();
-
+//        long curTime = System.currentTimeMillis();
         TbCctvCtlr obj;
         for (Map.Entry<String, TbCctvCtlr> e : AppRepository.getInstance().getCtlrMap().entrySet()) {
             obj = e.getValue();

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

@@ -644,7 +644,7 @@ public class MainUI {
         if (chkLogPauseFont != null) chkLogPause.setFont(chkLogPauseFont);
         chkLogPause.setHorizontalAlignment(0);
         chkLogPause.setHorizontalTextPosition(11);
-        chkLogPause.setText("멈춤");
+        chkLogPause.setText("멈춤   ");
         pnlLogTitle.add(chkLogPause, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         btnLogCopy = new JButton();
         Font btnLogCopyFont = this.$$$getFont$$$("Malgun Gothic", Font.PLAIN, 12, btnLogCopy.getFont());
@@ -655,7 +655,7 @@ public class MainUI {
         Font chkPtzControlFont = this.$$$getFont$$$("Malgun Gothic", Font.PLAIN, 12, chkPtzControl.getFont());
         if (chkPtzControlFont != null) chkPtzControl.setFont(chkPtzControlFont);
         chkPtzControl.setHorizontalAlignment(0);
-        chkPtzControl.setText("상태정보  ");
+        chkPtzControl.setText("상태정보   ");
         pnlLogTitle.add(chkPtzControl, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JScrollPane scrollPane2 = new JScrollPane();
         Font scrollPane2Font = this.$$$getFont$$$("D2Coding", Font.PLAIN, 12, scrollPane2.getFont());

src/main/java/com/its/cctv/xnettcp/cctv/CctvTcpClient.java

@@ -1,13 +1,13 @@
 package com.its.cctv.xnettcp.cctv;
 
 import com.its.app.AppUtils;
+import com.its.cctv.config.RunningConfig;
+import com.its.cctv.entity.TbCctvCtlr;
 import com.its.cctv.entity.TbCctvCtlrStts;
 import com.its.cctv.process.DbmsData;
 import com.its.cctv.process.DbmsDataProcess;
 import com.its.cctv.process.DbmsDataType;
 import com.its.cctv.ui.MainUI;
-import com.its.cctv.config.RunningConfig;
-import com.its.cctv.entity.TbCctvCtlr;
 import com.its.cctv.xnettcp.cctv.codec.CctvTcpClientDecoder;
 import com.its.cctv.xnettcp.cctv.codec.CctvTcpClientEncoder;
 import com.its.cctv.xnettcp.cctv.handler.CctvTcpClientIdleHandler;

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

@@ -2,6 +2,7 @@ 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;
@@ -50,9 +51,19 @@ public class CctvTcpClientEncoder extends MessageToByteEncoder<Object> {
         ByteBuffer buffer = (ByteBuffer)msg;
         byte[] sendBytes = buffer.array();
         outByteBuf.writeBytes(sendBytes);
-        log.info("[{}]. SEND: {}, {} Bytes.", obj.getCCTV_CTLR_ID(), CctvProtocol.getOpCodeName(sendBytes[CctvReqFrameHead.OPCODE_POS]), 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(), CctvProtocol.getOpCodeName(sendBytes[CctvReqFrameHead.OPCODE_POS]), sendBytes.length, SysUtils.byteArrayToHex(sendBytes));
+            log.info("[{}]. SEND: {}, {} Bytes. {}", obj.getCCTV_CTLR_ID(), opCodeDesc, sendBytes.length, SysUtils.byteArrayToHex(sendBytes));
         }
 
         MDC.remove(obj.getLogKey());