dev

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

@@ -129,6 +129,10 @@ public class TbFcltFailDto implements Serializable {
     @JsonProperty("use_desc")    // USE_YN
     private String useDesc;
 
+    @ApiModelProperty("시설물 유형명")
+    @JsonProperty("fclt_nm")
+    private String fcltNm;
+
     @ApiModel("TbFcltFailUpdReq(시설물 장애 발생 정보 정보변경)")
     @Getter
     @Setter

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

@@ -126,6 +126,10 @@ public class TbFcltInfrDto implements Serializable {
     @JsonProperty("fclt_group")
     private String fcltGroup;
 
+    @ApiModelProperty("시설물 유형명")
+    @JsonProperty("fclt_nm")
+    private String fcltNm;
+
     @ApiModel("TbFcltInfrUpdReq(시설물 정보 정보변경)")
     @Getter
     @Setter

src/main/java/com/its/op/entity/its/facility/TbFcltFail.java

@@ -127,6 +127,13 @@ public class TbFcltFail implements Serializable {
             dto.setFcltGroup(CodeManager.getFcltGroupNm(this.fclt.getFcltType()));
             dto.setFcltType(this.fclt.getFcltType());
             dto.setFcltLctn(this.fclt.getFcltLctn());
+            dto.setFcltNm(CodeManager.getFcltTypeNm(this.fclt.getFcltType()));
+        } else {
+            // 여기는 들어오면 안됌. DB 작업이 잘못돼서 들어가 있는 것임
+            dto.setFcltGroup("?");
+            dto.setFcltType("?");
+            dto.setFcltLctn("?");
+            dto.setFcltNm("?");
         }
 
         dto.setFailOcrrDesc(FcltCodeManager.getFailOcrrTypeName(this.failOcrrCd));

src/main/java/com/its/op/entity/its/facility/TbFcltInfr.java

@@ -171,10 +171,9 @@ public class TbFcltInfr implements Serializable {
             dto.setSubUserNm(this.subUser.getName());
         }
         String fcltGroup = CodeManager.getFcltGroupNm(this.fcltType);
-//        if (CodeManager.defUnknownDesc.equals(fcltGroup)) {
-//            fcltGroup = CodeManager.getCodeDescShort("FMS", this.fcltType);
-//        }
         dto.setFcltGroup(fcltGroup);
+        dto.setFcltNm(CodeManager.getFcltTypeNm(this.fcltType));
+
         return dto;
     }
 

src/main/java/com/its/op/global/CodeManager.java

@@ -198,7 +198,7 @@ public class CodeManager {
         if (codeMap != null) {
             for (String key : codeMap.keySet()) {
                 HashMap<String, Code> subCodeMap = codes.get(key);
-                for (String subKey : codeMap.keySet()) {
+                for (String subKey : subCodeMap.keySet()) {
                     if (subKey.equals(FCLT_TYPE)) {
                         return codeMap.get(key).getDesc();
                     }
@@ -207,6 +207,21 @@ public class CodeManager {
         }
         return defUnknownDesc;
     }
+    public static String getFcltTypeNm(String FCLT_TYPE) {
+        HashMap<String, Code> codeMap = codes.get(FMS_CLASS);
+        if (codeMap != null) {
+            for (String key : codeMap.keySet()) {
+                HashMap<String, Code> subCodeMap = codes.get(key);
+                for (String subKey : subCodeMap.keySet()) {
+                    if (subKey.equals(FCLT_TYPE)) {
+                        return subCodeMap.get(key).getDesc();
+                    }
+                }
+            }
+        }
+        return defUnknownDesc;
+    }
+
     public static String getWeatherCode(String CMMN_CD_KOR_NM) {
         HashMap<String, Code> codeMap = codes.get("DFW");
         if (codeMap != null) {

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

@@ -9,6 +9,7 @@ import com.its.op.dto.its.facility.TbFcltInfrDto;
 import com.its.op.dto.its.facility.UnRegisteredFcltInfrDto;
 import com.its.op.dto.its.rse.TbRseCtlrDto;
 import com.its.op.dto.its.scrs.TbScIxrCmraMngmDto;
+import com.its.op.dto.its.scrs.TbScIxrMngmDto;
 import com.its.op.dto.its.scrs.TbScSgnlCtlrDto;
 import com.its.op.dto.its.vds.TbVdsCtlrDto;
 import com.its.op.dto.its.vms.TbVmsCtlrDto;
@@ -19,6 +20,7 @@ import com.its.op.global.CodeManager;
 import com.its.op.service.its.cctv.TbCctvCtlrService;
 import com.its.op.service.its.rse.TbRseCtlrService;
 import com.its.op.service.its.scrs.TbScIxrCmraMngmService;
+import com.its.op.service.its.scrs.TbScIxrMngmService;
 import com.its.op.service.its.scrs.TbScSgnlCtlrService;
 import com.its.op.service.its.vds.TbVdsCtlrService;
 import com.its.op.service.its.vms.TbVmsCtlrService;
@@ -43,6 +45,7 @@ public class TbFcltInfrService {
     private final TbRseCtlrService dsrcCtlrService;
     private final TbScSgnlCtlrService sigCtlrService;
     private final TbScIxrCmraMngmService ccamCtlrService;
+    private final TbScIxrMngmService crsCtlrService;
     private final TbCmmnCdRepository cmmnCdRepo;
 
     // 데이터 1건 조회, 없으면 exception
@@ -277,6 +280,20 @@ public class TbFcltInfrService {
             });
         }
 
+        // 교차로
+        if (fcltType == null || "CRS".equals(fcltType)) {
+            List<TbScIxrMngmDto> crsList = this.crsCtlrService.findAllList();
+            crsList.forEach(obj -> {
+                TbFcltInfrDto regObj = regMap.get(obj.getIxrId());
+                if (regObj == null) {
+                    result.add(UnRegisteredFcltInfrDto.builder()
+                            .fcltType("CRS")
+                            .fcltId(obj.getIxrId())
+                            .fcltLctn(obj.getIxrNm())
+                            .build());
+                }
+            });
+        }
         return result;
     }
 
@@ -297,6 +314,11 @@ public class TbFcltInfrService {
         }
         return result;
     }
+
+    /**
+     * 시설물 ID 신규 번호
+     * @return
+     */
     @Transactional(readOnly = true)
     public NewIdLongDto getNewNmbr() {
         Long newId = this.repo.getNewNmbr();