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/manager/WebManager.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 1 deletions(-) diff --git a/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/manager/WebManager.java b/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/manager/WebManager.java index eb2ead8..9012022 100644 --- a/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/manager/WebManager.java +++ b/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/manager/WebManager.java @@ -1,16 +1,31 @@ package com.fzzy.igds.dzhwk.manager; 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.domain.Granary; +import com.fzzy.igds.dzhwk.domain.HScreenSer; +import com.fzzy.igds.dzhwk.service.ScreenSerService; import com.fzzy.igds.file.FileService; +import com.fzzy.igds.gas.dto.GasData; +import com.fzzy.igds.gas.service.GasService; +import com.fzzy.igds.grain.dto.GrainData; +import com.fzzy.igds.grain.service.GrainService; import com.fzzy.igds.sys.CoreDeptService; -import com.ruoyi.common.config.FrameworkConfig; +import com.fzzy.igds.sys.DepotService; +import com.fzzy.igds.sys.GranaryService; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.io.File; +import java.util.ArrayList; +import java.util.List; /** * @Description @@ -27,6 +42,20 @@ private FileService fileService; @Resource private DzhwkConfigData dzhwkConfigData; + @Resource + private ScreenSerService screenSerService; + @Resource + private DepotService depotService; + @Resource + private GranaryService granaryService; + @Resource + private ISysUserService userService; + @Resource + private GrainService grainService; + + @Resource + private GasService gasService; + /** * 鏍规嵁鍗曚綅ID鑾峰彇鍗曚綅淇℃伅 * @@ -59,4 +88,78 @@ } return dept; } + + /** + * + * @param sid + * @return + */ + public List<HwkDepotDto> getDepotsByGid(String sid) { + + if(StringUtils.isEmpty(sid)){ + return null; + } + //鑾峰彇sid瀵瑰簲鐨勫粧闂翠俊鎭紱 + HScreenSer screenSer = screenSerService.getDataBySn(sid); + + if(null == screenSer || StringUtils.isEmpty(screenSer.getAjdh())){ + return null; + } + Granary granary = granaryService.getGranaryById(screenSer.getAjdh()); + if(null == granary){ + return null; + } + + List<Depot> list = depotService.getCacheByAjdn(screenSer.getCompanyId(), screenSer.getAjdh()); + if(null == list || list.isEmpty()){ + return null; + } + + List<HwkDepotDto> result = new ArrayList<>(); + HwkDepotDto hwkDepotDto; + for (Depot depot : list) { + hwkDepotDto = new HwkDepotDto(); + BeanUtils.copyProperties(depot, hwkDepotDto); + + hwkDepotDto.setGranaryName(granary.getAjmc()); + hwkDepotDto.setStoreKeeperName(StringUtils.isEmpty(depot.getStoreKeeperName())?"--":depot.getStoreKeeperName()); + hwkDepotDto.setFoodVarietyName(StringUtils.isEmpty(depot.getFoodVarietyName())?"--":depot.getFoodVarietyName()); + hwkDepotDto.setFoodTypeName(StringUtils.isEmpty(depot.getFoodTypeName())?"--":depot.getFoodTypeName()); + hwkDepotDto.setFoodLevelName(StringUtils.isEmpty(depot.getFoodLevelName())?"--":depot.getFoodLevelName()); + hwkDepotDto.setStorageReal(hwkDepotDto.getStorageReal()/1000); + + //鏌ヨ绮儏淇℃伅 + GrainData grainData = grainService.getCacheGrainDate(depot.getCompanyId(), depot.getId()); + if(null != grainData){ + hwkDepotDto.setInTemp(grainData.getTempIn() + ""); + hwkDepotDto.setInHumidity(grainData.getHumidityIn() + ""); + hwkDepotDto.setOutTemp(grainData.getTempOut() + ""); + hwkDepotDto.setOutHumidity(grainData.getHumidityOut() + ""); + hwkDepotDto.setMaxTemp(grainData.getTempMax() + ""); + hwkDepotDto.setMinTemp(grainData.getTempMin() + ""); + hwkDepotDto.setAveTemp(grainData.getTempAve() + ""); + hwkDepotDto.setGrainDate(grainData.getReceiveDate()); + + } + + //鏌ヨ姘斾綋淇℃伅 + GasData gasData = gasService.getCacheGrainDate(depot.getCompanyId(), depot.getId()); + if(null != gasData){ + hwkDepotDto.setPerO2(gasData.getPerO2() + ""); + hwkDepotDto.setPerPh3(gasData.getPerPh3() + ""); + hwkDepotDto.setPerCo2(gasData.getPerCo2() + ""); + hwkDepotDto.setGasDate(gasData.getReceiveDate()); + } + + //鏌ヨ淇濈鍛樹俊鎭� + if(StringUtils.isNotEmpty(depot.getStoreKeeper())){ + SysUser sysUser = userService.selectUserByLoginName(depot.getStoreKeeper()); + hwkDepotDto.setUserImgPath(StringUtils.isEmpty(sysUser.getAvatar())?"/img/dzhwk/imgl6.jpg":sysUser.getAvatar()); + hwkDepotDto.setStoreKeeperPhone(StringUtils.isEmpty(sysUser.getPhonenumber())?"--":sysUser.getPhonenumber()); + } + + result.add(hwkDepotDto); + } + return result; + } } -- Gitblit v1.9.3