shjung 3 gadi atpakaļ
vecāks
revīzija
226fc0c1d5
100 mainītis faili ar 950 papildinājumiem un 192 dzēšanām
  1. 53 10
      src/main/java/com/its/op/controller/cctv/TbCctvCtlrController.java
  2. 40 0
      src/main/java/com/its/op/controller/cctv/TbCctvCtlrSttsController.java
  3. 41 0
      src/main/java/com/its/op/controller/cctv/TbCctvCtlrSttsHsController.java
  4. 73 0
      src/main/java/com/its/op/controller/cctv/TbCctvMonitoringController.java
  5. 6 7
      src/main/java/com/its/op/controller/cctv/mybatis/CctvCameraControllerMybatis.java
  6. 6 7
      src/main/java/com/its/op/controller/cctv/mybatis/CctvSttsControllerMybatis.java
  7. 6 7
      src/main/java/com/its/op/controller/cctv/mybatis/CctvSttsHsControllerMybatis.java
  8. 23 0
      src/main/java/com/its/op/controller/cctv/mybatis/TbCctvCtlrControllerMybatis.java
  9. 4 4
      src/main/java/com/its/op/controller/common/CommonController.java
  10. 1 1
      src/main/java/com/its/op/controller/database/LinkPrcsParaController.java
  11. 5 5
      src/main/java/com/its/op/controller/database/TbAtrdController.java
  12. 2 2
      src/main/java/com/its/op/controller/database/TbClctSystStupController.java
  13. 3 3
      src/main/java/com/its/op/controller/database/TbCmtrGradClsfController.java
  14. 2 2
      src/main/java/com/its/op/controller/database/TbCnctIntnController.java
  15. 2 2
      src/main/java/com/its/op/controller/database/TbGropMenuAthrController.java
  16. 4 4
      src/main/java/com/its/op/controller/database/TbIfscController.java
  17. 17 2
      src/main/java/com/its/op/controller/database/TbLeglHldyInfrController.java
  18. 2 2
      src/main/java/com/its/op/controller/database/TbLinkController.java
  19. 2 2
      src/main/java/com/its/op/controller/database/TbLinkParaClctSystController.java
  20. 2 2
      src/main/java/com/its/op/controller/database/TbLinkParaDetlController.java
  21. 2 2
      src/main/java/com/its/op/controller/database/TbLinkParaStupController.java
  22. 2 2
      src/main/java/com/its/op/controller/database/TbNodeController.java
  23. 2 2
      src/main/java/com/its/op/controller/database/TbParkingLotController.java
  24. 4 4
      src/main/java/com/its/op/controller/database/TbRoadController.java
  25. 2 2
      src/main/java/com/its/op/controller/database/TbUnitSystController.java
  26. 2 2
      src/main/java/com/its/op/controller/database/TbUserInfrController.java
  27. 3 3
      src/main/java/com/its/op/controller/history/TbUnitSystSttsHsController.java
  28. 6 6
      src/main/java/com/its/op/controller/traffic/CurrentTrafficController.java
  29. 5 4
      src/main/java/com/its/op/global/CodeManager.java
  30. 3 3
      src/main/java/com/its/op/global/NodeManager.java
  31. 97 0
      src/main/java/com/its/op/model/dto/cctv/CctvCtlrDto.java
  32. 45 0
      src/main/java/com/its/op/model/dto/cctv/CctvCtlrSttsDto.java
  33. 29 0
      src/main/java/com/its/op/model/dto/cctv/CctvCtlrSttsHsDto.java
  34. 60 0
      src/main/java/com/its/op/model/dto/cctv/CctvMonitoringDto.java
  35. 2 2
      src/main/java/com/its/op/model/dto/database/AtrdDto.java
  36. 2 2
      src/main/java/com/its/op/model/dto/database/AtrdRoadRltnDto.java
  37. 2 2
      src/main/java/com/its/op/model/dto/database/ClctSystStupDto.java
  38. 1 1
      src/main/java/com/its/op/model/dto/database/CmmnCdDto.java
  39. 1 1
      src/main/java/com/its/op/model/dto/database/CmmnClsfCdDto.java
  40. 2 2
      src/main/java/com/its/op/model/dto/database/CmtrGradClsfDto.java
  41. 2 2
      src/main/java/com/its/op/model/dto/database/CnctIntnDto.java
  42. 4 4
      src/main/java/com/its/op/model/dto/database/GropMenuAthrDto.java
  43. 2 2
      src/main/java/com/its/op/model/dto/database/IfscDto.java
  44. 2 2
      src/main/java/com/its/op/model/dto/database/IfscLinkRltnDto.java
  45. 2 2
      src/main/java/com/its/op/model/dto/database/IfscTrafDto.java
  46. 18 2
      src/main/java/com/its/op/model/dto/database/LeglHldyInfrDto.java
  47. 2 2
      src/main/java/com/its/op/model/dto/database/LinkDto.java
  48. 2 2
      src/main/java/com/its/op/model/dto/database/LinkParaClctSystDto.java
  49. 2 2
      src/main/java/com/its/op/model/dto/database/LinkParaDetlDto.java
  50. 2 2
      src/main/java/com/its/op/model/dto/database/LinkParaStupDto.java
  51. 4 4
      src/main/java/com/its/op/model/dto/database/LinkPrcsParaDto.java
  52. 2 2
      src/main/java/com/its/op/model/dto/database/LinkTrafDto.java
  53. 2 2
      src/main/java/com/its/op/model/dto/database/NodeDto.java
  54. 2 2
      src/main/java/com/its/op/model/dto/database/ParkingLotDto.java
  55. 2 2
      src/main/java/com/its/op/model/dto/database/RoadDto.java
  56. 2 2
      src/main/java/com/its/op/model/dto/database/RoadIfscRltnDto.java
  57. 2 2
      src/main/java/com/its/op/model/dto/database/RoadTrafDto.java
  58. 2 2
      src/main/java/com/its/op/model/dto/database/UnitSystDto.java
  59. 1 1
      src/main/java/com/its/op/model/dto/database/UnitSystSttsDto.java
  60. 2 2
      src/main/java/com/its/op/model/dto/database/UserInfrDto.java
  61. 1 1
      src/main/java/com/its/op/model/dto/history/UnitSystSttsHsDto.java
  62. 103 0
      src/main/java/com/its/op/model/entity/cctv/CctvCtlr.java
  63. 41 0
      src/main/java/com/its/op/model/entity/cctv/CctvCtlrStts.java
  64. 37 0
      src/main/java/com/its/op/model/entity/cctv/CctvCtlrSttsHs.java
  65. 20 0
      src/main/java/com/its/op/model/entity/cctv/CctvCtlrSttsHsKey.java
  66. 58 0
      src/main/java/com/its/op/model/entity/cctv/CctvMonitoring.java
  67. 19 0
      src/main/java/com/its/op/model/entity/cctv/CctvMonitoringKey.java
  68. 2 2
      src/main/java/com/its/op/model/entity/database/Atrd.java
  69. 1 1
      src/main/java/com/its/op/model/entity/database/AtrdRoadRltn.java
  70. 1 1
      src/main/java/com/its/op/model/entity/database/AtrdRoadRltnKey.java
  71. 1 1
      src/main/java/com/its/op/model/entity/database/AuditingEntity.java
  72. 1 1
      src/main/java/com/its/op/model/entity/database/BaseEntity.java
  73. 1 1
      src/main/java/com/its/op/model/entity/database/ClctSystStup.java
  74. 1 1
      src/main/java/com/its/op/model/entity/database/CmmnCd.java
  75. 1 1
      src/main/java/com/its/op/model/entity/database/CmmnCdKey.java
  76. 1 1
      src/main/java/com/its/op/model/entity/database/CmmnClsfCd.java
  77. 2 2
      src/main/java/com/its/op/model/entity/database/CmtrGradClsf.java
  78. 1 1
      src/main/java/com/its/op/model/entity/database/CmtrGradClsfKey.java
  79. 2 2
      src/main/java/com/its/op/model/entity/database/CnctIntn.java
  80. 2 2
      src/main/java/com/its/op/model/entity/database/GropMenuAthr.java
  81. 1 1
      src/main/java/com/its/op/model/entity/database/GropMenuAthrKey.java
  82. 2 2
      src/main/java/com/its/op/model/entity/database/Ifsc.java
  83. 1 1
      src/main/java/com/its/op/model/entity/database/IfscKey.java
  84. 1 1
      src/main/java/com/its/op/model/entity/database/IfscLinkRltn.java
  85. 1 1
      src/main/java/com/its/op/model/entity/database/IfscLinkRltnKey.java
  86. 1 1
      src/main/java/com/its/op/model/entity/database/IfscTraf.java
  87. 2 2
      src/main/java/com/its/op/model/entity/database/LeglHldyInfr.java
  88. 2 2
      src/main/java/com/its/op/model/entity/database/Link.java
  89. 2 2
      src/main/java/com/its/op/model/entity/database/LinkParaClctSyst.java
  90. 1 1
      src/main/java/com/its/op/model/entity/database/LinkParaClctSystKey.java
  91. 2 2
      src/main/java/com/its/op/model/entity/database/LinkParaDetl.java
  92. 2 2
      src/main/java/com/its/op/model/entity/database/LinkParaStup.java
  93. 1 1
      src/main/java/com/its/op/model/entity/database/LinkTraf.java
  94. 2 2
      src/main/java/com/its/op/model/entity/database/Node.java
  95. 1 1
      src/main/java/com/its/op/model/entity/database/OperSystMenu.java
  96. 2 2
      src/main/java/com/its/op/model/entity/database/ParkingLot.java
  97. 2 2
      src/main/java/com/its/op/model/entity/database/Road.java
  98. 1 1
      src/main/java/com/its/op/model/entity/database/RoadIfscRltn.java
  99. 1 1
      src/main/java/com/its/op/model/entity/database/RoadIfscRltnKey.java
  100. 1 1
      src/main/java/com/its/op/model/entity/database/RoadTraf.java

+ 53 - 10
src/main/java/com/its/op/controller/cctv/TbCctvCtlrController.java

@@ -1,24 +1,67 @@
 package com.its.op.controller.cctv;
 
