Commit 9d1de662 authored by pengxin's avatar pengxin

代码调整。

parent bf71dab9
...@@ -35,7 +35,6 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -35,7 +35,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -62,8 +61,6 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp ...@@ -62,8 +61,6 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
@Autowired @Autowired
private DatasetVersionService datasetVersionService; private DatasetVersionService datasetVersionService;
private final ConcurrentHashMap<Long, Future<?>> futures = new ConcurrentHashMap<>();
/** /**
* 返回当前Service的主表Mapper对象。 * 返回当前Service的主表Mapper对象。
* *
...@@ -177,10 +174,6 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp ...@@ -177,10 +174,6 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
*/ */
@Override @Override
public void stopCleanTask(Long cleanId) { public void stopCleanTask(Long cleanId) {
Future<?> future = futures.remove(cleanId);
if (future != null && !future.isDone()) {
future.cancel(true);
}
DatasetClean filter = this.datasetCleanMapper.selectById(cleanId); DatasetClean filter = this.datasetCleanMapper.selectById(cleanId);
if(null != filter){ if(null != filter){
updateCleanStatus(cleanId,DatasetConstant.PAUSE_FINISHED); updateCleanStatus(cleanId,DatasetConstant.PAUSE_FINISHED);
......
...@@ -41,11 +41,6 @@ public class DatasetDataServiceImpl implements DatasetDataService { ...@@ -41,11 +41,6 @@ public class DatasetDataServiceImpl implements DatasetDataService {
@Autowired @Autowired
private DatasetCleanService datasetCleanService; private DatasetCleanService datasetCleanService;
/**
* 线程集合
*/
private final ConcurrentHashMap<Long, Future<?>> futures = new ConcurrentHashMap<>();
/** /**
* 保存新增对象。 * 保存新增对象。
* *
...@@ -103,8 +98,7 @@ public class DatasetDataServiceImpl implements DatasetDataService { ...@@ -103,8 +98,7 @@ public class DatasetDataServiceImpl implements DatasetDataService {
param.setPageSize(DatasetConstant.MAX_PAGE_SIZE); param.setPageSize(DatasetConstant.MAX_PAGE_SIZE);
List<DatasetData> dataList = this.list(datasetId, param); List<DatasetData> dataList = this.list(datasetId, param);
if(CollUtil.isNotEmpty(dataList)) { if(CollUtil.isNotEmpty(dataList)) {
Future<Long> future = datasetCleanService.executeCleanTaskAsync(dataList, cleanId, datasetId); datasetCleanService.executeCleanTaskAsync(dataList, cleanId, datasetId);
futures.put(cleanId, future);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment