Merge remote-tracking branch 'origin/master'

rain

2026-01-23 019f3dd14f140a3381aec0bb696e3a84f76c45e4

 drone-ops/drone-resource/src/main/java/org/sxkj/resource/controller/AttachController.java

@@ -132,17 +132,17 @@
   /**
    * 分页 附件表
    */
   // @GetMapping("/list")
   // @ApiOperationSupport(order = 2)
   // @ApiOperation(value = "附件分页", notes = "传入attach")
   // public R<IPage<Attach>> list(Attach attach, Query query) {
   //    List<String> wayLineJobIds = attach.getWayLineJobIds();
   //    QueryWrapper<Attach> queryWrapper1 = Condition.getQueryWrapper(attach);
   //    QueryWrapper<Attach> queryWrapper = queryWrapper1.in(!CollectionUtils.isEmpty(wayLineJobIds), "wayline_job_id", wayLineJobIds);
   //    queryWrapper.eq("is_deleted", 0);
   //    IPage<Attach> pages = attachService.page(Condition.getPage(query), queryWrapper);
   //    return R.data(pages);
   // }
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "附件分页", notes = "传入attach")
    public R<IPage<Attach>> list(Attach attach, Query query) {
       List<String> wayLineJobIds = attach.getWayLineJobIds();
       QueryWrapper<Attach> queryWrapper1 = Condition.getQueryWrapper(attach);
       QueryWrapper<Attach> queryWrapper = queryWrapper1.in(!CollectionUtils.isEmpty(wayLineJobIds), "wayline_job_id", wayLineJobIds);
       queryWrapper.eq("is_deleted", 0);
       IPage<Attach> pages = attachService.page(Condition.getPage(query), queryWrapper);
       return R.data(pages);
    }

   /**
    * 自定义分页 附件表
@@ -189,22 +189,22 @@
   /**
    * 新增 附件表
    */
   // @PostMapping("/save")
   // @ApiOperationSupport(order = 4)
   // @ApiOperation(value = "新增", notes = "传入attach")
   // public R save(@Valid @RequestBody Attach attach) {
   //    return R.status(attachService.save(attach));
   // }
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入attach")
    public R save(@Valid @RequestBody Attach attach) {
       return R.status(attachService.save(attach));
    }

   /**
    * 修改 附件表
    */
   // @PostMapping("/update")
   // @ApiOperationSupport(order = 5)
   // @ApiOperation(value = "修改", notes = "传入attach")
   // public R update(@Valid @RequestBody Attach attach) {
   //    return R.status(attachService.updateById(attach));
   // }
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入attach")
    public R update(@Valid @RequestBody Attach attach) {
       return R.status(attachService.updateById(attach));
    }