parent
4ec5879745
commit
bb588ab0cb
@ -1,4 +1,41 @@
|
|||||||
package cc.yunxi.controller;
|
package cc.yunxi.controller;
|
||||||
|
|
||||||
|
import cc.yunxi.common.domain.CommonResult;
|
||||||
|
import cc.yunxi.common.domain.PageDTO;
|
||||||
|
import cc.yunxi.domain.po.RecycleCleanOrder;
|
||||||
|
import cc.yunxi.domain.query.RecycleCleanOrderQuery;
|
||||||
|
import cc.yunxi.domain.vo.recycleorder.RecycleCleanOrderVO;
|
||||||
|
import cc.yunxi.service.IRecycleCleanOrderService;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
|
@Api(tags = "清运订单接口")
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/clean-order")
|
||||||
|
@RequiredArgsConstructor
|
||||||
public class CleanOrderController {
|
public class CleanOrderController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private IRecycleCleanOrderService iRecycleCleanOrderService;
|
||||||
|
|
||||||
|
@ApiOperation("分页查询清运订单")
|
||||||
|
@PostMapping("/page")
|
||||||
|
private CommonResult<PageDTO<? extends RecycleCleanOrderVO>> queryOrderByPage(@RequestBody @Validated RecycleCleanOrderQuery cleanOrderQuery) {
|
||||||
|
Page<RecycleCleanOrder> result = iRecycleCleanOrderService.queryOrderByPage(cleanOrderQuery);
|
||||||
|
PageDTO<RecycleCleanOrderVO> orderVOPageDTO = PageDTO.of(result, RecycleCleanOrderVO.class);
|
||||||
|
return CommonResult.success(orderVOPageDTO);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation("根据id查询订单详情")
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
private CommonResult<RecycleCleanOrderVO> detailById(@PathVariable String id) {
|
||||||
|
RecycleCleanOrderVO recycleCleanOrderVO = iRecycleCleanOrderService.detailById(id);
|
||||||
|
return CommonResult.success(recycleCleanOrderVO);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,43 @@
|
|||||||
package cc.yunxi.controller;
|
package cc.yunxi.controller;
|
||||||
|
|
||||||
|
|
||||||
|
import cc.yunxi.common.domain.CommonResult;
|
||||||
|
import cc.yunxi.common.domain.PageDTO;
|
||||||
|
import cc.yunxi.domain.po.RecycleDeliveryOrder;
|
||||||
|
import cc.yunxi.domain.query.DeliveryOrderQuery;
|
||||||
|
import cc.yunxi.domain.vo.recycleorder.RecycleDeliveryOrderVO;
|
||||||
|
import cc.yunxi.service.IRecycleDeliveryOrderService;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
|
@Api(tags = "投运订单接口")
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/delivery-order")
|
||||||
|
@RequiredArgsConstructor
|
||||||
public class DeliveryOrderController {
|
public class DeliveryOrderController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private IRecycleDeliveryOrderService iRecycleDeliveryOrderService;
|
||||||
|
|
||||||
|
@ApiOperation("分页查询投运订单")
|
||||||
|
@PostMapping("/page")
|
||||||
|
private CommonResult<PageDTO<? extends RecycleDeliveryOrderVO>> queryOrderByPage(@RequestBody @Validated DeliveryOrderQuery deliveryOrderQuery) {
|
||||||
|
Page<RecycleDeliveryOrder> result = iRecycleDeliveryOrderService.queryOrderByPage(deliveryOrderQuery);
|
||||||
|
PageDTO<RecycleDeliveryOrderVO> orderVOPageDTO = PageDTO.of(result, RecycleDeliveryOrderVO.class);
|
||||||
|
return CommonResult.success(orderVOPageDTO);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation("根据id查询订单详情")
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
private CommonResult<RecycleDeliveryOrderVO> detailById(@PathVariable String id) {
|
||||||
|
RecycleDeliveryOrderVO recycleDeliveryOrderVO = iRecycleDeliveryOrderService.detailById(id);
|
||||||
|
return CommonResult.success(recycleDeliveryOrderVO);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,47 @@
|
|||||||
|
package cc.yunxi.domain.converter;
|
||||||
|
|
||||||
|
import cc.yunxi.domain.po.RecycleCleanOrder;
|
||||||
|
import cc.yunxi.domain.vo.recycleorder.RecycleCleanOrderVO;
|
||||||
|
import org.mapstruct.Mapper;
|
||||||
|
import org.mapstruct.factory.Mappers;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface RecycleCleanOrderConvertMapper {
|
||||||
|
|
||||||
|
RecycleCleanOrderConvertMapper INSTANCE = Mappers.getMapper(RecycleCleanOrderConvertMapper.class);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将 {@link RecycleCleanOrder} 转换为 {@link RecycleCleanOrderVO} 对象
|
||||||
|
*
|
||||||
|
* @param po PO对象
|
||||||
|
* @return DTO对象
|
||||||
|
*/
|
||||||
|
RecycleCleanOrderVO toVO(RecycleCleanOrder po);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将 {@link RecycleCleanOrderVO} 转换为 {@link RecycleCleanOrder} 对象
|
||||||
|
*
|
||||||
|
* @param dto DTO对象
|
||||||
|
* @return PO对象
|
||||||
|
*/
|
||||||
|
RecycleCleanOrder toDO(RecycleCleanOrderVO dto);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将 {@link RecycleCleanOrder} 转换为 {@link RecycleCleanOrderVO} 对象集合
|
||||||
|
*
|
||||||
|
* @param list PO对象
|
||||||
|
* @return DTO对象
|
||||||
|
*/
|
||||||
|
List<RecycleCleanOrderVO> toVO(List<RecycleCleanOrder> list);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将 {@link RecycleCleanOrder} 转换为 {@link RecycleCleanOrderVO} 对象集合
|
||||||
|
*
|
||||||
|
* @param list PO对象
|
||||||
|
* @return DTO对象
|
||||||
|
*/
|
||||||
|
List<RecycleCleanOrder> toDO(List<RecycleCleanOrderVO> list);
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,47 @@
|
|||||||
|
package cc.yunxi.domain.converter;
|
||||||
|
|
||||||
|
import cc.yunxi.domain.po.RecycleDeliveryOrder;
|
||||||
|
import cc.yunxi.domain.vo.recycleorder.RecycleDeliveryOrderVO;
|
||||||
|
import org.mapstruct.Mapper;
|
||||||
|
import org.mapstruct.factory.Mappers;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface RecycleDeliveryOrderConvertMapper {
|
||||||
|
|
||||||
|
RecycleDeliveryOrderConvertMapper INSTANCE = Mappers.getMapper(RecycleDeliveryOrderConvertMapper.class);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将 {@link RecycleDeliveryOrder} 转换为 {@link RecycleDeliveryOrderVO} 对象
|
||||||
|
*
|
||||||
|
* @param po PO对象
|
||||||
|
* @return DTO对象
|
||||||
|
*/
|
||||||
|
RecycleDeliveryOrderVO toVO(RecycleDeliveryOrder po);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将 {@link RecycleDeliveryOrderVO} 转换为 {@link RecycleDeliveryOrder} 对象
|
||||||
|
*
|
||||||
|
* @param dto DTO对象
|
||||||
|
* @return PO对象
|
||||||
|
*/
|
||||||
|
RecycleDeliveryOrder toDO(RecycleDeliveryOrderVO dto);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将 {@link RecycleDeliveryOrder} 转换为 {@link RecycleDeliveryOrderVO} 对象集合
|
||||||
|
*
|
||||||
|
* @param list PO对象
|
||||||
|
* @return DTO对象
|
||||||
|
*/
|
||||||
|
List<RecycleDeliveryOrderVO> toVO(List<RecycleDeliveryOrder> list);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将 {@link RecycleDeliveryOrder} 转换为 {@link RecycleDeliveryOrderVO} 对象集合
|
||||||
|
*
|
||||||
|
* @param list PO对象
|
||||||
|
* @return DTO对象
|
||||||
|
*/
|
||||||
|
List<RecycleDeliveryOrder> toDO(List<RecycleDeliveryOrderVO> list);
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,23 @@
|
|||||||
|
package cc.yunxi.domain.query;
|
||||||
|
|
||||||
|
import cc.yunxi.common.domain.PageQuery;
|
||||||
|
import cc.yunxi.domain.po.RecycleDeliveryOrder;
|
||||||
|
import io.swagger.annotations.ApiModel;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotBlank;
|
||||||
|
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@Accessors(chain = true)
|
||||||
|
@ApiModel(value = "DeliveryOrder", description = "投运订单查询条件")
|
||||||
|
public class DeliveryOrderQuery extends PageQuery<RecycleDeliveryOrder> {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "手机号", example = "17802164218")
|
||||||
|
@NotBlank(message = "手机号不能为空")
|
||||||
|
private String phoneNumber;
|
||||||
|
}
|
@ -0,0 +1,23 @@
|
|||||||
|
package cc.yunxi.domain.query;
|
||||||
|
|
||||||
|
import cc.yunxi.common.domain.PageQuery;
|
||||||
|
import cc.yunxi.domain.po.RecycleCleanOrder;
|
||||||
|
import io.swagger.annotations.ApiModel;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotBlank;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@Accessors(chain = true)
|
||||||
|
@ApiModel(value = "CleanOrder", description = "清运订单查询条件")
|
||||||
|
public class RecycleCleanOrderQuery extends PageQuery<RecycleCleanOrder> {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "手机号", example = "17802164218")
|
||||||
|
@NotBlank(message = "手机号不能为空")
|
||||||
|
private String phoneNumber;
|
||||||
|
|
||||||
|
}
|
@ -1,8 +1,25 @@
|
|||||||
package cc.yunxi.service;
|
package cc.yunxi.service;
|
||||||
|
|
||||||
import cc.yunxi.domain.po.RecycleCleanOrder;
|
import cc.yunxi.domain.po.RecycleCleanOrder;
|
||||||
import cc.yunxi.domain.po.RecycleDeviceEvent;
|
import cc.yunxi.domain.query.RecycleCleanOrderQuery;
|
||||||
|
import cc.yunxi.domain.vo.recycleorder.RecycleCleanOrderVO;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
public interface IRecycleCleanOrderService extends IService<RecycleCleanOrder> {
|
public interface IRecycleCleanOrderService extends IService<RecycleCleanOrder> {
|
||||||
|
/**
|
||||||
|
* 分页查询清运订单
|
||||||
|
*
|
||||||
|
* @param cleanOrderQuery 查询条件
|
||||||
|
* @return page
|
||||||
|
*/
|
||||||
|
Page<RecycleCleanOrder> queryOrderByPage(RecycleCleanOrderQuery cleanOrderQuery);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据id查询订单详情
|
||||||
|
*
|
||||||
|
* @param id 主键id
|
||||||
|
* @return vo
|
||||||
|
*/
|
||||||
|
RecycleCleanOrderVO detailById(String id);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in new issue