|
@@ -14,7 +14,6 @@ import com.inspur.source.mapper.*;
|
|
|
import com.inspur.source.service.ISmsbMinioDataService;
|
|
import com.inspur.source.service.ISmsbMinioDataService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.dromara.common.core.constant.Constants;
|
|
|
|
|
import org.dromara.common.core.exception.ServiceException;
|
|
import org.dromara.common.core.exception.ServiceException;
|
|
|
import org.dromara.common.core.utils.MapstructUtils;
|
|
import org.dromara.common.core.utils.MapstructUtils;
|
|
|
import org.dromara.common.core.utils.StringUtils;
|
|
import org.dromara.common.core.utils.StringUtils;
|
|
@@ -50,8 +49,8 @@ import java.nio.file.Paths;
|
|
|
import java.security.MessageDigest;
|
|
import java.security.MessageDigest;
|
|
|
import java.security.NoSuchAlgorithmException;
|
|
import java.security.NoSuchAlgorithmException;
|
|
|
import java.time.Duration;
|
|
import java.time.Duration;
|
|
|
-import java.util.*;
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.*;
|
|
|
import java.util.concurrent.*;
|
|
import java.util.concurrent.*;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
import java.util.stream.Stream;
|
|
@@ -313,9 +312,10 @@ public class SmsbMinioDataServiceImpl implements ISmsbMinioDataService {
|
|
|
SmsbMinioData::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
|
|
SmsbMinioData::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
|
|
|
lqw.orderByDesc(SmsbMinioData::getCreateTime);
|
|
lqw.orderByDesc(SmsbMinioData::getCreateTime);
|
|
|
lqw.eq(SmsbMinioData::getDelFlag, 0);
|
|
lqw.eq(SmsbMinioData::getDelFlag, 0);
|
|
|
|
|
+ lqw.in(bo.getTypes() != null && bo.getTypes().size() > 0, SmsbMinioData::getType, bo.getTypes());
|
|
|
lqw.like(bo.getOriginalName() != null && !StringUtils.equals(bo.getOriginalName(), ""),
|
|
lqw.like(bo.getOriginalName() != null && !StringUtils.equals(bo.getOriginalName(), ""),
|
|
|
- SmsbMinioData::getOriginalName,
|
|
|
|
|
- bo.getOriginalName());
|
|
|
|
|
|
|
+ SmsbMinioData::getOriginalName,
|
|
|
|
|
+ bo.getOriginalName());
|
|
|
return lqw;
|
|
return lqw;
|
|
|
}
|
|
}
|
|
|
|
|
|