From b3476e4b4b2641d91bb8d7b2e32cb3a55d18ea31 Mon Sep 17 00:00:00 2001 From: chenlw <874313221@qq.com> Date: Tue, 22 Nov 2016 16:54:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4entity=E5=92=8Cformbean?= =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/platform/controller/DataModelController.java | 6 +++--- src/com/platform/controller/ExcelController.java | 2 +- src/com/platform/controller/OracleController.java | 2 +- src/com/platform/controller/VolumeController.java | 2 +- src/com/platform/dao/DataInfoDao.java | 2 +- src/com/platform/dao/IRegionalismCodeDao.java | 2 +- src/com/platform/dao/PreDataInfoDao.java | 2 +- src/com/platform/entities/VolumeInitEntity.java | 4 ++++ src/com/platform/{entities => form}/PagerOptions.java | 6 +++++- src/com/platform/{entities => form}/VolumeForm.java | 5 ++++- src/com/platform/{entities => form}/oracleForm.java | 5 ++++- src/com/platform/{entities => form}/volumeMoveForm.java | 9 ++++++++- src/com/platform/service/DataInfoService.java | 2 +- src/com/platform/service/IPreDataInfoService.java | 2 +- src/com/platform/service/impl/DataInfoServiceImp.java | 2 +- .../platform/service/impl/PreDataInfoServiceImpl.java | 2 +- src/com/platform/service/thread/ThreadExtractOracle.java | 2 +- .../service/thread/ThreadExtractStandardOracle.java | 2 +- .../platform/service/thread/ThreadGainOracleConnect.java | 2 +- 19 files changed, 41 insertions(+), 20 deletions(-) rename src/com/platform/{entities => form}/PagerOptions.java (91%) rename src/com/platform/{entities => form}/VolumeForm.java (89%) rename src/com/platform/{entities => form}/oracleForm.java (82%) rename src/com/platform/{entities => form}/volumeMoveForm.java (75%) diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index eed00c39..8736e7ed 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/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.entities.volumeMoveForm; +import com.platform.form.PagerOptions; +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; diff --git a/src/com/platform/controller/ExcelController.java b/src/com/platform/controller/ExcelController.java index 0631de65..6e34c3fc 100644 --- a/src/com/platform/controller/ExcelController.java +++ b/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; diff --git a/src/com/platform/controller/OracleController.java b/src/com/platform/controller/OracleController.java index 32f62305..adab7964 100644 --- a/src/com/platform/controller/OracleController.java +++ b/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; diff --git a/src/com/platform/controller/VolumeController.java b/src/com/platform/controller/VolumeController.java index 5c4ecbfb..62bb9a26 100644 --- a/src/com/platform/controller/VolumeController.java +++ b/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; diff --git a/src/com/platform/dao/DataInfoDao.java b/src/com/platform/dao/DataInfoDao.java index cc0263eb..51a2a917 100644 --- a/src/com/platform/dao/DataInfoDao.java +++ b/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 { diff --git a/src/com/platform/dao/IRegionalismCodeDao.java b/src/com/platform/dao/IRegionalismCodeDao.java index 829017fc..a9b4242a 100644 --- a/src/com/platform/dao/IRegionalismCodeDao.java +++ b/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 diff --git a/src/com/platform/dao/PreDataInfoDao.java b/src/com/platform/dao/PreDataInfoDao.java index 98e561df..02cd8302 100644 --- a/src/com/platform/dao/PreDataInfoDao.java +++ b/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 { diff --git a/src/com/platform/entities/VolumeInitEntity.java b/src/com/platform/entities/VolumeInitEntity.java index 8f340164..4914fdf1 100644 --- a/src/com/platform/entities/VolumeInitEntity.java +++ b/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; diff --git a/src/com/platform/entities/PagerOptions.java b/src/com/platform/form/PagerOptions.java similarity index 91% rename from src/com/platform/entities/PagerOptions.java rename to src/com/platform/form/PagerOptions.java index 87d59629..6cf01887 100644 --- a/src/com/platform/entities/PagerOptions.java +++ b/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; //当前页码 diff --git a/src/com/platform/entities/VolumeForm.java b/src/com/platform/form/VolumeForm.java similarity index 89% rename from src/com/platform/entities/VolumeForm.java rename to src/com/platform/form/VolumeForm.java index 96002795..17abc412 100644 --- a/src/com/platform/entities/VolumeForm.java +++ b/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 volumes; diff --git a/src/com/platform/entities/oracleForm.java b/src/com/platform/form/oracleForm.java similarity index 82% rename from src/com/platform/entities/oracleForm.java rename to src/com/platform/form/oracleForm.java index 1ea62bd4..25d4a5ea 100644 --- a/src/com/platform/entities/oracleForm.java +++ b/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; diff --git a/src/com/platform/entities/volumeMoveForm.java b/src/com/platform/form/volumeMoveForm.java similarity index 75% rename from src/com/platform/entities/volumeMoveForm.java rename to src/com/platform/form/volumeMoveForm.java index f824d783..7e1ea5b5 100644 --- a/src/com/platform/entities/volumeMoveForm.java +++ b/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; diff --git a/src/com/platform/service/DataInfoService.java b/src/com/platform/service/DataInfoService.java index 91e34595..35efc7c2 100644 --- a/src/com/platform/service/DataInfoService.java +++ b/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); diff --git a/src/com/platform/service/IPreDataInfoService.java b/src/com/platform/service/IPreDataInfoService.java index 98fa7408..d4129f18 100644 --- a/src/com/platform/service/IPreDataInfoService.java +++ b/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 { diff --git a/src/com/platform/service/impl/DataInfoServiceImp.java b/src/com/platform/service/impl/DataInfoServiceImp.java index 6ad4d775..5c14cf45 100644 --- a/src/com/platform/service/impl/DataInfoServiceImp.java +++ b/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; diff --git a/src/com/platform/service/impl/PreDataInfoServiceImpl.java b/src/com/platform/service/impl/PreDataInfoServiceImpl.java index 2ac15a16..1e3afb25 100644 --- a/src/com/platform/service/impl/PreDataInfoServiceImpl.java +++ b/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; diff --git a/src/com/platform/service/thread/ThreadExtractOracle.java b/src/com/platform/service/thread/ThreadExtractOracle.java index 17f10014..b8f5ce69 100644 --- a/src/com/platform/service/thread/ThreadExtractOracle.java +++ b/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汇总库抽取 diff --git a/src/com/platform/service/thread/ThreadExtractStandardOracle.java b/src/com/platform/service/thread/ThreadExtractStandardOracle.java index a6430a32..fdeddd28 100644 --- a/src/com/platform/service/thread/ThreadExtractStandardOracle.java +++ b/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; /** 抽取标准表线程 diff --git a/src/com/platform/service/thread/ThreadGainOracleConnect.java b/src/com/platform/service/thread/ThreadGainOracleConnect.java index 1485801a..298ce775 100644 --- a/src/com/platform/service/thread/ThreadGainOracleConnect.java +++ b/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连接