ddd

src/main/java/com/its/op/controller/its/facility/TbFcltSttsErrorHsController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.its.facility;
 
 import com.its.op.dto.its.facility.FcltSttsErrorDto;
-import com.its.op.dto.its.facility.FcltSttsErrorTypeDto;
+import com.its.op.dto.its.statistics.FcltSttsStatTypeDto;
 import com.its.op.service.its.facility.TbFcltSttsErrorHsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,9 +24,9 @@ public class TbFcltSttsErrorHsController {
 
     private final TbFcltSttsErrorHsService service;
 
-    @ApiOperation(value = "시설물 장애내역조회 시설물구분 목록 조회", response = FcltSttsErrorTypeDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "시설물 장애내역조회 시설물구분 목록 조회", response = FcltSttsStatTypeDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/fclt-type", produces = {"application/json; charset=utf8"})
-    public List<FcltSttsErrorTypeDto> findAllFcltTypeList() {
+    public List<FcltSttsStatTypeDto> findAllFcltTypeList() {
         return this.service.findAllFcltTypeList();
     }
 

src/main/java/com/its/op/dto/its/facility/FcltSttsErrorTypeDto.java

@@ -1,33 +0,0 @@
-package com.its.op.dto.its.facility;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel("FcltSttsErrorTypeDto(시설물 장애내역조회 시설물구분)")
-public class FcltSttsErrorTypeDto implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("시설물 순서")
-    @JsonProperty("fclt_seq")
-    private Integer fcltSeq;
-
-    @ApiModelProperty("시설물 유형")
-    @JsonProperty("fclt_type")
-    private String fcltType;
-
-    @ApiModelProperty("시설물 유형명")
-    @JsonProperty("fclt_nm")
-    private String fcltNm;
-
-}

src/main/java/com/its/op/dto/its/statistics/FcltSttsStatTypeDto.java

@@ -12,9 +12,13 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel("FcltSttsStatTypeDto(시설물 통신단절통계 시설물 정보)")
+@ApiModel("FcltSttsStatTypeDto(시설물 시설물구분 정보)")
 public class FcltSttsStatTypeDto {
 
+    @ApiModelProperty("시설물구분순서")
+    @JsonProperty("fclt_seq")
+    private Integer fcltSeq;
+
     @ApiModelProperty("시설물구분코드")
     @JsonProperty("fclt_cd")
     private String fcltCd;

src/main/java/com/its/op/service/its/facility/TbFcltSttsErrorHsService.java

@@ -5,7 +5,7 @@ import com.its.op.dao.repository.its.vds.TbVdsCtlrSttsHsRepository;
 import com.its.op.dao.repository.its.vms.TbVmsSttsHsRepository;
 import com.its.op.dto.its.facility.FcltSttsErrorDto;
 import com.its.op.dto.its.facility.FcltSttsErrorInf;
-import com.its.op.dto.its.facility.FcltSttsErrorTypeDto;
+import com.its.op.dto.its.statistics.FcltSttsStatTypeDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -28,24 +28,12 @@ public class TbFcltSttsErrorHsService {
      * 시설물 장애내역 조회 시설물구분 목록조회
      * @return
      */
-    public List<FcltSttsErrorTypeDto> findAllFcltTypeList() {
-        List<FcltSttsErrorTypeDto> result = new ArrayList<>();
-        result.add(FcltSttsErrorTypeDto.builder()
-                .fcltSeq(0)
-                .fcltType("ALL")
-                .fcltNm("전 체").build());
-        result.add(FcltSttsErrorTypeDto.builder()
-                .fcltSeq(1)
-                .fcltType("CCTV")
-                .fcltNm("CCTV").build());
-        result.add(FcltSttsErrorTypeDto.builder()
-                .fcltSeq(2)
-                .fcltType("VMS")
-                .fcltNm("VMS").build());
-        result.add(FcltSttsErrorTypeDto.builder()
-                .fcltSeq(3)
-                .fcltType("VDS")
-                .fcltNm("VDS").build());
+    public List<FcltSttsStatTypeDto> findAllFcltTypeList() {
+        List<FcltSttsStatTypeDto> result = new ArrayList<>();
+        result.add(FcltSttsStatTypeDto.builder().fcltSeq(0).fcltCd("ALL").fcltNm("전 체").build());
+        result.add(FcltSttsStatTypeDto.builder().fcltSeq(0).fcltCd("CCTV").fcltNm("CCTV").build());
+        result.add(FcltSttsStatTypeDto.builder().fcltSeq(1).fcltCd("VMS").fcltNm("VMS").build());
+        result.add(FcltSttsStatTypeDto.builder().fcltSeq(2).fcltCd("VDS").fcltNm("VDS").build());
 
         return result;
     }

src/main/java/com/its/op/service/its/statistics/FcltSttsStatisticsService.java

@@ -32,9 +32,9 @@ public class FcltSttsStatisticsService {
 
         List<FcltSttsStatTypeDto> result = new ArrayList<>();
 
-        result.add(FcltSttsStatTypeDto.builder().fcltCd("CCTV").fcltNm("CCTV").build());
-        result.add(FcltSttsStatTypeDto.builder().fcltCd("VMS").fcltNm("VMS").build());
-        result.add(FcltSttsStatTypeDto.builder().fcltCd("VDS").fcltNm("VDS").build());
+        result.add(FcltSttsStatTypeDto.builder().fcltSeq(0).fcltCd("CCTV").fcltNm("CCTV").build());
+        result.add(FcltSttsStatTypeDto.builder().fcltSeq(1).fcltCd("VMS").fcltNm("VMS").build());
+        result.add(FcltSttsStatTypeDto.builder().fcltSeq(2).fcltCd("VDS").fcltNm("VDS").build());
 
         return result;
     }