合并----

src/com/platform/controller/DataModelController.java

@@ -2,7 +2,6 @@ package com.platform.controller;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -12,13 +11,11 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Controller;
-import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,22 +27,15 @@ import com.platform.entities.DataInfoEntity;
 import com.platform.entities.DataInfoEntityMoveTmp;
 import com.platform.entities.FolderNode;
 import com.platform.entities.GatherOracleInfo;
-import com.platform.entities.OracleConnectorParams;
 import com.platform.entities.PagerOptions;
 import com.platform.entities.VolumeEntity;
-import com.platform.glusterfs.CheckoutMD5;
 import com.platform.service.DataInfoService;
 import com.platform.service.ICodeService;
 import com.platform.service.IGfsService;
 import com.platform.service.IMoveDataService;
 import com.platform.service.IMySqlService;
 import com.platform.service.IOracleExtractService;
-import com.platform.service.OracleExtractHelper;
 import com.platform.service.OracleStatusService;
-import com.platform.service.impl.MySqlServiceImpl;
-import com.platform.test.Brick;
-import com.platform.test.FolderReader;
-import com.platform.test.Volume;
 import com.platform.utils.Bean2MapUtils;
 import com.platform.utils.Configs;
 import com.platform.utils.UtilsHelper;