feat: 代码重构

hjl

2024-07-16 ec6d43aa07ee0e8faf34498057ebcfbb446aa015

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java

@@ -1,13 +1,12 @@
package com.ruoyi.admin.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.Evaluate;
import com.ruoyi.admin.service.EvaluateService;
import com.ruoyi.admin.vo.EvaluatePageVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.order.api.entity.Evaluate;
import com.ruoyi.order.api.entity.EvaluatePageVO;
import com.ruoyi.order.api.feignClient.EvaluateClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -18,9 +17,6 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -36,7 +32,7 @@
public class EvaluateController {

    @Resource
    private EvaluateService evaluateService;
    private EvaluateClient evaluateClient;

    /**
     * 订单评价分页列表
@@ -54,10 +50,10 @@
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<IPage<EvaluatePageVO>> queryPageList(String userNo, String orderNumber, String workerName,
    public R<Page<EvaluatePageVO>> queryPageList(String userNo, String orderNumber, String workerName,
                                                  @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(evaluateService.queryPageList(userNo, orderNumber, workerName, Page.of(pageNum, pageSize)));
        return evaluateClient.queryPageList(userNo, orderNumber, workerName, pageNum, pageSize);
    }

    /**
@@ -72,7 +68,7 @@
            @ApiImplicitParam(value = "订单评价id", name = "id", dataType = "Integer", required = true)
    })
    public R<Evaluate> detail(@RequestParam Integer id) {
        return R.ok(evaluateService.getById(id));
        return evaluateClient.detail(id);
    }

    /**
@@ -87,10 +83,7 @@
            @ApiImplicitParam(value = "多条订单评价id ',' 拼接", name = "ids", dataType = "String", required = true)
    })
    public R<String> batchDelete(@RequestParam String ids) {
        List<String> idList = Arrays.stream(ids.split(",")).collect(Collectors.toList());
        List<Evaluate> list = evaluateService.lambdaQuery().in(Evaluate::getId, idList).list();
        list.forEach(data -> data.setIsDelete(1));
        return evaluateService.updateBatchById(list) ? R.ok() : R.fail();
        return evaluateClient.batchDelete(ids);
    }