From 283da741b2429cf5a53786e5ee1b5528b757fdf6 Mon Sep 17 00:00:00 2001 From: czt <czt18638530771@163.com> Date: 星期三, 11 六月 2025 11:10:42 +0800 Subject: [PATCH] 首页及电子货位卡页面 --- igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java | 95 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 75 insertions(+), 20 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 0558441..1280489 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,13 +1,15 @@ package com.fzzy.igds.dzhwk.controller; -import com.fzzy.igds.dzhwk.data.DzhwkConfigData; +import com.fzzy.igds.dzhwk.data.HwkDepotDto; +import com.fzzy.igds.dzhwk.domain.Depot; +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; @@ -22,30 +24,30 @@ private static final String prefix = "dzhwk/"; @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"; - } + private WebManager webManager; /** * 棣栭〉 + * @param sid 璐т綅鍗¤澶嘢N * @param view * @return */ @RequestMapping("/index") - public String index(ModelMap view) { - view.put("flag", "index"); + public String index(@RequestParam(value = "sid", required = false) String sid, ModelMap view) { - String videoUrl = dzhwkConfigData.getDzhwkVideo().replace(dzhwkConfigData.getProfile(),"/profile/"); - view.put("videoUrl", videoUrl); + //鑾峰彇搴撳尯淇℃伅锛屾煡鐪嬭棰戣矾寰勫拰楦熺灠鍥捐矾寰� + Dept dept = webManager.getDeptFile("1000001001"); + view.put("videoUrl", dept.getVideoFilePath()); + view.put("imgUrl", dept.getImgFilePath()); + + //鏍规嵁璐т綅鍗N锛岃幏鍙栧搴斿粧闂翠笅鐨勮揣浣嶅垪琛ㄤ俊鎭� + if(StringUtils.isEmpty(sid)){ + sid = "FZZY0001"; + } + List<HwkDepotDto> list = webManager.getDepotsByGid(sid); + view.put("depotList", list); + + view.put("flag", "index"); return prefix + "index"; } @@ -55,7 +57,16 @@ * @return */ @RequestMapping("/dzhwk") - public String dzhwk(ModelMap view) { + public String dzhwk(@RequestParam(value = "sid", required = false) String sid, ModelMap view) { + + //鏍规嵁璐т綅鍗N锛岃幏鍙栧搴斿粧闂翠笅鐨勮揣浣嶅垪琛ㄤ俊鎭� + if(StringUtils.isEmpty(sid)){ + sid = "FZZY0001"; + } + List<HwkDepotDto> list = webManager.getDepotsByGid(sid); + view.put("depotList", list); + view.put("name", list.get(0).getGranaryName()); + view.put("flag", "dzhwk"); return prefix + "dzhwk"; } @@ -262,4 +273,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