Merge branch 'master' of http://222.71.165.188:3000/yunxi/mes-heli
commit
1f6c0e8614
@ -0,0 +1,95 @@
|
||||
package com.chanko.yunxi.mes.module.heli.controller.admin.warehouse;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
import javax.validation.*;
|
||||
import javax.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
|
||||
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
|
||||
import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
|
||||
import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
|
||||
import com.chanko.yunxi.mes.module.heli.service.warehouse.WarehouseService;
|
||||
|
||||
@Tag(name = "管理后台 - 仓库")
|
||||
@RestController
|
||||
@RequestMapping("/heli/warehouse")
|
||||
@Validated
|
||||
public class WarehouseController {
|
||||
|
||||
@Resource
|
||||
private WarehouseService warehouseService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建仓库")
|
||||
@PreAuthorize("@ss.hasPermission('heli:warehouse:create')")
|
||||
public CommonResult<Long> createWarehouse(@Valid @RequestBody WarehouseSaveReqVO createReqVO) {
|
||||
return success(warehouseService.createWarehouse(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新仓库")
|
||||
@PreAuthorize("@ss.hasPermission('heli:warehouse:update')")
|
||||
public CommonResult<Boolean> updateWarehouse(@Valid @RequestBody WarehouseSaveReqVO updateReqVO) {
|
||||
warehouseService.updateWarehouse(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除仓库")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('heli:warehouse:delete')")
|
||||
public CommonResult<Boolean> deleteWarehouse(@RequestParam("id") Long id) {
|
||||
warehouseService.deleteWarehouse(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得仓库")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('heli:warehouse:query')")
|
||||
public CommonResult<WarehouseRespVO> getWarehouse(@RequestParam("id") Long id) {
|
||||
WarehouseDO warehouse = warehouseService.getWarehouse(id);
|
||||
return success(BeanUtils.toBean(warehouse, WarehouseRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得仓库分页")
|
||||
@PreAuthorize("@ss.hasPermission('heli:warehouse:query')")
|
||||
public CommonResult<PageResult<WarehouseRespVO>> getWarehousePage(@Valid WarehousePageReqVO pageReqVO) {
|
||||
PageResult<WarehouseDO> pageResult = warehouseService.getWarehousePage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, WarehouseRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出仓库 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('heli:warehouse:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportWarehouseExcel(@Valid WarehousePageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<WarehouseDO> list = warehouseService.getWarehousePage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "仓库.xls", "数据", WarehouseRespVO.class,
|
||||
BeanUtils.toBean(list, WarehouseRespVO.class));
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,35 @@
|
||||
package com.chanko.yunxi.mes.module.heli.dal.mysql.warehouse;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo.*;
|
||||
|
||||
/**
|
||||
* 仓库 Mapper
|
||||
*
|
||||
* @author 管理员
|
||||
*/
|
||||
@Mapper
|
||||
public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
|
||||
|
||||
default PageResult<WarehouseDO> selectPage(WarehousePageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<WarehouseDO>()
|
||||
.eqIfPresent(WarehouseDO::getId, reqVO.getId())
|
||||
.likeIfPresent(WarehouseDO::getWhNo, reqVO.getWhNo())
|
||||
.likeIfPresent(WarehouseDO::getWhName, reqVO.getWhName())
|
||||
.eqIfPresent(WarehouseDO::getContact, reqVO.getContact())
|
||||
.eqIfPresent(WarehouseDO::getTelephone, reqVO.getTelephone())
|
||||
.eqIfPresent(WarehouseDO::getWhStatus, reqVO.getWhStatus())
|
||||
.eqIfPresent(WarehouseDO::getCreator, reqVO.getCreator())
|
||||
.betweenIfPresent(WarehouseDO::getCreateTime, reqVO.getCreateTime())
|
||||
.eqIfPresent(WarehouseDO::getUpdater, reqVO.getUpdater())
|
||||
.betweenIfPresent(WarehouseDO::getUpdateTime, reqVO.getUpdateTime())
|
||||
.orderByDesc(WarehouseDO::getId));
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,55 @@
|
||||
package com.chanko.yunxi.mes.module.heli.service.warehouse;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.*;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
|
||||
|
||||
/**
|
||||
* 仓库 Service 接口
|
||||
*
|
||||
* @author 管理员
|
||||
*/
|
||||
public interface WarehouseService {
|
||||
|
||||
/**
|
||||
* 创建仓库
|
||||
*
|
||||
* @param createReqVO 创建信息
|
||||
* @return 编号
|
||||
*/
|
||||
Long createWarehouse(@Valid WarehouseSaveReqVO createReqVO);
|
||||
|
||||
/**
|
||||
* 更新仓库
|
||||
*
|
||||
* @param updateReqVO 更新信息
|
||||
*/
|
||||
void updateWarehouse(@Valid WarehouseSaveReqVO updateReqVO);
|
||||
|
||||
/**
|
||||
* 删除仓库
|
||||
*
|
||||
* @param id 编号
|
||||
*/
|
||||
void deleteWarehouse(Long id);
|
||||
|
||||
/**
|
||||
* 获得仓库
|
||||
*
|
||||
* @param id 编号
|
||||
* @return 仓库
|
||||
*/
|
||||
WarehouseDO getWarehouse(Long id);
|
||||
|
||||
/**
|
||||
* 获得仓库分页
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 仓库分页
|
||||
*/
|
||||
PageResult<WarehouseDO> getWarehousePage(WarehousePageReqVO pageReqVO);
|
||||
|
||||
}
|
@ -0,0 +1,81 @@
|
||||
package com.chanko.yunxi.mes.module.heli.service.warehouse;
|
||||
|
||||
import cn.hutool.core.lang.UUID;
|
||||
import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.*;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
|
||||
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
|
||||
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.warehouse.WarehouseMapper;
|
||||
|
||||
import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.SUPPLIER;
|
||||
import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.WAREHOUSE;
|
||||
import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
* 仓库 Service 实现类
|
||||
*
|
||||
* @author 管理员
|
||||
*/
|
||||
@Service
|
||||
@Validated
|
||||
public class WarehouseServiceImpl implements WarehouseService {
|
||||
|
||||
@Resource
|
||||
private WarehouseMapper warehouseMapper;
|
||||
|
||||
@Override
|
||||
public Long createWarehouse(WarehouseSaveReqVO createReqVO) {
|
||||
// 插入
|
||||
WarehouseDO warehouse = BeanUtils.toBean(createReqVO, WarehouseDO.class);
|
||||
warehouse.setWhNo(UUID.fastUUID().toString(true));
|
||||
warehouseMapper.insert(warehouse);
|
||||
|
||||
warehouse.setWhNo(WAREHOUSE.getCode(warehouse.getId().toString()));
|
||||
warehouseMapper.updateById(warehouse);
|
||||
// 返回
|
||||
return warehouse.getId();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateWarehouse(WarehouseSaveReqVO updateReqVO) {
|
||||
// 校验存在
|
||||
validateWarehouseExists(updateReqVO.getId());
|
||||
// 更新
|
||||
WarehouseDO updateObj = BeanUtils.toBean(updateReqVO, WarehouseDO.class);
|
||||
warehouseMapper.updateById(updateObj);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteWarehouse(Long id) {
|
||||
// 校验存在
|
||||
validateWarehouseExists(id);
|
||||
// 删除
|
||||
warehouseMapper.deleteById(id);
|
||||
}
|
||||
|
||||
private void validateWarehouseExists(Long id) {
|
||||
if (warehouseMapper.selectById(id) == null) {
|
||||
throw exception(WAREHOUSE_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public WarehouseDO getWarehouse(Long id) {
|
||||
return warehouseMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<WarehouseDO> getWarehousePage(WarehousePageReqVO pageReqVO) {
|
||||
return warehouseMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,40 @@
|
||||
import request from '@/config/axios'
|
||||
|
||||
export interface WarehouseVO {
|
||||
id: number
|
||||
whNo: string
|
||||
whName: string
|
||||
contact: string
|
||||
telephone: string
|
||||
whStatus: number
|
||||
}
|
||||
|
||||
// 查询仓库分页
|
||||
export const getWarehousePage = async (params) => {
|
||||
return await request.get({ url: `/heli/warehouse/page`, params })
|
||||
}
|
||||
|
||||
// 查询仓库详情
|
||||
export const getWarehouse = async (id: number) => {
|
||||
return await request.get({ url: `/heli/warehouse/get?id=` + id })
|
||||
}
|
||||
|
||||
// 新增仓库
|
||||
export const createWarehouse = async (data: WarehouseVO) => {
|
||||
return await request.post({ url: `/heli/warehouse/create`, data })
|
||||
}
|
||||
|
||||
// 修改仓库
|
||||
export const updateWarehouse = async (data: WarehouseVO) => {
|
||||
return await request.put({ url: `/heli/warehouse/update`, data })
|
||||
}
|
||||
|
||||
// 删除仓库
|
||||
export const deleteWarehouse = async (id: number) => {
|
||||
return await request.delete({ url: `/heli/warehouse/delete?id=` + id })
|
||||
}
|
||||
|
||||
// 导出仓库 Excel
|
||||
export const exportWarehouse = async (params) => {
|
||||
return await request.download({ url: `/heli/warehouse/export-excel`, params })
|
||||
}
|
Loading…
Reference in new issue