shjung il y a 2 ans
Parent
commit
9953cd279f

+ 1 - 0
pom.xml

@@ -23,6 +23,7 @@
         <org.projectlombok.version>1.18.20</org.projectlombok.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <jackson.version>2.13.1</jackson.version>
+
 <!--
         <jackson.version>2.12.0</jackson.version>
 -->

+ 2 - 2
src/main/java/com/its/op/dao/repository/its/facility/TbFcltFailRepository.java

@@ -13,10 +13,10 @@ import java.util.List;
 @Repository
 public interface TbFcltFailRepository extends JpaRepository<TbFcltFail, String>, JpaSpecificationExecutor<TbFcltFail> {
 
-    @Query("select p from TbFcltFail p")
+    @Query("select p from TbFcltFail p inner join fetch p.fclt f")
     List<TbFcltFail> findAll();
 
-    @Query("select p from TbFcltFail p")
+    @Query("select p from TbFcltFail p inner join fetch p.fclt f where p.useYn = 'Y'")
     List<TbFcltFail> findAllList();
 
     @Query(value = "SELECT TO_CHAR(sysdate,'YYYYMM') || NVL(MAX(SUBSTR(FAIL_NO, 7, 4)), '0000')+1  AS NEWID " +

+ 4 - 0
src/main/java/com/its/op/dto/its/facility/TbFcltFailActDto.java

@@ -109,6 +109,10 @@ public class TbFcltFailActDto implements Serializable {
     @JsonProperty("use_desc")    // USE_YN
     private String useDesc;
 
+    @ApiModelProperty("부품명")  // Y VARCHAR2(100)
+    @JsonProperty("part_nm")
+    private String partNm;
+
     @ApiModel("TbFcltFailActUpdReq(시설물 장애 발생 조치 정보 정보변경)")
     @Getter
     @Setter

+ 8 - 0
src/main/java/com/its/op/dto/its/facility/TbFcltFailDto.java

@@ -89,6 +89,14 @@ public class TbFcltFailDto implements Serializable {
     private String useYn;
 
     // Code Description Field
+    @ApiModelProperty("시설물 대분류")
+    @JsonProperty("fclt_group")
+    private String fcltGroup;
+
+    @ApiModelProperty("시설물 위치")  // Y VARCHAR2(100)
+    @JsonProperty("fclt_lctn")
+    private String fcltLctn;
+
     @ApiModelProperty("장애 발생 구분코드 설명")
     @JsonProperty("fail_ocrr_desc")    // FAIL_OCRR_CD
     private String failOcrrDesc;

+ 5 - 0
src/main/java/com/its/op/dto/its/facility/TbFcltInfrDto.java

@@ -121,6 +121,11 @@ public class TbFcltInfrDto implements Serializable {
     @JsonProperty("sub_user_nm")
     private String subUserNm;
 
+    // TODO
+    @ApiModelProperty("시설물 대분류")
+    @JsonProperty("fclt_group")
+    private String fcltGroup;
+
     @ApiModel("TbFcltInfrUpdReq(시설물 정보 정보변경)")
     @Getter
     @Setter

+ 39 - 5
src/main/java/com/its/op/entity/its/facility/TbFcltFail.java

@@ -7,11 +7,10 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -96,8 +95,13 @@ public class TbFcltFail implements Serializable {
     @Column(name = "USE_YN", columnDefinition = "CHAR", length = 1)
     private String useYn;
 
+    @OneToOne
+    @JoinColumn(insertable=false, updatable=false, name="FCLT_NMBR", referencedColumnName = "FCLT_NMBR")
+    @NotFound(action = NotFoundAction.IGNORE)
+    private TbFcltInfr fclt;
+
     public TbFcltFailDto toDto() {
-        return TbFcltFailDto.builder()
+        TbFcltFailDto dto = TbFcltFailDto.builder()
                 .failNo(this.failNo)
                 .regDt(this.regDt)
                 .fcltNmbr(this.fcltNmbr)
@@ -116,6 +120,36 @@ public class TbFcltFail implements Serializable {
                 .etcRmk(this.etcRmk)
                 .useYn(this.useYn)
                 .build();
+
+        if (this.fclt != null) {
+            // TODO
+            // 시설물 대분류, 시설물 군분류
+        }
+        //        @ApiModelProperty("장애 발생 구분코드 설명")
+//        @JsonProperty("fail_ocrr_desc")    // FAIL_OCRR_CD
+//        private String failOcrrDesc;
+//
+//        @ApiModelProperty("진행상태-장애조치('FSTEP') 설명")
+//        @JsonProperty("step_desc")    // STEP_CD
+//        private String stepDesc;
+//
+//        @ApiModelProperty("장애등록구분('FREG') 설명")
+//        @JsonProperty("fail_reg_desc")    // FAIL_REG_CD
+//        private String failRegDesc;
+//
+//        @ApiModelProperty("장애등급구분('FLVL') 설명")
+//        @JsonProperty("fail_levl_desc")    // FAIL_LEVL_CD
+//        private String failLevlDesc;
+//
+//        @ApiModelProperty("날씨('FWTHR') 설명")
+//        @JsonProperty("wthr_desc")    // WTHR_CD
+//        private String wthrDesc;
+//
+//        @ApiModelProperty("사용여부 설명")
+//        @JsonProperty("use_desc")    // USE_YN
+//        private String useDesc;
+
+        return dto;
     }
 
     public TbFcltFail(String failNo) {

+ 5 - 1
src/main/java/com/its/op/entity/its/facility/TbFcltFailAct.java

@@ -92,7 +92,7 @@ public class TbFcltFailAct implements Serializable {
     private String useYn;
 
     public TbFcltFailActDto toDto() {
-        return TbFcltFailActDto.builder()
+        TbFcltFailActDto dto = TbFcltFailActDto.builder()
                 .failNo(this.failNo)
                 .actSeq(this.actSeq)
                 .regDt(this.regDt)
@@ -110,6 +110,10 @@ public class TbFcltFailAct implements Serializable {
                 .etcRmk(this.etcRmk)
                 .useYn(this.useYn)
                 .build();
+
+        // TODO
+        // 코드 설명 추가
+        return dto;
     }
 
     public TbFcltFailAct(String failNo, Integer actSeq) {

+ 1 - 0
src/main/java/com/its/op/service/its/facility/TbFcltFailService.java

@@ -187,6 +187,7 @@ public class TbFcltFailService {
             data = this.repo.findListContinuous(fromDay + "000000", toDay + "235959");
         }
         for (TbFcltFail entity : data) {
+            // TODO
             result.add(entity.toDto());
         }
         return result;

+ 1 - 1
src/main/resources/application.yml

@@ -25,7 +25,7 @@ application:
     db-svr-stts: false
 
 server:
-  port: 80
+  port: 8998
   shutdown: graceful
   error:
     whitelabel: