From 6a4f68b8f99dca3a00c297cbcff82c065575212c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 16 八月 2025 11:25:20 +0800
Subject: [PATCH] 1、完善代码；2、作物去除lat属性，采用关联气象站的lat；3、project模块增加查询全部气象站的方法。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java
index 2f86cbe..2bbd078 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java
@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -47,8 +48,12 @@
private String requestVideoCommonUrl;//
@Value("${video.ys.requestVideoCameraPreUrl: ezopen://open.ys7.com/}")
private String requestVideoCameraPreUrl;//
- @Value("${video.ys.requestVideoCameraTailUrl: /1.live&themeId=}")
- private String requestVideoCameraTailUrl;//
+ @Value("${video.ys.requestVideoCameraTail4LiveUrl: /1.live}")
+ private String requestVideoCameraTail4LiveUrl;//
+ @Value("${video.ys.requestVideoCameraTail4ThemeIdUrl: themeId=}")
+ private String requestVideoCameraTail4ThemeIdUrl;//
+
+ private static final String DATEPATHPARAM = "&date=";
@Autowired
private void setSv(VideoSv sv, YsAppSv ysSv){
@@ -70,7 +75,7 @@
schema = @Schema(implementation = VoCamera.class))}
)
})
- @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "some")
@SsoAop()
public BaseResponse<QueryResultVo<List<VoVideo>>> some(VideoQo queryQo){
try {
@@ -95,15 +100,31 @@
sb.append("&url=");
sb.append(requestVideoCameraPreUrl);
sb.append(vo.devNo);
- sb.append(requestVideoCameraTailUrl);
- vvo.videoUrl4Simple = sb.toString() + "simple";
- vvo.videoUrl4Standard = sb.toString() + "standard" ;
- vvo.videoUrl4Security = sb.toString() + "security" ;
+ sb.append(requestVideoCameraTail4LiveUrl);
+ sb.append("&");
+ sb.append(requestVideoCameraTail4ThemeIdUrl);
+ vvo.videoUrl4Simple = sb.toString() + "simple" + DATEPATHPARAM ;
+ vvo.videoUrl4Standard = sb.toString() + "standard" + DATEPATHPARAM ;
+ vvo.videoUrl4Security = sb.toString() + "security" + DATEPATHPARAM ;
+
+ StringBuilder sb1 = new StringBuilder();
+ sb1.append(requestVideoCommonUrl);
+ sb1.append("?url=");
+ sb1.append(requestVideoCameraPreUrl);
+ sb1.append(vo.devNo);
+ sb1.append(requestVideoCameraTail4LiveUrl);
+ sb1.append("&accessToken=");
+ sb1.append(ysApp.accessToken);
+ sb1.append("&");
+ sb1.append(requestVideoCameraTail4ThemeIdUrl);
+ vvo.videoUrl4PcLive = sb1.toString() + "pcLive&env=" + DATEPATHPARAM ;
}else{
vvo.videoUrl4Simple = "" ;
vvo.videoUrl4Standard = "" ;
vvo.videoUrl4Security = "" ;
+ vvo.videoUrl4PcLive = "" ;
}
+ list.add(vvo) ;
}
}
QueryResultVo<List<VoVideo>> res = new QueryResultVo<>() ;
--
Gitblit v1.8.0