vds status update

src/main/java/com/its/op/dto/its/vds/TbVdsCtlrSttsDto.java

@@ -1,6 +1,7 @@
 package com.its.op.dto.its.vds;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.its.op.global.CodeManager;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
@@ -92,6 +93,9 @@ public class TbVdsCtlrSttsDto implements Serializable {
     @ApiModelProperty("VDS 제어기 명")
     @JsonProperty("vds_nm")
     private String vdsNm;
+    @ApiModelProperty("유효 여부")  // Y CHAR(1)
+    @JsonProperty("vald_yn")
+    private String valdYn;
 
     @ApiModelProperty("상태정보결측설명")
     @JsonProperty("miss_stts_yn")
@@ -101,4 +105,24 @@ public class TbVdsCtlrSttsDto implements Serializable {
     @JsonProperty("coll_cnt")
     private Integer collCnt;
 
+    @ApiModelProperty("수집 상태 코드 설명")
+    @JsonProperty("coll_stts_desc")    // HETR_STTS_CD
+    private String collSttsDesc;
+
+    /**
+     * 상태정보를 먼저 업데이트 한 다음 수집수량을 업데이트 하면 수집상태 코드도 함께 업데이트 된다.
+     * @param collCnt
+     */
+    public void setCollectInfo(Integer collCnt) {
+        this.collCnt = collCnt;
+        if (CodeManager.CMNC_STTS_NORMAL.equals(this.cmncSttsCd)) {
+            if (collCnt > 0) {
+                this.collSttsDesc = "정상";
+            } else {
+                this.collSttsDesc = "이상";
+            }
+        } else {
+            this.collSttsDesc = CodeManager.STTS_UNKNOWN;
+        }
+    }
 }

src/main/java/com/its/op/entity/its/vds/TbVdsCtlr.java

@@ -137,6 +137,7 @@ public class TbVdsCtlr implements Serializable {
                 .collCnt(0)
                 .vdsCtlrId(this.vdsCtlrId)
                 .vdsNm(this.lctn)
+                .valdYn(this.valdYn)
                 .build();
 
         if (this.state != null) {
@@ -172,12 +173,15 @@ public class TbVdsCtlr implements Serializable {
             dto.setCboxDoorSttsDesc(CodeManager.getCodeDescShort(CodeManager.DOOR_STTS_CD, dto.getCboxDoorSttsCd()));   // 도어
             dto.setFanSttsDesc(CodeManager.getCodeDescShort(CodeManager.FAN_STTS_CD, dto.getFanSttsCd()));              // 팬상태
             dto.setHetrSttsDesc(CodeManager.getCodeDescShort(CodeManager.HETR_STTS_CD, dto.getHetrSttsCd()));           // 히터상태
+
+            dto.setCollSttsDesc("이상");
         }
         else {
             dto.setPrntPwerSttsDesc(CodeManager.STTS_UNKNOWN);      // 전원상태
             dto.setCboxDoorSttsDesc(CodeManager.STTS_UNKNOWN);      // 도어
             dto.setFanSttsDesc(CodeManager.STTS_UNKNOWN);           // 팬상태
             dto.setHetrSttsDesc(CodeManager.STTS_UNKNOWN);          // 히터상태
+            dto.setCollSttsDesc(CodeManager.STTS_UNKNOWN);          // 수집상태
             dto.setCboxTmpr(255);
         }
 

src/main/java/com/its/op/service/its/vds/TbVdsCtlrService.java

@@ -84,7 +84,7 @@ public class TbVdsCtlrService {
         colList.forEach(obj -> {
             TbVdsCtlrSttsDto dto = tmp.get(obj.getNmbr());
             if (dto != null) {
-                dto.setCollCnt(obj.getErrCnt().intValue());
+                dto.setCollectInfo(obj.getErrCnt().intValue());
             }
         });
         return result;