yq 3 anni fa
parent
commit
1f760e6a45

+ 0 - 10
src/main/java/com/usky/dxtop/controller/web/SysFileController.java

@@ -1,10 +1,7 @@
 package com.usky.dxtop.controller.web;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.dxtop.common.core.domain.AjaxResult;
-import com.usky.dxtop.model.SysFile;
 import com.usky.dxtop.service.SysFileService;
 import com.usky.dxtop.service.vo.SysFileQueryRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,12 +59,5 @@ public class SysFileController {
                              @RequestParam(value = "ids[]",required = false) String[] ids){
         return AjaxResult.success(sysFileService.active(batchNo,Arrays.asList(ids)));
     }
-
-    @PostMapping("/files")
-    public AjaxResult files(@RequestParam(value = "batchNo[]",required = false) String[] batchNo){
-        LambdaQueryWrapper<SysFile> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.in(SysFile::getBatchNo,Arrays.asList(batchNo));
-        return AjaxResult.success(sysFileService.list(queryWrapper));
-    }
 }
 

+ 2 - 1
src/main/java/com/usky/dxtop/service/impl/SysFileServiceImpl.java

@@ -127,7 +127,8 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
         LambdaQueryWrapper<SysFile> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(StringUtils.isNotBlank(req.getBatchNo()), SysFile::getBatchNo, req.getBatchNo())
                 .eq(SysFile::getActiveFlag, 1)
-                .in(!CollectionUtils.isEmpty(req.getIds()), SysFile::getId, req.getIds());
+                .in(!CollectionUtils.isEmpty(req.getIds()), SysFile::getId, req.getIds())
+                .in(!CollectionUtils.isEmpty(req.getBatchNos()), SysFile::getBatchNo, req.getBatchNos());
         List<SysFile> list = this.list(queryWrapper);
         return list.stream().peek(sysFile -> {
             String url = sysFile.getUrl();

+ 2 - 0
src/main/java/com/usky/dxtop/service/vo/SysFileQueryRequest.java

@@ -16,4 +16,6 @@ public class SysFileQueryRequest {
     private Integer activeFlag;
 
     private List<Long> ids;
+
+    private List<String> batchNos;
 }