From 880c8f54cddc8533f00f674da3f14c2cf0d34340 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 25 六月 2024 17:58:17 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java
index 516da14..741cb20 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java
@@ -37,8 +37,8 @@
public class ProjectCameraController extends BaseController {
private String prefix = "geo/projectCamera";
- private String appkey = "833728d15dc74335ba90ad506e80f15e";
- private String secret = "dc02e61722ffd37198660d0644b4daa1";
+ private String appkey = "af786eacc71d43ef9393c028cf4face7";
+ private String secret = "9ad87671f63d2258af6fd9b2e5fa6005";
private String postUrl ="https://open.ys7.com/api/lapp/token/get";
@Autowired
@@ -49,6 +49,12 @@
public String projectCamera(String id, ModelMap mmap) {
mmap.put("projectId", id);
return prefix + "/projectCamera";
+ }
+
+ @RequiresPermissions("geo:projectCamera:view2")
+ @GetMapping("/view2")
+ public String projectCamera2() {
+ return prefix + "/projectCamera2";
}
/**
@@ -70,8 +76,6 @@
List<ProjectCamera> list = projectCameraService.selectProjectCameraList(projectCamera);
return AjaxResult.success(list);
}
-
-
@GetMapping("/cameraPlayerUrl")
@ResponseBody
@@ -124,7 +128,8 @@
* 鏂板鐩戞帶璁惧
*/
@GetMapping("/add")
- public String add() {
+ public String add(String projectId, ModelMap mmap) {
+ mmap.put("projectId", projectId);
return prefix + "/add";
}
--
Gitblit v1.9.1