dev

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

@@ -155,6 +155,13 @@ public class VdsCommServerApplication implements CommandLineRunner, ApplicationL
         ctlrService.loadDb();
         ctlrService.updateCtlrStts(true);
 
+        if (OS.isWindows()) {
+            MainUI UI = MainUI.getInstance();
+            if (UI != null) {
+                UI.LoadControllerInfo();
+            }
+        }
+
         VdsTcpClientCommService vdsCommClientService = (VdsTcpClientCommService)AppUtils.getBean(VdsTcpClientCommService.class);
         vdsCommClientService.run();
 
@@ -163,13 +170,6 @@ public class VdsCommServerApplication implements CommandLineRunner, ApplicationL
 
         // schedule enable
         applicationConfig.setStartSchedule(true);
-
-        if (OS.isWindows()) {
-            MainUI UI = MainUI.getInstance();
-            if (UI != null) {
-                UI.LoadControllerInfo();
-            }
-        }
     }
 
     public void terminateApplication() {

src/main/java/com/its/vds/dao/mapper/batch/VdsCtlrDao.java

@@ -44,20 +44,28 @@ public class VdsCtlrDao extends BatchDaoService {
     }
 
     public int updateStts(List<TbVdsCtlrStts> req, boolean isHistory) {
-        log.info("{}.updateStts: START. {} EA. History {}", this.serviceName, req.size(), isHistory);
+        if (req.size() > 1) {
+            log.info("{}.updateStts: START. {} EA. History {}", this.serviceName, req.size(), isHistory);
+        }
         Elapsed elapsed = new Elapsed();
         this.mapper = this.mapperName + "batchUpdateVdsCtlrStts";
         int total = updateBatch(this.mapper, getSttsList(req));
-        log.info("{}.updateStts: ..END. {} EA. {} ms.", this.serviceName, total, elapsed.milliSeconds());
+        if (req.size() > 1) {
+            log.info("{}.updateStts: ..END. {} EA. {} ms.", this.serviceName, total, elapsed.milliSeconds());
+        }
         return total;
     }
 
     public int insertStts(List<TbVdsCtlrStts> req) {
-        log.info("{}.insertStts: START. {} EA.", this.serviceName, req.size());
+        if (req.size() > 1) {
+            log.info("{}.insertStts: START. {} EA.", this.serviceName, req.size());
+        }
         Elapsed elapsed = new Elapsed();
         this.mapper = this.mapperName + "batchInsertVdsCtlrSttsHs";
         int total = insertBatch(this.mapper, getSttsList(req));
-        log.info("{}.insertStts: ..END. {} EA. {} ms.", this.serviceName, total, elapsed.milliSeconds());
+        if (req.size() > 1) {
+            log.info("{}.insertStts: ..END. {} EA. {} ms.", this.serviceName, total, elapsed.milliSeconds());
+        }
         return total;
     }
 

src/main/java/com/its/vds/dao/mapper/batch/VdsDtctDao.java

@@ -43,20 +43,28 @@ public class VdsDtctDao extends BatchDaoService {
     }
 
     public int updateClct(List<voVdsDtctClct> req, boolean isHistory) {
-        log.info("{}.updateStts: START. {} EA. History {}", this.serviceName, req.size(), isHistory);
+        if (req.size() > 1) {
+            log.info("{}.updateStts: START. {} EA. History {}", this.serviceName, req.size(), isHistory);
+        }
         Elapsed elapsed = new Elapsed();
         this.mapper = this.mapperName + "batchUpdateVdsDtctClctPnst";
         int total = updateBatch(this.mapper, getClctList(req));
-        log.info("{}.updateStts: ..END. {} EA. {} ms.", this.serviceName, total, elapsed.milliSeconds());
+        if (req.size() > 1) {
+            log.info("{}.updateStts: ..END. {} EA. {} ms.", this.serviceName, total, elapsed.milliSeconds());
+        }
         return total;
     }
 
     public int insertClct(List<voVdsDtctClct> req) {
-        log.info("{}.insertStts: START. {} EA.", this.serviceName, req.size());
+        if (req.size() > 1) {
+            log.info("{}.insertStts: START. {} EA.", this.serviceName, req.size());
+        }
         Elapsed elapsed = new Elapsed();
         this.mapper = this.mapperName + "batchInsertVdsDtctClct";
         int total = insertBatch(this.mapper, getClctList(req));
-        log.info("{}.insertStts: ..END. {} EA. {} ms.", this.serviceName, total, elapsed.milliSeconds());
+        if (req.size() > 1) {
+            log.info("{}.insertStts: ..END. {} EA. {} ms.", this.serviceName, total, elapsed.milliSeconds());
+        }
         return total;
     }
 

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

@@ -100,24 +100,24 @@ public class CtlrSttsTableModel extends AbstractTableModel {
                 heater = "-?-";
                 temper = "-?-";
                 video = "-?-";
-                if (stts.getCBOX_DOOR_STTS_CD().equals("CDS0")) {
+                if ("CDS0".equals(stts.getCBOX_DOOR_STTS_CD())) {
                     door = "닫힘";
-                } else if (stts.getCBOX_DOOR_STTS_CD().equals("CDS1")) {
+                } else if ("CDS1".equals(stts.getCBOX_DOOR_STTS_CD())) {
                     door = "열림";
                 }
-                if (stts.getFAN_STTS_CD().equals("PAS0")) {
+                if ("PAS0".equals(stts.getFAN_STTS_CD())) {
                     fan = "가동";
-                } else if (stts.getFAN_STTS_CD().equals("PAS1")) {
+                } else if ("PAS1".equals(stts.getFAN_STTS_CD())) {
                     fan = "중지";
                 }
-                if (stts.getHETR_STTS_CD().equals("HTS0")) {
+                if ("HTS0".equals(stts.getHETR_STTS_CD())) {
                     heater = "가동";
-                } else if (stts.getHETR_STTS_CD().equals("HTS1")) {
+                } else if ("HTS1".equals(stts.getHETR_STTS_CD())) {
                     heater = "중지";
                 }
-                if (stts.getVIDEO_INPUT().equals("VDI0")) {
+                if ("VDI0".equals(stts.getVIDEO_INPUT())) {
                     video = "정상";
-                } else if (stts.getHETR_STTS_CD().equals("VDI1")) {
+                } else if ("VDI1".equals(stts.getVIDEO_INPUT())) {
                     video = "이상";
                 }
                 temper = String.valueOf(stts.getCBOX_TMPR());

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

@@ -363,6 +363,13 @@ public class MainUI {
         }
         lblTotal.setText(" " + ctlrTotal + " ");
         lblError.setText(" " + ctlrError + " ");
+
+        if (this.isUpdatable) {
+            CtlrSttsTableModel tableModel = (CtlrSttsTableModel) tblCtlrList.getModel();
+            if (tableModel != null) {
+                tableModel.fireTableDataChanged();
+            }
+        }
     }
 
     public void LoadControllerInfo() {

src/main/java/com/its/vds/xnettcp/vds/codec/VdsTcpClientDecoder.java

@@ -48,7 +48,7 @@ public class VdsTcpClientDecoder extends ByteToMessageDecoder {
         MDC.put("id", obj.getLogKey());
         try {
             int readableBytes = byteBuf.readableBytes();
-            log.info("[{}]. RECV: ReadableBytes: {} Bytes, ReaderIndex: {}", obj.getVDS_CTLR_ID(), readableBytes, byteBuf.readerIndex());
+            //log.info("[{}]. RECV: ReadableBytes: {} Bytes, ReaderIndex: {}", obj.getVDS_CTLR_ID(), readableBytes, byteBuf.readerIndex());
 
             if (obj.isDump()) {
                 byte[] debugBytes = new byte[byteBuf.readableBytes()];

src/main/java/com/its/vds/xnettcp/vds/process/VdsDataProcess.java

@@ -72,11 +72,11 @@ public class VdsDataProcess {
             byte opCode = framePacket.getOpCode();
             int groupNo = framePacket.getHead().getGroupNo();
             int ctrlNo  = framePacket.getHead().getControllerNo();
-            if (groupNo != obj.getGROUP_NO() || ctrlNo != obj.getVDS_CTLR_LOCAL_NO()) {
-                log.error("VdsDataProcess.process: ID: {}, ChannelNo, Controller No Miss Matched: [{}]-[{}], [{}]-[{}]",
-                        obj.getVDS_CTLR_NMBR(), groupNo, obj.getGROUP_NO(), ctrlNo, obj.getVDS_CTLR_LOCAL_NO());
-                //return;
-            }
+//            if (groupNo != obj.getGROUP_NO() || ctrlNo != obj.getVDS_CTLR_LOCAL_NO()) {
+//                log.error("VdsDataProcess.process: ID: {}, ChannelNo, Controller No Miss Matched: [{}]-[{}], [{}]-[{}]",
+//                        obj.getVDS_CTLR_NMBR(), groupNo, obj.getGROUP_NO(), ctrlNo, obj.getVDS_CTLR_LOCAL_NO());
+//                //return;
+//            }
             log.info("VdsDataProcess.process: {}, {}, ThreadId: {}", ipAddress, VdsProtocol.getOpCodeName(opCode), Thread.currentThread().getId());
             if (!checkStatus(obj, framePacket)) {
                 return;

src/main/resources/application.yml

@@ -27,7 +27,7 @@ spring:
   application:
     name: vds-comm-server
   profiles:
-    active: dev
+    active: prod
   main:
     web-application-type: none
     log-startup-info: true