修改路径冲突

src/main/java/com/inspect/nvr/controller/IvsServerController.java

@@ -41,7 +41,7 @@ public class IvsServerController {
     @Value("${rtsp.testUrl:rtsp://admin:Zenap_qweasdzxc@192.168.1.217:554/h264/ch3/main/av_stream}")
     private String rtspTestUrl;
 
-    @GetMapping("/common/keepAlive")
+    @GetMapping("/common/keepAlive2")
     public ResponseEntity<IvsResult> keepAlive() {
         log.info("[GAB] keep alive");
         return ResponseEntity
@@ -49,7 +49,7 @@ public class IvsServerController {
                 .body(IvsResult.builder().resultCode("0").build());
     }
 
-    @PostMapping({"/loginInfo/login/v1.0"})
+    @PostMapping({"/loginInfo/login2/v1.0"})
     public ResponseEntity<IvsResult> login(@RequestBody Login login) {
         log.info("[GAB] login : {}", login.toString());
         HttpHeaders responseHeaders = new HttpHeaders();
@@ -60,7 +60,7 @@ public class IvsServerController {
                 .body(IvsResult.builder().resultCode("0").build());
     }
 
-    @GetMapping("/device/ptzpresetlist/{cameraCode}/{domainCode}")
+    @GetMapping("/device/ptzpresetlist2/{cameraCode}/{domainCode}")
     public ResponseEntity<IvsPresetListView> ptzPresetList(
             @PathVariable("cameraCode") String cameraCode,
             @PathVariable("domainCode") String domainCode
@@ -80,7 +80,7 @@ public class IvsServerController {
                         .build());
     }
 
-    @PostMapping({"/video/rtspurl/v1.0"})
+    @PostMapping({"/video/rtspurl2/v1.0"})
     public ResponseEntity<IvsVideoRtspView> videoRtspUrl(@RequestBody IvsVideoRtspVo rtspVo) {
         log.info("[GAB] videoRtspUrl : {}, rtspTestUrl: {}", rtspVo.toString(), rtspTestUrl);
         return ResponseEntity
@@ -94,7 +94,7 @@ public class IvsServerController {
                 );
     }
 
-    @PostMapping({"/device/ptzcontrol"})
+    @PostMapping({"/device/ptzcontrol2"})
     public ResponseEntity<ResultEntity> devicePtzControl(@RequestBody SipbPtzVo ptzVo) {
         log.info("[GAB] devicePtzControl : {}", ptzVo.toString());
         return ResponseEntity
@@ -102,7 +102,7 @@ public class IvsServerController {
                 .body(ResultEntity.builder().resultCode("0").build());
     }
 
-    @GetMapping("/device/deviceList/v1.0")
+    @GetMapping("/device/deviceList2/v1.0")
     public ResponseEntity<ResultEntity> getDeviceList(IvsDevChanListVo chanListVo) {
         log.info("[GAB] chanListVo : {}", chanListVo.toString());
         return ResponseEntity
@@ -112,7 +112,7 @@ public class IvsServerController {
 
     private static int mCount = 0;
 
-    @GetMapping("/platform/platformSnapshot/{cameraCode}/{domainCode}")
+    @GetMapping("/platform/platformSnapshot2/{cameraCode}/{domainCode}")
     public ResponseEntity<ResultEntity> getPlatformSnapshot(
             @PathVariable("cameraCode") String cameraCode,
             @PathVariable("domainCode") String domainCode,
@@ -156,7 +156,7 @@ public class IvsServerController {
 
     private static int mCount2 = 0;
 
-    @PostMapping("/platform/snapshotList")
+    @PostMapping("/platform/snapshotList2")
     public ResponseEntity<IvsPlatformSnapshotView> getPlatformSnapshotList(@RequestBody IvsChanSnapVo chanSnapVo) {
         log.info("[GAB] chanSnapVo: {}", chanSnapVo.toString());
 
@@ -199,7 +199,7 @@ public class IvsServerController {
 //        }
     }
 
-    @GetMapping("/platform/snapshot/{cameraCode}")
+    @GetMapping("/platform/snapshot2/{cameraCode}")
     public ResponseEntity<InputStreamResource> getPlatformSnapshotByCameraCode(@PathVariable("cameraCode") String cameraCode, HttpServletResponse response) {
         log.info("[GAB] get stream, cameraCode: {}", cameraCode);
         try {
@@ -227,7 +227,7 @@ public class IvsServerController {
         }
     }
 
-    @GetMapping("/platform/snapshot2/{cameraCode}")
+    @GetMapping("/platform/snapshot22/{cameraCode}")
     public ResponseEntity<InputStreamResource> getPlatformSnapshotByCameraCode2(@PathVariable("cameraCode") String cameraCode, HttpServletResponse response) {
         log.info("[GAB] get stream2, cameraCode: {}", cameraCode);
         try {