-import com.its.op.controller.AbstractDatabaseController;
-import com.its.op.service.cctv.impl.TbCctvCtlrServiceImpl;
-import com.its.op.model.vo.cctv.TbCctvCtlrVo;
+import com.its.op.model.dto.cctv.CctvCtlrDto;
+import com.its.op.model.entity.cctv.CctvCtlr;
+import com.its.op.service.cctv.TbCctvCtlrService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/api/cctv/manager")
 @Api(tags = "11.CCTV-1.CCTV 관리")//, description="CCTV")
-public class TbCctvCtlrController extends AbstractDatabaseController<TbCctvCtlrVo> {
+public class TbCctvCtlrController {
+
+    private final TbCctvCtlrService service;
+
+    @ApiOperation(value = "전체조회(TB_CCTV_CTLR)", response = CctvCtlrDto.CctvCtlrInfo.class)
+    @GetMapping(value = "", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<List<CctvCtlrDto.CctvCtlrInfo>> findAll() {
+        List<CctvCtlr> data = this.service.findAll();
+        List<CctvCtlrDto.CctvCtlrInfo> result = new ArrayList<>();
+        for (CctvCtlr obj: data) {
+            result.add(new CctvCtlrDto.CctvCtlrInfo(obj));
+        }
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
 
-    private final TbCctvCtlrServiceImpl service;
+    @ApiOperation(value = "개별조회(TB_CCTV_CTLR)", response = CctvCtlrDto.CctvCtlrInfo.class)
+    @GetMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<CctvCtlrDto.CctvCtlrInfo> findById(@PathVariable final Long id) {
+        CctvCtlr obj = this.service.findById(id);
+        if (obj != null) {
+            return new ResponseEntity<>(new CctvCtlrDto.CctvCtlrInfo(obj), HttpStatus.OK);
+        }
+        return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);//NO_CONTENT);
+    }
 
-    public TbCctvCtlrController(TbCctvCtlrServiceImpl service) {
-        super(service);
-        this.service = service;
+    @ApiOperation(value = "정보변경/생성(TB_CCTV_CTLR)", response = CctvCtlrDto.CctvCtlrInfo.class)
+    @PostMapping(value = "", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<CctvCtlrDto.CctvCtlrInfo> mergeInfo(@RequestBody @Valid final CctvCtlrDto.CctvCtlrUpdateReq req) {
+        CctvCtlr obj = this.service.mergeInfo(req);
+        if (obj != null) {
+            return new ResponseEntity<>(new CctvCtlrDto.CctvCtlrInfo(obj), HttpStatus.OK);
+        }
+        return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);//NO_CONTENT);
     }
 
+    @ApiOperation(value = "정보삭제(TB_CCTV_CTLR)", response = CctvCtlrDto.CctvCtlrInfo.class)
+    @DeleteMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<CctvCtlrDto.CctvCtlrInfo> deleteDataById(@PathVariable("id") Long id) {
+        CctvCtlr obj = this.service.deleteById(id);
+        if (obj != null) {
+            return new ResponseEntity<>(new CctvCtlrDto.CctvCtlrInfo(obj), HttpStatus.OK);
+        }
+        return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);//NO_CONTENT);
+    }
 }

+ 40 - 0
src/main/java/com/its/op/controller/cctv/TbCctvCtlrSttsController.java

@@ -0,0 +1,40 @@
+package com.its.op.controller.cctv;
+
+import com.its.op.model.dto.cctv.CctvCtlrSttsDto;
+import com.its.op.model.entity.cctv.CctvCtlrStts;
+import com.its.op.service.cctv.TbCctvCtlrSttsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/cctv/stts")
+@Api(tags = "11.CCTV-3.CCTV 상태 모니터링")//, description="CCTV 상태 모니터링")
+public class TbCctvCtlrSttsController {
+
+    private final TbCctvCtlrSttsService service;
+
+    @ApiOperation(value = "상태조회(TB_CCTV_STTS)", response = CctvCtlrSttsDto.CctvCtlrSttsInfo.class)
+    @GetMapping(value = "", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<List<CctvCtlrSttsDto.CctvCtlrSttsInfo>> findAll() {
+        List<CctvCtlrSttsDto.CctvCtlrSttsInfo> result = new ArrayList<>();
+        List<CctvCtlrStts> data = this.service.findAll();
+        for (CctvCtlrStts obj : data) {
+            if (obj.getCctv() != null && obj.getCctv().getDEL_YN().equals("N")) {
+                result.add(new CctvCtlrSttsDto.CctvCtlrSttsInfo(obj));
+            }
+        }
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+}

+ 41 - 0
src/main/java/com/its/op/controller/cctv/TbCctvCtlrSttsHsController.java

@@ -0,0 +1,41 @@
+package com.its.op.controller.cctv;
+
+import com.its.op.model.dto.cctv.CctvCtlrSttsHsDto;
+import com.its.op.model.entity.cctv.CctvCtlrSttsHs;
+import com.its.op.service.cctv.TbCctvCtlrSttsHsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/cctv/stts-hs")
+@Api(tags = "11.CCTV-2.CCTV 상태이력")//, description="CCTV 상태이력")
+public class TbCctvCtlrSttsHsController {
+
+    private final TbCctvCtlrSttsHsService service;
+
+    @ApiOperation(value = "이력조회(TB_CCTV_STTS_HS)", response = CctvCtlrSttsHsDto.CctvCtlrSttsHsInfo.class)
+    @GetMapping(value = "", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<List<CctvCtlrSttsHsDto.CctvCtlrSttsHsInfo>> findAllByDateRange(
+            @RequestParam String FROM_DT, @RequestParam String TO_DT, @RequestParam List<Long> idList
+    ) {
+        List<CctvCtlrSttsHsDto.CctvCtlrSttsHsInfo> result = new ArrayList<>();
+        List<CctvCtlrSttsHs> data = this.service.findAllByDateRange(FROM_DT, TO_DT, idList);
+        for (CctvCtlrSttsHs obj : data) {
+            result.add(new CctvCtlrSttsHsDto.CctvCtlrSttsHsInfo(obj));
+        }
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+}

+ 73 - 0
src/main/java/com/its/op/controller/cctv/TbCctvMonitoringController.java

@@ -0,0 +1,73 @@
+package com.its.op.controller.cctv;
+
+import com.its.op.model.dto.cctv.CctvMonitoringDto;
+import com.its.op.model.entity.cctv.CctvMonitoring;
+import com.its.op.service.cctv.TbCctvMonitoringService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/cctv/cmra-monitoring")
+@Api(tags = "11.CCTV-4.CCTV 카메라 모니터링")//, description="CCTV 카메라 모니터링")
+public class TbCctvMonitoringController {
+
+    private final TbCctvMonitoringService service;
+
+    @ApiOperation(value = "정보조회(TB_CCTV_MONITORING)", response = CctvMonitoringDto.CctvMonitoringInfo.class)
+    @GetMapping(value = "", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<List<CctvMonitoringDto.CctvMonitoringInfo>> findAll() {
+        List<CctvMonitoringDto.CctvMonitoringInfo> result = new ArrayList<>();
+        List<CctvMonitoring> data = this.service.findAll();
+        if (data != null) {
+            for (CctvMonitoring obj : data) {
+                result.add(new CctvMonitoringDto.CctvMonitoringInfo(obj));
+            }
+        }
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @ApiOperation(value = "개별정보조회(TB_CCTV_MONITORING)", response = CctvMonitoringDto.CctvMonitoringInfo.class)
+    @GetMapping(value = "/{name}", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<List<CctvMonitoringDto.CctvMonitoringInfo>> findById(@PathVariable final String name) {
+        List<CctvMonitoringDto.CctvMonitoringInfo> result = new ArrayList<>();
+        List<CctvMonitoring> data = this.service.findByName(name);
+        if (data != null) {
+            for (CctvMonitoring obj : data) {
+                result.add(new CctvMonitoringDto.CctvMonitoringInfo(obj));
+            }
+        }
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @ApiOperation(value = "정보변경/생성(TB_CCTV_MONITORING)", response = CctvMonitoringDto.CctvMonitoringUpdateReq.class)
+    @PostMapping(value = "", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<List<CctvMonitoringDto.CctvMonitoringUpdateReq>> mergeInfo(
+            @RequestBody final List<CctvMonitoringDto.CctvMonitoringUpdateReq> req) {
+        List<CctvMonitoringDto.CctvMonitoringUpdateReq> result = this.service.mergeInfo(req);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @ApiOperation(value = "정보삭제(TB_CCTV_MONITORING)", response = CctvMonitoringDto.CctvMonitoringInfo.class)
+    @DeleteMapping(value = "", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<List<CctvMonitoringDto.CctvMonitoringInfo>> deleteByName(@RequestBody final String name) {
+        List<CctvMonitoringDto.CctvMonitoringInfo> result = new ArrayList<>();
+        List<CctvMonitoring> data = this.service.deleteByName(name);
+        if (data != null) {
+            for (CctvMonitoring obj : data) {
+                result.add(new CctvMonitoringDto.CctvMonitoringInfo(obj));
+            }
+        }
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+}

+ 6 - 7
src/main/java/com/its/op/controller/cctv/CctvCameraController.java → src/main/java/com/its/op/controller/cctv/mybatis/CctvCameraControllerMybatis.java

@@ -1,22 +1,21 @@
-package com.its.op.controller.cctv;
+package com.its.op.controller.cctv.mybatis;
 
 import com.its.op.controller.AbstractDatabaseController;
-import com.its.op.service.cctv.impl.CctvCameraServiceImpl;
 import com.its.op.model.vo.cctv.CctvCameraVo;
+import com.its.op.service.cctv.impl.CctvCameraServiceImpl;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
-@RestController
-@RequestMapping("/api/cctv/camera")
+//@RestController
+@RequestMapping("/api-mybatis/cctv/camera")
 @Api(tags = "11.CCTV-4.CCTV 카메라 모니터링")//, description="CCTV 카메라 모니터링")
-public class CctvCameraController extends AbstractDatabaseController<CctvCameraVo> {
+public class CctvCameraControllerMybatis extends AbstractDatabaseController<CctvCameraVo> {
 
     private final CctvCameraServiceImpl service;
 
-    public CctvCameraController(CctvCameraServiceImpl service) {
+    public CctvCameraControllerMybatis(CctvCameraServiceImpl service) {
         super(service);
         this.service = service;
     }

+ 6 - 7
src/main/java/com/its/op/controller/cctv/CctvSttsController.java → src/main/java/com/its/op/controller/cctv/mybatis/CctvSttsControllerMybatis.java

@@ -1,7 +1,7 @@
-package com.its.op.controller.cctv;
+package com.its.op.controller.cctv.mybatis;
 
-import com.its.op.service.cctv.impl.CctvSttsServiceImpl;
 import com.its.op.model.vo.cctv.CctvSttsVo;
+import com.its.op.service.cctv.impl.CctvSttsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -9,20 +9,19 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Slf4j
-@RestController
-@RequestMapping("/api/cctv/stts")
+//@RestController
+@RequestMapping("/api-mybatis/cctv/stts")
 @Api(tags = "11.CCTV-3.CCTV 상태 모니터링")//, description="CCTV 상태 모니터링")
-public class CctvSttsController {
+public class CctvSttsControllerMybatis {
 
     private final CctvSttsServiceImpl service;
 
-    public CctvSttsController(CctvSttsServiceImpl service) {
+    public CctvSttsControllerMybatis(CctvSttsServiceImpl service) {
         this.service = service;
     }
 

+ 6 - 7
src/main/java/com/its/op/controller/cctv/CctvSttsHsController.java → src/main/java/com/its/op/controller/cctv/mybatis/CctvSttsHsControllerMybatis.java

@@ -1,23 +1,22 @@
-package com.its.op.controller.cctv;
+package com.its.op.controller.cctv.mybatis;
 
 import com.its.op.controller.AbstractHistoryController;
-import com.its.op.service.cctv.impl.CctvSttsHsServiceImpl;
 import com.its.op.model.vo.cctv.CctvSttsHsParam;
 import com.its.op.model.vo.cctv.CctvSttsVo;
+import com.its.op.service.cctv.impl.CctvSttsHsServiceImpl;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
-@RestController
-@RequestMapping("/api/cctv/history/stts")
+//@RestController
+@RequestMapping("/api-mybatis/cctv/history/stts")
 @Api(tags = "11.CCTV-2.CCTV 상태이력")//, description="CCTV 상태이력")
-public class CctvSttsHsController extends AbstractHistoryController<CctvSttsHsParam, CctvSttsVo> {
+public class CctvSttsHsControllerMybatis extends AbstractHistoryController<CctvSttsHsParam, CctvSttsVo> {
 
     private final CctvSttsHsServiceImpl service;
 
-    public CctvSttsHsController(CctvSttsHsServiceImpl service) {
+    public CctvSttsHsControllerMybatis(CctvSttsHsServiceImpl service) {
         super(service);
         this.service = service;
     }

+ 23 - 0
src/main/java/com/its/op/controller/cctv/mybatis/TbCctvCtlrControllerMybatis.java

@@ -0,0 +1,23 @@
+package com.its.op.controller.cctv.mybatis;
+
+import com.its.op.controller.AbstractDatabaseController;
+import com.its.op.model.vo.cctv.TbCctvCtlrVo;
+import com.its.op.service.cctv.impl.TbCctvCtlrServiceImpl;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Slf4j
+//@RestController
+@RequestMapping("/api-mybatis/cctv/manager")
+@Api(tags = "11.CCTV-1.CCTV 관리")//, description="CCTV")
+public class TbCctvCtlrControllerMybatis extends AbstractDatabaseController<TbCctvCtlrVo> {
+
+    private final TbCctvCtlrServiceImpl service;
+
+    public TbCctvCtlrControllerMybatis(TbCctvCtlrServiceImpl service) {
+        super(service);
+        this.service = service;
+    }
+
+}

+ 4 - 4
src/main/java/com/its/op/controller/common/CommonController.java

@@ -1,9 +1,9 @@
 package com.its.op.controller.common;
 
-import com.its.op.model.dto.ClctSystStupDto;
-import com.its.op.model.dto.UnitSystSttsDto;
-import com.its.op.model.entity.ClctSystStup;
-import com.its.op.model.entity.VwUnitSystStts;
+import com.its.op.model.dto.database.ClctSystStupDto;
+import com.its.op.model.dto.database.UnitSystSttsDto;
+import com.its.op.model.entity.database.ClctSystStup;
+import com.its.op.model.entity.database.VwUnitSystStts;
 import com.its.op.model.mapper.CommonEntityMapper;
 import com.its.op.model.vo.common.*;
 import com.its.op.service.common.impl.CommonServiceImpl;

+ 1 - 1
src/main/java/com/its/op/controller/database/LinkPrcsParaController.java

@@ -1,6 +1,6 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.LinkPrcsParaDto;
+import com.its.op.model.dto.database.LinkPrcsParaDto;
 import com.its.op.service.database.LinkPrcsParaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 5 - 5
src/main/java/com/its/op/controller/database/TbAtrdController.java

@@ -1,10 +1,10 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.AtrdDto;
-import com.its.op.model.dto.AtrdRoadRltnDto;
-import com.its.op.model.dto.RoadIfscRltnDto;
-import com.its.op.model.entity.Atrd;
-import com.its.op.model.entity.AtrdRoadRltn;
+import com.its.op.model.dto.database.AtrdDto;
+import com.its.op.model.dto.database.AtrdRoadRltnDto;
+import com.its.op.model.dto.database.RoadIfscRltnDto;
+import com.its.op.model.entity.database.Atrd;
+import com.its.op.model.entity.database.AtrdRoadRltn;
 import com.its.op.service.database.TbAtrdService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/its/op/controller/database/TbClctSystStupController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.ClctSystStupDto;
-import com.its.op.model.entity.ClctSystStup;
+import com.its.op.model.dto.database.ClctSystStupDto;
+import com.its.op.model.entity.database.ClctSystStup;
 import com.its.op.service.database.TbClctSystStupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 3 - 3
src/main/java/com/its/op/controller/database/TbCmtrGradClsfController.java

@@ -1,8 +1,8 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.CmtrGradClsfDto;
-import com.its.op.model.dto.CnctIntnDto;
-import com.its.op.model.entity.CmtrGradClsf;
+import com.its.op.model.dto.database.CmtrGradClsfDto;
+import com.its.op.model.dto.database.CnctIntnDto;
+import com.its.op.model.entity.database.CmtrGradClsf;
 import com.its.op.service.database.TbCmtrGradClsfService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/its/op/controller/database/TbCnctIntnController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.CnctIntnDto;
-import com.its.op.model.entity.CnctIntn;
+import com.its.op.model.dto.database.CnctIntnDto;
+import com.its.op.model.entity.database.CnctIntn;
 import com.its.op.service.database.TbCnctIntnService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/its/op/controller/database/TbGropMenuAthrController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.GropMenuAthrDto;
-import com.its.op.model.entity.GropMenuAthr;
+import com.its.op.model.dto.database.GropMenuAthrDto;
+import com.its.op.model.entity.database.GropMenuAthr;
 import com.its.op.service.database.TbGropMenuAthrService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 4 - 4
src/main/java/com/its/op/controller/database/TbIfscController.java

@@ -1,9 +1,9 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.IfscDto;
-import com.its.op.model.dto.IfscLinkRltnDto;
-import com.its.op.model.entity.Ifsc;
-import com.its.op.model.entity.IfscLinkRltn;
+import com.its.op.model.dto.database.IfscDto;
+import com.its.op.model.dto.database.IfscLinkRltnDto;
+import com.its.op.model.entity.database.Ifsc;
+import com.its.op.model.entity.database.IfscLinkRltn;
 import com.its.op.service.database.TbIfscService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 17 - 2
src/main/java/com/its/op/controller/database/TbLeglHldyInfrController.java

@@ -1,7 +1,10 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.LeglHldyInfrDto;
-import com.its.op.model.entity.LeglHldyInfr;
+import com.its.op.global.CodeManager;
+import com.its.op.model.dto.database.LeglHldyInfrDto;
+import com.its.op.model.entity.database.CmmnCd;
+import com.its.op.model.entity.database.LeglHldyInfr;
+import com.its.op.service.database.TbCmmnCdService;
 import com.its.op.service.database.TbLeglHldyInfrService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,6 +26,18 @@ import java.util.List;
 public class TbLeglHldyInfrController {
 
     private final TbLeglHldyInfrService service;
+    private final TbCmmnCdService cmmnCdService;
+
+    @ApiOperation(value = "휴일코드조회(TB_CMMN_CD)", response = LeglHldyInfrDto.HldyTypeInfo.class)
+    @GetMapping(value = "/hldy-type", produces = {"application/json; charset=utf8"})
+    public ResponseEntity<List<LeglHldyInfrDto.HldyTypeInfo>> findAllHldyType() {
+        List<LeglHldyInfrDto.HldyTypeInfo> result = new ArrayList<>();
+        List<CmmnCd> data = this.cmmnCdService.findAllByCmmnClsfCd(CodeManager.HLDY_DAY_CD);
+        for (CmmnCd obj: data) {
+            result.add(new LeglHldyInfrDto.HldyTypeInfo(obj));
+        }
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
 
     @ApiOperation(value = "전체조회(TB_LEGL_HLDY_INFR)", response = LeglHldyInfrDto.LeglHldyInfo.class)
     @GetMapping(value = "", produces = {"application/json; charset=utf8"})

+ 2 - 2
src/main/java/com/its/op/controller/database/TbLinkController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.LinkDto;
-import com.its.op.model.entity.Link;
+import com.its.op.model.dto.database.LinkDto;
+import com.its.op.model.entity.database.Link;
 import com.its.op.service.database.TbLinkService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/its/op/controller/database/TbLinkParaClctSystController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.LinkParaClctSystDto;
-import com.its.op.model.entity.LinkParaClctSyst;
+import com.its.op.model.dto.database.LinkParaClctSystDto;
+import com.its.op.model.entity.database.LinkParaClctSyst;
 import com.its.op.service.database.TbLinkParaClctSystService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/its/op/controller/database/TbLinkParaDetlController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.LinkParaDetlDto;
-import com.its.op.model.entity.LinkParaDetl;
+import com.its.op.model.dto.database.LinkParaDetlDto;
+import com.its.op.model.entity.database.LinkParaDetl;
 import com.its.op.service.database.TbLinkParaDetlService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/its/op/controller/database/TbLinkParaStupController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.LinkParaStupDto;
-import com.its.op.model.entity.LinkParaStup;
+import com.its.op.model.dto.database.LinkParaStupDto;
+import com.its.op.model.entity.database.LinkParaStup;
 import com.its.op.service.database.TbLinkParaStupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/its/op/controller/database/TbNodeController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.NodeDto;
-import com.its.op.model.entity.Node;
+import com.its.op.model.dto.database.NodeDto;
+import com.its.op.model.entity.database.Node;
 import com.its.op.service.database.TbNodeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/its/op/controller/database/TbParkingLotController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.ParkingLotDto;
-import com.its.op.model.entity.ParkingLot;
+import com.its.op.model.dto.database.ParkingLotDto;
+import com.its.op.model.entity.database.ParkingLot;
 import com.its.op.service.database.TbParkingLotService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 4 - 4
src/main/java/com/its/op/controller/database/TbRoadController.java

@@ -1,9 +1,9 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.RoadDto;
-import com.its.op.model.dto.RoadIfscRltnDto;
-import com.its.op.model.entity.Road;
-import com.its.op.model.entity.RoadIfscRltn;
+import com.its.op.model.dto.database.RoadDto;
+import com.its.op.model.dto.database.RoadIfscRltnDto;
+import com.its.op.model.entity.database.Road;
+import com.its.op.model.entity.database.RoadIfscRltn;
 import com.its.op.service.database.TbRoadService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/its/op/controller/database/TbUnitSystController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.UnitSystDto;
-import com.its.op.model.entity.UnitSyst;
+import com.its.op.model.dto.database.UnitSystDto;
+import com.its.op.model.entity.database.UnitSyst;
 import com.its.op.service.database.TbUnitSystService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/its/op/controller/database/TbUserInfrController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.database;
 
-import com.its.op.model.dto.UserInfrDto;
-import com.its.op.model.entity.UserInfr;
+import com.its.op.model.dto.database.UserInfrDto;
+import com.its.op.model.entity.database.UserInfr;
 import com.its.op.service.database.TbUserInfrService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 3 - 3
src/main/java/com/its/op/controller/history/TbUnitSystSttsHsController.java

@@ -1,9 +1,9 @@
 package com.its.op.controller.history;
 
-import com.its.op.model.dto.UnitSystDto;
-import com.its.op.model.entity.UnitSyst;
+import com.its.op.model.dto.database.UnitSystDto;
+import com.its.op.model.entity.database.UnitSyst;
 import com.its.op.model.entity.history.UnitSystSttsHs;
-import com.its.op.model.entity.history.dto.UnitSystSttsHsDto;
+import com.its.op.model.dto.history.UnitSystSttsHsDto;
 import com.its.op.service.database.TbUnitSystService;
 import com.its.op.service.history.TbUnitSystSttsHsService;
 import io.swagger.annotations.Api;

+ 6 - 6
src/main/java/com/its/op/controller/traffic/CurrentTrafficController.java

@@ -1,11 +1,11 @@
 package com.its.op.controller.traffic;
 
-import com.its.op.model.dto.IfscTrafDto;
-import com.its.op.model.dto.LinkTrafDto;
-import com.its.op.model.dto.RoadTrafDto;
-import com.its.op.model.entity.IfscTraf;
-import com.its.op.model.entity.LinkTraf;
-import com.its.op.model.entity.RoadTraf;
+import com.its.op.model.dto.database.IfscTrafDto;
+import com.its.op.model.dto.database.LinkTrafDto;
+import com.its.op.model.dto.database.RoadTrafDto;
+import com.its.op.model.entity.database.IfscTraf;
+import com.its.op.model.entity.database.LinkTraf;
+import com.its.op.model.entity.database.RoadTraf;
 import com.its.op.service.traffic.IfscTrafService;
 import com.its.op.service.traffic.LinkTrafService;
 import com.its.op.service.traffic.RoadTrafService;

+ 5 - 4
src/main/java/com/its/op/global/CodeManager.java

@@ -1,9 +1,9 @@
 package com.its.op.global;
 
-import com.its.op.model.entity.CmmnCd;
-import com.its.op.model.entity.SectGradClsf;
-import com.its.op.repository.CmmnCdRepository;
-import com.its.op.repository.SectGradClsfRepository;
+import com.its.op.model.entity.database.CmmnCd;
+import com.its.op.model.entity.database.SectGradClsf;
+import com.its.op.repository.database.CmmnCdRepository;
+import com.its.op.repository.database.SectGradClsfRepository;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +42,7 @@ public class CodeManager {
     public static final String DRCT_CD              = "IFD";    // 방향 코드
     public static final String HLDY_DAY_CD          = "LHT";    // 휴일유형코드
     public static final String CNCT_INTN_TYPE_CD    = "COT";    // 연계기관유형코드
+    public static final String CMNC_STTS_CD         = "CMS";    // 통신상태코드
 
     private static final ConcurrentHashMap<String, HashMap<String, Code>> codes = new ConcurrentHashMap<>();
 

+ 3 - 3
src/main/java/com/its/op/global/NodeManager.java

@@ -1,8 +1,8 @@
 package com.its.op.global;
 
-import com.its.op.model.dto.NodeDto;
-import com.its.op.model.entity.Node;
-import com.its.op.repository.NodeRepository;
+import com.its.op.model.dto.database.NodeDto;
+import com.its.op.model.entity.database.Node;
+import com.its.op.repository.database.NodeRepository;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+ 97 - 0
src/main/java/com/its/op/model/dto/cctv/CctvCtlrDto.java

@@ -0,0 +1,97 @@
+package com.its.op.model.dto.cctv;
+
+import com.its.op.model.entity.cctv.CctvCtlr;
+import lombok.*;
+
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Positive;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+public class CctvCtlrDto implements Serializable {
+
+    @Getter
+    public static class CctvCtlrInfo {
+
+        private final Long CCTV_MNGM_NMBR;     //	N	NUMBER(10)	    N			CCTV 관리 번호
+        private final String CCTV_CTLR_ID;       //	N	VARCHAR2(30)	Y			CCTV 제어기 ID
+        private final String CCTV_CTLR_IP;       //	N	VARCHAR2(20)	Y			CCTV 제어기 아이피
+        private final String CCTV_CTLR_PORT;     //	N	VARCHAR2(5)	    Y			CCTV 제어기 포트
+        private final String STRM_SESN_NM;       //	N	VARCHAR2(200)	Y			스트리밍 세션 명
+        private final Double X_CRDN;             //	N	NUMBER(11,8)	Y			X 좌표
+        private final Double Y_CRDN;             //	N	NUMBER(10,8)	Y			Y 좌표
+        private final String ISTL_LCTN_NM;       //	N	VARCHAR2(40)	Y			설치 위치 명
+        private final String ISTL_LCTN_ADDR;     //	N	VARCHAR2(200)	Y			설치 위치 주소
+        private final String STRM_RTSP_ADDR;     //	N	VARCHAR2(200)	Y			스트리밍 RTSP 주소
+        private final String STRM_RTMP_ADDR;     //	N	VARCHAR2(200)	Y			스트리밍 RTMP 주소
+        private final String STRM_HTTP_ADDR;     //	N	VARCHAR2(200)	Y			스트리밍 HTTP 주소
+
+        private final String CCTV_TYPE;          //	N	VARCHAR2(10)	Y			CCTV 유형
+        private final String DEL_YN;             //	N	CHAR(1)	        Y	'N'		삭제 여부
+
+        public CctvCtlrInfo(CctvCtlr entity) {
+            this.CCTV_MNGM_NMBR = entity.getCCTV_MNGM_NMBR();
+            this.CCTV_CTLR_ID = entity.getCCTV_CTLR_ID();
+            this.CCTV_CTLR_IP = entity.getCCTV_CTLR_IP();
+            this.CCTV_CTLR_PORT = entity.getCCTV_CTLR_PORT();
+            this.STRM_SESN_NM = entity.getSTRM_SESN_NM();
+            this.X_CRDN = entity.getX_CRDN();
+            this.Y_CRDN = entity.getY_CRDN();
+            this.ISTL_LCTN_NM = entity.getISTL_LCTN_NM();
+            this.ISTL_LCTN_ADDR = entity.getISTL_LCTN_ADDR();
+            this.STRM_RTSP_ADDR = entity.getSTRM_RTSP_ADDR();
+            this.STRM_RTMP_ADDR = entity.getSTRM_RTMP_ADDR();
+            this.STRM_HTTP_ADDR = entity.getSTRM_HTTP_ADDR();
+            this.CCTV_TYPE = entity.getCCTV_TYPE();
+            this.DEL_YN = entity.getDEL_YN();
+        }
+    }
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor(access = AccessLevel.PROTECTED)
+    //@NotBlank
+    public static class CctvCtlrUpdateReq {
+
+        @Positive
+        private Long CCTV_MNGM_NMBR;       //	N	NUMBER(10)	    N			CCTV 관리 번호
+        @Size(min = 1, max = 30)
+        private String CCTV_CTLR_ID;       //	N	VARCHAR2(30)	Y			CCTV 제어기 ID
+        @Size(min = 1, max = 20)
+        private String CCTV_CTLR_IP;       //	N	VARCHAR2(20)	Y			CCTV 제어기 아이피
+        @Size(min = 1, max = 5)
+        private String CCTV_CTLR_PORT;     //	N	VARCHAR2(5)	    Y			CCTV 제어기 포트
+        @Size(min = 1, max = 200)
+        private String STRM_SESN_NM;       //	N	VARCHAR2(200)	Y			스트리밍 세션 명
+        private Double X_CRDN;             //	N	NUMBER(11,8)	Y			X 좌표
+        private Double Y_CRDN;             //	N	NUMBER(10,8)	Y			Y 좌표
+        private String ISTL_LCTN_NM;       //	N	VARCHAR2(40)	Y			설치 위치 명
+        private String ISTL_LCTN_ADDR;     //	N	VARCHAR2(200)	Y			설치 위치 주소
+        private String STRM_RTSP_ADDR;     //	N	VARCHAR2(200)	Y			스트리밍 RTSP 주소
+        private String STRM_RTMP_ADDR;     //	N	VARCHAR2(200)	Y			스트리밍 RTMP 주소
+        private String STRM_HTTP_ADDR;     //	N	VARCHAR2(200)	Y			스트리밍 HTTP 주소
+        private String CCTV_TYPE;          //	N	VARCHAR2(10)	Y			CCTV 유형
+        @Size(min = 1, max = 1)
+        @Pattern(regexp = "[YN]")
+        private String DEL_YN;             //	N	CHAR(1)	        Y	'N'		삭제 여부
+
+        @Builder
+        public CctvCtlrUpdateReq(Long CCTV_MNGM_NMBR, String CCTV_CTLR_ID, String CCTV_CTLR_IP, String CCTV_CTLR_PORT, String STRM_SESN_NM, Double x_CRDN, Double y_CRDN, String ISTL_LCTN_NM, String ISTL_LCTN_ADDR, String STRM_RTSP_ADDR, String STRM_RTMP_ADDR, String STRM_HTTP_ADDR, String CCTV_TYPE, String DEL_YN) {
+            this.CCTV_MNGM_NMBR = CCTV_MNGM_NMBR;
+            this.CCTV_CTLR_ID = CCTV_CTLR_ID;
+            this.CCTV_CTLR_IP = CCTV_CTLR_IP;
+            this.CCTV_CTLR_PORT = CCTV_CTLR_PORT;
+            this.STRM_SESN_NM = STRM_SESN_NM;
+            X_CRDN = x_CRDN;
+            Y_CRDN = y_CRDN;
+            this.ISTL_LCTN_NM = ISTL_LCTN_NM;
+            this.ISTL_LCTN_ADDR = ISTL_LCTN_ADDR;
+            this.STRM_RTSP_ADDR = STRM_RTSP_ADDR;
+            this.STRM_RTMP_ADDR = STRM_RTMP_ADDR;
+            this.STRM_HTTP_ADDR = STRM_HTTP_ADDR;
+            this.CCTV_TYPE = CCTV_TYPE;
+            this.DEL_YN = DEL_YN;
+        }
+    }
+}

+ 45 - 0
src/main/java/com/its/op/model/dto/cctv/CctvCtlrSttsDto.java

@@ -0,0 +1,45 @@
+package com.its.op.model.dto.cctv;
+
+import com.its.op.global.CodeManager;
+import com.its.op.model.entity.cctv.CctvCtlrStts;
+import com.its.op.utils.ItsUtils;
+import lombok.Getter;
+
+import java.io.Serializable;
+
+public class CctvCtlrSttsDto implements Serializable {
+
+    @Getter
+    public static class CctvCtlrSttsInfo {
+
+        private final Long   CCTV_MNGM_NMBR;     //	N	NUMBER(10)	    N			CCTV 관리 번호
+        private final String UPDT_DT;            //	N	VARCHAR2(14)	N			생성 일시
+        private final String CMNC_STTS_CD;       //	N	VARCHAR2(7)	    Y			통신 상태 코드
+
+        private final String CMNC_STTS_DESC;
+
+        private final String CCTV_CTLR_ID;       //	N	VARCHAR2(30)	Y			CCTV 제어기 ID
+        private final String ISTL_LCTN_NM;       //	N	VARCHAR2(40)	Y			설치 위치 명
+        private final String MISS_STTS_YN;
+
+        public CctvCtlrSttsInfo(CctvCtlrStts entity) {
+            this.CCTV_MNGM_NMBR = entity.getCCTV_MNGM_NMBR();
+            this.UPDT_DT = entity.getUPDT_DT();
+            this.CMNC_STTS_CD = entity.getCMNC_STTS_CD();
+
+            this.CMNC_STTS_DESC = CodeManager.getCodeDesc(CodeManager.CMNC_STTS_CD, this.CMNC_STTS_CD);
+
+            if (entity.getCctv() != null) {
+                this.CCTV_CTLR_ID = entity.getCctv().getCCTV_CTLR_ID();
+                this.ISTL_LCTN_NM = entity.getCctv().getISTL_LCTN_NM();
+            }
+            else {
+                this.CCTV_CTLR_ID = "-";
+                this.ISTL_LCTN_NM = "?";
+            }
+
+            this.MISS_STTS_YN = ItsUtils.getMissSttsYn(this.UPDT_DT);
+        }
+    }
+
+}

+ 29 - 0
src/main/java/com/its/op/model/dto/cctv/CctvCtlrSttsHsDto.java

@@ -0,0 +1,29 @@
+package com.its.op.model.dto.cctv;
+
+import com.its.op.global.CodeManager;
+import com.its.op.model.entity.cctv.CctvCtlrSttsHs;
+import lombok.Getter;
+
+import java.io.Serializable;
+
+public class CctvCtlrSttsHsDto implements Serializable {
+
+    @Getter
+    public static class CctvCtlrSttsHsInfo {
+
+        private final Long   CCTV_MNGM_NMBR;     //	N	NUMBER(10)	    N			CCTV 관리 번호
+        private final String CRTN_DT;            //	N	VARCHAR2(14)	N			생성 일시
+        private final String CMNC_STTS_CD;       //	N	VARCHAR2(7)	    Y			통신 상태 코드
+
+        private final String CMNC_STTS_DESC;
+
+        public CctvCtlrSttsHsInfo(CctvCtlrSttsHs entity) {
+            this.CCTV_MNGM_NMBR = entity.getCCTV_MNGM_NMBR();
+            this.CRTN_DT = entity.getCRTN_DT();
+            this.CMNC_STTS_CD = entity.getCMNC_STTS_CD();
+
+            this.CMNC_STTS_DESC = CodeManager.getCodeDesc(CodeManager.CMNC_STTS_CD, this.CMNC_STTS_CD);
+        }
+    }
+
+}

+ 60 - 0
src/main/java/com/its/op/model/dto/cctv/CctvMonitoringDto.java

@@ -0,0 +1,60 @@
+package com.its.op.model.dto.cctv;
+
+import com.its.op.model.entity.cctv.CctvMonitoring;
+import lombok.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Positive;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+public class CctvMonitoringDto implements Serializable {
+
+    @Getter
+    public static class CctvMonitoringInfo {
+
+        private final String  MONITORING_NM;      //	N	VARCHAR2(40)	N			모니터링명칭
+        private final Integer MONITORING_SEQ;     //	N	NUMBER(3)	    N			모니터링순서
+        private final Long    CCTV_CTLR_NMBR;     //	N	NUMBER(10)	    N			웹카메라 제어기번호
+        private final String  CCTV_CTLR_ID;       //	N	VARCHAR2(30)	Y			CCTV 제어기 ID
+        private final String  ISTL_LCTN_NM;       //	N	VARCHAR2(40)	Y			설치 위치 명
+
+        public CctvMonitoringInfo(CctvMonitoring entity) {
+            this.MONITORING_NM  = entity.getMONITORING_NM();
+            this.MONITORING_SEQ = entity.getMONITORING_SEQ();
+            this.CCTV_CTLR_NMBR = entity.getCCTV_CTLR_NMBR();
+
+            if (entity.getCctv() != null) {
+                this.CCTV_CTLR_ID = entity.getCctv().getCCTV_CTLR_ID();
+                this.ISTL_LCTN_NM = entity.getCctv().getISTL_LCTN_NM();
+            }
+            else {
+                this.CCTV_CTLR_ID = "-";
+                this.ISTL_LCTN_NM = "?";
+            }
+        }
+    }
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor(access = AccessLevel.PROTECTED)
+    public static class CctvMonitoringUpdateReq {
+
+        @NotEmpty
+        @Size(min=1, max=40)
+        private String  MONITORING_NM;      //	N	VARCHAR2(40)	N			모니터링명칭
+        @Positive
+        private Integer MONITORING_SEQ;     //	N	NUMBER(3)	    N			모니터링순서
+        @Positive
+        private Long    CCTV_CTLR_NMBR;     //	N	NUMBER(10)	    N			웹카메라 제어기번호
+
+        @Builder
+        public CctvMonitoringUpdateReq(String MONITORING_NM, Integer MONITORING_SEQ, Long CCTV_CTLR_NMBR) {
+            this.MONITORING_NM = MONITORING_NM;
+            this.MONITORING_SEQ = MONITORING_SEQ;
+            this.CCTV_CTLR_NMBR = CCTV_CTLR_NMBR;
+        }
+    }
+
+}

+ 2 - 2
src/main/java/com/its/op/model/dto/AtrdDto.java → src/main/java/com/its/op/model/dto/database/AtrdDto.java

@@ -1,6 +1,6 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
-import com.its.op.model.entity.Atrd;
+import com.its.op.model.entity.database.Atrd;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;

+ 2 - 2
src/main/java/com/its/op/model/dto/AtrdRoadRltnDto.java → src/main/java/com/its/op/model/dto/database/AtrdRoadRltnDto.java

@@ -1,8 +1,8 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
 import com.its.op.global.NodeManager;
-import com.its.op.model.entity.AtrdRoadRltn;
+import com.its.op.model.entity.database.AtrdRoadRltn;
 import lombok.*;
 
 import javax.validation.constraints.Positive;

+ 2 - 2
src/main/java/com/its/op/model/dto/ClctSystStupDto.java → src/main/java/com/its/op/model/dto/database/ClctSystStupDto.java

@@ -1,6 +1,6 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
-import com.its.op.model.entity.ClctSystStup;
+import com.its.op.model.entity.database.ClctSystStup;
 import lombok.Getter;
 
 import java.io.Serializable;

+ 1 - 1
src/main/java/com/its/op/model/dto/CmmnCdDto.java → src/main/java/com/its/op/model/dto/database/CmmnCdDto.java

@@ -1,4 +1,4 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
src/main/java/com/its/op/model/dto/CmmnClsfCdDto.java → src/main/java/com/its/op/model/dto/database/CmmnClsfCdDto.java

@@ -1,4 +1,4 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 2 - 2
src/main/java/com/its/op/model/dto/CmtrGradClsfDto.java → src/main/java/com/its/op/model/dto/database/CmtrGradClsfDto.java

@@ -1,7 +1,7 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.model.entity.CmtrGradClsf;
+import com.its.op.model.entity.database.CmtrGradClsf;
 import lombok.*;
 
 import javax.validation.constraints.NotEmpty;

+ 2 - 2
src/main/java/com/its/op/model/dto/CnctIntnDto.java → src/main/java/com/its/op/model/dto/database/CnctIntnDto.java

@@ -1,7 +1,7 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.model.entity.CnctIntn;
+import com.its.op.model.entity.database.CnctIntn;
 import lombok.*;
 
 import javax.validation.constraints.NotEmpty;

+ 4 - 4
src/main/java/com/its/op/model/dto/GropMenuAthrDto.java → src/main/java/com/its/op/model/dto/database/GropMenuAthrDto.java

@@ -1,8 +1,8 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
-import com.its.op.model.entity.GropMenuAthr;
-import com.its.op.model.entity.OperSystMenu;
-import com.its.op.model.entity.UserGropInfr;
+import com.its.op.model.entity.database.GropMenuAthr;
+import com.its.op.model.entity.database.OperSystMenu;
+import com.its.op.model.entity.database.UserGropInfr;
 import lombok.*;
 
 import javax.validation.constraints.NotEmpty;

+ 2 - 2
src/main/java/com/its/op/model/dto/IfscDto.java → src/main/java/com/its/op/model/dto/database/IfscDto.java

@@ -1,8 +1,8 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
 import com.its.op.global.NodeManager;
-import com.its.op.model.entity.Ifsc;
+import com.its.op.model.entity.database.Ifsc;
 import lombok.*;
 
 import java.io.Serializable;

+ 2 - 2
src/main/java/com/its/op/model/dto/IfscLinkRltnDto.java → src/main/java/com/its/op/model/dto/database/IfscLinkRltnDto.java

@@ -1,8 +1,8 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
 import com.its.op.global.NodeManager;
-import com.its.op.model.entity.IfscLinkRltn;
+import com.its.op.model.entity.database.IfscLinkRltn;
 import lombok.*;
 
 import javax.validation.constraints.Positive;

+ 2 - 2
src/main/java/com/its/op/model/dto/IfscTrafDto.java → src/main/java/com/its/op/model/dto/database/IfscTrafDto.java

@@ -1,7 +1,7 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.model.entity.IfscTraf;
+import com.its.op.model.entity.database.IfscTraf;
 import com.its.op.utils.ItsUtils;
 import lombok.Getter;
 

+ 18 - 2
src/main/java/com/its/op/model/dto/LeglHldyInfrDto.java → src/main/java/com/its/op/model/dto/database/LeglHldyInfrDto.java

@@ -1,7 +1,8 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.model.entity.LeglHldyInfr;
+import com.its.op.model.entity.database.CmmnCd;
+import com.its.op.model.entity.database.LeglHldyInfr;
 import lombok.*;
 
 import javax.validation.constraints.NotEmpty;
@@ -29,6 +30,21 @@ public class LeglHldyInfrDto implements Serializable {
         }
     }
 
+    @Getter
+    public static class HldyTypeInfo {
+        private final String DAY_TYPE_CD;     //	N	VARCHAR2(7)	    Y			요일 유형 코드
+        private final String LEGL_HLDY_NM;    //	N	VARCHAR2(30)	Y			공휴일 명
+
+        private final String DAY_TYPE_DESC;   //	요일 유형 설명
+
+        public HldyTypeInfo(CmmnCd entity) {
+            this.DAY_TYPE_CD = entity.getCMMN_CD();
+            this.LEGL_HLDY_NM = entity.getCMMN_CD_KOR_NM();
+
+            this.DAY_TYPE_DESC = "[" + this.DAY_TYPE_CD + "] " + this.LEGL_HLDY_NM;
+        }
+    }
+
     @Getter
     @Setter
     @ToString

+ 2 - 2
src/main/java/com/its/op/model/dto/LinkDto.java → src/main/java/com/its/op/model/dto/database/LinkDto.java

@@ -1,7 +1,7 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.model.entity.Link;
+import com.its.op.model.entity.database.Link;
 import lombok.*;
 
 import java.io.Serializable;

+ 2 - 2
src/main/java/com/its/op/model/dto/LinkParaClctSystDto.java → src/main/java/com/its/op/model/dto/database/LinkParaClctSystDto.java

@@ -1,6 +1,6 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
-import com.its.op.model.entity.LinkParaClctSyst;
+import com.its.op.model.entity.database.LinkParaClctSyst;
 import lombok.*;
 
 import java.io.Serializable;

+ 2 - 2
src/main/java/com/its/op/model/dto/LinkParaDetlDto.java → src/main/java/com/its/op/model/dto/database/LinkParaDetlDto.java

@@ -1,6 +1,6 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
-import com.its.op.model.entity.LinkParaDetl;
+import com.its.op.model.entity.database.LinkParaDetl;
 import lombok.*;
 
 import java.io.Serializable;

+ 2 - 2
src/main/java/com/its/op/model/dto/LinkParaStupDto.java → src/main/java/com/its/op/model/dto/database/LinkParaStupDto.java

@@ -1,6 +1,6 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
-import com.its.op.model.entity.LinkParaStup;
+import com.its.op.model.entity.database.LinkParaStup;
 import lombok.*;
 
 import java.io.Serializable;

+ 4 - 4
src/main/java/com/its/op/model/dto/LinkPrcsParaDto.java → src/main/java/com/its/op/model/dto/database/LinkPrcsParaDto.java

@@ -1,8 +1,8 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
-import com.its.op.model.entity.LinkParaClctSyst;
-import com.its.op.model.entity.LinkParaDetl;
-import com.its.op.model.entity.LinkParaStup;
+import com.its.op.model.entity.database.LinkParaClctSyst;
+import com.its.op.model.entity.database.LinkParaDetl;
+import com.its.op.model.entity.database.LinkParaStup;
 import lombok.*;
 
 import java.io.Serializable;

+ 2 - 2
src/main/java/com/its/op/model/dto/LinkTrafDto.java → src/main/java/com/its/op/model/dto/database/LinkTrafDto.java

@@ -1,7 +1,7 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.model.entity.LinkTraf;
+import com.its.op.model.entity.database.LinkTraf;
 import com.its.op.utils.ItsUtils;
 import lombok.Getter;
 

+ 2 - 2
src/main/java/com/its/op/model/dto/NodeDto.java → src/main/java/com/its/op/model/dto/database/NodeDto.java

@@ -1,7 +1,7 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.model.entity.Node;
+import com.its.op.model.entity.database.Node;
 import lombok.*;
 
 import java.io.Serializable;

+ 2 - 2
src/main/java/com/its/op/model/dto/ParkingLotDto.java → src/main/java/com/its/op/model/dto/database/ParkingLotDto.java

@@ -1,6 +1,6 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
-import com.its.op.model.entity.ParkingLot;
+import com.its.op.model.entity.database.ParkingLot;
 import lombok.*;
 
 import javax.validation.constraints.DecimalMax;

+ 2 - 2
src/main/java/com/its/op/model/dto/RoadDto.java → src/main/java/com/its/op/model/dto/database/RoadDto.java

@@ -1,8 +1,8 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
 import com.its.op.global.NodeManager;
-import com.its.op.model.entity.Road;
+import com.its.op.model.entity.database.Road;
 import lombok.*;
 
 import java.io.Serializable;

+ 2 - 2
src/main/java/com/its/op/model/dto/RoadIfscRltnDto.java → src/main/java/com/its/op/model/dto/database/RoadIfscRltnDto.java

@@ -1,8 +1,8 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
 import com.its.op.global.NodeManager;
-import com.its.op.model.entity.RoadIfscRltn;
+import com.its.op.model.entity.database.RoadIfscRltn;
 import lombok.*;
 
 import javax.validation.constraints.Positive;

+ 2 - 2
src/main/java/com/its/op/model/dto/RoadTrafDto.java → src/main/java/com/its/op/model/dto/database/RoadTrafDto.java

@@ -1,7 +1,7 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.model.entity.RoadTraf;
+import com.its.op.model.entity.database.RoadTraf;
 import com.its.op.utils.ItsUtils;
 import lombok.Getter;
 

+ 2 - 2
src/main/java/com/its/op/model/dto/UnitSystDto.java → src/main/java/com/its/op/model/dto/database/UnitSystDto.java

@@ -1,6 +1,6 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
-import com.its.op.model.entity.UnitSyst;
+import com.its.op.model.entity.database.UnitSyst;
 import lombok.*;
 
 import javax.validation.constraints.DecimalMax;

+ 1 - 1
src/main/java/com/its/op/model/dto/UnitSystSttsDto.java → src/main/java/com/its/op/model/dto/database/UnitSystSttsDto.java

@@ -1,4 +1,4 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 2 - 2
src/main/java/com/its/op/model/dto/UserInfrDto.java → src/main/java/com/its/op/model/dto/database/UserInfrDto.java

@@ -1,6 +1,6 @@
-package com.its.op.model.dto;
+package com.its.op.model.dto.database;
 
-import com.its.op.model.entity.UserInfr;
+import com.its.op.model.entity.database.UserInfr;
 import lombok.*;
 
 import javax.validation.constraints.Email;

+ 1 - 1
src/main/java/com/its/op/model/entity/history/dto/UnitSystSttsHsDto.java → src/main/java/com/its/op/model/dto/history/UnitSystSttsHsDto.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity.history.dto;
+package com.its.op.model.dto.history;
 
 import com.its.op.global.CodeManager;
 import com.its.op.model.entity.history.UnitSystSttsHs;

+ 103 - 0
src/main/java/com/its/op/model/entity/cctv/CctvCtlr.java

@@ -0,0 +1,103 @@
+package com.its.op.model.entity.cctv;
+
+import com.its.op.model.dto.cctv.CctvCtlrDto;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@DynamicInsert
+@DynamicUpdate
+@Getter
+@NoArgsConstructor
+@Builder
+@AllArgsConstructor
+@Entity
+@Table(name = "TB_CCTV_CTLR")
+public class CctvCtlr {
+
+    @Id
+    @Column(nullable = false, unique = true, length = 10)
+    private Long    CCTV_MNGM_NMBR;     //	N	NUMBER(10)	    N			CCTV 관리 번호
+    @Column(nullable = false, length = 30)
+    private String  CCTV_CTLR_ID;       //	N	VARCHAR2(30)	Y			CCTV 제어기 ID
+    private String  CCTV_CTLR_IP;       //	N	VARCHAR2(20)	Y			CCTV 제어기 아이피
+    private String  CCTV_CTLR_PORT;     //	N	VARCHAR2(5)	    Y			CCTV 제어기 포트
+    private String  CCTV_CAPT_IP;       //	N	VARCHAR2(20)	Y			CCTV 자막기 아이피
+    private String  CCTV_CAPT_PORT;     //	N	VARCHAR2(5)	    Y			CCTV 자막기 포트
+    private String  CCTV_FIBR_IP;       //	N	VARCHAR2(20)	Y			CCTV 광장비 아이피
+    private String  CCTV_ENCD_IP;       //	N	VARCHAR2(20)	Y			CCTV 인코더 아이피
+    private String  STRM_SVR_IP;        //	N	VARCHAR2(20)	Y			스트리밍 서버 아이피
+    private String  STRM_SVR_PORT;      //	N	VARCHAR2(5)	    Y			스트리밍 서버 포트
+    private String  STRM_SESN_NM;       //	N	VARCHAR2(200)	Y			스트리밍 세션 명
+    @Column(columnDefinition = "NUMBER", length = 11, precision = 8)
+    private Double  X_CRDN;             //	N	NUMBER(11,8)	Y			X 좌표
+    @Column(columnDefinition = "NUMBER", length = 10, precision = 8)
+    private Double  Y_CRDN;             //	N	NUMBER(10,8)	Y			Y 좌표
+    private String  ISTL_LCTN_NM;       //	N	VARCHAR2(40)	Y			설치 위치 명
+    private String  ISTL_LCTN_ADDR;     //	N	VARCHAR2(200)	Y			설치 위치 주소
+    private Integer CCTV_CHNL;          //	N	NUMBER(2)	    Y			CCTV 채널
+    private Long    LINK_ID;            //	N	NUMBER(10)	    Y			링크ID
+    private Long    NODE_ID;            //	N	NUMBER(10)	    Y			노드ID
+    private String  CCTV_ID;            //	N	VARCHAR2(10)	Y			공단 CCTV ID
+    private String  RELY_PORT;          //	N	VARCHAR2(5)	    Y			연계 포트
+    private String  STRM_RTSP_ADDR;     //	N	VARCHAR2(200)	Y			스트리밍 RTSP 주소
+    private String  STRM_RTMP_ADDR;     //	N	VARCHAR2(200)	Y			스트리밍 RTMP 주소
+    private String  STRM_HTTP_ADDR;     //	N	VARCHAR2(200)	Y			스트리밍 HTTP 주소
+    private String  STRM_STOR_ADDR;     //	N	VARCHAR2(200)	Y			스트리밍 저장 주소
+    private String  AREA_CD;            //	N	VARCHAR2(7)	    Y			지역 코드
+    private String  CCTV_TYPE;          //	N	VARCHAR2(10)	Y			CCTV 유형
+    @Lob
+    private byte[]  CCTV_SBST_IMGN;     //	N	BLOB	        Y			CCTV 대체 영상
+    //private Blob    CCTV_SBST_IMGN;     //	N	BLOB	        Y			CCTV 대체 영상
+    @Column(columnDefinition = "CHAR", length = 1)
+    @ColumnDefault(value = "N")
+    private String  CCTV_SBST_DSPL_YN;  //	N	CHAR(1)	        Y	'N'		CCTV 대체 표출 여부
+    private String  CCTV_AREA_DVSN;     //	N	VARCHAR2(7)	    Y			CCTV 지역 구분
+    private String  INTR_RTMP_ADDR;     //	N	VARCHAR2(200)	Y			내부 RTMP 주소
+    @Column(columnDefinition = "CHAR", length = 1)
+    @ColumnDefault(value = "N")
+    private String  SYOP_CNTL_YN;       //	N	CHAR(1)	        Y	'N'		운영자 제어 여부
+    @Column(columnDefinition = "CHAR", length = 1)
+    @ColumnDefault(value = "N")
+    private String  DEL_YN;             //	N	CHAR(1)	        Y	'N'		삭제 여부
+
+/*
+    public InputStream getPhotoContent() throws SQLException {
+        if (this.CCTV_SBST_IMGN == null) {
+            return null;
+        }
+        return this.CCTV_SBST_IMGN.getBinaryStream();
+    }
+    public void setPhotoContent(InputStream sourceStream) throws IOException {
+        this.CCTV_SBST_IMGN = BlobProxy.generateProxy(sourceStream.);
+    }
+*/
+
+    public CctvCtlr(Long CCTV_MNGM_NMBR) {
+        this.CCTV_MNGM_NMBR = CCTV_MNGM_NMBR;
+    }
+
+    public void updateInfo(CctvCtlrDto.CctvCtlrUpdateReq req) {
+        this.CCTV_CTLR_ID = req.getCCTV_CTLR_ID();
+        this.CCTV_CTLR_IP = req.getCCTV_CTLR_IP();
+        this.CCTV_CTLR_PORT = req.getCCTV_CTLR_PORT();
+        this.STRM_SESN_NM = req.getSTRM_SESN_NM();
+        this.X_CRDN = req.getX_CRDN();
+        this.Y_CRDN = req.getY_CRDN();
+        this.ISTL_LCTN_NM = req.getISTL_LCTN_NM();
+        this.ISTL_LCTN_ADDR = req.getISTL_LCTN_ADDR();
+        this.STRM_RTSP_ADDR = req.getSTRM_RTSP_ADDR();
+        this.STRM_RTMP_ADDR = req.getSTRM_RTMP_ADDR();
+        this.STRM_HTTP_ADDR = req.getSTRM_HTTP_ADDR();
+        this.CCTV_TYPE = req.getCCTV_TYPE();
+        this.DEL_YN = req.getDEL_YN();
+
+    }
+
+}

+ 41 - 0
src/main/java/com/its/op/model/entity/cctv/CctvCtlrStts.java

@@ -0,0 +1,41 @@
+package com.its.op.model.entity.cctv;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
+import javax.persistence.*;
+
+@DynamicInsert
+@DynamicUpdate
+@Getter
+@NoArgsConstructor
+@Builder
+@AllArgsConstructor
+@Entity
+@Table(name = "TB_CCTV_STTS")
+public class CctvCtlrStts {
+
+    @Id
+    @Column(nullable = false, unique = true, length = 14)
+    private Long    CCTV_MNGM_NMBR;     //	N	NUMBER(10)	    N			CCTV 관리 번호
+    @Column(nullable = false, length = 14)
+    private String  UPDT_DT;            //	N	VARCHAR2(14)	N			생성 일시
+
+    private String  CMNC_STTS_CD;       //	N	VARCHAR2(7)	    Y			통신 상태 코드
+    private String  CBOX_DOOR_STTS_CD;  //	N	VARCHAR2(7)	    Y			함체 문 상태 코드
+    private String  FAN_STTS_CD;        //	N	VARCHAR2(7)	    Y			팬 상태 코드
+    private String  HETR_STTS_CD;       //	N	VARCHAR2(7)	    Y			히터 상태 코드
+    private Integer CBOX_TMPR;          //	N	NUMBER(3)	    Y	0		함체 온도
+    private Integer CBOX_HMDT;          //	N	NUMBER(3)	    Y	0		함체 습도
+
+    @OneToOne
+    @JoinColumn(insertable=false, updatable=false, name="CCTV_MNGM_NMBR", referencedColumnName = "CCTV_MNGM_NMBR")
+    @NotFound(action = NotFoundAction.IGNORE)
+    private CctvCtlr cctv = new CctvCtlr();
+}

+ 37 - 0
src/main/java/com/its/op/model/entity/cctv/CctvCtlrSttsHs.java

@@ -0,0 +1,37 @@
+package com.its.op.model.entity.cctv;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@DynamicInsert
+@DynamicUpdate
+@Getter
+@NoArgsConstructor
+@Builder
+@AllArgsConstructor
+@Entity
+@Table(name = "TB_CCTV_STTS_HS")
+@IdClass(CctvCtlrSttsHsKey.class)
+public class CctvCtlrSttsHs {
+
+    @Id
+    @Column(nullable = false, length = 14)
+    private Long    CCTV_MNGM_NMBR;     //	N	NUMBER(10)	    N			CCTV 관리 번호
+    @Id
+    @Column(nullable = false, length = 14)
+    private String  CRTN_DT;            //	N	VARCHAR2(14)	N			생성 일시
+
+    private String  CMNC_STTS_CD;       //	N	VARCHAR2(7)	    Y			통신 상태 코드
+    private String  CBOX_DOOR_STTS_CD;  //	N	VARCHAR2(7)	    Y			함체 문 상태 코드
+    private String  FAN_STTS_CD;        //	N	VARCHAR2(7)	    Y			팬 상태 코드
+    private String  HETR_STTS_CD;       //	N	VARCHAR2(7)	    Y			히터 상태 코드
+    private Integer CBOX_TMPR;          //	N	NUMBER(3)	    Y	0		함체 온도
+    private Integer CBOX_HMDT;          //	N	NUMBER(3)	    Y	0		함체 습도
+
+}

+ 20 - 0
src/main/java/com/its/op/model/entity/cctv/CctvCtlrSttsHsKey.java

@@ -0,0 +1,20 @@
+package com.its.op.model.entity.cctv;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+//@Embeddable
+public class CctvCtlrSttsHsKey implements Serializable {
+
+    //@Id @Column(nullable = false, length = 10)
+    private Long   CCTV_MNGM_NMBR;      //	N	NUMBER(10)	    N			CCTV 관리 번호
+    //@Id @Column(nullable = false, length = 14)
+    private String CRTN_DT;             //	N	VARCHAR2(14)	N			생성 일시
+
+}

+ 58 - 0
src/main/java/com/its/op/model/entity/cctv/CctvMonitoring.java

@@ -0,0 +1,58 @@
+package com.its.op.model.entity.cctv;
+
+import com.its.op.model.dto.cctv.CctvMonitoringDto;
+import lombok.*;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
+import javax.persistence.*;
+
+@DynamicInsert
+@DynamicUpdate
+@Getter
+@NoArgsConstructor
+@Builder
+@AllArgsConstructor
+@Entity
+@Table(name = "TB_CCTV_MONITORING")
+@IdClass(CctvMonitoringKey.class)
+public class CctvMonitoring {
+
+    @Id
+    @Column(nullable = false, length = 3)
+    private Integer MONITORING_TYPE;    //	N	NUMBER(3)	    N			모니터링유형(1:예비,2,예비,3,영상,4:예비)
+    @Id
+    @Column(nullable = false, length = 40)
+    private String  MONITORING_NM;      //	N	VARCHAR2(40)	N			모니터링명칭
+    @Id
+    @Column(nullable = false, length = 3)
+    private Integer MONITORING_SEQ;     //	N	NUMBER(3)	    N			모니터링순서
+
+    @Column(nullable = false, length = 10)
+    private Long    CCTV_CTLR_NMBR;     //	N	NUMBER(10)	    N			웹카메라 제어기번호
+
+    @Column(length = 1)
+    private Integer VIEW_MODE;          //	N	NUMBER(1)	    Y	0		화면에 보여지는 방식(0:기본,1:화면맞춤))
+
+    @OneToOne//(cascade = CascadeType.ALL)
+    @JoinColumn(insertable=false, updatable=false, name="CCTV_CTLR_NMBR", referencedColumnName="CCTV_MNGM_NMBR")
+    @NotFound(action = NotFoundAction.IGNORE)
+    private CctvCtlr cctv = new CctvCtlr();
+
+    public CctvMonitoring(Integer MONITORING_TYPE, CctvMonitoringDto.CctvMonitoringUpdateReq req) {
+        this.MONITORING_TYPE = MONITORING_TYPE;
+        this.MONITORING_NM  = req.getMONITORING_NM();
+        this.MONITORING_SEQ = req.getMONITORING_SEQ();
+        this.CCTV_CTLR_NMBR = req.getCCTV_CTLR_NMBR();
+        this.VIEW_MODE = 0;
+    }
+    public void updateInfo(Integer MONITORING_TYPE, CctvMonitoringDto.CctvMonitoringUpdateReq req) {
+        this.MONITORING_TYPE = MONITORING_TYPE;
+        this.MONITORING_NM  = req.getMONITORING_NM();
+        this.MONITORING_SEQ = req.getMONITORING_SEQ();
+        this.CCTV_CTLR_NMBR = req.getCCTV_CTLR_NMBR();
+        this.VIEW_MODE = 0;
+    }
+}

+ 19 - 0
src/main/java/com/its/op/model/entity/cctv/CctvMonitoringKey.java

@@ -0,0 +1,19 @@
+package com.its.op.model.entity.cctv;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+//@Embeddable
+public class CctvMonitoringKey implements Serializable {
+
+    private Integer MONITORING_TYPE;    //	N	NUMBER(3)	N			모니터링유형(1:예비,2,예비,3,영상,4:예비)
+    private String  MONITORING_NM;      //	N	VARCHAR2(40)	N			모니터링명칭
+    private Integer MONITORING_SEQ;     //	N	NUMBER(3)	N			모니터링순서
+
+}

+ 2 - 2
src/main/java/com/its/op/model/entity/Atrd.java → src/main/java/com/its/op/model/entity/database/Atrd.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.AtrdDto;
+import com.its.op.model.dto.database.AtrdDto;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

+ 1 - 1
src/main/java/com/its/op/model/entity/AtrdRoadRltn.java → src/main/java/com/its/op/model/entity/database/AtrdRoadRltn.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
src/main/java/com/its/op/model/entity/AtrdRoadRltnKey.java → src/main/java/com/its/op/model/entity/database/AtrdRoadRltnKey.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
src/main/java/com/its/op/model/entity/AuditingEntity.java → src/main/java/com/its/op/model/entity/database/AuditingEntity.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.Getter;
 import org.springframework.data.annotation.CreatedBy;

+ 1 - 1
src/main/java/com/its/op/model/entity/BaseEntity.java → src/main/java/com/its/op/model/entity/database/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.Getter;
 

+ 1 - 1
src/main/java/com/its/op/model/entity/ClctSystStup.java → src/main/java/com/its/op/model/entity/database/ClctSystStup.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
src/main/java/com/its/op/model/entity/CmmnCd.java → src/main/java/com/its/op/model/entity/database/CmmnCd.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.*;
 import org.hibernate.annotations.*;

+ 1 - 1
src/main/java/com/its/op/model/entity/CmmnCdKey.java → src/main/java/com/its/op/model/entity/database/CmmnCdKey.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
src/main/java/com/its/op/model/entity/CmmnClsfCd.java → src/main/java/com/its/op/model/entity/database/CmmnClsfCd.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 2 - 2
src/main/java/com/its/op/model/entity/CmtrGradClsf.java → src/main/java/com/its/op/model/entity/database/CmtrGradClsf.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.CmtrGradClsfDto;
+import com.its.op.model.dto.database.CmtrGradClsfDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 1 - 1
src/main/java/com/its/op/model/entity/CmtrGradClsfKey.java → src/main/java/com/its/op/model/entity/database/CmtrGradClsfKey.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 2 - 2
src/main/java/com/its/op/model/entity/CnctIntn.java → src/main/java/com/its/op/model/entity/database/CnctIntn.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.CnctIntnDto;
+import com.its.op.model.dto.database.CnctIntnDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 2 - 2
src/main/java/com/its/op/model/entity/GropMenuAthr.java → src/main/java/com/its/op/model/entity/database/GropMenuAthr.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.GropMenuAthrDto;
+import com.its.op.model.dto.database.GropMenuAthrDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 1 - 1
src/main/java/com/its/op/model/entity/GropMenuAthrKey.java → src/main/java/com/its/op/model/entity/database/GropMenuAthrKey.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 2 - 2
src/main/java/com/its/op/model/entity/Ifsc.java → src/main/java/com/its/op/model/entity/database/Ifsc.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.IfscDto;
+import com.its.op.model.dto.database.IfscDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 1 - 1
src/main/java/com/its/op/model/entity/IfscKey.java → src/main/java/com/its/op/model/entity/database/IfscKey.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
src/main/java/com/its/op/model/entity/IfscLinkRltn.java → src/main/java/com/its/op/model/entity/database/IfscLinkRltn.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
src/main/java/com/its/op/model/entity/IfscLinkRltnKey.java → src/main/java/com/its/op/model/entity/database/IfscLinkRltnKey.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
src/main/java/com/its/op/model/entity/IfscTraf.java → src/main/java/com/its/op/model/entity/database/IfscTraf.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 2 - 2
src/main/java/com/its/op/model/entity/LeglHldyInfr.java → src/main/java/com/its/op/model/entity/database/LeglHldyInfr.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.LeglHldyInfrDto;
+import com.its.op.model.dto.database.LeglHldyInfrDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 2 - 2
src/main/java/com/its/op/model/entity/Link.java → src/main/java/com/its/op/model/entity/database/Link.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.LinkDto;
+import com.its.op.model.dto.database.LinkDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 2 - 2
src/main/java/com/its/op/model/entity/LinkParaClctSyst.java → src/main/java/com/its/op/model/entity/database/LinkParaClctSyst.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.LinkParaClctSystDto;
+import com.its.op.model.dto.database.LinkParaClctSystDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 1 - 1
src/main/java/com/its/op/model/entity/LinkParaClctSystKey.java → src/main/java/com/its/op/model/entity/database/LinkParaClctSystKey.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 2 - 2
src/main/java/com/its/op/model/entity/LinkParaDetl.java → src/main/java/com/its/op/model/entity/database/LinkParaDetl.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.LinkParaDetlDto;
+import com.its.op.model.dto.database.LinkParaDetlDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 2 - 2
src/main/java/com/its/op/model/entity/LinkParaStup.java → src/main/java/com/its/op/model/entity/database/LinkParaStup.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.LinkParaStupDto;
+import com.its.op.model.dto.database.LinkParaStupDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 1 - 1
src/main/java/com/its/op/model/entity/LinkTraf.java → src/main/java/com/its/op/model/entity/database/LinkTraf.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 2 - 2
src/main/java/com/its/op/model/entity/Node.java → src/main/java/com/its/op/model/entity/database/Node.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.NodeDto;
+import com.its.op.model.dto.database.NodeDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 1 - 1
src/main/java/com/its/op/model/entity/OperSystMenu.java → src/main/java/com/its/op/model/entity/database/OperSystMenu.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 2 - 2
src/main/java/com/its/op/model/entity/ParkingLot.java → src/main/java/com/its/op/model/entity/database/ParkingLot.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.ParkingLotDto;
+import com.its.op.model.dto.database.ParkingLotDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 2 - 2
src/main/java/com/its/op/model/entity/Road.java → src/main/java/com/its/op/model/entity/database/Road.java

@@ -1,6 +1,6 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
-import com.its.op.model.dto.RoadDto;
+import com.its.op.model.dto.database.RoadDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 1 - 1
src/main/java/com/its/op/model/entity/RoadIfscRltn.java → src/main/java/com/its/op/model/entity/database/RoadIfscRltn.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
src/main/java/com/its/op/model/entity/RoadIfscRltnKey.java → src/main/java/com/its/op/model/entity/database/RoadIfscRltnKey.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
src/main/java/com/its/op/model/entity/RoadTraf.java → src/main/java/com/its/op/model/entity/database/RoadTraf.java

@@ -1,4 +1,4 @@
-package com.its.op.model.entity;
+package com.its.op.model.entity.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels