weekend update

src/main/java/com/its/api/bis/model/dto/BitStatusHistoryDto.java

@@ -20,7 +20,7 @@ public class BitStatusHistoryDto implements Serializable {
 
     @ApiModelProperty("recorddate")  // N DATE(0)
     @JsonProperty("recorddate")
-    private LocalDateTime recorddate;
+    private String recorddate;
 
     @ApiModelProperty("recordtimestamp")  // N TIMESTAMP(6)(0)
     @JsonProperty("recordtimestamp")

src/main/java/com/its/api/bis/model/entity/BitStatusHistory.java

@@ -8,6 +8,7 @@ import lombok.*;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 /**
  *  Entity Class
@@ -99,8 +100,8 @@ public class BitStatusHistory implements Serializable {
     private Integer soundvolume;
 
     public BitStatusHistoryDto toDto() {
-        return BitStatusHistoryDto.builder()
-                .recorddate(this.recorddate)
+        BitStatusHistoryDto dto = BitStatusHistoryDto.builder()
+                //.recorddate(this.recorddate)
                 .recordtimestamp(this.recordtimestamp)
                 .bitid(this.bitid)
                 .temperature(this.temperature)
@@ -119,6 +120,14 @@ public class BitStatusHistory implements Serializable {
                 .illumination(this.illumination)
                 .soundvolume(this.soundvolume)
                 .build();
+        if (this.recorddate != null) {
+            String collDt = DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(this.recorddate);
+            dto.setRecorddate(collDt);
+        }
+        else {
+            dto.setRecorddate("19700101000000");
+        }
+        return dto;
     }
 
 }

src/main/java/com/its/api/bis/service/BitService.java

@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -88,6 +89,7 @@ public class BitService {
                     .strmUrl("")
                     .sttsCd(CodeManager.CMNC_STTS_ERROR)
                     .sttsDesc(CodeManager.getCodeDescShort(CodeManager.CMNC_STTS_CD, CodeManager.CMNC_STTS_ERROR))
+                    .updtDt("19700101000000")
                     .build();
             resultMap.put(stts.getFcltNmbr(), stts);
         });
@@ -217,17 +219,21 @@ public class BitService {
                     .strmUrl("")
                     .sttsCd(CodeManager.CMNC_STTS_ERROR)
                     .sttsDesc(CodeManager.getCodeDescShort(CodeManager.CMNC_STTS_CD, CodeManager.CMNC_STTS_ERROR))
+                    .updtDt("19700101000000")
                     .build();
             resultMap.put(stts.getFcltNmbr(), stts);
         });
 
-        // 통신 상태가 오류 인 제어기 정보만 조회한다.
         sttsList.forEach(obj -> {
             FcltSttsDto stts = resultMap.get(obj.getBitid());
             if (stts == null) {
                 return;
             }
 
+            if (obj.getRecorddate() != null) {
+                String collDt = DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(obj.getRecorddate());
+                stts.setUpdtDt(collDt);
+            }
             if (("1").equals(obj.getWcommstatus())) {
                 // 유선통신 정상
                 normal.getAndIncrement();

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

@@ -65,4 +65,8 @@ public class FcltSttsDto implements Serializable {
     @JsonProperty("fclt_info2")
     private String fcltInfo2;
 
+    @ApiModelProperty("갱신 일시")  // Y VARCHAR(14)
+    @JsonProperty("updt_dt")
+    private String updtDt;
+
 }

src/main/java/com/its/api/its/model/dto/common/TrafDto.java

@@ -37,4 +37,8 @@ public class TrafDto implements Serializable {
     @JsonProperty("miss_yn")
     private String missYn;
 
+    @ApiModelProperty("가공 일시")
+    @JsonProperty("prcn_dt")
+    private String prcnDt;
+
 }

src/main/java/com/its/api/its/model/dto/ifsc/TbIfscVrtxArrDto.java

@@ -18,7 +18,7 @@ public class TbIfscVrtxArrDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("정보제공구간 ID")  // N NUMBER(10)
-    @JsonProperty("ifsc_id")
+    @JsonProperty("id")
     private Long ifscId;
 
     @ApiModelProperty("레벨")  // N NUMBER(5)

src/main/java/com/its/api/its/model/dto/link/TbLinkVrtxArrDto.java

@@ -18,7 +18,7 @@ public class TbLinkVrtxArrDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("링크 ID")  // N NUMBER(10)
-    @JsonProperty("link_id")
+    @JsonProperty("id")
     private Long linkId;
 
     @ApiModelProperty("레벨")  // N NUMBER(5)

src/main/java/com/its/api/its/model/dto/parking/ParkingLotDto.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
  */
 @Data
 @Builder
-@ApiModel("ParkinglotDto(주차장)")
+@ApiModel("ParkingLotDto(주차장)")
 public class ParkingLotDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -52,14 +52,14 @@ public class ParkingLotDto implements Serializable {
     @JsonProperty("coordy")
     private Double coordy;
 
-    //@ApiModelProperty("주차정보플래그")  // Y CHAR(1)
-    //@JsonProperty("pisflag")
-    @JsonIgnore
+    @ApiModelProperty("주차정보플래그")  // Y CHAR(1)
+    @JsonProperty("pisflag")
+    //@JsonIgnore
     private String pisFlag;
 
-    //@ApiModelProperty("지역ID")  // Y VARCHAR(5)
-    //@JsonProperty("districtid")
-    @JsonIgnore
+    @ApiModelProperty("지역ID")  // Y VARCHAR(5)
+    @JsonProperty("districtid")
+    //@JsonIgnore
     private String districtId;
 
     @ApiModelProperty("영문명")  // Y VARCHAR(30)

src/main/java/com/its/api/its/model/dto/road/TbRoadVrtxArrDto.java

@@ -18,7 +18,7 @@ public class TbRoadVrtxArrDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("도로 ID")  // N NUMBER(10)
-    @JsonProperty("road_id")
+    @JsonProperty("id")
     private Long roadId;
 
     @ApiModelProperty("레벨")  // N NUMBER(5)

src/main/java/com/its/api/its/model/entity/ifsc/TbIfscTrafSimple.java

@@ -69,6 +69,7 @@ public class TbIfscTrafSimple implements Serializable {
                 .sped(this.sped)
                 .cmtrGradCd(this.cmtrGradCd)
                 .trvlHh(this.trvlHh)
+                .prcnDt(this.prcnDt)
                 .build();
 
         dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, dto.getCmtrGradCd()));

src/main/java/com/its/api/its/model/entity/link/TbLinkTrafSimple.java

@@ -94,6 +94,7 @@ public class TbLinkTrafSimple implements Serializable {
                 .trvlHh(this.trvlHh)
                 .cmtrGradCd(this.cmtrGradCd)
                 .missYn(this.missYn)
+                .prcnDt(this.prcnDt)
                 .build();
 
         dto.setMissYn(this.missYn.equals("N") ? ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd) : "Y");

src/main/java/com/its/api/its/model/entity/parking/ParkingLot.java

@@ -92,6 +92,8 @@ public class ParkingLot implements Serializable {
                 .parkingEName(this.parkingEName)
                 .eLocation(this.eLocation)
                 .eAddress(this.eAddress)
+                .pisFlag(this.pisFlag)
+                .districtId(this.districtId)
                 .build();
     }
 

src/main/java/com/its/api/its/model/entity/road/TbRoadTrafSimple.java

@@ -69,6 +69,7 @@ public class TbRoadTrafSimple implements Serializable {
                 .sped(this.sped)
                 .cmtrGradCd(this.cmtrGradCd)
                 .trvlHh(this.trvlHh)
+                .prcnDt(this.prcnDt)
                 .build();
 
         dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, dto.getCmtrGradCd()));

