封装返回值

xin

2025-06-24 3e5c32288447da14ad6032aeb5bf5f79fa9a0560

 oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java

@@ -4,18 +4,22 @@
import com.oying.modules.sh.domain.Order;
import com.oying.modules.sh.service.OrderService;
import com.oying.modules.sh.domain.dto.OrderQueryCriteria;
import com.oying.utils.R;
import lombok.RequiredArgsConstructor;

import java.util.List;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;

import java.io.IOException;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.utils.PageResult;

/**
* @author lixin
@@ -39,9 +43,9 @@
    @GetMapping
    @ApiOperation("查询订单信息")
    @PreAuthorize("@el.check('order:list')")
    public ResponseEntity<PageResult<Order>> queryOrder(OrderQueryCriteria criteria){
    public ResponseEntity<Object> queryOrder(OrderQueryCriteria criteria) {
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
        return new ResponseEntity<>(orderService.queryAll(criteria,page),HttpStatus.OK);
        return new ResponseEntity<>(R.success(orderService.queryAll(criteria, page)), HttpStatus.OK);
    }

    @PostMapping
@@ -50,7 +54,7 @@
    @PreAuthorize("@el.check('order:add')")
    public ResponseEntity<Object> createOrder(@Validated @RequestBody Order resources){
        orderService.create(resources);
        return new ResponseEntity<>(HttpStatus.CREATED);
        return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
    }

    @PutMapping
@@ -59,7 +63,7 @@
    @PreAuthorize("@el.check('order:edit')")
    public ResponseEntity<Object> updateOrder(@Validated @RequestBody Order resources){
        orderService.update(resources);
        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
        return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
    }

    @DeleteMapping
@@ -68,6 +72,6 @@
    @PreAuthorize("@el.check('order:del')")
    public ResponseEntity<Object> deleteOrder(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
        orderService.deleteAll(ids);
        return new ResponseEntity<>(HttpStatus.OK);
        return new ResponseEntity<>(R.success(), HttpStatus.OK);
    }
}