shjung 3 éve
szülő
commit
377fb4bf09

+ 2 - 2
src/main/java/com/its/api/its/controller/vms/TbVmsMsgDsplSchController.java

@@ -219,7 +219,7 @@ public class TbVmsMsgDsplSchController {
      */
     @ApiOperation(value = "VMS 교통 정보 표출 일정 정보변경/생성-목록[전체 VMS 등록 - 저장](TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsMsgDsplSchDto.class, responseContainer = "ArrayList")
     @PostMapping(value = "/batch", produces = {"application/json; charset=utf8"})
-    public List<TbVmsMsgDsplSchDto> batchCreateInfoList(@RequestBody @Valid final List<TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchUpdReq> listReq) {
+    public List<TbVmsMsgDsplSchDto> batchCreateInfoList(@RequestBody @Valid final List<TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchEditUpdReq> listReq) {
         return this.service.batchCreateInfoList(listReq);
     }
 
@@ -230,7 +230,7 @@ public class TbVmsMsgDsplSchController {
      */
     @ApiOperation(value = "VMS 교통 정보 표출 일정 정보변경/생성-목록[전체 VMS 편집 - 저장](TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsMsgDsplSchDto.class, responseContainer = "ArrayList")
     @PutMapping(value = "/batch", produces = {"application/json; charset=utf8"})
-    public List<TbVmsMsgDsplSchDto> batchMergeInfoList(@RequestBody @Valid final List<TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchUpdReq> listReq) {
+    public List<TbVmsMsgDsplSchDto> batchMergeInfoList(@RequestBody @Valid final List<TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchEditUpdReq> listReq) {
         return this.service.batchMergeInfoList(listReq);
     }
 

+ 90 - 4
src/main/java/com/its/api/its/model/dto/vms/TbVmsMsgDsplSchDto.java

@@ -233,15 +233,15 @@ public class TbVmsMsgDsplSchDto implements Serializable {
                     .trfcSituTypeCd(this.trfcSituTypeCd)
                     .phase(this.phase)
                     .vmsFormId(this.vmsFormId)
+                    .dsplStrtHh(this.dsplStrtHh)
+                    .dsplEndHh(this.dsplEndHh)
+                    .dsplHh(this.dsplHh)
+                    .useYn(this.useYn)
                     .frstVmsIfscId(this.frstVmsIfscId)
                     .secdVmsIfscId(this.secdVmsIfscId)
                     .vmsFormPrrtCd(this.vmsFormPrrtCd)
-                    .dsplHh(this.dsplHh)
-                    .dsplStrtHh(this.dsplStrtHh)
-                    .dsplEndHh(this.dsplEndHh)
                     .thirVmsIfscId(this.thirVmsIfscId)
                     .fourVmsIfscId(this.fourVmsIfscId)
-                    .useYn(this.useYn)
                     .frstImgIfscId(this.frstImgIfscId)
                     .secdImgIfscId(this.secdImgIfscId)
                     .thirImgIfscId(this.thirImgIfscId)
@@ -250,6 +250,92 @@ public class TbVmsMsgDsplSchDto implements Serializable {
         }
 
     }
+
+
+    @ApiModel("TbVmsTrfcInfrDsplSchEditUpdReq(VMS 교통 정보 표출 일정 편집 정보 일괄 변경)")
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor(access = AccessLevel.PROTECTED)
+    public static class TbVmsTrfcInfrDsplSchEditUpdReq {
+
+        @ApiModelProperty("VMS 제어기 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
+        @JsonProperty("vms_ctlr_nmbr")
+        @PositiveOrZero
+        private Long vmsCtlrNmbr;
+
+        @ApiModelProperty("스케줄 유형 코드(0:교통정보,1:돌발,2:공사/행사문안,3:홍보문안,4:우회도로,5:고정스케줄, 6:기본스케줄), Nullable = N, VARCHAR(7)")  // N VARCHAR(7)
+        @JsonProperty("trfc_situ_type_cd")
+        @Size(min=1, max=7)
+        private String trfcSituTypeCd;
+
+        @ApiModelProperty("PHASE, Nullable = N, NUMBER(2)")  // N NUMBER(2)
+        @JsonProperty("phase")
+        @PositiveOrZero
+        private Integer phase;
+
+        @ApiModelProperty("VMS FORM ID, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
+        @JsonProperty("vms_form_id")
+        @PositiveOrZero
+        private Integer vmsFormId;
+
+        @ApiModelProperty("표출 시간, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
+        @JsonProperty("dspl_hh")
+        @PositiveOrZero
+        private Integer dsplHh;
+
+        @ApiModelProperty("표출 시작 시간, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
+        @JsonProperty("dspl_strt_hh")
+        @Size(min=1, max=14)
+        private String dsplStrtHh;
+
+        @ApiModelProperty("표출 종료 시간, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
+        @JsonProperty("dspl_end_hh")
+        @Size(min=1, max=14)
+        private String dsplEndHh;
+
+        @ApiModelProperty("사용여부(Y:시용,N:사용안함), Nullable = Y, CHAR(1)")  // Y CHAR(1)
+        @JsonProperty("use_yn")
+        @Size(min=1, max=1)
+        @Pattern(regexp = "[YN]")
+        private String useYn;
+
+        @Builder
+        public TbVmsTrfcInfrDsplSchEditUpdReq(Long vms_ctlr_nmbr, String trfc_situ_type_cd, Integer phase, Integer vms_form_id, Integer dspl_hh, String dspl_strt_hh, String dspl_end_hh, String use_yn) {
+            this.vmsCtlrNmbr = vms_ctlr_nmbr;
+            this.trfcSituTypeCd = trfc_situ_type_cd;
+            this.phase = phase;
+            this.vmsFormId = vms_form_id;
+            this.dsplHh = dspl_hh;
+            this.dsplStrtHh = dspl_strt_hh;
+            this.dsplEndHh = dspl_end_hh;
+            this.useYn = use_yn;
+        }
+
+        public TbVmsMsgDsplSch toEntity() {
+            return TbVmsMsgDsplSch.builder()
+                    .vmsCtlrNmbr(this.vmsCtlrNmbr)
+                    .trfcSituTypeCd(this.trfcSituTypeCd)
+                    .phase(this.phase)
+                    .vmsFormId(this.vmsFormId)
+                    .dsplStrtHh(this.dsplStrtHh)
+                    .dsplEndHh(this.dsplEndHh)
+                    .dsplHh(this.dsplHh)
+                    .useYn(this.useYn)
+                    .vmsFormPrrtCd(null)
+                    .frstVmsIfscId(null)
+                    .secdVmsIfscId(null)
+                    .thirVmsIfscId(null)
+                    .fourVmsIfscId(null)
+                    .frstImgIfscId(null)
+                    .secdImgIfscId(null)
+                    .thirImgIfscId(null)
+                    .fourImgIfscId(null)
+                    .build();
+        }
+
+    }
+
     @ApiModel("TbVmsTrfcInfrDsplSchDelReq(VMS 교통 정보 표출 일정 정보삭제)")
     @Getter
     @Setter

+ 1 - 1
src/main/java/com/its/api/its/model/entity/vms/TbVmsMsgDsplSch.java

@@ -102,7 +102,7 @@ public class TbVmsMsgDsplSch implements Serializable {
     @NotFound(action = NotFoundAction.IGNORE)
     private TbVmsForm form = new TbVmsForm();
 
-    public void setEditInfo(TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchUpdReq dto) {
+    public void setEditInfo(TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchEditUpdReq dto) {
         this.dsplStrtHh = dto.getDsplStrtHh();
         this.dsplEndHh = dto.getDsplEndHh();
         this.dsplHh = dto.getDsplHh();

+ 4 - 4
src/main/java/com/its/api/its/service/vms/TbVmsMsgDsplSchService.java

@@ -421,9 +421,9 @@ public class TbVmsMsgDsplSchService {
      * @return
      */
     @Transactional
-    public List<TbVmsMsgDsplSchDto> batchCreateInfoList(List<TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchUpdReq> reqList) {
+    public List<TbVmsMsgDsplSchDto> batchCreateInfoList(List<TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchEditUpdReq> reqList) {
         List<TbVmsMsgDsplSchDto> result = new ArrayList<>();
-        for (TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchUpdReq req : reqList) {
+        for (TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchEditUpdReq req : reqList) {
             TbVmsMsgDsplSch obj = req.toEntity();
             if (!("8".equals(req.getTrfcSituTypeCd()))) {
                 // 재난 안전 폼이 아닌경우 해당 폼 유형에서 최대 PHASE 로 설정 한다.
@@ -444,9 +444,9 @@ public class TbVmsMsgDsplSchService {
      * @return
      */
     @Transactional
-    public List<TbVmsMsgDsplSchDto> batchMergeInfoList(List<TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchUpdReq> reqList) {
+    public List<TbVmsMsgDsplSchDto> batchMergeInfoList(List<TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchEditUpdReq> reqList) {
         List<TbVmsMsgDsplSchDto> result = new ArrayList<>();
-        for (TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchUpdReq req : reqList) {
+        for (TbVmsMsgDsplSchDto.TbVmsTrfcInfrDsplSchEditUpdReq req : reqList) {
 
             TbVmsMsgDsplSchKey key = new TbVmsMsgDsplSchKey(req.getVmsCtlrNmbr(), req.getTrfcSituTypeCd(), req.getPhase());
             try {