dev

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

@@ -3,6 +3,7 @@ package com.its.op.entity.its.cctv;
 import com.its.op.config.AppUtils;
 import com.its.op.dto.its.cctv.TbCctvCtlrDto;
 import com.its.op.dto.its.cctv.TbCctvCtlrSttsDto;
+import com.its.op.dto.its.facility.TbFcltSttsAlrmStupDto;
 import com.its.op.global.CmmnCdManager;
 import com.its.utils.ItsUtils;
 import io.swagger.annotations.ApiModel;
@@ -354,4 +355,25 @@ public class TbCctvCtlr implements Serializable {
         }
         return this.state;
     }
+
+    public void setAlrmSetup(TbFcltSttsAlrmStupDto alarm) {
+        if (alarm == null || "N".equals(alarm.getUseYn())) {
+            return;
+        }
+        if ("N".equals(alarm.getCmncStts())) {
+            getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
+            getState().setUpdtDt(ItsUtils.getSysTime());
+        }
+        if (CmmnCdManager.CMNC_STTS_NORMAL.equals(getState().getCmncSttsCd())) {
+            if ("N".equals(alarm.getDoorStts())) {
+                getState().setCboxDoorSttsCd("CDS0");
+                getState().setFrontDoorSttsCd("CDS0");
+                getState().setBackDoorSttsCd("CDS0");
+            }
+            if ("N".equals(alarm.getVideoInput())) {
+                getState().setVideoInput("VDI0");
+            }
+        }
+    }
+
 }

src/main/java/com/its/op/entity/its/rse/TbRseCtlr.java

@@ -1,5 +1,6 @@
 package com.its.op.entity.its.rse;
 
+import com.its.op.dto.its.facility.TbFcltSttsAlrmStupDto;
 import com.its.op.dto.its.rse.TbRseCtlrDto;
 import com.its.op.dto.its.rse.TbRseCtlrSttsDto;
 import com.its.op.global.CmmnCdManager;
@@ -242,4 +243,22 @@ public class TbRseCtlr implements Serializable {
         }
         return this.state;
     }
+
+    public void setAlrmSetup(TbFcltSttsAlrmStupDto alarm) {
+        if (alarm == null || "N".equals(alarm.getUseYn())) {
+            return;
+        }
+        if ("N".equals(alarm.getCmncStts())) {
+            getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
+            getState().setUpdtDt(ItsUtils.getSysTime());
+        }
+        if (CmmnCdManager.CMNC_STTS_NORMAL.equals(getState().getCmncSttsCd())) {
+            if ("N".equals(alarm.getDoorStts())) {
+                getState().setCboxDoorSttsCd("CDS0");
+                getState().setFrontDoorSttsCd("CDS0");
+                getState().setBackDoorSttsCd("CDS0");
+            }
+        }
+    }
+
 }

src/main/java/com/its/op/entity/its/scrs/TbScIxrCmraMngm.java

@@ -1,5 +1,6 @@
 package com.its.op.entity.its.scrs;
 
+import com.its.op.dto.its.facility.TbFcltSttsAlrmStupDto;
 import com.its.op.dto.its.scrs.TbScIxrCmraMngmDto;
 import com.its.op.dto.its.scrs.TbScIxrCmraSttsDto;
 import com.its.op.global.CmmnCdManager;
@@ -227,6 +228,12 @@ public class TbScIxrCmraMngm implements Serializable {
                 dto.setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
             }
         }
+        if (CmmnCdManager.CMNC_STTS_ERROR_DT.equals(dto.getUpdtDt())) {
+            // FOR setAlrmSetup
+            if (CmmnCdManager.CMNC_STTS_NORMAL.equals(dto.getCmncSttsCd())) {
+                dto.setUpdtDt(ItsUtils.getSysTime());
+            }
+        }
         dto.setMissSttsYn(ItsUtils.getMissSttsYn(dto.getUpdtDt()));
         if (("Y").equals(dto.getMissSttsYn())) {
             // 기준시각 보다 크기 때문에 상태정보를 통신두절로 설정
@@ -268,4 +275,14 @@ public class TbScIxrCmraMngm implements Serializable {
         this.rtcId = req.getRtcId();
     }
 
+    public void setAlrmSetup(TbFcltSttsAlrmStupDto alarm) {
+        if (alarm == null || "N".equals(alarm.getUseYn())) {
+            return;
+        }
+        if ("N".equals(alarm.getCmncStts())) {
+            getState().setCmraStts(1);
+            getState().setClctDt(ItsUtils.getSysTime());
+        }
+    }
+
 }

