Hua/Aria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务实体优化

Browse Source
This commit is contained in:
AriaLyy
2017-10-17 23:18:33 +08:00
parent 9f6c0d727a
commit fd57d3ffe9
23 changed files with 216 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Aria/src/main/java/com/arialyy/aria/core/UrlMapping.java Normal file
View File

@@ -0,0 +1,34 @@
/*
* Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.arialyy.aria.core;
import com.arialyy.aria.orm.DbEntity;
/**
* Created by lyy on 2017/10/17.
* Url 映射表
*/
public class UrlMapping extends DbEntity {
/**
* 各实体对应的key
*/
public String key;
/**
* 链接
*/
public String url;
}

1
Aria/src/main/java/com/arialyy/aria/core/common/AbsFtpInfoThread.java
View File

@@ -88,7 +88,6 @@ public abstract class AbsFtpInfoThread<ENTITY extends AbsEntity, TASK_ENTITY ext
if (mSize != 0 && !isUpload) {
mEntity.setFileSize(mSize);
}
mEntity.update();
mTaskEntity.update();
onPreComplete(reply);
} catch (IOException e) {

19
Aria/src/main/java/com/arialyy/aria/core/download/BaseDListener.java
View File

@@ -143,22 +143,17 @@ class BaseDListener<ENTITY extends AbsEntity, TASK_ENTITY extends AbsTaskEntity<
}
private void saveData(int state, long location) {
mEntity.setComplete(state == IEntity.STATE_COMPLETE);
mTaskEntity.state = state;
mEntity.setState(state);
mEntity.setComplete(state == IEntity.STATE_COMPLETE);
if (state == IEntity.STATE_CANCEL) {
mEntity.setState(state);
mEntity.deleteData();
} else if (state == IEntity.STATE_COMPLETE) {
mEntity.setState(state);
mTaskEntity.deleteData();
return;
} else if (mEntity.isComplete()) {
mEntity.setCompleteTime(System.currentTimeMillis());
mEntity.setCurrentProgress(mEntity.getFileSize());
mEntity.update();
} else {
mEntity.setState(state);
if (location != -1) {
mEntity.setCurrentProgress(location);
}
mEntity.update();
} else if (location > 0) {
mEntity.setCurrentProgress(location);
}
mTaskEntity.update();
}

1
Aria/src/main/java/com/arialyy/aria/core/download/BaseGroupTarget.java
View File

@@ -55,7 +55,6 @@ abstract class BaseGroupTarget<TARGET extends AbsTarget, TASK_ENTITY extends Abs
entity = new DownloadGroupEntity();
entity.setGroupName(mGroupName);
entity.setUrls(mUrls);
entity.insert();
}
return entity;
}

7
Aria/src/main/java/com/arialyy/aria/core/download/DownloadGroupTarget.java
View File

@@ -49,13 +49,10 @@ public class DownloadGroupTarget
mTaskEntity = DbEntity.findFirst(DownloadGroupTaskEntity.class, "key=?", key);
if (mTaskEntity == null) {
mTaskEntity = new DownloadGroupTaskEntity();
mTaskEntity.key = key;
mTaskEntity.entity = getDownloadGroupEntity();
mTaskEntity.insert();
mTaskEntity.save(getDownloadGroupEntity());
}
if (mTaskEntity.entity == null || TextUtils.isEmpty(mTaskEntity.entity.getKey())) {
mTaskEntity.entity = getDownloadGroupEntity();
mTaskEntity.save();
mTaskEntity.save(getDownloadGroupEntity());
}
mEntity = mTaskEntity.entity;
}

8
Aria/src/main/java/com/arialyy/aria/core/download/DownloadGroupTaskEntity.java
View File

@@ -28,4 +28,12 @@ public class DownloadGroupTaskEntity extends AbsGroupTaskEntity<DownloadGroupEnt
@Override public DownloadGroupEntity getEntity() {
return entity;
}
public void save(DownloadGroupEntity groupEntity){
key = groupEntity.getKey();
entity = groupEntity;
groupEntity.save();
save();
}
}

15
Aria/src/main/java/com/arialyy/aria/core/download/DownloadTarget.java
View File

