shjung преди 3 години
родител
ревизия
d53e6d8d7a

+ 1 - 1
src/main/java/com/its/api/its/controller/database/TbNodeController.java

@@ -21,7 +21,7 @@ public class TbNodeController {
     private final TbNodeService service;
 
     @ApiOperation(value = "노드정보 전체조회(TB_NODE)", response = TbNodeDto.class, responseContainer = "ArrayList")
-    @GetMapping(value = "", produces = {"application/json; charset=utf8"})
+    @GetMapping(value = "/list", produces = {"application/json; charset=utf8"})
     public List<TbNodeDto> findAll() {
         return service.findAll();
     }

+ 1 - 1
src/main/java/com/its/api/its/model/dto/cctv/TbCctvSttsDto.java

@@ -25,7 +25,7 @@ public class TbCctvSttsDto implements Serializable {
     @JsonProperty("updt_dt")
     private String updtDt;
 
-    @ApiModelProperty("통신 상태 코드")  // Y VARCHAR(7)
+    @ApiModelProperty("통신 상태 코드(0:정상, 1:통신이상, 2:알수없음")  // Y VARCHAR(7)
     @JsonProperty("cmnc_stts_cd")
     private String cmncSttsCd;
 

+ 1 - 1
src/main/java/com/its/api/its/model/dto/common/FcltSttsDto.java

@@ -45,7 +45,7 @@ public class FcltSttsDto implements Serializable {
     @JsonProperty("y_crdn")
     private Double yCrdn;
 
-    @ApiModelProperty("시설물통신상태(0:정상, 1:통신이상)")  // Y VARCHAR(1)
+    @ApiModelProperty("시설물통신상태(0:정상, 1:통신이상, 2:알수없음)")  // Y VARCHAR(1)
     @JsonProperty("stts_cd")
     private String sttsCd;
 

+ 1 - 1
src/main/java/com/its/api/its/model/dto/vds/TbVdsCtlrSttsDto.java

@@ -21,7 +21,7 @@ public class TbVdsCtlrSttsDto implements Serializable {
     @JsonProperty("ctlr_mngm_nmbr")
     private String ctlrMngmNmbr;
 
-    @ApiModelProperty("통신 상태 코드")  // Y VARCHAR(7)
+    @ApiModelProperty("통신 상태 코드(0:정상, 1:통신이상, 2:알수없음)")  // Y VARCHAR(7)
     @JsonProperty("cmnc_stts_cd")
     private String cmncSttsCd;
 

+ 1 - 1
src/main/java/com/its/api/its/model/dto/vms/TbVmsSttsDto.java

@@ -26,7 +26,7 @@ public class TbVmsSttsDto implements Serializable {
     @JsonProperty("updt_dt")
     private String updtDt;
 
-    @ApiModelProperty("통신 상태 코드")  // Y VARCHAR(7)
+    @ApiModelProperty("통신 상태 코드(0:정상, 1:통신이상, 2:알수없음)")  // Y VARCHAR(7)
     @JsonProperty("cmnc_stts_cd")
     private String cmncSttsCd;
 

+ 28 - 1
src/main/java/com/its/api/its/model/entity/incident/TbIncdOcrr.java

@@ -194,7 +194,7 @@ public class TbIncdOcrr implements Serializable {
         this.incdPrgrStepCd = CodeManager.INCD_PRGR_STEP_ISS4;
     }
     public TbIncdOcrrDto toDto() {
-        return TbIncdOcrrDto.builder()
+        TbIncdOcrrDto dto = TbIncdOcrrDto.builder()
                 .incdOcrrId(this.incdOcrrId)
                 .rgstDt(this.rgstDt)
                 .incdOrgnCd(this.incdOrgnCd)
@@ -237,6 +237,33 @@ public class TbIncdOcrr implements Serializable {
                 .recrPerd(this.recrPerd)
                 .linkId(this.linkId)
                 .build();
+
+        dto.setIncdOrgnDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_IST, this.incdOrgnCd));
+        dto.setCmtrGradDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_LTCU, this.cmtrGradCd));
+        dto.setIncdCnfmMthdDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_ICM, this.incdCnfmMthdCd));
+        dto.setIncdTypeClsfDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_IDTU, this.incdTypeClsfCd));
+        if ("1".equals(this.incdTypeClsfCd)) {
+            dto.setIncdTypeDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_ACTU, this.incdTypeCd));
+        }
+        else if ("2".equals(this.incdTypeClsfCd)) {
+            dto.setIncdTypeDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_CRTU, this.incdTypeCd));
+        }
+        else if ("3".equals(this.incdTypeClsfCd)) {
+            dto.setIncdTypeDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_EVTU, this.incdTypeCd));
+        }
+        else {
+            dto.setIncdTypeDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_WETU, this.incdTypeCd));
+        }
+
+        dto.setIncdSernDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_SRLU, this.incdSernCd));
+        dto.setTrvlLmntTypeDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_PRTU, this.trvlLmntTypeCd));
+        dto.setTrubVhclDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_PRTU, this.trvlLmntTypeCd));
+
+        dto.setRespLvlDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_RSL, this.respLvlCd));
+        dto.setIncdPrgrStepDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_ISS, this.incdPrgrStepCd));
+        dto.setIncdEndCnfmMthdDesc(CodeManager.getCodeDesc(CodeManager.INCD_CODE_ICM, this.incdEndCnfmMthdCd));
+
+        return dto;
     }
 
     public TbIncdOcrr(String incdOcrrId) {