|
@@ -1,9 +1,12 @@
|
|
|
package beilv.hik.controller;
|
|
|
|
|
|
|
|
|
+import beilv.common.config.RuoYiConfig;
|
|
|
import beilv.common.core.controller.BaseController;
|
|
|
import beilv.common.core.domain.AjaxResult;
|
|
|
import beilv.hik.controller.utils.GetCameraPreviewURL;
|
|
|
+import beilv.hik.controller.vo.CompetitionInfo;
|
|
|
+import beilv.stadium.domain.Stadium;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.ui.ModelMap;
|
|
@@ -11,11 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.PathVariable;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
-
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.io.IOException;
|
|
|
-import java.io.PrintWriter;
|
|
|
+import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
|
|
|
@Controller
|
|
@@ -24,9 +23,17 @@ public class HiKController extends BaseController {
|
|
|
|
|
|
private String prefix = "system/hik";
|
|
|
|
|
|
- @GetMapping("/{cameraIndexCode}")
|
|
|
- public String hik(@PathVariable("cameraIndexCode") String cameraIndexCode) throws IOException {
|
|
|
- return prefix + "/hik";
|
|
|
+// @GetMapping("/{cameraIndexCode}")
|
|
|
+// public String hik(@PathVariable("cameraIndexCode") String cameraIndexCode) {
|
|
|
+// return prefix + "/hik";
|
|
|
+// }
|
|
|
+
|
|
|
+ @GetMapping()
|
|
|
+ public Object hik(CompetitionInfo obj, ModelMap mmap) {
|
|
|
+ ModelAndView modelAndView = new ModelAndView("system/hik/hik");
|
|
|
+ modelAndView.addObject("dataSource", obj);
|
|
|
+ mmap.put("version", RuoYiConfig.getVersion());
|
|
|
+ return modelAndView;
|
|
|
}
|
|
|
|
|
|
@Value("${hik.appKey}")
|