|
|
|
@ -18,6 +18,7 @@ package com.logpm.basicdata.controller;
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; |
|
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
|
|
|
|
import com.logpm.basicdata.dto.BasicdataWarehouseDTO; |
|
|
|
|
import com.logpm.basicdata.entity.BasicdataWarehouseEntity; |
|
|
|
@ -33,9 +34,11 @@ import io.swagger.annotations.ApiParam;
|
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.log4j.Log4j2; |
|
|
|
|
import org.springblade.core.boot.ctrl.BladeController; |
|
|
|
|
import org.springblade.core.cache.utils.CacheUtil; |
|
|
|
|
import org.springblade.core.excel.util.ExcelUtil; |
|
|
|
|
import org.springblade.core.mp.support.Condition; |
|
|
|
|
import org.springblade.core.mp.support.Query; |
|
|
|
|
import org.springblade.core.redis.cache.BladeRedis; |
|
|
|
|
import org.springblade.core.secure.BladeUser; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.constant.BladeConstant; |
|
|
|
@ -66,6 +69,8 @@ public class BasicdataWarehouseController extends BladeController {
|
|
|
|
|
|
|
|
|
|
private final IBasicdataWarehouseClient basicdataWarehouseClient; |
|
|
|
|
|
|
|
|
|
private final BladeRedis bladeRedis; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 仓库 详情 |
|
|
|
|
*/ |
|
|
|
@ -178,6 +183,7 @@ public class BasicdataWarehouseController extends BladeController {
|
|
|
|
|
@ApiOperation(value = "新增", notes = "传入warehouseWarehouse") |
|
|
|
|
public R save(@Valid @RequestBody BasicdataWarehouseEntity warehouseWarehouse) { |
|
|
|
|
warehouseWarehouse.setEnableStatus("2"); |
|
|
|
|
CacheUtil.evict("getMyWarehouseList","basicdata","WarehouseList"); |
|
|
|
|
return R.status(warehouseService.save(warehouseWarehouse)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -198,6 +204,7 @@ public class BasicdataWarehouseController extends BladeController {
|
|
|
|
|
@ApiOperationSupport(order = 6) |
|
|
|
|
@ApiOperation(value = "新增或修改", notes = "传入warehouseWarehouse") |
|
|
|
|
public R submit(@Valid @RequestBody BasicdataWarehouseEntity warehouseWarehouse) { |
|
|
|
|
CacheUtil.evict("getMyWarehouseList","basicdata","WarehouseList"); |
|
|
|
|
return R.status(warehouseService.saveOrUpdate(warehouseWarehouse)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -211,6 +218,9 @@ public class BasicdataWarehouseController extends BladeController {
|
|
|
|
|
@ApiOperationSupport(order = 7) |
|
|
|
|
@ApiOperation(value = "逻辑删除", notes = "传入ids") |
|
|
|
|
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { |
|
|
|
|
|
|
|
|
|
CacheUtil.evict("getMyWarehouseList","basicdata","WarehouseList"); |
|
|
|
|
|
|
|
|
|
boolean result = warehouseService.removeWarehouse(ids); |
|
|
|
|
if (result) { |
|
|
|
|
return R.status(true); |
|
|
|
@ -274,7 +284,14 @@ public class BasicdataWarehouseController extends BladeController {
|
|
|
|
|
@GetMapping("/getMyWarehouseList") |
|
|
|
|
@ApiOperationSupport(order = 3) |
|
|
|
|
public R<List<BasicdataWarehouseEntity>> getMyWarehouseList() { |
|
|
|
|
List<BasicdataWarehouseEntity> basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList(); |
|
|
|
|
|
|
|
|
|
List<BasicdataWarehouseEntity> basicdataGoodsShelfVOList = CacheUtil.get("getMyWarehouseList", "basicdata", "WarehouseList",List.class); |
|
|
|
|
|
|
|
|
|
if(ObjectUtils.isNull(basicdataGoodsShelfVOList)){ |
|
|
|
|
basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList(); |
|
|
|
|
CacheUtil.put("getMyWarehouseList","basicdata","WarehouseList",basicdataGoodsShelfVOList); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return R.data(basicdataGoodsShelfVOList); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|