hbwri/skjcmanager.git

湖北水库项目

summary
reflog
commits
tree
docs
forks
compare

Merge remote-tracking branch 'origin/jtdev' into jtdev

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java

@@ -151,7 +151,7 @@
    * @return
    */
   @ApiOperation(value = "海康设备-海康摄像头云台的控制", notes = "海康设备-海康摄像头云台的控制")
   @GetMapping(value = "/handleCameraPosition")
   @GetMapping(value = "/handleCameraPosition2")
   public R handleCameraPosition(HkVO hk) {
      // 获取海康播放url
      String result = controlling(null==hk.getType()?1:hk.getType(),HkConstant.controllingURLs,

			@@ -151,7 +151,7 @@
			* @return
			*/
			@ApiOperation(value = "海康设备-海康摄像头云台的控制", notes = "海康设备-海康摄像头云台的控制")
			@GetMapping(value = "/handleCameraPosition")
			@GetMapping(value = "/handleCameraPosition2")
			public R handleCameraPosition(HkVO hk) {
			// 获取海康播放url
			String result = controlling(null==hk.getType()?1:hk.getType(),HkConstant.controllingURLs,