|  | @ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 | 
	
		
			
				|  |  | import javax.annotation.Resource;
 | 
	
		
			
				|  |  | import java.util.ArrayList;
 | 
	
		
			
				|  |  | import java.util.List;
 | 
	
		
			
				|  |  | import java.util.Objects;
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | @Transactional
 | 
	
		
			
				|  |  | @Service("CrawlerService")
 | 
	
	
		
			
				|  | @ -147,8 +148,10 @@ public class CrawlerService {
 | 
	
		
			
				|  |  |             String schemeId = obj.getString("schemeId");
 | 
	
		
			
				|  |  |             String version = obj.getString("version");
 | 
	
		
			
				|  |  |             AdapterSchemeVersionModel versionModel = adapterSchemeVersionService.getByVersion(version);
 | 
	
		
			
				|  |  |             //删除已存在的数据集
 | 
	
		
			
				|  |  |             crawlerDatasetDao.deleteCrawlerDatasetList(versionModel.getId());
 | 
	
		
			
				|  |  |             JSONArray dataSets = obj.getJSONArray("dataSets");
 | 
	
		
			
				|  |  |             //保存数据集
 | 
	
		
			
				|  |  |             //重新存入数据集
 | 
	
		
			
				|  |  |             for (Object o : dataSets) {
 | 
	
		
			
				|  |  |                 JSONObject dataSet = JSONObject.fromObject(o);
 | 
	
		
			
				|  |  |                 String datasetId = dataSet.getString("datasetId");
 | 
	
	
		
			
				|  | @ -160,12 +163,11 @@ public class CrawlerService {
 | 
	
		
			
				|  |  |                 dataSetModel.setDatasetId(Integer.valueOf(datasetId));
 | 
	
		
			
				|  |  |                 dataSetModel.setDatasetCode(datasetCode);
 | 
	
		
			
				|  |  |                 dataSetModel.setDatasetName(datasetName);
 | 
	
		
			
				|  |  |                 crawlerDatasetDao.saveOrUpdateEntity(dataSetModel);
 | 
	
		
			
				|  |  |                 crawlerDatasetDao.saveEntity(dataSetModel);
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             if (obj.containsKey("lines") && obj.containsKey("entrances")) {
 | 
	
		
			
				|  |  |                 // TODO: 2016/4/27  保存编排关系
 | 
	
		
			
				|  |  | //                 saveDataSetRelation(schemeId, version, json);
 | 
	
		
			
				|  |  |             //如果存在编排映射关系,进行保存操作
 | 
	
		
			
				|  |  |             if (obj.containsKey("relation") && !Objects.equals(obj.getString("relation"), "")) {
 | 
	
		
			
				|  |  |                  saveDataSetRelation(version,json);
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -233,8 +235,38 @@ public class CrawlerService {
 | 
	
		
			
				|  |  |             e.printStackTrace();
 | 
	
		
			
				|  |  |             return "删除失败";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         return Constants.EMPTY;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 数据集列表
 | 
	
		
			
				|  |  |      * @param limit rows
 | 
	
		
			
				|  |  |      * @param offset page
 | 
	
		
			
				|  |  |      * @return
 | 
	
		
			
				|  |  |      */
 | 
	
		
			
				|  |  |     public DetailModelResult getDataSetResult(Integer limit, Integer offset){
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  |             StringBuffer stringBuffer = new StringBuffer();
 | 
	
		
			
				|  |  |             String sql = "SELECT a.scheme_id, a.scheme_version_id, GROUP_CONCAT(a.dataset_id SEPARATOR ';') AS datasetId, GROUP_CONCAT(a.dataset_name SEPARATOR ';') AS datasetName" +
 | 
	
		
			
				|  |  |                     " FROM ( SELECT scheme_id, scheme_version_id, CONCAT(dataset_id) AS dataset_id, CONCAT( dataset_code, ',', dataset_name ) AS dataset_name FROM crawler_dataset ) a" +
 | 
	
		
			
				|  |  |                     " GROUP BY a.scheme_id, a.scheme_version_id";
 | 
	
		
			
				|  |  |             stringBuffer.append(sql);
 | 
	
		
			
				|  |  |             if (limit != null && offset != null) {
 | 
	
		
			
				|  |  |                 if (limit > 0 && offset > 0) {
 | 
	
		
			
				|  |  |                     stringBuffer.append("  LIMIT " + (offset - 1) * limit + "," + limit);
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |             stringBuffer.append(" ;");
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             List list = crawlerDatasetDao.queryListBySql(stringBuffer.toString());
 | 
	
		
			
				|  |  |             DetailModelResult detailModelResult = DetailModelResult.success("获取数据集成功");
 | 
	
		
			
				|  |  |             detailModelResult.setDetailModelList(list);
 | 
	
		
			
				|  |  |             return detailModelResult;
 | 
	
		
			
				|  |  |         } catch (Exception e) {
 | 
	
		
			
				|  |  |             e.printStackTrace();
 | 
	
		
			
				|  |  |             return DetailModelResult.error("获取数据集失败");
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | }
 |