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 | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 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 24533a2..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,6 +1,7 @@ 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; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; +import java.util.List; /** * @Description @@ -22,21 +24,30 @@ private static final String prefix = "dzhwk/"; @Resource - private DzhwkConfigData dzhwkConfigData; - @Resource private WebManager webManager; /** * 棣栭〉 - * @param gid 寤掗棿id + * @param sid 璐т綅鍗¤澶嘢N * @param view * @return */ @RequestMapping("/index") - public String index(@RequestParam(value = "gid", required = false) String gid, ModelMap view) { + 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"; } @@ -46,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"; } -- Gitblit v1.9.3