lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java
@@ -1,6 +1,5 @@
package org.jeecg.modules.dnc.controller;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -13,7 +12,6 @@
import org.jeecg.modules.dnc.request.DocInfoUploadRequest;
import org.jeecg.modules.dnc.response.CommonCode;
import org.jeecg.modules.dnc.response.QueryListResponseResult;
import org.jeecg.modules.dnc.response.QueryPageResponseResult;
import org.jeecg.modules.dnc.response.ResponseResult;
import org.jeecg.modules.dnc.service.IDocInfoService;
import org.jeecg.modules.dnc.utils.ValidateUtil;
@@ -57,9 +55,9 @@
    @AutoLog(value = "文档表-删除文档信息")
    @ApiOperation(value = "文档表-删除文档信息", notes = "文档表-删除文档信息")
    @DeleteMapping("/delete")
    public ResponseResult deleteDocInfo(@RequestParam("id") String id) {
        boolean b = docInfoService.deleteDocInfo(id);
    @DeleteMapping("/delete/{id}/{attrType}/{attrId}")
    public ResponseResult deleteDocInfo(@PathVariable("id") String id, @PathVariable("attrType") String attrType, @PathVariable("attrId") String attrId) {
        boolean b = docInfoService.deleteDocInfo(id,attrType,attrId);
        if(!b)
            return new ResponseResult(CommonCode.FAIL);
        return new ResponseResult(CommonCode.SUCCESS);
@@ -132,8 +130,8 @@
    @AutoLog(value = "文档表-查询设备发送目录的文档状态")
    @ApiOperation(value = "文档表-查询设备发送目录的文档状态", notes = "文档表-查询设备发送目录的文档状态")
    @GetMapping("/find/page/device/{page}/{size}")
    public QueryPageResponseResult<DocInfo> findPageListByDevice(@PathVariable("page") int page, @PathVariable("size") int size, DocInfoQueryRequest docQuery) {
        return docInfoService.findPageListByDevice(page, size, docQuery);
    public Result<?> findPageListByDevice(@PathVariable("page") int page, @PathVariable("size") int size, DocInfoQueryRequest docQuery) {
        return Result.ok(docInfoService.findPageListByDevice(page, size, docQuery));
    }
    @AutoLog(value = "文档表-文档文件预览")
@@ -176,15 +174,16 @@
    @AutoLog(value = "文件表-查询可指派的文档信息列表")
    @ApiOperation(value = "文件表-查询可指派的文档信息列表", notes = "文件表-查询可指派的文档信息列表")
    @GetMapping("/find/list")
    public QueryListResponseResult<DocInfo> findList(DocInfoQueryRequest docQuery) {
        return docInfoService.findList(docQuery);
    public Result<?> findList(DocInfoQueryRequest docQuery) {
        List<DocInfo> docInfoList=docInfoService.findList(docQuery);
        return Result.ok(docInfoList);
    }
    @AutoLog(value = "文件表-批量删除文档接口")
    @ApiOperation(value = "文件表-批量删除文档接口", notes = "文件表-批量删除文档接口")
    @PostMapping("/batch/remove")
    public ResponseResult batchRemoveDocInfo(@RequestBody String[] docIds) {
        boolean b = docInfoService.batchRemoveDocInfo(docIds);
    @PostMapping("/batch/remove/{docIds}/{attrType}/{attrId}")
    public ResponseResult batchRemoveDocInfo(@PathVariable("docIds") String[] docIds, @PathVariable("attrType") String attrType, @PathVariable("attrId") String attrId) {
        boolean b = docInfoService.batchRemoveDocInfo(docIds,attrType,attrId);
        if(!b)
            return new ResponseResult(CommonCode.FAIL);
        return new ResponseResult(CommonCode.SUCCESS);