From 688fd8243286b342bfdeb3ee0b4ee45be4c005cc Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 04 六月 2025 11:38:08 +0800
Subject: [PATCH] 增加货位卡设备配置
---
igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java b/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java
index dd9df54..24533a2 100644
--- a/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java
+++ b/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java
@@ -1,15 +1,15 @@
package com.fzzy.igds.dzhwk.controller;
import com.fzzy.igds.dzhwk.data.DzhwkConfigData;
+import com.fzzy.igds.dzhwk.domain.Dept;
+import com.fzzy.igds.dzhwk.manager.WebManager;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
-
import javax.annotation.Resource;
-import java.util.List;
/**
* @Description
@@ -23,30 +23,20 @@
@Resource
private DzhwkConfigData dzhwkConfigData;
-
- /**
- * 閿佸睆
- * @param view
- * @return
- */
- @RequestMapping("/lock")
- public String lock(@RequestParam(value = "flag", required = true) String flag, ModelMap view) {
- view.put("flag", flag);
- return prefix + "lock";
- }
+ @Resource
+ private WebManager webManager;
/**
* 棣栭〉
+ * @param gid 寤掗棿id
* @param view
* @return
*/
@RequestMapping("/index")
- public String index(ModelMap view) {
- view.put("flag", "index");
+ public String index(@RequestParam(value = "gid", required = false) String gid, ModelMap view) {
String videoUrl = dzhwkConfigData.getDzhwkVideo().replace(dzhwkConfigData.getProfile(),"/profile/");
view.put("videoUrl", videoUrl);
- view.put("imgUrl", "/profile/IMG/5303/SECURITY/aerial-5303_001-0.png");
return prefix + "index";
}
@@ -263,4 +253,48 @@
return prefix + "sys";
}
+ /**
+ * 閿佸睆
+ * @param view
+ * @return
+ */
+ @RequestMapping("/lock")
+ public String lock(@RequestParam(value = "flag", required = true) String flag, ModelMap view) {
+ view.put("flag", flag);
+ return prefix + "lock";
+ }
+
+ /**
+ * 瑙嗛棰勮椤甸潰
+ *
+ * @return
+ */
+ @RequestMapping("/dept-video")
+ public String deptVideo(@RequestParam(value = "id", required = true) String id,
+ ModelMap view) {
+
+ if(StringUtils.isNotEmpty(id)){
+ Dept dept = webManager.getDeptFile(id);
+ view.put("videoPath", dept.getVideoFilePath());
+ }
+
+ return prefix + "dept-video";
+ }
+
+ /**
+ * 楦熺灠鍥鹃瑙堥〉闈�
+ *
+ * @return
+ */
+ @RequestMapping("/dept-img")
+ public String deptImg(@RequestParam(value = "id", required = true) String id,
+ ModelMap view) {
+
+ if(StringUtils.isNotEmpty(id)){
+ Dept dept = webManager.getDeptFile(id);;
+ view.put("imgPath", dept.getImgFilePath());
+ }
+
+ return prefix + "dept-img";
+ }
}
--
Gitblit v1.9.3