Merge http://115.91.94.42:3000/PYEONGTAEK/its-op-server

src/main/java/com/its/op/controller/its/scrs/TbScIxrCmraMngmController.java

@@ -60,7 +60,8 @@ public class TbScIxrCmraMngmController {
     @ApiOperation(value = "카메라 관리 정보삭제-개별(TB_SC_IXR_CMRA_MNGM)", response = TbScIxrCmraMngmDto.class)
     @DeleteMapping(value = "/{ixrId}/{cmraId}/{drctDvsnCd}", produces = {"application/json; charset=utf8"})
     public TbScIxrCmraMngmDto deleteDataById(@PathVariable("ixrId") final String ixrId, @PathVariable("cmraId") final String cmraId, @PathVariable("drctDvsnCd") final Integer drctDvsnCd) {
-        TbScIxrCmraMngmKey ixrKey = new TbScIxrCmraMngmKey(ixrId, cmraId, drctDvsnCd);
+//        TbScIxrCmraMngmKey ixrKey = new TbScIxrCmraMngmKey(ixrId, cmraId, drctDvsnCd);
+        TbScIxrCmraMngmKey ixrKey = new TbScIxrCmraMngmKey(ixrId, cmraId);
         return this.service.deleteById(ixrKey);
     }
 

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

@@ -43,7 +43,7 @@ public class TbScIxrCmraMngm implements Serializable {
     private String cmraId;
 
     @ApiModelProperty("방향 구분 코드")  // N NUMBER(1)
-    @Id
+//    @Id
     @Column(name = "DRCT_DVSN_CD", nullable = false, columnDefinition = "NUMBER", length = 1)
     private Integer drctDvsnCd;
 

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

@@ -22,6 +22,6 @@ public class TbScIxrCmraMngmKey implements Serializable {
     private String cmraId;
 
     // DRCT_DVSN_CD, 방향 구분 코드  // N NUMBER(1)
-    private Integer drctDvsnCd;
+//    private Integer drctDvsnCd;
 
 }