dev

src/main/java/com/its/op/controller/its/rse/TbRseCtlrSttsController.java

@@ -1,13 +1,12 @@
 package com.its.op.controller.its.rse;
 
 import com.its.op.dto.its.rse.TbRseCtlrSttsDto;
-import com.its.op.service.its.rse.TbRseCtlrSttsService;
+import com.its.op.service.its.rse.TbRseCtlrService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,21 +16,21 @@ import java.util.List;
 @Validated
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/rse/tb_rse_ctlr_stts")
+@RequestMapping("/api/rse/monitoring/stts")
 public class TbRseCtlrSttsController {
 
-    private final TbRseCtlrSttsService service;
+    private final TbRseCtlrService service;
 
     @ApiOperation(value = "RSE 상태 현황 전체조회(TB_RSE_CTLR_STTS)", response = TbRseCtlrSttsDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "", produces = {"application/json; charset=utf8"})
     public List<TbRseCtlrSttsDto> findAll() {
-        return this.service.findAll();
-    }
-
-    @ApiOperation(value = "RSE 상태 현황 개별조회(TB_RSE_CTLR_STTS)", response = TbRseCtlrSttsDto.class)
-    @GetMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public TbRseCtlrSttsDto findById(@PathVariable final String id) {
-        return this.service.findById(id);
+        return this.service.findAllStts();
     }
+//
+//    @ApiOperation(value = "RSE 상태 현황 개별조회(TB_RSE_CTLR_STTS)", response = TbRseCtlrSttsDto.class)
+//    @GetMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
+//    public TbRseCtlrSttsDto findById(@PathVariable final String id) {
+//        return this.service.findById(id);
+//    }
 
 }

src/main/java/com/its/op/dto/its/rse/TbRseCtlrSttsDto.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -100,15 +99,15 @@ public class TbRseCtlrSttsDto implements Serializable {
 
     // Code Description Field
     @ApiModelProperty("RSE 제어기 ID")  // Y VARCHAR2(30)
-    @Column(name = "RSE_CTLR_ID", length = 30)
+    @JsonProperty("rse_ctlr_id")
     private String rseCtlrId;
 
     @ApiModelProperty("RSE 명칭")  // Y VARCHAR2(40)
-    @Column(name = "RSE_NM", length = 40)
+    @JsonProperty("rse_nm")
     private String rseNm;
 
     @ApiModelProperty("설치 위치 명")  // Y VARCHAR2(40)
-    @Column(name = "ISTL_LCTN_NM", length = 40)
+    @JsonProperty("istl_lctn_nm")
     private String istlLctnNm;
 
     @ApiModelProperty("통신 상태 코드('CMS') 설명")

src/main/java/com/its/op/service/its/rse/TbRseCtlrService.java

@@ -183,4 +183,18 @@ public class TbRseCtlrService {
         return result;
     }
 
+    /**
+     * 삭제 되지 않은 제어기 상태 정보 조회
+     * @return
+     */
+    @Transactional(readOnly = true)
+    public List<TbRseCtlrSttsDto> findAllStts() {
+        List<TbRseCtlrSttsDto> result = new ArrayList<>();
+        List<TbRseCtlr> data = this.repo.findAllList();
+        data.forEach(obj -> {
+            result.add(obj.toSttsDto());
+        });
+        return result;
+    }
+
 }