|
@@ -16,6 +16,7 @@ import com.fdkankan.common.constant.SceneDownloadProgressStatus;
|
|
|
import com.fdkankan.common.constant.SceneKind;
|
|
|
import com.fdkankan.common.exception.BusinessException;
|
|
|
import com.fdkankan.common.util.FileUtils;
|
|
|
+import com.fdkankan.download.CommonConstant;
|
|
|
import com.fdkankan.download.bean.ImageType;
|
|
|
import com.fdkankan.download.bean.ImageTypeDetail;
|
|
|
import com.fdkankan.download.bean.SceneEditControlsBean;
|
|
@@ -55,21 +56,13 @@ import javax.annotation.Resource;
|
|
|
@Service
|
|
|
public class DownloadServiceImpl implements IDownloadService {
|
|
|
|
|
|
- private static final String[] prefixArr = new String[]{
|
|
|
- UploadFilePath.DATA_VIEW_PATH,
|
|
|
- UploadFilePath.VOICE_VIEW_PATH,
|
|
|
- UploadFilePath.VIDEOS_VIEW_PATH,
|
|
|
- UploadFilePath.IMG_VIEW_PATH,
|
|
|
- UploadFilePath.USER_VIEW_PATH,
|
|
|
- };
|
|
|
-
|
|
|
- private static final List<ImageType> imageTypes = Lists.newArrayList();
|
|
|
- static{
|
|
|
- imageTypes.add(ImageType.builder().name("4k_face").size("4096").ranges(new String[]{"0", "511", "1023", "1535", "2047","2559","3071","3583"}).build());
|
|
|
- imageTypes.add(ImageType.builder().name("2k_face").size("2048").ranges(new String[]{"0", "511", "1023", "1535"}).build());
|
|
|
- imageTypes.add(ImageType.builder().name("1k_face").size("1024").ranges(new String[]{"0", "511"}).build());
|
|
|
- imageTypes.add(ImageType.builder().name("512_face").size("512").ranges(new String[]{"0"}).build());
|
|
|
- }
|
|
|
+// private static final List<ImageType> imageTypes = Lists.newArrayList();
|
|
|
+// static{
|
|
|
+// imageTypes.add(ImageType.builder().name("4k_face").size("4096").ranges(new String[]{"0", "511", "1023", "1535", "2047","2559","3071","3583"}).build());
|
|
|
+// imageTypes.add(ImageType.builder().name("2k_face").size("2048").ranges(new String[]{"0", "511", "1023", "1535"}).build());
|
|
|
+// imageTypes.add(ImageType.builder().name("1k_face").size("1024").ranges(new String[]{"0", "511"}).build());
|
|
|
+// imageTypes.add(ImageType.builder().name("512_face").size("512").ranges(new String[]{"0"}).build());
|
|
|
+// }
|
|
|
|
|
|
@Value("${path.v4school}")
|
|
|
private String v4localPath;
|
|
@@ -318,7 +311,7 @@ public class DownloadServiceImpl implements IDownloadService {
|
|
|
|| StrUtil.isEmpty(num)){
|
|
|
throw new Exception("本地下载图片资源不符合规则,key:" + key);
|
|
|
}
|
|
|
- for (ImageType imageType : imageTypes) {
|
|
|
+ for (ImageType imageType : CommonConstant.imageTypes) {
|
|
|
|
|
|
if(imageType.getName().equals("4k_face") && !"4k".equals(resolution)){
|
|
|
continue;
|
|
@@ -427,7 +420,7 @@ public class DownloadServiceImpl implements IDownloadService {
|
|
|
private Map<String, List<String>> getAllFiles(String num, String v4localPath, String bucket) throws Exception{
|
|
|
//列出oss所有文件路径
|
|
|
List<String> ossFilePaths = new ArrayList<>();
|
|
|
- for (String prefix : prefixArr) {
|
|
|
+ for (String prefix : CommonConstant.prefixArr) {
|
|
|
prefix = String.format(prefix, num);
|
|
|
List<String> keys = fYunFileService.listRemoteFiles(bucket, prefix);
|
|
|
if(CollUtil.isEmpty(keys)){
|