shjung 2 жил өмнө
parent
commit
8fb647dc79

+ 8 - 8
src/main/java/com/its/op/controller/its/vms/TbVmsDsplSchAutoController.java

@@ -40,21 +40,21 @@ public class TbVmsDsplSchAutoController {
 
     /**
      * 교통정보 폼 스케쥴 정보제공구간 요청
-     * @param id
-     * @param type
+     * @param ctlrId
+     * @param schType
      * @return
      */
     @ApiOperation(value = "VMS 제어기 유형별 폼 스케줄 목록 조회(TB_VMS_TRFC_INFR_DSPL_SCH)", response = VmsFormIfscDto.class)
-    @GetMapping(value = "/form/ifsc/{id}/{type}/{phase}", produces = {"application/json; charset=utf8"})
+    @GetMapping(value = "/form/ifsc/{ctlrId}/{schType}/{phase}", produces = {"application/json; charset=utf8"})
     public VmsFormIfscDto findAllVmsFormIfsc(
-            @ApiParam(name = "id", value = "VMS 제어기 관리번호", example = "10005", required = true)
-            @PathVariable final Long id,
-            @ApiParam(name = "type", value = "VMS 스케쥴 코드(0:교통정보,1:돌발,2:공사/행사,3:홍보,4:우회도로,7:정체,8:재난안전)", example = "0", required = true)
-            @PathVariable final Integer type,
+            @ApiParam(name = "ctlrId", value = "VMS 제어기 관리번호", example = "10005", required = true)
+            @PathVariable final Long ctlrId,
+            @ApiParam(name = "schType", value = "VMS 스케쥴 코드(0:교통정보,1:돌발,2:공사/행사,3:홍보,4:우회도로,7:정체,8:재난안전)", example = "0", required = true)
+            @PathVariable final Integer schType,
             @ApiParam(name = "phase", value = "스케쥴 PHASE", example = "1", required = true)
             @PathVariable final Integer phase
     ) {
-        return this.service.findAllVmsFormIfsc(id, "A", type, phase);
+        return this.service.findAllVmsFormIfsc(ctlrId, "A", schType, phase);
     }
 
 

+ 4 - 0
src/main/java/com/its/op/dto/its/vms/TbVmsDsplSchDto.java

@@ -145,6 +145,10 @@ public class TbVmsDsplSchDto implements Serializable {
     @JsonProperty("imag_fmt")
     private String imagFmt;
 
+    @ApiModelProperty("VMS FORM 유형 코드")  // N NUMBER(3)
+    @JsonProperty("vms_form_type_cd")
+    private Integer vmsFormTypeCd;
+
     @ApiModel("TbVmsTrfcInfrDsplSchUpdReq(VMS 교통 정보 표출 일정 정보변경)")
     @Getter
     @Setter

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

@@ -186,7 +186,7 @@ public class TbVmsDsplSch implements Serializable {
                 .build();
 
         if (this.form != null) {
-            // TODO dto.setVmsFormTypeCd(this.form.getVmsFormTypeCd());
+            dto.setVmsFormTypeCd(this.form.getVmsFormTypeCd());
             dto.setVmsFormImag(ItsUtils.convertBmpToPng(this.form.getVmsFormImag()));
             dto.setImagFmt("png");
         }