dd

src/main/java/com/its/op/controller/its/cctv/TbCctvCtlrSttsHsController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.its.cctv;
 
 import com.its.op.dto.its.cctv.TbCctvCtlrSttsHsDto;
-import com.its.op.service.its.cctv.TbCctvSttsHsService;
+import com.its.op.service.its.cctv.TbCctvCtlrSttsHsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -23,7 +23,7 @@ import java.util.List;
 @RequestMapping("/api/cctv/history")
 public class TbCctvCtlrSttsHsController {
 
-    private final TbCctvSttsHsService service;
+    private final TbCctvCtlrSttsHsService service;
 
     @ApiOperation(value = "CCTV 상태 이력 조회(TB_CCTV_STTS_HS)", response = TbCctvCtlrSttsHsDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/stts-hs", produces = {"application/json; charset=utf8"})

src/main/java/com/its/op/dto/its/cctv/TbCctvCtlrSttsDto.java

@@ -102,6 +102,10 @@ public class TbCctvCtlrSttsDto implements Serializable {
     @JsonProperty("hetr_stts_desc")    // HETR_STTS_CD
     private String hetrSttsDesc;
 
+    @ApiModelProperty("VIDEO INPUT 상태 코드('VDI') 설명")
+    @JsonProperty("video_input_desc")    // HETR_STTS_CD
+    private String videoInputDesc;
+
     @ApiModelProperty("CCTV 제어기 ID")  // Y VARCHAR(30)
     @JsonProperty("cctv_ctlr_id")
     private String cctvCtlrId;

src/main/java/com/its/op/dto/its/cctv/TbCctvCtlrSttsHsDto.java

@@ -102,6 +102,10 @@ public class TbCctvCtlrSttsHsDto implements Serializable {
     @JsonProperty("hetr_stts_desc")    // HETR_STTS_CD
     private String hetrSttsDesc;
 
+    @ApiModelProperty("VIDEO INPUT 상태 코드('VDI') 설명")
+    @JsonProperty("video_input_desc")    // HETR_STTS_CD
+    private String videoInputDesc;
+
     @ApiModelProperty("CCTV 제어기 ID")  // Y VARCHAR(30)
     @JsonProperty("cctv_ctlr_id")
     private String cctvCtlrId;

src/main/java/com/its/op/entity/its/cctv/TbCctvCtlr.java

@@ -221,15 +221,37 @@ public class TbCctvCtlr implements Serializable {
                 .cmncSttsCd(CodeManager.CMNC_STTS_ERROR)
                 .build();
 
+//        private String cmncSttsDesc;
+//        private String cboxDoorSttsDesc;
+//        private String frontDoorSttsDesc;
+//        private String backDoorSttsDesc;
+//        private String fanSttsDesc;
+//        private String hetrSttsDesc;
+//        private String videoInputDesc;
+        dto.setUpdtDt(this.state.getUpdtDt());
         if (this.state != null) {
             dto.setUpdtDt(this.state.getUpdtDt());
 
             dto.setCmncSttsCd(this.state.getCmncSttsCd());
             dto.setCboxDoorSttsCd(this.state.getCboxDoorSttsCd());
+            dto.setFrontDoorSttsCd(this.state.getFrontDoorSttsCd());
+            dto.setBackDoorSttsCd(this.state.getBackDoorSttsCd());
             dto.setFanSttsCd(this.state.getFanSttsCd());
             dto.setHetrSttsCd(this.state.getHetrSttsCd());
+            dto.setVideoInput(this.state.getVideoInput());
             dto.setCboxTmpr(this.state.getCboxTmpr());
             dto.setCboxHmdt(this.state.getCboxHmdt());
+            dto.setPan(this.state.getPan());
+            dto.setTilt(this.state.getTilt());
+            dto.setZoom(this.state.getZoom());
+            dto.setFocus(this.state.getFocus());
+
+            dto.setCboxDoorSttsDesc(CodeManager.getCodeDescShort(CodeManager.DOOR_STTS_CD, dto.getCboxDoorSttsCd()));
+            dto.setFrontDoorSttsDesc(CodeManager.getCodeDescShort(CodeManager.DOOR_STTS_CD, dto.getFrontDoorSttsCd()));
+            dto.setBackDoorSttsDesc(CodeManager.getCodeDescShort(CodeManager.DOOR_STTS_CD, dto.getBackDoorSttsCd()));
+            dto.setFanSttsDesc(CodeManager.getCodeDescShort(CodeManager.FAN_STTS_CD, dto.getFanSttsCd()));
+            dto.setHetrSttsDesc(CodeManager.getCodeDescShort(CodeManager.HETR_STTS_CD, dto.getHetrSttsCd()));
+            dto.setVideoInputDesc(CodeManager.getCodeDescShort(CodeManager.VIDEO_INPUT_CD, dto.getVideoInput()));
         }
         dto.setMissSttsYn(ItsUtils.getMissSttsYn(dto.getUpdtDt()));
         if (("Y").equals(dto.getMissSttsYn())) {

src/main/java/com/its/op/entity/its/cctv/TbCctvCtlrSttsHs.java

@@ -122,6 +122,13 @@ public class TbCctvCtlrSttsHs implements Serializable {
 
         dto.setCmncSttsDesc(CodeManager.getCodeDesc(CodeManager.CMNC_STTS_CD, this.cmncSttsCd));
 
+        dto.setCboxDoorSttsDesc(CodeManager.getCodeDescShort(CodeManager.DOOR_STTS_CD, dto.getCboxDoorSttsCd()));
+        dto.setFrontDoorSttsDesc(CodeManager.getCodeDescShort(CodeManager.DOOR_STTS_CD, dto.getFrontDoorSttsCd()));
+        dto.setBackDoorSttsDesc(CodeManager.getCodeDescShort(CodeManager.DOOR_STTS_CD, dto.getBackDoorSttsCd()));
+        dto.setFanSttsDesc(CodeManager.getCodeDescShort(CodeManager.FAN_STTS_CD, dto.getFanSttsCd()));
+        dto.setHetrSttsDesc(CodeManager.getCodeDescShort(CodeManager.HETR_STTS_CD, dto.getHetrSttsCd()));
+        dto.setVideoInputDesc(CodeManager.getCodeDescShort(CodeManager.VIDEO_INPUT_CD, dto.getVideoInput()));
+
         return dto;
     }
 

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

@@ -95,6 +95,7 @@ public class CodeManager {
     public static final String DOOR_STTS_CD         = "CDS";    // 도어상태
     public static final String FAN_STTS_CD          = "PAS";    // 팬상태
     public static final String HETR_STTS_CD         = "HTS";    // 히터상태
+    public static final String VIDEO_INPUT_CD       = "VDI";    // VIDEO Input 상태
 
     public static final String CCTV_TYPE_CD          = "CCTVT"; // CCTV 유형 코드
 

src/main/java/com/its/op/service/its/cctv/TbCctvSttsHsService.java → src/main/java/com/its/op/service/its/cctv/TbCctvCtlrSttsHsService.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class TbCctvSttsHsService {
+public class TbCctvCtlrSttsHsService {
 
     private final TbCctvCtlrSttsHsRepository repo;