Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

 src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java

@@ -3,11 +3,11 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.pojo.DocumentClassification;
import com.ruoyi.warehouse.service.DocumentClassificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -15,7 +15,7 @@
import java.util.List;

@RestController
@Api(tags = "文档分类")
@Tag(name = "文档分类")
@RequestMapping("/warehouse/documentClassification")
@AllArgsConstructor
public class DocumentClassificationController extends BaseController {
@@ -23,30 +23,30 @@

    //树结构
    @GetMapping("/getList")
    public AjaxResult getList() {
        return AjaxResult.success(documentClassificationService.selectDocumentClassificationList());
    public R<?> getList() {
        return R.ok(documentClassificationService.selectDocumentClassificationList());
    }

    @PostMapping("/add")
    @ApiOperation("文档分类-添加")
    @Operation(summary = "文档分类-添加")
    @Log(title = "文档分类-添加", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody DocumentClassification documentClassification) {
        return AjaxResult.success(documentClassificationService.save(documentClassification));
    public R<?> add(@RequestBody DocumentClassification documentClassification) {
        return R.ok(documentClassificationService.save(documentClassification));
    }

    @PutMapping("/update")
    @ApiOperation("文档分类-更新")
    @Operation(summary = "文档分类-更新")
    @Log(title = "文档分类-更新", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody DocumentClassification documentClassification) {
        return AjaxResult.success(documentClassificationService.updateById(documentClassification));
    public R<?> update(@RequestBody DocumentClassification documentClassification) {
        return R.ok(documentClassificationService.updateById(documentClassification));
    }

    @DeleteMapping("/delete")
    @ApiOperation("文档分类删除")
    @Operation(summary = "文档分类删除")
    @Log(title = "文档分类删除", businessType = BusinessType.DELETE)
    public AjaxResult delete(@RequestBody List<Long> ids) {
        if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("请传入要删除的ID");
        return AjaxResult.success(documentClassificationService.deleteByIds(ids));
    public R<?> delete(@RequestBody List<Long> ids) {
        if (CollectionUtils.isEmpty(ids)) return R.fail("请传入要删除的ID");
        return R.ok(documentClassificationService.deleteByIds(ids));
    }

}