Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-heli into dev
commit
4aaf964519
@ -1,106 +1,138 @@
|
||||
package com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder;
|
||||
|
||||
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.deliverorder.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
|
||||
import com.chanko.yunxi.mes.module.heli.service.deliverorder.DeliverOrderService;
|
||||
|
||||
@Tag(name = "管理后台 - 发货订单")
|
||||
@RestController
|
||||
@RequestMapping("/heli/deliver-order")
|
||||
@Validated
|
||||
public class DeliverOrderController {
|
||||
|
||||
@Resource
|
||||
private DeliverOrderService deliverOrderService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建发货订单")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:create')")
|
||||
public CommonResult<Long> createDeliverOrder(@Valid @RequestBody DeliverOrderSaveReqVO createReqVO) {
|
||||
return success(deliverOrderService.createDeliverOrder(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新发货订单")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:update')")
|
||||
public CommonResult<Boolean> updateDeliverOrder(@Valid @RequestBody DeliverOrderSaveReqVO updateReqVO) {
|
||||
deliverOrderService.updateDeliverOrder(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除发货订单")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:delete')")
|
||||
public CommonResult<Boolean> deleteDeliverOrder(@RequestParam("id") Long id) {
|
||||
deliverOrderService.deleteDeliverOrder(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得发货订单")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
|
||||
public CommonResult<DeliverOrderRespVO> getDeliverOrder(@RequestParam("id") Long id) {
|
||||
DeliverOrderDO deliverOrder = deliverOrderService.getDeliverOrder(id);
|
||||
return success(BeanUtils.toBean(deliverOrder, DeliverOrderRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得发货订单分页")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
|
||||
public CommonResult<PageResult<DeliverOrderRespVO>> getDeliverOrderPage(@Valid DeliverOrderPageReqVO pageReqVO) {
|
||||
PageResult<DeliverOrderDO> pageResult = deliverOrderService.getDeliverOrderPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, DeliverOrderRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出发货订单 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportDeliverOrderExcel(@Valid DeliverOrderPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<DeliverOrderDO> list = deliverOrderService.getDeliverOrderPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "发货订单.xls", "数据", DeliverOrderRespVO.class,
|
||||
BeanUtils.toBean(list, DeliverOrderRespVO.class));
|
||||
}
|
||||
|
||||
// ==================== 子表(发货订单子项) ====================
|
||||
|
||||
@GetMapping("/deliver-order-sub/list-by-delivery-order-id")
|
||||
@Operation(summary = "获得发货订单子项列表")
|
||||
@Parameter(name = "deliveryOrderId", description = "订单id")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
|
||||
public CommonResult<List<DeliverOrderSubDO>> getDeliverOrderSubListByDeliveryOrderId(@RequestParam("deliveryOrderId") Long deliveryOrderId) {
|
||||
return success(deliverOrderService.getDeliverOrderSubListByDeliveryOrderId(deliveryOrderId));
|
||||
}
|
||||
|
||||
}
|
||||
package com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum;
|
||||
import com.chanko.yunxi.mes.framework.operatelog.core.service.OperateLogFrameworkService;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderSaveReqVO;
|
||||
import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
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.time.LocalDateTime;
|
||||
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.deliverorder.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
|
||||
import com.chanko.yunxi.mes.module.heli.service.deliverorder.DeliverOrderService;
|
||||
|
||||
@Tag(name = "管理后台 - 发货订单")
|
||||
@RestController
|
||||
@RequestMapping("/heli/deliver-order")
|
||||
@Validated
|
||||
public class DeliverOrderController {
|
||||
|
||||
@Resource
|
||||
private DeliverOrderService deliverOrderService;
|
||||
|
||||
@Resource
|
||||
private OperateLogFrameworkService operateLogFrameworkService;
|
||||
|
||||
@Resource
|
||||
private HttpServletRequest request;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建发货订单")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:create')")
|
||||
public CommonResult<Long> createDeliverOrder(@Valid @RequestBody DeliverOrderSaveReqVO createReqVO) {
|
||||
return success(deliverOrderService.createDeliverOrder(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新发货订单")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:update')")
|
||||
public CommonResult<Boolean> updateDeliverOrder(@Valid @RequestBody DeliverOrderSaveReqVO updateReqVO) {
|
||||
deliverOrderService.updateDeliverOrder(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@PostMapping("/operate")
|
||||
@Operation(summary = "操作项目订单")
|
||||
@PreAuthorize("@ss.hasPermission('heli:delivery-order:update')")
|
||||
@OperateLog(enable = false)
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public CommonResult<Long> operateProjectOrder(@Valid @RequestBody DeliverOrderSaveReqVO operateReqVO) {
|
||||
LocalDateTime startTime = LocalDateTime.now();
|
||||
deliverOrderService.operateProjectOrder(operateReqVO);
|
||||
|
||||
// 手动记录日志
|
||||
operateLogFrameworkService.createOperateLog(request,
|
||||
startTime,
|
||||
BusinesTypeEnum.PROJECT_ORDER.name(),
|
||||
operateReqVO.getId(),
|
||||
OperateTypeEnum.valueOf(operateReqVO.getActive()).getType(),
|
||||
operateReqVO.getActiveOpinion());
|
||||
|
||||
return success(operateReqVO.getId());
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除发货订单")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:delete')")
|
||||
public CommonResult<Boolean> deleteDeliverOrder(@RequestParam("id") Long id) {
|
||||
deliverOrderService.deleteDeliverOrder(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得发货订单")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
|
||||
public CommonResult<DeliverOrderRespVO> getDeliverOrder(@RequestParam("id") Long id) {
|
||||
DeliverOrderDO deliverOrder = deliverOrderService.getDeliverOrder(id);
|
||||
return success(BeanUtils.toBean(deliverOrder, DeliverOrderRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得发货订单分页")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
|
||||
public CommonResult<PageResult<DeliverOrderRespVO>> getDeliverOrderPage(@Valid DeliverOrderPageReqVO pageReqVO) {
|
||||
PageResult<DeliverOrderDO> pageResult = deliverOrderService.getDeliverOrderPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, DeliverOrderRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出发货订单 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportDeliverOrderExcel(@Valid DeliverOrderPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<DeliverOrderDO> list = deliverOrderService.getDeliverOrderPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "发货订单.xls", "数据", DeliverOrderRespVO.class,
|
||||
BeanUtils.toBean(list, DeliverOrderRespVO.class));
|
||||
}
|
||||
|
||||
// ==================== 子表(发货订单子项) ====================
|
||||
|
||||
@GetMapping("/deliver-order-sub/list-by-delivery-order-id")
|
||||
@Operation(summary = "获得发货订单子项列表")
|
||||
@Parameter(name = "deliveryOrderId", description = "订单id")
|
||||
@PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
|
||||
public CommonResult<List<DeliverOrderSubDO>> getDeliverOrderSubListByDeliveryOrderId(@RequestParam("deliveryOrderId") Long deliveryOrderId) {
|
||||
return success(deliverOrderService.getDeliverOrderSubListByDeliveryOrderId(deliveryOrderId));
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,66 +1,67 @@
|
||||
package com.chanko.yunxi.mes.module.heli.service.deliverorder;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.*;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
|
||||
|
||||
/**
|
||||
* 发货订单 Service 接口
|
||||
*
|
||||
* @author 管理员
|
||||
*/
|
||||
public interface DeliverOrderService {
|
||||
|
||||
/**
|
||||
* 创建发货订单
|
||||
*
|
||||
* @param createReqVO 创建信息
|
||||
* @return 编号
|
||||
*/
|
||||
Long createDeliverOrder(@Valid DeliverOrderSaveReqVO createReqVO);
|
||||
|
||||
/**
|
||||
* 更新发货订单
|
||||
*
|
||||
* @param updateReqVO 更新信息
|
||||
*/
|
||||
void updateDeliverOrder(@Valid DeliverOrderSaveReqVO updateReqVO);
|
||||
|
||||
/**
|
||||
* 删除发货订单
|
||||
*
|
||||
* @param id 编号
|
||||
*/
|
||||
void deleteDeliverOrder(Long id);
|
||||
|
||||
/**
|
||||
* 获得发货订单
|
||||
*
|
||||
* @param id 编号
|
||||
* @return 发货订单
|
||||
*/
|
||||
DeliverOrderDO getDeliverOrder(Long id);
|
||||
|
||||
/**
|
||||
* 获得发货订单分页
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 发货订单分页
|
||||
*/
|
||||
PageResult<DeliverOrderDO> getDeliverOrderPage(DeliverOrderPageReqVO pageReqVO);
|
||||
|
||||
// ==================== 子表(发货订单子项) ====================
|
||||
|
||||
/**
|
||||
* 获得发货订单子项列表
|
||||
*
|
||||
* @param deliveryOrderId 订单id
|
||||
* @return 发货订单子项列表
|
||||
*/
|
||||
List<DeliverOrderSubDO> getDeliverOrderSubListByDeliveryOrderId(Long deliveryOrderId);
|
||||
|
||||
}
|
||||
package com.chanko.yunxi.mes.module.heli.service.deliverorder;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.*;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverordersub.DeliverOrderSubDO;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
|
||||
|
||||
/**
|
||||
* 发货订单 Service 接口
|
||||
*
|
||||
* @author 管理员
|
||||
*/
|
||||
public interface DeliverOrderService {
|
||||
|
||||
/**
|
||||
* 创建发货订单
|
||||
*
|
||||
* @param createReqVO 创建信息
|
||||
* @return 编号
|
||||
*/
|
||||
Long createDeliverOrder(@Valid DeliverOrderSaveReqVO createReqVO);
|
||||
|
||||
/**
|
||||
* 更新发货订单
|
||||
*
|
||||
* @param updateReqVO 更新信息
|
||||
*/
|
||||
void updateDeliverOrder(@Valid DeliverOrderSaveReqVO updateReqVO);
|
||||
|
||||
/**
|
||||
* 删除发货订单
|
||||
*
|
||||
* @param id 编号
|
||||
*/
|
||||
void deleteDeliverOrder(Long id);
|
||||
|
||||
/**
|
||||
* 获得发货订单
|
||||
*
|
||||
* @param id 编号
|
||||
* @return 发货订单
|
||||
*/
|
||||
DeliverOrderDO getDeliverOrder(Long id);
|
||||
|
||||
/**
|
||||
* 获得发货订单分页
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 发货订单分页
|
||||
*/
|
||||
PageResult<DeliverOrderDO> getDeliverOrderPage(DeliverOrderPageReqVO pageReqVO);
|
||||
|
||||
// ==================== 子表(发货订单子项) ====================
|
||||
|
||||
/**
|
||||
* 获得发货订单子项列表
|
||||
*
|
||||
* @param deliveryOrderId 订单id
|
||||
* @return 发货订单子项列表
|
||||
*/
|
||||
List<DeliverOrderSubDO> getDeliverOrderSubListByDeliveryOrderId(Long deliveryOrderId);
|
||||
|
||||
void operateProjectOrder(DeliverOrderSaveReqVO operateReqVO);
|
||||
}
|
||||
|
Loading…
Reference in new issue