From 87e07ac8b8f1868eb4302fac73dfc93c5417f977 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 11:06:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java | 124 +++++++++++++++++++++++++++++++++++++----
1 files changed, 112 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
index 78b949f..b66f156 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.SlGoodsShelf;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.dto.GoodsShelfDTO;
@@ -15,9 +17,12 @@
import com.ruoyi.management.service.SlGoodsShelfService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.management.service.SlStoreManagementService;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -35,14 +40,24 @@
@Resource
private SlStoreManagementService SlStoreManagementService;
+
+ @Resource
+ private SysUserClient sysUserClient;
+
+
@Override
public PageDTO<SlGoodsShelfVO> getGoodsShelfList(SlGoodsShelfQuery slGoodsShelfQuery) {
+ Long userid = SecurityUtils.getUserId();
+ SysUser data = sysUserClient.getSysUser(userid).getData();
LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
+ if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!=""){
+ wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
+ }
if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
wrapper.eq(SlStoreManagement::getStoreManagementGrade,slGoodsShelfQuery.getStoreManagementNumber());
}
+ wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
wrapper.eq(SlStoreManagement::getDelFlag,0);
List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper);
Set<Long> slStoreManagementIdList = null;
@@ -53,8 +68,14 @@
Page<SlGoodsShelf> page = new Page<>(slGoodsShelfQuery.getPageCurr(), slGoodsShelfQuery.getPageSize());
LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
- if (slStoreManagementIdList.size()>0){
- wrapper1.in(SlGoodsShelf::getStoreManagementId,slStoreManagementIdList);
+ if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
+ if (slStoreManagementIdList.size() > 0) {
+ wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
+ } else {
+ slStoreManagementIdList=new HashSet<>();
+ slStoreManagementIdList.add(0L);
+ wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
+ }
}
wrapper1.eq( SlGoodsShelf::getDelFlag,0);
wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
@@ -82,6 +103,44 @@
}
@Override
+ public List<SlGoodsShelf> getBGoodsShelfList(SlGoodsShelfQuery slGoodsShelfQuery) {
+ Long userid = SecurityUtils.getUserId();
+ SysUser data = sysUserClient.getSysUser(userid).getData();
+
+ LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
+ if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!=""){
+ wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
+ }
+ if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
+ wrapper.eq(SlStoreManagement::getStoreManagementGrade,slGoodsShelfQuery.getStoreManagementNumber());
+ }
+ wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
+ wrapper.eq(SlStoreManagement::getDelFlag,0);
+ List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper);
+ Set<Long> slStoreManagementIdList = null;
+ slStoreManagementIdList = page1.stream().map(SlStoreManagement::getId)
+ .collect(Collectors.toSet());
+
+
+ LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
+ if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
+ if (slStoreManagementIdList.size() > 0) {
+ wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
+ } else {
+ slStoreManagementIdList=new HashSet<>();
+ slStoreManagementIdList.add(0L);
+ wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
+ }
+ }
+ wrapper1.eq( SlGoodsShelf::getDelFlag,0);
+ wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
+ List<SlGoodsShelf> page2 = this.list(wrapper1);
+
+ return page2;
+ }
+
+ @Override
public void addSlGoodsShelf(SlGoodsShelfDTO slGoodsShelfDTO) {
if (slGoodsShelfDTO.getId()==null){
SlGoodsShelf slGoodsShelf=new SlGoodsShelf();
@@ -97,11 +156,33 @@
if (slGoodsShelfDTO.getStoreManagementNumber()!=null){
slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
}
- if (slGoodsShelfDTO.getGoodsShelfName()!=null){
- slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
+ if (slGoodsShelfDTO.getStoreManagementId()!=null){
+ slGoodsShelf.setStoreManagementId(slGoodsShelfDTO.getStoreManagementId());
}
this.updateById(slGoodsShelf);
}
+ }
+
+ @Override
+ public SlGoodsShelfVO getSlGoodsShelfOne(Long id) {
+ SlGoodsShelf byId1 = this.getById(id);
+ SlGoodsShelfVO slGoodsShelfVO=new SlGoodsShelfVO();
+ BeanUtils.copyProperties(byId1,slGoodsShelfVO.getClass());
+ slGoodsShelfVO.setGoodsShelfName(byId1.getGoodsShelfName());
+ SlStoreManagement byId = SlStoreManagementService.getById(byId1.getStoreManagementId());
+ slGoodsShelfVO.setStoreManagementId(byId1.getStoreManagementId());
+ slGoodsShelfVO.setStoreManagementName(byId.getStoreManagementName());
+ slGoodsShelfVO.setStoreManagementNumber(byId.getStoreManagementNumber());
+ slGoodsShelfVO.setProvinceName(byId.getProvinceName());
+ slGoodsShelfVO.setProvinceCode(byId.getProvinceCode());
+ slGoodsShelfVO.setCityName(byId.getCityName());
+ slGoodsShelfVO.setCityCode(byId.getCityCode());
+ slGoodsShelfVO.setCountyName(byId.getCountyName());
+ slGoodsShelfVO.setCountyCode(byId.getCountyCode());
+ slGoodsShelfVO.setTownCode(byId.getTownCode());
+ slGoodsShelfVO.setTownName(byId.getTownName());
+
+ return slGoodsShelfVO;
}
@Override
@@ -109,7 +190,6 @@
LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(SlGoodsShelf::getStoreManagementId,goodsShelfQuery.getStoreManagementId());
wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,goodsShelfQuery.getStoreManagementNumber());
- wrapper1.eq(SlGoodsShelf::getIsStoreManagement,1);
wrapper1.eq( SlGoodsShelf::getDelFlag,0);
wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
List<SlGoodsShelf> page2 = this.list(wrapper1);
@@ -118,12 +198,17 @@
@Override
public void fanzGoodsShelfList(GoodsShelfDTO goodsShelfDTO) {
- SlGoodsShelf slGoodsShelf = this.getById(goodsShelfDTO.getId());
- slGoodsShelf.setImgId(goodsShelfDTO.getImgId());
- slGoodsShelf.setIsStoreManagement(2);
- slGoodsShelf.setZbX(goodsShelfDTO.getZbX());
- slGoodsShelf.setZbY(goodsShelfDTO.getZbY());
- this.updateById(slGoodsShelf);
+ for(GoodsShelfDTO.ShelfDTO g:goodsShelfDTO.getShelfDTOS()){
+ SlGoodsShelf slGoodsShelf = this.getById(g.getId());
+ slGoodsShelf.setImgId(goodsShelfDTO.getImgId());
+ slGoodsShelf.setIsStoreManagement(2);
+ slGoodsShelf.setZbX(g.getZbX());
+ slGoodsShelf.setZbY(g.getZbY());
+ slGoodsShelf.setWidth(g.getWidth());
+ slGoodsShelf.setHeight(g.getHeight());
+ this.updateById(slGoodsShelf);
+ }
+
}
@Override
@@ -136,4 +221,19 @@
List<SlGoodsShelf> page2 = this.list(wrapper1);
return page2;
}
+
+ @Override
+ public List<SlGoodsShelf> getGoodsSheManagementlfList(SlGoodsShelfQuery slGoodsShelfQuery) {
+ LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
+ if (slGoodsShelfQuery.getStoreManagementId()!=null){
+ wrapper1.eq(SlGoodsShelf::getStoreManagementId,slGoodsShelfQuery.getStoreManagementId());
+ }
+ if (slGoodsShelfQuery.getStoreManagementNumber()!=null){
+ wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,slGoodsShelfQuery.getStoreManagementNumber());
+ }
+ wrapper1.eq( SlGoodsShelf::getDelFlag,0);
+ wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
+ List<SlGoodsShelf> page2 = this.list(wrapper1);
+ return page2;
+ }
}
--
Gitblit v1.7.1