feat: 数据迁移;netty通信;bug修改

hjl

2024-07-23 562699fa6d0c279fe0f4f81ce87c336a34a3fb91

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChangeDispatchController.java

@@ -1,15 +1,14 @@
package com.ruoyi.order.controller;


import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.order.entity.ChangeDispatch;
import com.ruoyi.order.entity.Order;
import com.ruoyi.order.request.ChangeDispatchRequest;
import com.ruoyi.order.service.ChangeDispatchService;
import com.ruoyi.order.service.OrderService;
import io.swagger.annotations.Api;
@@ -45,12 +44,11 @@
    /**
     * 订单改派分页列表
     *
     * @param pageNum  页码
     * @param pageSize 每页显示条数
     * @param request 查询参数
     */
    @RequiresPermissions("reassignment_apply")
    @ApiOperation(value = "订单改派分页查询列表", tags = {"后台-系统设置-订单改派管理"})
    @GetMapping(value = "/page")
    @PostMapping(value = "/page")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "师傅名称", name = "workerName", dataType = "String"),
            @ApiImplicitParam(value = "订单编号", name = "orderNumber", dataType = "String"),
@@ -58,26 +56,9 @@
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<Page<ChangeDispatch>> queryPageList(@RequestParam(value = "workerName", required = false) String workerName,
                                                 @RequestParam(value = "orderNumber", required = false) String orderNumber,
                                                 @RequestParam(value = "userName", required = false) String userName,
                                                 @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        LambdaQueryChainWrapper<ChangeDispatch> wrapper = changeDispatchService.lambdaQuery();
        wrapper = StringUtils.isNotBlank(workerName) ? wrapper.like(ChangeDispatch::getWorkerName, workerName) : wrapper;
        wrapper = StringUtils.isNotBlank(orderNumber) ? wrapper.like(ChangeDispatch::getOrderNumber, orderNumber) : wrapper;
        wrapper = StringUtils.isNotBlank(userName) ? wrapper.like(ChangeDispatch::getUserName, userName) : wrapper;
        Page<ChangeDispatch> page = wrapper.eq(ChangeDispatch::getIsDelete, 0)
                .orderByDesc(ChangeDispatch::getCreateTime).page(Page.of(pageNum, pageSize));
        for (ChangeDispatch record : page.getRecords()) {
            String orderId = record.getOrderId();
            Order order = orderService.lambdaQuery()
                    .eq(Order::getId, orderId)
                    .eq(Order::getIsDelete, 0).one();
            if (null != order) {
                record.setOrderTime(order.getCreateTime());
            }
        }
    public R<Page<ChangeDispatch>> queryPageList(@RequestBody ChangeDispatchRequest request) {
        Page<ChangeDispatch> page = changeDispatchService.queryPageList(request, Page.of(request.getPageNum(),
                request.getPageSize()));
        return R.ok(page);
    }

@@ -202,6 +183,7 @@
                .eq(Order::getId, changeDispatch.getOrderId())
                .eq(Order::getIsDelete, 0).one();
        order.setState(Constants.ONE);
        Integer serverId = order.getServerId();
        return R.ok(update && orderService.updateById(order));
    }