shjung hace 3 años
padre
commit
3ecc984d2d

+ 6 - 0
src/main/java/com/its/op/controller/its/vms/TbVmsIfscRltnController.java

@@ -35,6 +35,12 @@ public class TbVmsIfscRltnController {
         return service.findAll();
     }
 
+    @ApiOperation(value = "VMS 정보제공구간 관계 전체조회(TB_VMS_IFSC_RLTN)", response = TbVmsIfscRltnDto.class)
+    @GetMapping(value = "/figure", produces = {"application/json; charset=utf8"})
+    public List<TbVmsIfscRltnDto> findAllFigure() {
+        return service.findAllFigure();
+    }
+
     @ApiOperation(value = "VMS 정보제공구간 관계 개별조회(TB_VMS_IFSC_RLTN)", response = TbVmsIfscRltnDto.class)
     @GetMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
     public List<TbVmsIfscRltnDto> findDataById(@PathVariable("id") final Long vmsCtlrNmbr) {

+ 5 - 0
src/main/java/com/its/op/dto/its/vms/TbVmsIfscRltnDto.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import javax.persistence.Column;
 import javax.validation.constraints.PositiveOrZero;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -36,6 +37,10 @@ public class TbVmsIfscRltnDto implements Serializable {
     @JsonProperty("vms_nm")
     private String vmsNm;
 
+    @ApiModelProperty("VMS 유형 코드")  // Y VARCHAR(7)
+    @Column(name = "VMS_TYPE_CD", length = 7)
+    private String vmsTypeCd;
+
     @ApiModelProperty("VMS 정보제공구간 ID")  // N NUMBER(10)
     @JsonProperty("vms_ifsc_id")
     private Long vmsIfscId;

+ 1 - 0
src/main/java/com/its/op/entity/its/vms/TbVmsIfscRltn.java

@@ -67,6 +67,7 @@ public class TbVmsIfscRltn implements Serializable {
             dto.setVmsId(this.vms.getVmsId());
             dto.setVmsCtlrId(this.vms.getVmsCtlrId());
             dto.setVmsNm(this.vms.getVmsNm());
+            dto.setVmsTypeCd(this.vms.getVmsTypeCd());
         }
         return dto;
     }

+ 26 - 0
src/main/java/com/its/op/service/its/vms/TbVmsIfscRltnService.java

@@ -36,6 +36,32 @@ public class TbVmsIfscRltnService {
         return result;
     }
 
+    public List<TbVmsIfscRltnDto> findAllFigure() {
+        List<TbVmsIfscRltnDto> result = new ArrayList<>();
+        List<TbVmsIfscRltn> data = this.repo.findAll();
+        for (TbVmsIfscRltn obj : data) {
+            if (obj.getIfsc() != null && obj.getVms() != null && ("VMP1").equals(obj.getVms().getVmsTypeCd())) {
+                if (!("Y").equals(obj.getVms().getDelYn()) && !("EDI2").equals(obj.getIfsc().getEdtnCd())) {
+                    // 삭제 된것 제외
+                    result.add(obj.toDto());
+                }
+            }
+        }
+        return result;
+//
+//        List<TbVmsIfscRltnDto> result = new ArrayList<>();
+//        List<TbVmsIfscRltn> list = this.repo.findDataAll();
+//        for (TbVmsIfscRltn obj : list) {
+//            if (obj.getIfsc() != null && obj.getVms() != null && ("VMP1").equals(obj.getVms().getVmsTypeCd())) {
+//                if (!("Y").equals(obj.getVms().getDelYn()) && !("EDI2").equals(obj.getIfsc().getEdtnCd())) {
+//                    // 삭제 된것 제외
+//                    result.add(obj.toDto());
+//                }
+//            }
+//        }
+//        return result;
+    }
+
     // 데이터 1건 조회(기존 데이터가 반드시 존재해야 함)
     public TbVmsIfscRltnDto findById(TbVmsIfscRltnKey id) {
         TbVmsIfscRltn entity = requireOne(id);