dev 3

src/main/java/com/its/op/controller/its/cctv/CctvControlController.java

@@ -25,6 +25,12 @@ public class CctvControlController {
     private final CctvControlService service;
     private final LoginController loginController;
 
+//    @GetMapping("/ex_redirect2")
+//    public ModelAndView exRedirect2() {
+//        String uri = String.format("http://115.91.94.42:8903/api/cctv/control/status/%d", );
+//        String projectUrl = "redirect:http://www.naver.com";
+//        return new ModelAndView("redirect:" + projectUrl);
+//    }
     @ApiOperation(value = "CCTV PTZ 제어", response = CctvControlDto.CctvControlRes.class)
     @PostMapping(value = "/ptz/{id}", produces = {"application/json; charset=utf8"})
     public CctvControlDto.CctvControlRes controlPtz(

src/main/java/com/its/op/dto/its/scrs/TbScIxrCmraMngmDto.java

@@ -95,6 +95,10 @@ public class TbScIxrCmraMngmDto implements Serializable {
     @JsonProperty("srvc_anly_en")
     private Integer srvcAnlyEn;
 
+    @ApiModelProperty("차선수")  // Y NUMBER(2)
+    @JsonProperty("lane_cnt")
+    private Integer laneCnt;
+
     // Code Description Field
     @ApiModelProperty("방향 구분 코드 설명")
     @JsonProperty("drct_dvsn_desc")    // DRCT_DVSN_CD
@@ -202,8 +206,13 @@ public class TbScIxrCmraMngmDto implements Serializable {
         @PositiveOrZero
         private Integer srvcAnlyEn;
 
+        @ApiModelProperty("차선수, Nullable = Y, NUMBER(2)")  // Y NUMBER(3)
+        @JsonProperty("lane_cnt")
+        @PositiveOrZero
+        private Integer laneCnt;
+
         @Builder
-        public TbScIxrCmraMngmUpdReq(String ixr_id, String cmra_id, Integer drct_dvsn_cd, String istl_lctn, String cmra_ip, String cmra_port, Integer use_en, String cmra_logn_id, String cmra_logn_pw, Integer cmra_http_port, String stre_url, String cmra_url, Integer cmra_type, String cmra_x_crdn, String cmra_y_crdn, Integer cmra_angl, Integer hmpg_dspl_en, Integer bus_dvrs_lane_en, Integer srvc_anly_en) {
+        public TbScIxrCmraMngmUpdReq(String ixr_id, String cmra_id, Integer drct_dvsn_cd, String istl_lctn, String cmra_ip, String cmra_port, Integer use_en, String cmra_logn_id, String cmra_logn_pw, Integer cmra_http_port, String stre_url, String cmra_url, Integer cmra_type, String cmra_x_crdn, String cmra_y_crdn, Integer cmra_angl, Integer hmpg_dspl_en, Integer bus_dvrs_lane_en, Integer srvc_anly_en, Integer lane_cnt) {
             this.ixrId = ixr_id;
             this.cmraId = cmra_id;
             this.drctDvsnCd = drct_dvsn_cd;
@@ -223,6 +232,7 @@ public class TbScIxrCmraMngmDto implements Serializable {
             this.hmpgDsplEn = hmpg_dspl_en;
             this.busDvrsLaneEn = bus_dvrs_lane_en;
             this.srvcAnlyEn = srvc_anly_en;
+            this.laneCnt = lane_cnt;
         }
 
         public TbScIxrCmraMngm toEntity() {
@@ -246,6 +256,7 @@ public class TbScIxrCmraMngmDto implements Serializable {
                     .hmpgDsplEn(this.hmpgDsplEn)
                     .busDvrsLaneEn(this.busDvrsLaneEn)
                     .srvcAnlyEn(this.srvcAnlyEn)
+                    .laneCnt(this.laneCnt)
                     .build();
         }
 

src/main/java/com/its/op/dto/its/scrs/TbScIxrMngmDto.java

@@ -55,6 +55,10 @@ public class TbScIxrMngmDto implements Serializable {
     @JsonProperty("use_en")
     private Integer useEn;
 
+    @ApiModelProperty("노드ID")  // N NUMBER(10)
+    @JsonProperty("node_id")
+    private Long nodeId;
+
     // Code Description Field
     @ApiModel("TbScIxrMngmUpdReq(교차로 관리 정보변경)")
     @Getter
@@ -108,8 +112,13 @@ public class TbScIxrMngmDto implements Serializable {
         @PositiveOrZero
         private Integer useEn;
 
+        @ApiModelProperty("노드ID, Nullable = Y, NUMBER(10)")  // N NUMBER(10)
+        @JsonProperty("node_id")
+        @PositiveOrZero
+        private Long nodeId;
+
         @Builder
-        public TbScIxrMngmUpdReq(String ixr_id, String ixr_nm, Integer phas_cnt, String spot_fetr, String ixr_x_crdn, String ixr_y_crdn, Integer ixr_type, Integer dvsn, Integer use_en) {
+        public TbScIxrMngmUpdReq(String ixr_id, String ixr_nm, Integer phas_cnt, String spot_fetr, String ixr_x_crdn, String ixr_y_crdn, Integer ixr_type, Integer dvsn, Integer use_en, Long node_id) {
             this.ixrId = ixr_id;
             this.ixrNm = ixr_nm;
             this.phasCnt = phas_cnt;
@@ -119,6 +128,7 @@ public class TbScIxrMngmDto implements Serializable {
             this.ixrType = ixr_type;
             this.dvsn = dvsn;
             this.useEn = use_en;
+            this.nodeId = node_id;
         }
 
         public TbScIxrMngm toEntity() {
@@ -132,6 +142,7 @@ public class TbScIxrMngmDto implements Serializable {
                     .ixrType(this.ixrType)
                     .dvsn(this.dvsn)
                     .useEn(this.useEn)
+                    .nodeId(this.nodeId)
                     .build();
         }
 

src/main/java/com/its/op/entity/its/scrs/TbScIxrCmraMngm.java

@@ -104,6 +104,10 @@ public class TbScIxrCmraMngm implements Serializable {
     @Column(name = "SRVC_ANLY_EN", columnDefinition = "NUMBER", length = 1)
     private Integer srvcAnlyEn;
 
+    @ApiModelProperty("차선수")  // Y NUMBER(3)
+    @Column(name = "LANE_CNT", columnDefinition = "NUMBER", length = 2)
+    private Integer laneCnt;
+
     public TbScIxrCmraMngmDto toDto() {
         return TbScIxrCmraMngmDto.builder()
                 .ixrId(this.ixrId)
@@ -125,6 +129,7 @@ public class TbScIxrCmraMngm implements Serializable {
                 .hmpgDsplEn(this.hmpgDsplEn)
                 .busDvrsLaneEn(this.busDvrsLaneEn)
                 .srvcAnlyEn(this.srvcAnlyEn)
+                .laneCnt(this.laneCnt)
                 .build();
     }
 
@@ -151,6 +156,7 @@ public class TbScIxrCmraMngm implements Serializable {
         this.hmpgDsplEn = req.getHmpgDsplEn();
         this.busDvrsLaneEn = req.getBusDvrsLaneEn();
         this.srvcAnlyEn = req.getSrvcAnlyEn();
+        this.laneCnt = req.getLaneCnt();
     }
 
 }

src/main/java/com/its/op/entity/its/scrs/TbScIxrMngm.java

@@ -64,6 +64,10 @@ public class TbScIxrMngm implements Serializable {
     @Column(name = "USE_EN", columnDefinition = "NUMBER", length = 1)
     private Integer useEn;
 
+    @ApiModelProperty("노드ID")  // N NUMBER(10)
+    @Column(name = "NODE_ID", nullable = false, columnDefinition = "NUMBER", length = 10)
+    private Long nodeId;
+
     public TbScIxrMngmDto toDto() {
         return TbScIxrMngmDto.builder()
                 .ixrId(this.ixrId)
@@ -75,6 +79,7 @@ public class TbScIxrMngm implements Serializable {
                 .ixrType(this.ixrType)
                 .dvsn(this.dvsn)
                 .useEn(this.useEn)
+                .nodeId(this.nodeId)
                 .build();
     }
 
@@ -91,6 +96,7 @@ public class TbScIxrMngm implements Serializable {
         this.ixrType = req.getIxrType();
         this.dvsn = req.getDvsn();
         this.useEn = req.getUseEn();
+        this.nodeId = req.getNodeId();
     }
 
 }