1.修改缓存实体

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java

@@ -85,7 +85,7 @@ public interface IBasicdataWarehouseClient {
 	 * @return
 	 */
 	@GetMapping(API_PREFIX+"/getMyWarehouseList")
-	List<BasicdataWarehouseVO> getMyWarehouseList();
+	List<BasicdataWarehouseEntity> getMyWarehouseList();
 
 	/**
 	 * 将当前登录人选择仓库存至缓存
@@ -99,7 +99,7 @@ public interface IBasicdataWarehouseClient {
 	 * @return
 	 */
 	@GetMapping(API_PREFIX+"/getMyCurrentWarehouse")
-	BasicdataWarehouseVO getMyCurrentWarehouse();
+	BasicdataWarehouseEntity getMyCurrentWarehouse();
 
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -103,8 +103,8 @@ public class BasicdataWarehouseController extends BladeController {
 
 		warehouseWarehouse.put("endDate", null);
 		//获取当前登录人仓库
-		List<BasicdataWarehouseVO> myWarehouseList = new ArrayList<>();
+		List<BasicdataWarehouseEntity> myWarehouseList = new ArrayList<>();
-		BasicdataWarehouseVO myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (Objects.isNull(myCurrentWarehouse)){
 			 myWarehouseList = basicdataWarehouseClient.getMyWarehouseList();
 		}else {myWarehouseList.add(myCurrentWarehouse);}
@@ -254,8 +254,8 @@ public class BasicdataWarehouseController extends BladeController {
 	@GetMapping("/getMyWarehouseList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf")
-	public R<List<BasicdataWarehouseVO>> getMyWarehouseList() {
+	public R<List<BasicdataWarehouseEntity>> getMyWarehouseList() {
-		List<BasicdataWarehouseVO> basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList();
+		List<BasicdataWarehouseEntity> basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList();
 		return R.data(basicdataGoodsShelfVOList);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java

@@ -119,8 +119,8 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 	 */
 	@GetMapping(API_PREFIX+"/getMyWarehouseList")
 	@Override
-	public List<BasicdataWarehouseVO> getMyWarehouseList() {
+	public List<BasicdataWarehouseEntity> getMyWarehouseList() {
-		List<BasicdataWarehouseVO> myWarehouseList = warehouseWarehouseService.getMyWarehouseList();
+		List<BasicdataWarehouseEntity> myWarehouseList = warehouseWarehouseService.getMyWarehouseList();
 		return myWarehouseList;
 	}
 
@@ -142,9 +142,9 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 	 */
 	@GetMapping(API_PREFIX+"/getMyCurrentWarehouse")
 	@Override
-	public BasicdataWarehouseVO getMyCurrentWarehouse() {
+	public BasicdataWarehouseEntity getMyCurrentWarehouse() {
-		BasicdataWarehouseVO myCurrentWarehouse = warehouseWarehouseService.getMyCurrentWarehouse();
+		BasicdataWarehouseEntity warehouseEntity = warehouseWarehouseService.getMyCurrentWarehouse();
-		return myCurrentWarehouse;
+		return warehouseEntity;
 	}
 
 	@Override

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java

@@ -92,7 +92,7 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
 	 * 根据当前登陆人获取仓库列表
 	 * @return
 	 */
-	List<BasicdataWarehouseVO> getMyWarehouseList();
+	List<BasicdataWarehouseEntity> getMyWarehouseList();
 
 	/**
 	 * 保存当前用户选择的仓库至Redis缓存中
@@ -103,7 +103,7 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
 	/**
 	 * 根据当前登录用户查询Redis缓存中选择的仓库信息
 	 */
-	BasicdataWarehouseVO getMyCurrentWarehouse();
+	BasicdataWarehouseEntity getMyCurrentWarehouse();
 
     BasicdataWarehouseEntity getWarehouseEntityByWarehouseCode(String warehouseCode);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -53,10 +53,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import java.util.Collections;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 /**
  * 货区 服务实现类
@@ -183,12 +180,16 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 	public List<BasicdataWarehouseVO> getNode() {
 		//查询当前登陆用户能够操作的仓库列表
 //		BladeUser user = AuthUtil.getUser();
-		List<BasicdataWarehouseVO> myWarehouseList = basicdataWarehouseService.getMyWarehouseList();
+		List<BasicdataWarehouseEntity> myWarehouseList = basicdataWarehouseService.getMyWarehouseList();
+		ArrayList<BasicdataWarehouseVO> arrayList = new ArrayList<>();
 		if (Func.isNotEmpty(myWarehouseList)){
 			myWarehouseList.forEach(w->{
+				BasicdataWarehouseVO basicdataWarehouseVO = new BasicdataWarehouseVO();
+				Func.copy(w,basicdataWarehouseVO);
 				LambdaQueryWrapper<BasicdataGoodsAreaEntity> qw = Wrappers.<BasicdataGoodsAreaEntity>query().lambda().eq(BasicdataGoodsAreaEntity::getWarehouseId, w.getId());
 				List<BasicdataGoodsAreaEntity> basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(qw);
-				w.setChildren(basicdataGoodsAreaEntities);
+				basicdataWarehouseVO.setChildren(basicdataGoodsAreaEntities);
+				arrayList.add(basicdataWarehouseVO);
 			});
 		}
 //		//查询一级仓库节点信息
@@ -198,7 +199,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 //			List<BasicdataNodeVO> goodeAreaNodes = goodsAllocationMapper.selectSecondNode(basicdataNodeVO.getValue());
 //			basicdataNodeVO.setChildren(goodeAreaNodes);
 //		}
-		return myWarehouseList;
+		return arrayList;
 	}
 
 	@Override

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@@ -38,6 +38,7 @@ import com.logpm.basicdata.mapper.BasicdataGoodsShelfMapper;
 import com.logpm.basicdata.service.IBasicdataGoodsAllocationService;
 import com.logpm.basicdata.service.IBasicdataGoodsShelfService;
 import com.logpm.basicdata.vo.BasicdataGoodsShelfVO;
+import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
 import lombok.AllArgsConstructor;
@@ -132,8 +133,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			log.error("仓库货区信息不合法");
 			throw new RuntimeException("请完善货区信息!!!");
 		}
-		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
+		BasicdataWarehouseEntity basicdataWarehouseVO = basicdataWarehouseClient.getMyCurrentWarehouse();
-		if (Objects.isNull(basicdataWarehouseEntity)){
+		if (Objects.isNull(basicdataWarehouseVO)){
 			throw new RuntimeException("当前登录人没有选择仓库!!!");
 		}
 		BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity();
@@ -161,7 +162,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 		String shelfCode =basicdataGoodsShelfDTO.getGoodsAreaName();
 		basicdataGoodsShelfEntity.setQrCode(shelfCode);
 //		basicdataGoodsShelfEntity.setWarehouseId(1687637854291722242L);
-		basicdataGoodsShelfEntity.setWarehouseId(basicdataWarehouseEntity.getId());
+		basicdataGoodsShelfEntity.setWarehouseId(basicdataWarehouseVO.getId());
 		result = this.save(basicdataGoodsShelfEntity);
 		//这里需要根据货架的列数和层数进行货位信息的生成
 //		Integer rowNum = basicdataGoodsShelfEntity.getRowNum();

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -156,7 +156,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 	 */
 
 	@Override
-	public List<BasicdataWarehouseVO> getMyWarehouseList() {
+	public List<BasicdataWarehouseEntity> getMyWarehouseList() {
 
 		// 获取当前登陆人
 		BladeUser user = AuthUtil.getUser();
@@ -174,7 +174,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		}
 		String str = depts.deleteCharAt(depts.length() - 1).toString();
 		List<BasicdataWarehouseEntity> warehouseEntityList = baseMapper.selectList(Wrappers.<BasicdataWarehouseEntity>query().lambda().in(BasicdataWarehouseEntity::getDepartment, str));
-		return BasicdataWarehouseWrapper.build().listVO(warehouseEntityList);
+		return warehouseEntityList;
 	}
 
 
@@ -196,10 +196,10 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 //			1、用户只有一个仓库信息，直接返回
 //			2、用户没有选择仓库的动作，返回null
 	@Override
-	public BasicdataWarehouseVO getMyCurrentWarehouse() {
+	public BasicdataWarehouseEntity getMyCurrentWarehouse() {
 		BladeUser user = AuthUtil.getUser();
 		String str = user.getTenantId()+"--" + user.getUserId();
-		BasicdataWarehouseVO o = redis.get(str);
+		BasicdataWarehouseEntity o = redis.get(str);
 		return o;
 	}