src/main/java/com/its/api/its/model/entity/vms/TbVmsCmtrInfr.java

@@ -88,6 +88,7 @@ public class TbVmsCmtrInfr implements Serializable {
                 .sped(this.sped)
                 .cmtrGradCd("LTC"+this.cmtrGradCd)
                 .trvlHh(this.trvlHh)
+                .prcnDt(this.rgstDt)
                 .build();
 
         dto.setMissYn(ItsUtils.getMissYn(this.rgstDt, dto.getCmtrGradCd()));

src/main/java/com/its/api/utis/model/dto/UtisRseStateDto.java

@@ -81,8 +81,11 @@ public class UtisRseStateDto {
         if (rse.getState() != null) {
             String collDt = DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(rse.getState().getColldt());
             stts.setCollDt(collDt);
-            stts.setCommCd(ItsUtils.getRseCommStts(stts.getCollDt()));
         }
+        else {
+            stts.setCollDt("19700101000000");
+        }
+        stts.setCommCd(ItsUtils.getRseCommStts(stts.getCollDt()));
         stts.setCommDesc(CodeManager.getCodeDescShort(CodeManager.CMNC_STTS_CD, stts.getCommCd()));       // 통신상태
         /*if (("0").equals(stts.getCommCd())) {
             stts.setCommDesc("정상");

src/main/java/com/its/api/utis/service/RsemstService.java

@@ -108,6 +108,7 @@ public class RsemstService {
                     .yCrdn(obj.getCoordy()/10000000.)
                     .sttsCd(dto.getCommCd())
                     .sttsDesc(dto.getCommDesc())
+                    .updtDt(dto.getCollDt())
                     .build();
 
             sttsDtoList.add(stts);