From ec4dd98377402495c73008da682f58e18de43006 Mon Sep 17 00:00:00 2001 From: chenlw <874313221@qq.com> Date: Wed, 21 Sep 2016 15:58:54 +0800 Subject: [PATCH] chou qu oracle --- .../controller/DataModelController.java | 25 ++------- src/com/platform/entities/oracleForm.java | 55 +++++++++++++++++++ .../service/IOracleExtractService.java | 2 +- .../impl/OracleExtractServiceImpl.java | 13 ++--- .../service/thread/ThreadMoveData.java | 2 + 5 files changed, 66 insertions(+), 31 deletions(-) create mode 100644 src/com/platform/entities/oracleForm.java diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index 418ed466..b3163d70 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -31,6 +31,7 @@ import com.platform.entities.FolderNode; 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.service.DataInfoService; import com.platform.service.ICodeService; @@ -136,29 +137,11 @@ public class DataModelController extends BaseController{ @RequestMapping(value="/oracle/{name}/extract", method= RequestMethod.POST) public void oracleExtract(HttpServletRequest res, - HttpServletResponse req,@PathVariable String name) throws Exception { + HttpServletResponse req,@RequestBody oracleForm form) throws Exception { res.setCharacterEncoding("UTF-8"); - System.out.println("------extract-------"); - System.out.println(name); - Map paramMap = res.getParameterMap(); - //汇总库 对象信息--带有tableName- - String[] nodes = paramMap.get("target"); - Map map = null; - for (String string : nodes) { - JSONObject jsonobject = JSONObject.fromObject(string); - map = jsonobject; - System.out.println(map); - } - - // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下) - String[] inneed = paramMap.get("inneed"); - List> colleclist = new ArrayList>(); - for (String string : nodes) { - JSONObject jsonobject = JSONObject.fromObject(string); - Map inneedMap = jsonobject; - colleclist.add(inneedMap); + if (null != form.getCollOracle() && form.getCollOracle().size() > 0) { + OracleExtract.extractOracle(form.getTotalOracleName(), form.getCollOracle(), form.getTotalOracle()); } - OracleExtract.extractOracle(name, colleclist, map); req.setStatus(200); } // public void oracleExtract(HttpServletRequest res, diff --git a/src/com/platform/entities/oracleForm.java b/src/com/platform/entities/oracleForm.java new file mode 100644 index 00000000..3e130066 --- /dev/null +++ b/src/com/platform/entities/oracleForm.java @@ -0,0 +1,55 @@ +package com.platform.entities; + +import java.util.List; + +public class oracleForm { + + private GatherOracleInfo totalOracle; + + private List collOracle; + + private String totalOracleName; + + /** + * @return the totalOracle + */ + public GatherOracleInfo getTotalOracle() { + return totalOracle; + } + + /** + * @param totalOracle the totalOracle to set + */ + public void setTotalOracle(GatherOracleInfo totalOracle) { + this.totalOracle = totalOracle; + } + + /** + * @return the collOracle + */ + public List getCollOracle() { + return collOracle; + } + + /** + * @param collOracle the collOracle to set + */ + public void setCollOracle(List collOracle) { + this.collOracle = collOracle; + } + + /** + * @return the totalOracleName + */ + public String getTotalOracleName() { + return totalOracleName; + } + + /** + * @param totalOracleName the totalOracleName to set + */ + public void setTotalOracleName(String totalOracleName) { + this.totalOracleName = totalOracleName; + } + +} diff --git a/src/com/platform/service/IOracleExtractService.java b/src/com/platform/service/IOracleExtractService.java index 87386f82..77cabccd 100644 --- a/src/com/platform/service/IOracleExtractService.java +++ b/src/com/platform/service/IOracleExtractService.java @@ -18,5 +18,5 @@ public interface IOracleExtractService { */ // public boolean extractOracle(String name, List dataInfos, GatherOracleInfo oracleConnect) throws Exception; // public boolean extractOracle(String name, List dataInfos, Map oracleConnect) throws Exception; - public boolean extractOracle(String name, List> dataInfo, Map oracleConnect) throws Exception; + public boolean extractOracle(String name, List dataInfo, GatherOracleInfo oracleConnect) throws Exception; } diff --git a/src/com/platform/service/impl/OracleExtractServiceImpl.java b/src/com/platform/service/impl/OracleExtractServiceImpl.java index 053001e9..7be5d033 100644 --- a/src/com/platform/service/impl/OracleExtractServiceImpl.java +++ b/src/com/platform/service/impl/OracleExtractServiceImpl.java @@ -32,19 +32,14 @@ public class OracleExtractServiceImpl implements IOracleExtractService { private OracleConnector connect = new OracleConnector(); @Override - public boolean extractOracle(String name, List> dataInfoMap, - Map oracleConnect) throws Exception { + public boolean extractOracle(String name, List dataInfolist, + GatherOracleInfo oracleConnect) throws Exception { boolean isSuccess = false; try{ //map转 bean(汇总库信息-带tableName的) - GatherOracleInfo oracleModel = (GatherOracleInfo) Bean2MapUtils.convertMap(GatherOracleInfo.class, oracleConnect); - + GatherOracleInfo oracleModel = oracleConnect; //采集库连接参数 - List datainfos = new ArrayList(); - for (Map map : dataInfoMap) { - OracleConnectorParams dataInfoEntity = (OracleConnectorParams) Bean2MapUtils.convertMap(OracleConnectorParams.class, oracleConnect); - datainfos.add(dataInfoEntity); - } + List datainfos = dataInfolist; Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleModel.getIp() + ":" + oracleModel.getPort() + "/" + oracleModel.getDatabaseName(), oracleModel.getUser(), oracleModel.getPassword()); diff --git a/src/com/platform/service/thread/ThreadMoveData.java b/src/com/platform/service/thread/ThreadMoveData.java index 4096107d..cedcc319 100644 --- a/src/com/platform/service/thread/ThreadMoveData.java +++ b/src/com/platform/service/thread/ThreadMoveData.java @@ -97,6 +97,7 @@ public class ThreadMoveData{ } // 查询大小：。//gfs 获取size， long srcSize = show.getFolderSize(dataMove.getDataPath()); + srcSize = (long) (srcSize * 0.998); long dstSize = show.getFolderSize(dataMove.getDstPath()); if (srcSize < 0) { log.error(dataMove.getDataPath() + " : 路径不存在！ "); @@ -118,6 +119,7 @@ public class ThreadMoveData{ if("1".equals(dataMove.getCompleteStatus()) && dataMove.getRate() > 0){ //传输完毕：进行校验 if (realRate == 100) { + //TODO 查看当前拷贝目录进程是否结束？ //TODO 进行MD5校验 int resl = check.checkoutMD5Folder(dataMove.getDataPath(), dataMove.getDstPath()); //TODO 校验成功--则删除数据库记录