@@ -61,20 +61,13 @@ public class DownloadTarget
entity.getDownloadPath(), entity.getUrl());
if (mTaskEntity == null) {
mTaskEntity = new DownloadTaskEntity();
mTaskEntity.url = entity.getUrl();
mTaskEntity.key = entity.getDownloadPath();
mTaskEntity.entity = entity;
mTaskEntity.save();
mTaskEntity.save(entity);
} else if (mTaskEntity.entity == null || TextUtils.isEmpty(mTaskEntity.entity.getUrl())) {
mTaskEntity.entity = entity;
mTaskEntity.save();
mTaskEntity.save(entity);
} else if (!mTaskEntity.entity.getUrl().equals(entity.getUrl())) { //处理地址切换而保存路径不变
mTaskEntity.entity.deleteData();
mTaskEntity.entity = entity;
entity.save();
mTaskEntity.save();
mTaskEntity.save(entity);
}
mEntity = mTaskEntity.entity;
mEntity = entity;
}
/**

1
Aria/src/main/java/com/arialyy/aria/core/download/DownloadTask.java
View File

@@ -175,7 +175,6 @@ public class DownloadTask extends AbsNormalTask<DownloadTaskEntity> {
public DownloadTask build() {
DownloadTask task = new DownloadTask(taskEntity, outHandler);
task.setTargetName(targetName);
taskEntity.getEntity().save();
taskEntity.save();
return task;
}

11
Aria/src/main/java/com/arialyy/aria/core/download/DownloadTaskEntity.java
View File

@@ -18,6 +18,7 @@ package com.arialyy.aria.core.download;
import com.arialyy.aria.core.inf.AbsNormalTaskEntity;
import com.arialyy.aria.core.inf.AbsTaskEntity;
import com.arialyy.aria.orm.Ignore;
import com.arialyy.aria.orm.NoNull;
import com.arialyy.aria.orm.OneToOne;
/**
@@ -31,7 +32,7 @@ public class DownloadTaskEntity extends AbsNormalTaskEntity<DownloadEntity> {
/**
* 任务的url
*/
public String url = "";
@NoNull public String url = "";
/**
* 所属的任务组组名，如果不属于任务组，则为null
@@ -49,4 +50,12 @@ public class DownloadTaskEntity extends AbsNormalTaskEntity<DownloadEntity> {
@Override public DownloadEntity getEntity() {
return entity;
}
public void save(DownloadEntity entity) {
url = entity.getUrl();
key = entity.getDownloadPath();
this.entity = entity;
entity.save();
save();
}
}

6
Aria/src/main/java/com/arialyy/aria/core/download/FtpDirDownloadTarget.java
View File

@@ -50,12 +50,10 @@ public class FtpDirDownloadTarget
mTaskEntity = DbEntity.findFirst(DownloadGroupTaskEntity.class, "key=?", key);
if (mTaskEntity == null) {
mTaskEntity = new DownloadGroupTaskEntity();
mTaskEntity.key = key;
mTaskEntity.entity = getDownloadGroupEntity();
mTaskEntity.insert();
mTaskEntity.save(getDownloadGroupEntity());
}
if (mTaskEntity.entity == null) {
mTaskEntity.entity = getDownloadGroupEntity();
mTaskEntity.save(getDownloadGroupEntity());
}
mEntity = mTaskEntity.entity;
}

1
Aria/src/main/java/com/arialyy/aria/core/download/FtpDownloadTarget.java
View File

@@ -75,7 +75,6 @@ public class FtpDownloadTarget extends DownloadTarget {
mEntity.setDownloadPath(downloadPath);
mEntity.setFileName(newFile.getName());
mTaskEntity.key = downloadPath;
mEntity.update();
mTaskEntity.update();
CommonUtil.renameDownloadConfig(oldFile.getName(), newFile.getName());
}

115
Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsGroupUtil.java
View File

@@ -169,25 +169,25 @@ public abstract class AbsGroupUtil implements IUtil {
* @param url 子任务下载地址
*/
public void cancelSubTask(String url) {
//List<String> urls = mTaskEntity.entity.getUrls();
//if (urls != null && !urls.isEmpty() && urls.contains(url)) {
// urls.remove(url);
// DownloadTaskEntity det =
// DbEntity.findFirst(DownloadTaskEntity.class, "url=? and isGroupTask='true'", url);
// if (det != null) {
// mTotalLen -= det.getEntity().getFileSize();
// mGroupSize--;
// if (mGroupSize == 0) {
// closeTimer(false);
// mListener.onCancel();
// }
// }
// mTaskEntity.getEntity().update();
//}
//Downloader d = getDownloader(url, false);
//if (d != null) {
// d.cancel();
//}
List<String> urls = mTaskEntity.entity.getUrls();
if (urls != null && !urls.isEmpty() && urls.contains(url)) {
urls.remove(url);
DownloadTaskEntity det =
DbEntity.findFirst(DownloadTaskEntity.class, "url=? and isGroupTask='true'", url);
if (det != null) {
mTotalLen -= det.getEntity().getFileSize();
mGroupSize--;
if (mGroupSize == 0) {
closeTimer(false);
mListener.onCancel();
}
}
mTaskEntity.update();
}
Downloader d = getDownloader(url, false);
if (d != null) {
d.cancel();
}
}
/**
@@ -416,19 +416,18 @@ public abstract class AbsGroupUtil implements IUtil {
* 子任务事件监听
*/
private class ChildDownloadListener implements IDownloadListener {
DownloadTaskEntity taskEntity;
DownloadEntity entity;
private DownloadTaskEntity subTaskEntity;
private DownloadEntity subEntity;
private int RUN_SAVE_INTERVAL = 5 * 1000; //5s保存一次下载中的进度
private long mLastSaveTime;
long lastLen = 0;
private long lastSaveTime;
private long lastLen = 0;
ChildDownloadListener(DownloadTaskEntity entity) {
this.taskEntity = entity;
this.entity = taskEntity.getEntity();
this.entity.setFailNum(0);
lastLen = this.entity.getCurrentProgress();
mLastSaveTime = System.currentTimeMillis();
subTaskEntity = entity;
subEntity = subTaskEntity.getEntity();
subEntity.setFailNum(0);
lastLen = subEntity.getCurrentProgress();
lastSaveTime = System.currentTimeMillis();
}
@Override public void onPre() {
@@ -436,33 +435,33 @@ public abstract class AbsGroupUtil implements IUtil {
}
@Override public void onPostPre(long fileSize) {
entity.setFileSize(fileSize);
entity.setConvertFileSize(CommonUtil.formatFileSize(fileSize));
subEntity.setFileSize(fileSize);
subEntity.setConvertFileSize(CommonUtil.formatFileSize(fileSize));
saveData(IEntity.STATE_POST_PRE, -1);
mListener.onSubPre(entity);
mListener.onSubPre(subEntity);
}
@Override public void onResume(long resumeLocation) {
saveData(IEntity.STATE_POST_PRE, IEntity.STATE_RUNNING);
lastLen = resumeLocation;
mListener.onSubStart(entity);
mListener.onSubStart(subEntity);
}
@Override public void onStart(long startLocation) {
saveData(IEntity.STATE_POST_PRE, IEntity.STATE_RUNNING);
lastLen = startLocation;
mListener.onSubStart(entity);
mListener.onSubStart(subEntity);
}
@Override public void onProgress(long currentLocation) {
long speed = currentLocation - lastLen;
mCurrentLocation += speed;
entity.setCurrentProgress(currentLocation);
subEntity.setCurrentProgress(currentLocation);
handleSpeed(speed);
mListener.onSubRunning(entity);
if (System.currentTimeMillis() - mLastSaveTime >= RUN_SAVE_INTERVAL) {
mListener.onSubRunning(subEntity);
if (System.currentTimeMillis() - lastSaveTime >= RUN_SAVE_INTERVAL) {
saveData(IEntity.STATE_RUNNING, currentLocation);
mLastSaveTime = System.currentTimeMillis();
lastSaveTime = System.currentTimeMillis();
}
lastLen = currentLocation;
}
@@ -470,7 +469,7 @@ public abstract class AbsGroupUtil implements IUtil {
@Override public void onStop(long stopLocation) {
saveData(IEntity.STATE_STOP, stopLocation);
handleSpeed(0);
mListener.onSubStop(entity);
mListener.onSubStop(subEntity);
synchronized (AbsGroupUtil.class) {
mStopNum++;
if (mStopNum + mCompleteNum + mInitFailNum + mFailNum >= mGroupSize) {
@@ -483,13 +482,13 @@ public abstract class AbsGroupUtil implements IUtil {
@Override public void onCancel() {
saveData(IEntity.STATE_CANCEL, -1);
handleSpeed(0);
mListener.onSubCancel(entity);
mListener.onSubCancel(subEntity);
}
@Override public void onComplete() {
saveData(IEntity.STATE_COMPLETE, entity.getFileSize());
saveData(IEntity.STATE_COMPLETE, subEntity.getFileSize());
handleSpeed(0);
mListener.onSubComplete(entity);
mListener.onSubComplete(subEntity);
synchronized (AbsGroupUtil.class) {
mCompleteNum++;
//如果子任务完成的数量和总任务数一致，表示任务组任务已经完成
@@ -505,7 +504,7 @@ public abstract class AbsGroupUtil implements IUtil {
}
@Override public void onFail(boolean needRetry) {
entity.setFailNum(entity.getFailNum() + 1);
subEntity.setFailNum(subEntity.getFailNum() + 1);
saveData(IEntity.STATE_FAIL, lastLen);
handleSpeed(0);
reTry(needRetry);
@@ -516,12 +515,12 @@ public abstract class AbsGroupUtil implements IUtil {
*/
private void reTry(boolean needRetry) {
synchronized (AriaManager.LOCK) {
if (entity.getFailNum() < 5 && isRunning && needRetry && NetUtils.isConnected(
if (subEntity.getFailNum() < 5 && isRunning && needRetry && NetUtils.isConnected(
AriaManager.APP)) {
reStartTask();
} else {
mFailNum++;
mListener.onSubFail(entity);
mListener.onSubFail(subEntity);
//如果失败的任务数大于实际的下载任务数，任务组停止下载
if (mFailNum >= mActualTaskNum) {
closeTimer(false);
@@ -535,28 +534,32 @@ public abstract class AbsGroupUtil implements IUtil {
Timer timer = new Timer();
timer.schedule(new TimerTask() {
@Override public void run() {
Downloader dt = mDownloaderMap.get(entity.getUrl());
Downloader dt = mDownloaderMap.get(subEntity.getUrl());
dt.start();
}
}, 3000);
}
private void handleSpeed(long speed) {
entity.setSpeed(speed);
entity.setConvertSpeed(speed <= 0 ? "" : CommonUtil.formatFileSize(speed) + "/s");
entity.setPercent((int) (entity.getCurrentProgress() * 100 / entity.getFileSize()));
subEntity.setSpeed(speed);
subEntity.setConvertSpeed(speed <= 0 ? "" : CommonUtil.formatFileSize(speed) + "/s");
subEntity.setPercent((int) (subEntity.getCurrentProgress() * 100 / subEntity.getFileSize()));
}
private void saveData(int state, long location) {
entity.setState(state);
entity.setComplete(state == IEntity.STATE_COMPLETE);
if (entity.isComplete()) {
entity.setCompleteTime(System.currentTimeMillis());
entity.setCurrentProgress(entity.getFileSize());
subTaskEntity.state = state;
subEntity.setState(state);
subEntity.setComplete(state == IEntity.STATE_COMPLETE);
if (state == IEntity.STATE_CANCEL) {
subTaskEntity.deleteData();
return;
} else if (subEntity.isComplete()) {
subEntity.setCompleteTime(System.currentTimeMillis());
subEntity.setCurrentProgress(subEntity.getFileSize());
} else if (location > 0) {
entity.setCurrentProgress(location);
subEntity.setCurrentProgress(location);
}
entity.update();
subTaskEntity.update();
}
@Override public void supportBreakpoint(boolean support) {

1
Aria/src/main/java/com/arialyy/aria/core/download/downloader/HttpFileInfoThread.java
View File

@@ -118,7 +118,6 @@ class HttpFileInfoThread implements Runnable {
if (onFileInfoListener != null) {
onFileInfoListener.onComplete(mEntity.getUrl(), code);
}
mEntity.update();
mTaskEntity.update();
}
}

2
Aria/src/main/java/com/arialyy/aria/core/inf/AbsTarget.java
View File

@@ -45,7 +45,7 @@ public abstract class AbsTarget<TARGET extends AbsTarget, ENTITY extends AbsEnti
* 删除记录
*/
public void removeRecord() {
mEntity.deleteData();
mTaskEntity.deleteData();
}
/**

14
Aria/src/main/java/com/arialyy/aria/core/inf/AbsTaskEntity.java
View File

@@ -143,4 +143,18 @@ public abstract class AbsTaskEntity<ENTITY extends AbsEntity> extends DbEntity {
public int getState() {
return getEntity().getState();
}
@Override public void deleteData() {
if (getEntity() != null) {
getEntity().deleteData();
}
super.deleteData();
}
@Override public void update() {
if (getEntity() != null) {
getEntity().update();
}
super.update();
}
}

1
Aria/src/main/java/com/arialyy/aria/core/inf/AbsUploadTarget.java
View File

@@ -40,7 +40,6 @@ public abstract class AbsUploadTarget<TARGET extends AbsUploadTarget, ENTITY ext
CheckUtil.checkDownloadUrl(uploadUrl);
if (mEntity.getUrl().equals(uploadUrl)) return (TARGET) this;
mEntity.setUrl(uploadUrl);
//mEntity.setUrl(CommonUtil.convertUrl(uploadUrl));
mEntity.update();
return (TARGET) this;
}

18
Aria/src/main/java/com/arialyy/aria/core/upload/BaseUListener.java
View File

@@ -131,21 +131,17 @@ class BaseUListener<ENTITY extends AbsEntity, TASK_ENTITY extends AbsTaskEntity<
}
private void saveData(int state, long location) {
mEntity.setComplete(state == IEntity.STATE_COMPLETE);
mTaskEntity.state = state;
mEntity.setState(state);
mEntity.setComplete(state == IEntity.STATE_COMPLETE);
if (state == IEntity.STATE_CANCEL) {
mEntity.deleteData();
} else if (state == IEntity.STATE_COMPLETE) {
mEntity.setState(state);
mTaskEntity.deleteData();
return;
} else if (mEntity.isComplete()) {
mEntity.setCompleteTime(System.currentTimeMillis());
mEntity.setCurrentProgress(mEntity.getFileSize());
mEntity.update();
} else {
mEntity.setState(state);
if (location != -1) {
mEntity.setCurrentProgress(location);
}
mEntity.update();
} else if (location > 0) {
mEntity.setCurrentProgress(location);
}
mTaskEntity.update();
}

5
Aria/src/main/java/com/arialyy/aria/orm/DBConfig.java
View File

@@ -17,6 +17,7 @@ package com.arialyy.aria.orm;
import android.text.TextUtils;
import com.arialyy.aria.core.ErrorEntity;
import com.arialyy.aria.core.UrlMapping;
import com.arialyy.aria.core.download.DownloadEntity;
import com.arialyy.aria.core.download.DownloadGroupEntity;
import com.arialyy.aria.core.download.DownloadGroupTaskEntity;
@@ -33,7 +34,8 @@ import java.util.Map;
class DBConfig {
static Map<String, Class> mapping = new HashMap<>();
static String DB_NAME;
static int VERSION = 16;
//static int VERSION = 16;
static int VERSION = 17;
static {
if (TextUtils.isEmpty(DB_NAME)) {
@@ -52,5 +54,6 @@ class DBConfig {
mapping.put("UploadEntity", UploadEntity.class);
mapping.put("UploadTaskEntity", UploadTaskEntity.class);
mapping.put("ErrorEntity", ErrorEntity.class);
//mapping.put("UrlMapping", UrlMapping.class);
}
}

30
Aria/src/main/java/com/arialyy/aria/orm/NoNull.java Normal file
View File

@@ -0,0 +1,30 @@
/*
* Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.arialyy.aria.orm;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Created by lyy on 2015/11/2.
* 非空字段
*/
@Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface NoNull {
boolean value() default true;
}

28
Aria/src/main/java/com/arialyy/aria/orm/SqlHelper.java
View File

@@ -26,7 +26,6 @@ import android.util.Log;
import com.arialyy.aria.core.AriaManager;
import com.arialyy.aria.util.CheckUtil;
import com.arialyy.aria.util.CommonUtil;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.ArrayList;
@@ -423,6 +422,8 @@ final class SqlHelper extends SQLiteOpenHelper {
db = checkDb(db);
List<Field> fields = CommonUtil.getAllFields(clazz);
if (fields != null && fields.size() > 0) {
//外键Map，在Sqlite3中foreign修饰的字段必须放在最后
final List<Field> foreignArray = new ArrayList<>();
StringBuilder sb = new StringBuilder();
sb.append("create table ")
.append(TextUtils.isEmpty(tableName) ? CommonUtil.getClassName(clazz) : tableName)
@@ -458,17 +459,26 @@ final class SqlHelper extends SQLiteOpenHelper {
sb.append(" PRIMARY KEY");
}
if (SqlUtil.isForeign(field)) {
Foreign foreign = field.getAnnotation(Foreign.class);
sb.append(",FOREIGN KEY (")
.append(field.getName())
.append(") REFERENCES ")
.append(foreign.table())
.append("(")
.append(foreign.column())
.append(")");
foreignArray.add(field);
}
if (SqlUtil.isNoNull(field)) {
sb.append(" NOT NULL");
}
sb.append(",");
}
for (Field field : foreignArray) {
Foreign foreign = field.getAnnotation(Foreign.class);
sb.append("FOREIGN KEY (")
.append(field.getName())
.append(") REFERENCES ")
.append(CommonUtil.getClassName(foreign.table()))
.append("(")
.append(foreign.column())
.append("),");
}
String str = sb.toString();
str = str.substring(0, str.length() - 1) + ");";
print(CREATE_TABLE, str);

10
Aria/src/main/java/com/arialyy/aria/orm/SqlUtil.java
View File

@@ -184,13 +184,13 @@ final class SqlUtil {
}
/**
* 判断是否是主外键约束
* 判断是否是非空约束
*
* @return {@code true}主外键约束
* @return {@code true}为非空约束
*/
static boolean isPrimaryAndForeign(Field field) {
PrimaryAndForeign fk = field.getAnnotation(PrimaryAndForeign.class);
return fk != null;
static boolean isNoNull(Field field) {
NoNull nn = field.getAnnotation(NoNull.class);
return nn != null;
}
private static Object checkData(String type, String data) {

5
Aria/src/main/java/com/arialyy/aria/util/CommonUtil.java
View File

@@ -247,9 +247,6 @@ public class CommonUtil {
dir.delete();
}
}
if (entity != null) {
entity.deleteData();
}
tEntity.deleteData();
}
@@ -271,7 +268,7 @@ public class CommonUtil {
if (config.exists()) {
config.delete();
}
uEntity.deleteData();
//uEntity.deleteData();
tEntity.deleteData();
}

9
aria/src/main/java/com/arialyy/aria/core/upload/UploadTaskEntity.java
View File

@@ -29,6 +29,7 @@ public class UploadTaskEntity extends AbsNormalTaskEntity<UploadEntity> {
public String contentType = "multipart/form-data"; //上传的文件类型
public String userAgent = "User-Agent";
@OneToOne(table = UploadEntity.class, key = "filePath") public UploadEntity entity;
public String filePath = "";
/**
* 文件上传表单
@@ -41,4 +42,12 @@ public class UploadTaskEntity extends AbsNormalTaskEntity<UploadEntity> {
@Override public UploadEntity getEntity() {
return entity;
}
public void save(UploadEntity entity) {
filePath = entity.getFilePath();
key = entity.getKey();
this.entity = entity;
entity.save();
save();
}
}