调整entity和formbean的位置

src/com/platform/controller/DataModelController.java

@@ -30,10 +30,10 @@ import com.base.BaseController;
 import com.platform.entities.DataInfoEntity;
 import com.platform.entities.DataInfoEntityMoveTmp;
 import com.platform.entities.GatherOracleInfo;
-import com.platform.entities.PagerOptions;
 import com.platform.entities.VolumeEntity;
-import com.platform.entities.oracleForm;
+import com.platform.form.PagerOptions;
-import com.platform.entities.volumeMoveForm;
+import com.platform.form.oracleForm;
+import com.platform.form.volumeMoveForm;
 import com.platform.http.gfs.HttpUtils;
 import com.platform.service.DataInfoService;
 import com.platform.service.ICodeService;

src/com/platform/controller/ExcelController.java

@@ -42,10 +42,10 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import com.base.BaseController;
-import com.platform.entities.PagerOptions;
 import com.platform.entities.PreDataInfo;
 import com.platform.entities.ResumableInfo;
 import com.platform.entities.ResumableInfoStorage;
+import com.platform.form.PagerOptions;
 import com.platform.service.IPreDataInfoService;
 import com.platform.service.IScriptMakeService;
 import com.platform.utils.Configs;

src/com/platform/controller/OracleController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.base.BaseController;
 import com.platform.dao.GatherOracleDao;
 import com.platform.entities.GatherOracleInfo;
-import com.platform.entities.oracleForm;
+import com.platform.form.oracleForm;
 import com.platform.service.ILogRead;
 import com.platform.service.IOracleExtractService;
 import com.platform.service.thread.ThreadExtractOracle;

src/com/platform/controller/VolumeController.java

@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.base.BaseController;
 import com.platform.entities.VolumeEntity;
-import com.platform.entities.VolumeForm;
 import com.platform.entities.VolumeInitEntity;
+import com.platform.form.VolumeForm;
 import com.platform.http.gfs.HttpUtils;
 import com.platform.service.IVolumeService;
 import com.platform.utils.Configs;

src/com/platform/dao/DataInfoDao.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import com.platform.entities.DataInfoEntity;
-import com.platform.entities.PagerOptions;
+import com.platform.form.PagerOptions;
 
 @Repository(value = "dataInfoDao")
 public interface DataInfoDao {

src/com/platform/dao/IRegionalismCodeDao.java

@@ -7,8 +7,8 @@ import org.springframework.stereotype.Repository;
 
 import com.platform.entities.DataInfoEntity;
 import com.platform.entities.DataInfoEntityMoveTmp;
-import com.platform.entities.PagerOptions;
 import com.platform.entities.RegionalismEntity;
+import com.platform.form.PagerOptions;
 
 /**
  * @author chen

src/com/platform/dao/PreDataInfoDao.java

@@ -5,8 +5,8 @@ import java.util.List;
 import org.springframework.stereotype.Repository;
 
 import com.platform.entities.CheckoutEntity;
-import com.platform.entities.PagerOptions;
 import com.platform.entities.PreDataInfo;
+import com.platform.form.PagerOptions;
 
 @Repository(value = "preDataInfoDao")
 public interface PreDataInfoDao {

src/com/platform/entities/VolumeInitEntity.java

@@ -2,6 +2,10 @@ package com.platform.entities;
 
 import java.util.List;
 
+/** 用于保存Mysql数据库的实体
+ * @author chen
+ *
+ */
 public class VolumeInitEntity {
 	
 	private int id;

src/com/platform/form/PagerOptions.java

@@ -1,10 +1,14 @@
-package com.platform.entities;
+package com.platform.form;
 
 import java.util.List;
 
 import com.platform.utils.page.Page;
 
 
+/** 查询数据的 form对象，接收查询条件
+ * @author chen
+ *
+ */
 public class PagerOptions extends Page{
 //	private Integer currentPageNum = 1; //当前页码
 	

src/com/platform/form/VolumeForm.java

@@ -1,8 +1,11 @@
-package com.platform.entities;
+package com.platform.form;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import com.platform.entities.Brick;
+import com.platform.entities.FolderNode;
+
 public class VolumeForm {
 //	
 //	List<VolumeEntity> volumes;

src/com/platform/form/oracleForm.java

@@ -1,7 +1,10 @@
-package com.platform.entities;
+package com.platform.form;
 
 import java.util.List;
 
+import com.platform.entities.GatherOracleInfo;
+import com.platform.entities.OracleConnectorParams;
+
 public class oracleForm {
 	
 	private GatherOracleInfo target;

src/com/platform/form/volumeMoveForm.java

@@ -1,7 +1,14 @@
-package com.platform.entities;
+package com.platform.form;
 
 import java.util.List;
 
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.FolderNode;
+
+/**迁移数据--接收前端传值：volume名，目录，数据对象
+ * @author chen
+ *
+ */
 public class volumeMoveForm {
 	
 	private String name;

src/com/platform/service/DataInfoService.java

@@ -6,7 +6,7 @@ import java.util.List;
 import org.springframework.ui.ModelMap;
 
 import com.platform.entities.DataInfoEntity;
-import com.platform.entities.PagerOptions;
+import com.platform.form.PagerOptions;
 
 public interface DataInfoService {
 	public ModelMap getPagerTableData(PagerOptions pagerOptions);

src/com/platform/service/IPreDataInfoService.java

@@ -3,8 +3,8 @@ package com.platform.service;
 import java.util.List;
 import java.util.Map;
 
-import com.platform.entities.PagerOptions;
 import com.platform.entities.PreDataInfo;
+import com.platform.form.PagerOptions;
 
 public interface IPreDataInfoService {
 	

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

@@ -16,7 +16,7 @@ import com.base.Custom4exception;
 import com.base.CustomException;
 import com.platform.dao.DataInfoDao;
 import com.platform.entities.DataInfoEntity;
-import com.platform.entities.PagerOptions;
+import com.platform.form.PagerOptions;
 import com.platform.glusterfs.RemoveData;
 import com.platform.service.DataInfoService;
 import com.platform.utils.Configs;

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

@@ -19,10 +19,10 @@ import org.springframework.stereotype.Service;
 import com.platform.dao.IRegionalismCodeDao;
 import com.platform.dao.ISystemCodeDao;
 import com.platform.dao.PreDataInfoDao;
-import com.platform.entities.PagerOptions;
 import com.platform.entities.PreDataInfo;
 import com.platform.entities.RegionalismEntity;
 import com.platform.entities.SystemEntity;
+import com.platform.form.PagerOptions;
 import com.platform.service.IPreDataInfoService;
 import com.platform.utils.BeanCopy;
 import com.platform.utils.Configs;

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

@@ -2,7 +2,7 @@ package com.platform.service.thread;
 
 import com.base.Custom4exception;
 import com.base.CustomException;
-import com.platform.entities.oracleForm;
+import com.platform.form.oracleForm;
 import com.platform.service.IOracleExtractService;
 
 /** oracle汇总库抽取

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

@@ -2,7 +2,7 @@ package com.platform.service.thread;
 
 import com.base.Custom4exception;
 import com.base.CustomException;
-import com.platform.entities.oracleForm;
+import com.platform.form.oracleForm;
 import com.platform.service.IOracleExtractService;
 
 /** 抽取标准表线程

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

@@ -2,7 +2,7 @@ package com.platform.service.thread;
 
 import com.base.Custom4exception;
 import com.base.CustomException;
-import com.platform.entities.oracleForm;
+import com.platform.form.oracleForm;
 import com.platform.service.IOracleExtractService;
 
 /** 测试是否能获得oracle连接