dev

src/main/java/com/its/op/dto/its/facility/TbFcltSttsAlrmStupDto.java

@@ -27,6 +27,10 @@ public class TbFcltSttsAlrmStupDto implements Serializable {
     @JsonProperty("fclt_id")
     private String fcltId;
 
+    @ApiModelProperty("시설물 명")  // N VARCHAR2(30)
+    @JsonProperty("fclt_nm")
+    private String fcltNm;
+
     @ApiModelProperty("등록일시")  // N VARCHAR2(14)
     @JsonProperty("reg_dt")
     private String regDt;
@@ -83,10 +87,11 @@ public class TbFcltSttsAlrmStupDto implements Serializable {
     @JsonProperty("use_yn")
     private String useYn;
 
-    public static TbFcltSttsAlrmStupDto build(String fcltType, String fcltId) {
+    public static TbFcltSttsAlrmStupDto build(String fcltType, String fcltId, String fcltNm) {
         return TbFcltSttsAlrmStupDto.builder()
                 .fcltType(fcltType)
                 .fcltId(fcltId)
+                .fcltNm(fcltNm)
                 .regDt("19700101000000")
                 .cmncStts("Y")
                 .pwerStts("Y")

src/main/java/com/its/op/service/its/facility/TbFcltSttsAlrmStupService.java

@@ -52,16 +52,16 @@ public class TbFcltSttsAlrmStupService {
         List<TbVdsCtlr> vdsList = this.vdsRepo.findAllList();
         List<TbRseCtlr> rseList = this.rseRepo.findAllList();
         for (TbCctvCtlr cctv : cctvList) {
-            result.put(cctv.getCctvCtlrId(), TbFcltSttsAlrmStupDto.build("CCTV", cctv.getCctvCtlrId()));
+            result.put(cctv.getCctvCtlrId(), TbFcltSttsAlrmStupDto.build("CCTV", cctv.getCctvCtlrId(), cctv.getCctvNm()));
         }
         for (TbVmsCtlr vms : vmsList) {
-            result.put(vms.getVmsCtlrId(), TbFcltSttsAlrmStupDto.build("VMS", vms.getVmsCtlrId()));
+            result.put(vms.getVmsCtlrId(), TbFcltSttsAlrmStupDto.build("VMS", vms.getVmsCtlrId(), vms.getVmsNm()));
         }
         for (TbVdsCtlr vds : vdsList) {
-            result.put(vds.getVdsCtlrId(), TbFcltSttsAlrmStupDto.build("VDS", vds.getVdsCtlrId()));
+            result.put(vds.getVdsCtlrId(), TbFcltSttsAlrmStupDto.build("VDS", vds.getVdsCtlrId(), vds.getVdsNm()));
         }
         for (TbRseCtlr rse : rseList) {
-            result.put(rse.getRseCtlrId(), TbFcltSttsAlrmStupDto.build("DSRC", rse.getRseCtlrId()));
+            result.put(rse.getRseCtlrId(), TbFcltSttsAlrmStupDto.build("DSRC", rse.getRseCtlrId(), rse.getRseNm()));
         }
 
         List<TbFcltSttsAlrmStup> data = this.repo.findAllList();
@@ -113,25 +113,25 @@ public class TbFcltSttsAlrmStupService {
         if ("CCTV".equals(fcltType)) {
             List<TbCctvCtlr> cctvList = this.cctvRepo.findAllList();
             for (TbCctvCtlr cctv : cctvList) {
-                result.put(cctv.getCctvCtlrId(), TbFcltSttsAlrmStupDto.build("CCTV", cctv.getCctvCtlrId()));
+                result.put(cctv.getCctvCtlrId(), TbFcltSttsAlrmStupDto.build("CCTV", cctv.getCctvCtlrId(), cctv.getCctvNm()));
             }
         }
         else if ("VMS".equals(fcltType)) {
             List<TbVmsCtlr> vmsList = this.vmsRepo.findAllList();
             for (TbVmsCtlr vms : vmsList) {
-                result.put(vms.getVmsCtlrId(), TbFcltSttsAlrmStupDto.build("VMS", vms.getVmsCtlrId()));
+                result.put(vms.getVmsCtlrId(), TbFcltSttsAlrmStupDto.build("VMS", vms.getVmsCtlrId(), vms.getVmsNm()));
             }
         }
         else if ("VDS".equals(fcltType)) {
             List<TbVdsCtlr> vdsList = this.vdsRepo.findAllList();
             for (TbVdsCtlr vds : vdsList) {
-                result.put(vds.getVdsCtlrId(), TbFcltSttsAlrmStupDto.build("VDS", vds.getVdsCtlrId()));
+                result.put(vds.getVdsCtlrId(), TbFcltSttsAlrmStupDto.build("VDS", vds.getVdsCtlrId(), vds.getVdsNm()));
             }
         }
         else if ("DSRC".equals(fcltType)) {
             List<TbRseCtlr> rseList = this.rseRepo.findAllList();
             for (TbRseCtlr rse : rseList) {
-                result.put(rse.getRseCtlrId(), TbFcltSttsAlrmStupDto.build("DSRC", rse.getRseCtlrId()));
+                result.put(rse.getRseCtlrId(), TbFcltSttsAlrmStupDto.build("DSRC", rse.getRseCtlrId(), rse.getRseNm()));
             }
         }