src/main/java/com/its/op/entity/its/scrs/TbScSgnlCtlr.java

@@ -1,5 +1,6 @@
 package com.its.op.entity.its.scrs;
 
+import com.its.op.dto.its.facility.TbFcltSttsAlrmStupDto;
 import com.its.op.dto.its.scrs.TbScSgnlCtlrDto;
 import com.its.op.dto.its.scrs.TbScSgnlCtlrPhaseDto;
 import com.its.op.dto.its.scrs.TbScSgnlIxrSttsDto;
@@ -287,7 +288,7 @@ public class TbScSgnlCtlr implements Serializable {
             dto.setCntlMode(this.stts.getCntlMode());
             dto.setCntlStts(this.stts.getCntlStts());
             if (this.stts.getCntlStts() != 3) {
-                dto.setCmncSttsCd("CMS0");
+                dto.setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
             }
             dto.setSpclCntl(this.stts.getSpclCntl());
             dto.setCycl(this.stts.getCycl());
@@ -316,6 +317,12 @@ public class TbScSgnlCtlr implements Serializable {
 
             dto.setCboxStts(this.stts.getCboxStts());
         }
+        if (CmmnCdManager.CMNC_STTS_ERROR_DT.equals(dto.getUpdtDt())) {
+            // FOR setAlrmSetup
+            if (1 == this.stts.getCntlStts() || CmmnCdManager.CMNC_STTS_NORMAL.equals(dto.getCmncSttsCd())) {
+                dto.setUpdtDt(ItsUtils.getSysTime());
+            }
+        }
 
         dto.setMissSttsYn(ItsUtils.getMissSttsYn(dto.getUpdtDt()));
         if (("Y").equals(dto.getMissSttsYn())) {
@@ -326,4 +333,14 @@ public class TbScSgnlCtlr implements Serializable {
 
         return dto;
     }
+
+    public void setAlrmSetup(TbFcltSttsAlrmStupDto alarm) {
+        if (alarm == null || "N".equals(alarm.getUseYn())) {
+            return;
+        }
+        if ("N".equals(alarm.getCmncStts())) {
+            getStts().setCntlStts(1);   // OnLine
+        }
+    }
+
 }

src/main/java/com/its/op/entity/its/vds/TbVdsCtlr.java

@@ -1,5 +1,6 @@
 package com.its.op.entity.its.vds;
 
+import com.its.op.dto.its.facility.TbFcltSttsAlrmStupDto;
 import com.its.op.dto.its.vds.TbVdsCtlrDto;
 import com.its.op.dto.its.vds.TbVdsCtlrSttsDto;
 import com.its.op.global.CmmnCdManager;
@@ -262,4 +263,25 @@ public class TbVdsCtlr implements Serializable {
         }
         return this.state;
     }
+
+    public void setAlrmSetup(TbFcltSttsAlrmStupDto alarm) {
+        if (alarm == null || "N".equals(alarm.getUseYn())) {
+            return;
+        }
+        if ("N".equals(alarm.getCmncStts())) {
+            getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
+            getState().setUpdtDt(ItsUtils.getSysTime());
+        }
+        if (CmmnCdManager.CMNC_STTS_NORMAL.equals(getState().getCmncSttsCd())) {
+            if ("N".equals(alarm.getDoorStts())) {
+                getState().setCboxDoorSttsCd("CDS0");
+                getState().setFrontDoorSttsCd("CDS0");
+                getState().setBackDoorSttsCd("CDS0");
+            }
+            if ("N".equals(alarm.getVideoInput())) {
+                getState().setVideoInput("VDI0");
+            }
+        }
+    }
+
 }

src/main/java/com/its/op/entity/its/vms/TbVmsCtlr.java

@@ -1,5 +1,6 @@
 package com.its.op.entity.its.vms;
 
+import com.its.op.dto.its.facility.TbFcltSttsAlrmStupDto;
 import com.its.op.dto.its.vms.TbVmsCtlrDto;
 import com.its.op.dto.its.vms.TbVmsCtlrSttsDto;
 import com.its.op.global.CmmnCdManager;
@@ -470,4 +471,25 @@ public class TbVmsCtlr implements Serializable {
         }
         return this.state;
     }
+
+    public void setAlrmSetup(TbFcltSttsAlrmStupDto alarm) {
+        if (alarm == null || "N".equals(alarm.getUseYn())) {
+            return;
+        }
+        if ("N".equals(alarm.getCmncStts())) {
+            if ("N".equals(alarm.getCmncStts())) {
+                getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
+                getState().setUpdtDt(ItsUtils.getSysTime());
+            }
+        }
+        if (CmmnCdManager.CMNC_STTS_NORMAL.equals(getState().getCmncSttsCd())) {
+            if ("N".equals(alarm.getDoorStts())) {
+                getState().setCboxDoorSttsCd("CDS0");
+            }
+            if ("N".equals(alarm.getModlStts())) {
+                getState().setModlSttsCd("MOS0");
+            }
+        }
+    }
+
 }

