shjung 2 жил өмнө
parent
commit
5c496ed5d5

+ 1 - 1
src/main/java/com/its/vds/VdsCommServerApplication.java

@@ -103,7 +103,7 @@ public class VdsCommServerApplication implements CommandLineRunner, ApplicationL
                 frame.addWindowListener(new WindowAdapter() {
                     @Override
                     public void windowClosing(WindowEvent e) {
-                        if (JOptionPane.showConfirmDialog(UI.getRootPanel(), "시스템을 종료 하시겠습니까?", "시스템 종료", 0) == 0) {
+                        if (JOptionPane.showConfirmDialog(UI.getRootPanel(), "VDS 통신서버 프로그램을 종료 하시겠습니까?", "프로그램 종료", 0) == 0) {
                             System.exit(0);
                         } else {
                             frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);

+ 1 - 0
src/main/java/com/its/vds/ui/CtlrSttsTableCellRenderer.java

@@ -10,6 +10,7 @@ public class CtlrSttsTableCellRenderer extends DefaultTableCellRenderer {
 
         Component cell = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
         String commStts = table.getModel().getValueAt(row, 6).toString();
+        cell.setForeground(new Color(0, 0, 0, 255));
         if (commStts.equals("Connect")) {
             cell.setBackground(new Color(255, 255, 255, 255));
             if (column == 7) {

+ 1 - 0
src/main/java/com/its/vds/ui/CtlrSttsTableModel.java

@@ -84,6 +84,7 @@ public class CtlrSttsTableModel extends AbstractTableModel {
         synchronized (this.ctlrList) {
             TbVdsCtlr info = this.ctlrList.get(rowIndex);
             if (info == null) {
+                //log.error("NotFound: {}, {}", rowIndex, columnIndex);
                 return "";
             }
 

+ 7 - 7
src/main/java/com/its/vds/ui/MainUI.java

@@ -392,13 +392,13 @@ public class MainUI {
         if (this.ctlrSttsTableModel == null) {
             return;
         }
-        for (int ii = 0; ii < this.ctlrSttsTableModel.getRowCount(); ii++) {
-            if (obj.getVDS_CTLR_ID().equals(this.ctlrSttsTableModel.getValueAt(ii, 2).toString())) {
-                int modelRow = tblCtlrList.convertRowIndexToModel(ii);
-                this.ctlrSttsTableModel.setValue(obj, ii, modelRow);
-                break;
-            }
-        }
+//        for (int ii = 0; ii < this.ctlrSttsTableModel.getRowCount(); ii++) {
+//            if (obj.getVDS_CTLR_ID().equals(this.ctlrSttsTableModel.getValueAt(ii, 2).toString())) {
+//                int modelRow = tblCtlrList.convertRowIndexToModel(ii);
+//                this.ctlrSttsTableModel.setValue(obj, ii, modelRow);
+//                break;
+//            }
+//        }
         CtlrSttsTableModel tableModel = (CtlrSttsTableModel) tblCtlrList.getModel();
         if (tableModel != null) {
             tableModel.fireTableDataChanged();

+ 3 - 3
src/main/resources/logback-spring.xml

@@ -88,7 +88,7 @@
             <pattern>${LOG_PATTERN_ERROR}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_ERROR}.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_ERROR}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
             <maxFileSize>${MAX_FILESIZE}</maxFileSize>
             <maxHistory>${MAX_HISTORY}</maxHistory>
         </rollingPolicy>
@@ -112,7 +112,7 @@
             <pattern>${LOG_PATTERN_CENTER_COMM}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}CenterComm/${LOG_FILE_NAME_CENTER_COMM}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
+            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_CENTER_COMM}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
             <maxFileSize>${MAX_FILESIZE}</maxFileSize>
             <maxHistory>${MAX_HISTORY}</maxHistory>
         </rollingPolicy>
@@ -149,7 +149,7 @@
             <pattern>${LOG_PATTERN_STATISTICS}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}Schedule/${LOG_FILE_NAME_STATISTICS}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
+            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_STATISTICS}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
             <maxFileSize>${MAX_FILESIZE}</maxFileSize>
             <maxHistory>${MAX_HISTORY}</maxHistory>
         </rollingPolicy>