注释，修改抽取连接未关闭的bug,任务增加可批量删除

src/com/platform/controller/CheckoutController.java

@@ -58,7 +58,7 @@ public class CheckoutController extends BaseController {
 	}
 	
 	/**
-	 * 信息系统--校验--查看所有系统的 标准表情况
+	 * 信息系统--校验--查看系统的 标准表情况
 	 * @return
 	 * @throws Exception
 	 */
@@ -95,7 +95,7 @@ public class CheckoutController extends BaseController {
 	}
 
 	/**
-	 * 信息系统--校验--查看单条数据的修改详情
+	 * 信息系统--校验--查看单条数据的详情
 	 * @return
 	 * @throws Exception
 	 */
@@ -116,7 +116,7 @@ public class CheckoutController extends BaseController {
 	}
 	
 	/**
-	 *  信息系统--校验--查看后 -> 单条数据的修改详情
+	 *  信息系统--校验--(查看后 )单条数据的修改详情
 	 * @return
 	 * @throws Exception
 	 */

src/com/platform/controller/DataModelController.java

@@ -381,7 +381,7 @@ public class DataModelController extends BaseController {
 	}
 
 	/**
-	 * 迁移 数据 的查询
+	 * 迁移任务 的查询
 	 * 
 	 * @return
 	 * @throws Exception
@@ -414,6 +414,32 @@ public class DataModelController extends BaseController {
 		req.setStatus(200);
 		return result;
 	}
+	
+	/**
+	 * 迁移完成后的 删除记录功能
+	 * 
+	 * @param res
+	 * @param req
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/task/transfer/deletes", method = RequestMethod.POST)
+	@ResponseBody
+	public Object taskTransferDeletes(HttpServletRequest res,
+			HttpServletResponse req, @RequestBody String[] ids) throws Exception {
+		log.info("---------/task/transfer/deletes----------------------");
+		req.setStatus(200);
+		int result = 0;
+		if (ids != null ) {
+//			String[] ids = idsString.split(",");
+			result = moveDataService.delete(ids);
+		}
+		else {
+			req.setStatus(500);
+		}
+		return result;
+	}
 
 	/**
 	 * 迁移数据完成后新增一条数据（暂时去掉，新增功能不在此）

src/com/platform/form/PagerOptions.java

@@ -39,13 +39,13 @@ public class PagerOptions extends Page{
 	
 	private Integer offset; // 查询偏移量：起始id
 	
-	private String keyQuery;
-	//模糊查询字段
-	private List<String> array;
+	private String keyQuery;//模糊查询字段
 	
-	private String volumeType;
-	//冷热区字段
-	private String mark;
+	private List<String> array;//模糊查询字段数组
+	
+	private String volumeType;//冷热区字段
+	
+	private String mark;//冷热区字段
 
 	public String getDataType() {
 		return dataType;

src/com/platform/form/ScriptForm.java

@@ -5,10 +5,20 @@ import java.util.Properties;
 
 import com.platform.entities.SqlFileInfoEntity;
 
+/**
+ * @author chen
+ * 脚本 表单接收
+ */
 public class ScriptForm {
 	
+	/**
+	 * 脚本内容
+	 */
 	private String content;
 	
+	/**
+	 * 脚本实体内容
+	 */
 	private SqlFileInfoEntity item;
 
 	/**

src/com/platform/form/VolumeForm.java

@@ -29,9 +29,9 @@ public class VolumeForm {
 	/** 挂载点  */
 	private String path;
 	
-	/**  * exist，正常返回状态Started,Stopped,Created */
 	private boolean status;
 	
+	/**  * exist，正常返回状态Started,Stopped,Created */
 	private String type;
 	
 	/** volume树形目录  */

src/com/platform/form/volumeMoveForm.java

@@ -5,16 +5,25 @@ import java.util.List;
 import com.platform.entities.DataInfoEntity;
 import com.platform.entities.FolderNode;
 
-/**迁移数据--接收前端传值：volume名，目录，数据对象
+/**迁移数据--接收前端传值
  * @author chen
  *
  */
 public class volumeMoveForm {
 	
+	/**
+	 * volume名
+	 */
 	private String name;
 	
+	/**
+	 * 目录
+	 */
 	private FolderNode selectNode;
 	
+	/**
+	 * 数据对象
+	 */
 	private List<DataInfoEntity> selectItems;
 
 	/**

src/com/platform/service/IMoveDataService.java

@@ -32,6 +32,12 @@ public interface IMoveDataService {
 	 */
 	public int delete(DataInfoEntityMoveTmp dataMove) throws Exception;
 	
+	/** 删除多个
+	 * @return
+	 * @throws Exception
+	 */
+	public int delete(String... ids) throws Exception;
+	
 	/** 迁移数据--更新
 	 * @param data
 	 * @return

src/com/platform/service/impl/MoveDataServiceImpl.java

@@ -210,11 +210,14 @@ public class MoveDataServiceImpl implements IMoveDataService {
 			}
 			
 		}
+		int result = 0;
 		//迁移失败
 		if ("3".equals(dataMove.getCompleteStatus())) {
-			removeservice.deleteFolder(dataMove.getDstPath());
+			int code = removeservice.deleteFolder(dataMove.getDstPath());
+			if (code == -100) {
+				return result;
+			}
 		}
-		int result = 0;
 		//是正则迁移时：
 		if ("1".equals(dataMove.getCompleteStatus())) {
 			if(1 != removeservice.abortcopyFolder(dataMove.getDataPath(), makeDstPath(dataMove.getDstPath()))){
@@ -263,4 +266,42 @@ public class MoveDataServiceImpl implements IMoveDataService {
 		}
 		return dstPath;
 	}
+
+	@Override
+	public int delete(String... ids) throws Exception {
+		List<DataInfoEntityMoveTmp> list = dataInfoMoveTmpDao.findAll();
+		List<DataInfoEntityMoveTmp> dellist = new ArrayList<DataInfoEntityMoveTmp>();
+		if (null != list) {
+			for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : list) {
+				for (String id : ids) {
+					if (Integer.valueOf(id) == dataInfoEntityMoveTmp.getId()) {
+						dellist.add(dataInfoEntityMoveTmp);
+					}
+				}
+			}
+			
+		}
+		int result = 0;
+		for (DataInfoEntityMoveTmp dataMove : dellist) {
+			//迁移失败
+			if ("3".equals(dataMove.getCompleteStatus())) {
+				int code = removeservice.deleteFolder(dataMove.getDstPath());
+				if (code == -100) {
+					continue;
+				}
+			}
+			//是正则迁移时：
+			if ("1".equals(dataMove.getCompleteStatus())) {
+				if(1 != removeservice.abortcopyFolder(dataMove.getDataPath(), makeDstPath(dataMove.getDstPath()))){
+					try{
+						removeservice.deleteFolder(dataMove.getDstPath());
+					}catch(Exception e){
+						log.error(e);
+					}
+				}
+			}
+			result = dataInfoMoveTmpDao.remove(dataMove.getId());
+		}
+		return result;
+	}
 }

src/com/platform/service/impl/OracleExtractServiceImpl.java

@@ -331,6 +331,7 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 				dataInfoDao.update(data);
 				log.error(Custom4exception.OracleSQL_Except, e);
 			} finally {
+				conn.close();
 				// 去掉保存的当前数据id,
 				CacheSetCantDelete.removeStandardId(collectOracle.getDataId());
 				String msg = "抽取标准表结束";

src/com/platform/service/thread/ThreadExtractStandardSqlServer.java

@@ -8,6 +8,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
 
@@ -154,10 +155,11 @@ public class ThreadExtractStandardSqlServer extends Thread{
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
+				 Connection conn = null;
 				try {
-					File execSql = new File(execFilePath);
-					Connection conn = OracleConnector.connectionBuilder("jdbc:oracle:thin:@" + oracleConnect.getIp() + ":" + oracleConnect.getPort() + ":"
+					conn = OracleConnector.connectionBuilder("jdbc:oracle:thin:@" + oracleConnect.getIp() + ":" + oracleConnect.getPort() + ":"
 							+ oracleConnect.getDatabaseName(), oracleConnect.getUser(), oracleConnect.getPassword(), null);
+					File execSql = new File(execFilePath);
 					// 创建表空间    创建  抽取标准表的 用户并授权
 					oracleExtract.createTableSpace(conn, collectOracle , oracleConnect); //
 					oracleExtract.createOnlyUser(conn, collectOracle, oracleConnect);//
@@ -199,8 +201,17 @@ public class ThreadExtractStandardSqlServer extends Thread{
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
+				finally{
+					try {
+						conn.close();
+					} catch (SQLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
 				 
 			 }
+			 
 			 //删除保存过的id
 			 CacheSetCantDelete.removeStandardId(String.valueOf(element.getDataId()));
 			// sql日志记录时间：