src/main/java/com/its/op/entity/its/wcam/TbWcamCtlr.java

@@ -1,5 +1,6 @@
 package com.its.op.entity.its.wcam;
 
+import com.its.op.dto.its.facility.TbFcltSttsAlrmStupDto;
 import com.its.op.dto.its.wcam.TbWcamCtlrDto;
 import com.its.op.dto.its.wcam.TbWcamCtlrSttsDto;
 import com.its.op.global.CmmnCdManager;
@@ -285,4 +286,17 @@ public class TbWcamCtlr implements Serializable {
         }
         return this.state;
     }
+
+    public void setAlrmSetup(TbFcltSttsAlrmStupDto alarm) {
+        if (alarm == null || "N".equals(alarm.getUseYn())) {
+            return;
+        }
+        if ("N".equals(alarm.getCmncStts())) {
+            getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
+            getState().setUpdtDt(ItsUtils.getSysTime());
+        }
+        //if (CmmnCdManager.CMNC_STTS_NORMAL.equals(getState().getCmncSttsCd())) {
+        ///}
+    }
+
 }

src/main/java/com/its/op/service/its/cctv/TbCctvCtlrService.java

@@ -103,19 +103,8 @@ public class TbCctvCtlrService {
         data.forEach(obj -> {
             if (!CmmnCdManager.CMNC_STTS_NORMAL.equals(obj.getCmncSttsCd())) {
                 TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getCctvCtlrId());
-                if (alarm != null && "Y".equals(alarm.getUseYn())) {
-                    if ("N".equals(alarm.getCmncStts())) {
-                        obj.getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
-                        obj.getState().setUpdtDt(ItsUtils.getSysTime());
-                        if ("N".equals(alarm.getDoorStts())) {
-                            obj.getState().setCboxDoorSttsCd("CDS0");
-                            obj.getState().setFrontDoorSttsCd("CDS0");
-                            obj.getState().setBackDoorSttsCd("CDS0");
-                        }
-                        if ("N".equals(alarm.getVideoInput())) {
-                            obj.getState().setVideoInput("VDI0");
-                        }
-                    }
+                if (alarm != null) {
+                    obj.setAlrmSetup(alarm);
                 }
             }
             result.add(obj.toSttsDto());
@@ -225,17 +214,8 @@ public class TbCctvCtlrService {
 
         ctlrList.forEach(obj -> {
             TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getCctvCtlrId());
-            if (alarm != null && "Y".equals(alarm.getUseYn()) && "N".equals(alarm.getCmncStts())) {
-                obj.getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
-                obj.getState().setUpdtDt(ItsUtils.getSysTime());
-                if ("N".equals(alarm.getDoorStts())) {
-                    obj.getState().setCboxDoorSttsCd("CDS0");
-                    obj.getState().setFrontDoorSttsCd("CDS0");
-                    obj.getState().setBackDoorSttsCd("CDS0");
-                }
-                if ("N".equals(alarm.getVideoInput())) {
-                    obj.getState().setVideoInput("VDI0");
-                }
+            if (alarm != null) {
+                obj.setAlrmSetup(alarm);
             }
 
             TbCctvCtlrSttsDto dto = obj.toSttsDto();

src/main/java/com/its/op/service/its/rse/TbRseCtlrService.java

@@ -101,16 +101,8 @@ public class TbRseCtlrService {
         data.forEach(obj -> {
             if (!CmmnCdManager.CMNC_STTS_NORMAL.equals(obj.getCmncSttsCd())) {
                 TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getRseCtlrId());
-                if (alarm != null && "Y".equals(alarm.getUseYn())) {
-                    if ("N".equals(alarm.getCmncStts())) {
-                        obj.getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
-                        obj.getState().setUpdtDt(ItsUtils.getSysTime());
-                        if ("N".equals(alarm.getDoorStts())) {
-                            obj.getState().setCboxDoorSttsCd("CDS0");
-                            obj.getState().setFrontDoorSttsCd("CDS0");
-                            obj.getState().setBackDoorSttsCd("CDS0");
-                        }
-                    }
+                if (alarm != null) {
+                    obj.setAlrmSetup(alarm);
                 }
             }
             result.add(obj.toSttsDto());
@@ -274,14 +266,8 @@ public class TbRseCtlrService {
 
         ctlrList.forEach(obj -> {
             TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getRseCtlrId());
-            if (alarm != null && "Y".equals(alarm.getUseYn()) && "N".equals(alarm.getCmncStts())) {
-                obj.getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
-                obj.getState().setUpdtDt(ItsUtils.getSysTime());
-                if ("N".equals(alarm.getDoorStts())) {
-                    obj.getState().setCboxDoorSttsCd("CDS0");
-                    obj.getState().setFrontDoorSttsCd("CDS0");
-                    obj.getState().setBackDoorSttsCd("CDS0");
-                }
+            if (alarm != null) {
+                obj.setAlrmSetup(alarm);
             }
 
             TbRseCtlrSttsDto dto = obj.toSttsDto();

src/main/java/com/its/op/service/its/scrs/TbScIxrCmraMngmService.java

@@ -172,8 +172,8 @@ public class TbScIxrCmraMngmService {
 
         ctlrList.forEach(obj -> {
             TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getCmraId());
-            if (alarm != null && "Y".equals(alarm.getUseYn()) && "N".equals(alarm.getCmncStts())) {
-                obj.getState().setCmraStts(1);
+            if (alarm != null) {
+                obj.setAlrmSetup(alarm);
             }
 
             TbScIxrCmraSttsDto dto = obj.toSttsDto();
@@ -263,10 +263,8 @@ public class TbScIxrCmraMngmService {
         data.forEach(obj -> {
             if (!CmmnCdManager.CMNC_STTS_NORMAL.equals(obj.getCmncSttsCd())) {
                 TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getCmraId());
-                if (alarm != null && "Y".equals(alarm.getUseYn())) {
-                    if ("N".equals(alarm.getCmncStts())) {
-                        obj.getState().setCmraStts(1);
-                    }
+                if (alarm != null) {
+                    obj.setAlrmSetup(alarm);
                 }
             }
             result.add(obj.toSttsDto());

src/main/java/com/its/op/service/its/scrs/TbScSgnlCtlrService.java

@@ -191,8 +191,8 @@ public class TbScSgnlCtlrService {
 
         ctlrList.forEach(obj -> {
             TbFcltSttsAlrmStupDto alarm = alarmMap.get(String.valueOf(obj.getSgnlIxrNmbr()));
-            if (alarm != null && "Y".equals(alarm.getUseYn()) && "N".equals(alarm.getCmncStts())) {
-                obj.getStts().setCntlStts(1);   // OnLine
+            if (alarm != null) {
+                obj.setAlrmSetup(alarm);
             }
             TbScSgnlIxrSttsDto dto = obj.toSttsDto();
             if (total) {
@@ -255,10 +255,8 @@ public class TbScSgnlCtlrService {
         data.forEach(obj -> {
             if (obj.getStts().getCntlStts() == 3) {
                 TbFcltSttsAlrmStupDto alarm = alarmMap.get(String.valueOf(obj.getSgnlIxrNmbr()));
-                if (alarm != null && "Y".equals(alarm.getUseYn())) {
-                    if ("N".equals(alarm.getCmncStts())) {
-                        obj.getStts().setCntlStts(1);   // OnLine
-                    }
+                if (alarm != null) {
+                    obj.setAlrmSetup(alarm);
                 }
             }
             result.add(obj.toSttsDto());

src/main/java/com/its/op/service/its/vds/TbVdsCtlrService.java

@@ -107,19 +107,8 @@ public class TbVdsCtlrService {
         data.forEach(obj -> {
             if (!CmmnCdManager.CMNC_STTS_NORMAL.equals(obj.getCmncSttsCd())) {
                 TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getVdsCtlrId());
-                if (alarm != null && "Y".equals(alarm.getUseYn())) {
-                    if ("N".equals(alarm.getCmncStts())) {
-                        obj.getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
-                        obj.getState().setUpdtDt(ItsUtils.getSysTime());
-                        if ("N".equals(alarm.getDoorStts())) {
-                            obj.getState().setCboxDoorSttsCd("CDS0");
-                            obj.getState().setFrontDoorSttsCd("CDS0");
-                            obj.getState().setBackDoorSttsCd("CDS0");
-                        }
-                        if ("N".equals(alarm.getVideoInput())) {
-                            obj.getState().setVideoInput("VDI0");
-                        }
-                    }
+                if (alarm != null) {
+                    obj.setAlrmSetup(alarm);
                 }
             }
             TbVdsCtlrSttsDto dto = obj.toSttsDto();
@@ -306,17 +295,8 @@ public class TbVdsCtlrService {
         // 상태 설정
         ctlrList.forEach(obj -> {
             TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getVdsCtlrId());
-            if (alarm != null && "Y".equals(alarm.getUseYn()) && "N".equals(alarm.getCmncStts())) {
-                obj.getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
-                obj.getState().setUpdtDt(ItsUtils.getSysTime());
-                if ("N".equals(alarm.getDoorStts())) {
-                    obj.getState().setCboxDoorSttsCd("CDS0");
-                    obj.getState().setFrontDoorSttsCd("CDS0");
-                    obj.getState().setBackDoorSttsCd("CDS0");
-                }
-                if ("N".equals(alarm.getVideoInput())) {
-                    obj.getState().setVideoInput("VDI0");
-                }
+            if (alarm != null) {
+                obj.setAlrmSetup(alarm);
             }
 
             TbVdsCtlrSttsDto dto = obj.toSttsDto();

src/main/java/com/its/op/service/its/vms/TbVmsCtlrService.java

@@ -109,17 +109,8 @@ public class TbVmsCtlrService {
         data.forEach(obj -> {
             if (!CmmnCdManager.CMNC_STTS_NORMAL.equals(obj.getCmncSttsCd())) {
                 TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getVmsCtlrId());
-                if (alarm != null && "Y".equals(alarm.getUseYn())) {
-                    if ("N".equals(alarm.getCmncStts())) {
-                        obj.getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
-                        obj.getState().setUpdtDt(ItsUtils.getSysTime());
-                        if ("N".equals(alarm.getDoorStts())) {
-                            obj.getState().setCboxDoorSttsCd("CDS0");
-                        }
-                        if ("N".equals(alarm.getModlStts())) {
-                            obj.getState().setModlSttsCd("MOS0");
-                        }
-                    }
+                if (alarm != null) {
+                    obj.setAlrmSetup(alarm);
                 }
             }
             result.put(obj.getVmsCtlrNmbr(), obj.toSttsDto());
@@ -358,15 +349,8 @@ public class TbVmsCtlrService {
 
         ctlrList.forEach(obj -> {
             TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getVmsCtlrId());
-            if (alarm != null && "Y".equals(alarm.getUseYn()) && "N".equals(alarm.getCmncStts())) {
-                obj.getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
-                obj.getState().setUpdtDt(ItsUtils.getSysTime());
-                if ("N".equals(alarm.getDoorStts())) {
-                    obj.getState().setCboxDoorSttsCd("CDS0");
-                }
-                if ("N".equals(alarm.getModlStts())) {
-                    obj.getState().setModlSttsCd("MOS0");
-                }
+            if (alarm != null) {
+                obj.setAlrmSetup(alarm);
             }
 
             TbVmsCtlrSttsDto dto = obj.toSttsDto();

src/main/java/com/its/op/service/its/wcam/TbWcamCtlrService.java

@@ -212,14 +212,8 @@ public class TbWcamCtlrService {
 
         ctlrList.forEach(obj -> {
             TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getWcamCtlrId());
-            if (alarm != null && "Y".equals(alarm.getUseYn()) && "N".equals(alarm.getCmncStts())) {
-                obj.getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
-                obj.getState().setUpdtDt(ItsUtils.getSysTime());
-//                if ("N".equals(alarm.getDoorStts())) {
-//                }
-//                if ("N".equals(alarm.getVideoInput())) {
-//                    //obj.getState().setVideoInput("VDI0");
-//                }
+            if (alarm != null) {
+                obj.setAlrmSetup(alarm);
             }
 
             TbWcamCtlrSttsDto dto = obj.toSttsDto();
@@ -285,16 +279,8 @@ public class TbWcamCtlrService {
         data.forEach(obj -> {
             if (!CmmnCdManager.CMNC_STTS_NORMAL.equals(obj.getCmncSttsCd())) {
                 TbFcltSttsAlrmStupDto alarm = alarmMap.get(obj.getWcamCtlrId());
-                if (alarm != null && "Y".equals(alarm.getUseYn())) {
-                    if ("N".equals(alarm.getCmncStts())) {
-                        obj.getState().setCmncSttsCd(CmmnCdManager.CMNC_STTS_NORMAL);
-                        obj.getState().setUpdtDt(ItsUtils.getSysTime());
-//                        if ("N".equals(alarm.getDoorStts())) {
-//                        }
-//                        if ("N".equals(alarm.getVideoInput())) {
-//                            obj.getState().setVideoInput("VDI0");
-//                        }
-                    }
+                if (alarm != null) {
+                    obj.setAlrmSetup(alarm);
                 }
             }
             result.add(obj.toSttsDto());