shjung 2 سال پیش
والد
کامیت
8d2e794e36

+ 4 - 4
src/main/java/com/its/cctv/ui/CtlrSttsDetlTableCellRenderer.java

@@ -12,10 +12,10 @@ public class CtlrSttsDetlTableCellRenderer extends DefaultTableCellRenderer {
         String commStts = table.getModel().getValueAt(row, 6).toString();
         if (commStts.equals("Connect")) {
             cell.setBackground(new Color(255, 255, 255, 255));
-            String door = table.getModel().getValueAt(row, 7).toString();
-            String fan = table.getModel().getValueAt(row, 8).toString();
-            String heater = table.getModel().getValueAt(row, 9).toString();
-            String video = table.getModel().getValueAt(row, 11).toString();
+//            String door = table.getModel().getValueAt(row, 7).toString();
+//            String fan = table.getModel().getValueAt(row, 8).toString();
+//            String heater = table.getModel().getValueAt(row, 9).toString();
+//            String video = table.getModel().getValueAt(row, 11).toString();
         } else if (commStts.equals("Login")) {
             cell.setBackground(new Color(182, 175, 97, 176));
         } else {

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

@@ -12,6 +12,7 @@ public class CtlrSttsTableCellRenderer extends DefaultTableCellRenderer {
         String commStts = table.getModel().getValueAt(row, 6).toString();
         if (commStts.equals("Connect")) {
             cell.setBackground(new Color(255, 255, 255, 255));
+            cell.setForeground(new Color(0, 0, 0, 255));
             if (column == 7) {
                 String door = table.getModel().getValueAt(row, 7).toString();
                 if (door.equals("열림")) {

+ 4 - 4
src/main/java/com/its/cctv/ui/CtlrSttsTableModel.java

@@ -108,14 +108,14 @@ public class CtlrSttsTableModel extends AbstractTableModel {
                     door = "열림";
                 }
                 if ("PAS0".equals(stts.getFAN_STTS_CD())) {
-                    fan = "가동";
-                } else if ("PAS1".equals(stts.getFAN_STTS_CD())) {
                     fan = "중지";
+                } else if ("PAS1".equals(stts.getFAN_STTS_CD())) {
+                    fan = "가동";
                 }
                 if ("HTS0".equals(stts.getHETR_STTS_CD())) {
-                    heater = "가동";
-                } else if ("HTS1".equals(stts.getHETR_STTS_CD())) {
                     heater = "중지";
+                } else if ("HTS1".equals(stts.getHETR_STTS_CD())) {
+                    heater = "가동";
                 }
                 if ("VDI0".equals(stts.getVIDEO_INPUT())) {
                     video = "정상";

+ 3 - 3
src/main/java/com/its/cctv/ui/MainUI.java

@@ -406,7 +406,7 @@ public class MainUI {
         TableColumnModel getColumnModel = tblCtlrList.getColumnModel();
         getColumnModel.getColumn(0).setPreferredWidth(30);  //  "S",
         getColumnModel.getColumn(1).setPreferredWidth(65);  //  "번호",
-        getColumnModel.getColumn(2).setPreferredWidth(110); //  "시설물ID",
+        getColumnModel.getColumn(2).setPreferredWidth(110); //  "CCTV ID",
         getColumnModel.getColumn(3).setPreferredWidth(190); //  "명칭",
         getColumnModel.getColumn(4).setPreferredWidth(120); //  "IP",
         getColumnModel.getColumn(5).setPreferredWidth(55);  //  "PORT",
@@ -415,8 +415,8 @@ public class MainUI {
         getColumnModel.getColumn(8).setPreferredWidth(50);  //  "팬",
         getColumnModel.getColumn(9).setPreferredWidth(50);  //  "히터",
         getColumnModel.getColumn(10).setPreferredWidth(50); //  "온도",
-        getColumnModel.getColumn(11).setPreferredWidth(50); //  "Video",
-        getColumnModel.getColumn(12).setPreferredWidth(170); //  "sttsText",
+        getColumnModel.getColumn(11).setPreferredWidth(50); //  "영상",
+        getColumnModel.getColumn(12).setPreferredWidth(170); //  "P / T / Z / F",
 
         getColumnModel.getColumn(13).setPreferredWidth(125);
         getColumnModel.getColumn(14).setPreferredWidth(125);