diff --git a/.classpath b/.classpath index bb361b44..4d25e0c9 100644 --- a/.classpath +++ b/.classpath @@ -9,6 +9,6 @@ - + diff --git a/.gitignore b/.gitignore index 6b468b62..d1638636 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -*.class +build/ \ No newline at end of file diff --git a/WebContent/WEB-INF/config/config.properties b/WebContent/WEB-INF/config/config.properties index 3d1dc608..050f4bfa 100644 --- a/WebContent/WEB-INF/config/config.properties +++ b/WebContent/WEB-INF/config/config.properties @@ -4,7 +4,7 @@ # 驱动程序 jdbc.mysql.driver=com.mysql.jdbc.Driver # 连接url -jdbc.mysql.url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true # 用户名 jdbc.mysql.username=root # 密码 diff --git a/WebContent/WEB-INF/config/mybatis-applicationConfig.xml b/WebContent/WEB-INF/config/mybatis-applicationConfig.xml index 02e5011b..85138096 100644 --- a/WebContent/WEB-INF/config/mybatis-applicationConfig.xml +++ b/WebContent/WEB-INF/config/mybatis-applicationConfig.xml @@ -7,8 +7,10 @@ + - + + \ No newline at end of file diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 99cc03de..d9935a26 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -59,7 +59,7 @@ - + \ No newline at end of file diff --git a/build/classes/.gitignore b/build/classes/.gitignore deleted file mode 100644 index 43e58b99..00000000 --- a/build/classes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/com diff --git a/build/classes/com/platform/controller/DataModelController.class b/build/classes/com/platform/controller/DataModelController.class index 837dcfde..1da50b3a 100644 Binary files a/build/classes/com/platform/controller/DataModelController.class and b/build/classes/com/platform/controller/DataModelController.class differ diff --git a/build/classes/com/platform/dao/DataInfoDao.class b/build/classes/com/platform/dao/DataInfoDao.class deleted file mode 100644 index b2c3bfed..00000000 Binary files a/build/classes/com/platform/dao/DataInfoDao.class and /dev/null differ diff --git a/build/classes/com/platform/dao/EncodeInfoDao.class b/build/classes/com/platform/dao/EncodeInfoDao.class deleted file mode 100644 index f6b44c7b..00000000 Binary files a/build/classes/com/platform/dao/EncodeInfoDao.class and /dev/null differ diff --git a/build/classes/com/platform/entities/BasedType.class b/build/classes/com/platform/entities/BasedType.class deleted file mode 100644 index 30ba1020..00000000 Binary files a/build/classes/com/platform/entities/BasedType.class and /dev/null differ diff --git a/build/classes/com/platform/entities/DataInfoEntity.class b/build/classes/com/platform/entities/DataInfoEntity.class deleted file mode 100644 index 0bc0b835..00000000 Binary files a/build/classes/com/platform/entities/DataInfoEntity.class and /dev/null differ diff --git a/build/classes/com/platform/entities/EncodedInfoEntity.class b/build/classes/com/platform/entities/EncodedInfoEntity.class deleted file mode 100644 index ca2439bd..00000000 Binary files a/build/classes/com/platform/entities/EncodedInfoEntity.class and /dev/null differ diff --git a/build/classes/com/platform/entities/FolderNode.class b/build/classes/com/platform/entities/FolderNode.class index f5bb0dee..d9be3d55 100644 Binary files a/build/classes/com/platform/entities/FolderNode.class and b/build/classes/com/platform/entities/FolderNode.class differ diff --git a/build/classes/com/platform/entities/OracleConnectorParams.class b/build/classes/com/platform/entities/OracleConnectorParams.class deleted file mode 100644 index 2d57408c..00000000 Binary files a/build/classes/com/platform/entities/OracleConnectorParams.class and /dev/null differ diff --git a/build/classes/com/platform/entities/PagerOptions.class b/build/classes/com/platform/entities/PagerOptions.class deleted file mode 100644 index 0f0a2176..00000000 Binary files a/build/classes/com/platform/entities/PagerOptions.class and /dev/null differ diff --git a/build/classes/com/platform/entities/SimpleConfigParamsBean.class b/build/classes/com/platform/entities/SimpleConfigParamsBean.class deleted file mode 100644 index 8e274e5f..00000000 Binary files a/build/classes/com/platform/entities/SimpleConfigParamsBean.class and /dev/null differ diff --git a/build/classes/com/platform/kubernetes/SimpleKubeClient.class b/build/classes/com/platform/kubernetes/SimpleKubeClient.class deleted file mode 100644 index 78331ee3..00000000 Binary files a/build/classes/com/platform/kubernetes/SimpleKubeClient.class and /dev/null differ diff --git a/build/classes/com/platform/oracle/OracleConnector.class b/build/classes/com/platform/oracle/OracleConnector.class deleted file mode 100644 index 04a516c4..00000000 Binary files a/build/classes/com/platform/oracle/OracleConnector.class and /dev/null differ diff --git a/build/classes/com/platform/service/DataInfoService.class b/build/classes/com/platform/service/DataInfoService.class deleted file mode 100644 index 95758eba..00000000 Binary files a/build/classes/com/platform/service/DataInfoService.class and /dev/null differ diff --git a/build/classes/com/platform/service/DataInfoServiceImp.class b/build/classes/com/platform/service/DataInfoServiceImp.class deleted file mode 100644 index 2b8ecde7..00000000 Binary files a/build/classes/com/platform/service/DataInfoServiceImp.class and /dev/null differ diff --git a/build/classes/com/platform/service/EncodeInfoService.class b/build/classes/com/platform/service/EncodeInfoService.class deleted file mode 100644 index 4e7ea229..00000000 Binary files a/build/classes/com/platform/service/EncodeInfoService.class and /dev/null differ diff --git a/build/classes/com/platform/service/EncodeInfoServiceImpl.class b/build/classes/com/platform/service/EncodeInfoServiceImpl.class deleted file mode 100644 index 56590e83..00000000 Binary files a/build/classes/com/platform/service/EncodeInfoServiceImpl.class and /dev/null differ diff --git a/build/classes/com/platform/service/OracleExtractHelper.class b/build/classes/com/platform/service/OracleExtractHelper.class deleted file mode 100644 index cd929b15..00000000 Binary files a/build/classes/com/platform/service/OracleExtractHelper.class and /dev/null differ diff --git a/build/classes/com/platform/service/OracleStatusService$connectTask.class b/build/classes/com/platform/service/OracleStatusService$connectTask.class deleted file mode 100644 index 84eef078..00000000 Binary files a/build/classes/com/platform/service/OracleStatusService$connectTask.class and /dev/null differ diff --git a/build/classes/com/platform/service/OracleStatusService.class b/build/classes/com/platform/service/OracleStatusService.class deleted file mode 100644 index b61344b5..00000000 Binary files a/build/classes/com/platform/service/OracleStatusService.class and /dev/null differ diff --git a/build/classes/com/platform/service/SimplePropertyReader.class b/build/classes/com/platform/service/SimplePropertyReader.class deleted file mode 100644 index d54c4934..00000000 Binary files a/build/classes/com/platform/service/SimplePropertyReader.class and /dev/null differ diff --git a/build/classes/com/platform/test/SMBasedTest.class b/build/classes/com/platform/test/SMBasedTest.class deleted file mode 100644 index e64ea7a7..00000000 Binary files a/build/classes/com/platform/test/SMBasedTest.class and /dev/null differ diff --git a/build/classes/com/platform/test/User.class b/build/classes/com/platform/test/User.class deleted file mode 100644 index a38adbfb..00000000 Binary files a/build/classes/com/platform/test/User.class and /dev/null differ diff --git a/build/classes/com/platform/test/testSystemInfoDao.class b/build/classes/com/platform/test/testSystemInfoDao.class deleted file mode 100644 index f86a419c..00000000 Binary files a/build/classes/com/platform/test/testSystemInfoDao.class and /dev/null differ diff --git a/build/classes/com/platform/utils/ConfigLoder.class b/build/classes/com/platform/utils/ConfigLoder.class deleted file mode 100644 index 9c600c3d..00000000 Binary files a/build/classes/com/platform/utils/ConfigLoder.class and /dev/null differ diff --git a/build/classes/com/platform/utils/ConfigPropertyReader.class b/build/classes/com/platform/utils/ConfigPropertyReader.class deleted file mode 100644 index 81d2b1c3..00000000 Binary files a/build/classes/com/platform/utils/ConfigPropertyReader.class and /dev/null differ diff --git a/build/classes/com/platform/utils/FileOperateHelper.class b/build/classes/com/platform/utils/FileOperateHelper.class deleted file mode 100644 index 40db4e3d..00000000 Binary files a/build/classes/com/platform/utils/FileOperateHelper.class and /dev/null differ diff --git a/build/classes/com/platform/utils/UtilsHelper.class b/build/classes/com/platform/utils/UtilsHelper.class deleted file mode 100644 index e06cff03..00000000 Binary files a/build/classes/com/platform/utils/UtilsHelper.class and /dev/null differ diff --git a/build/classes/spring-applicationContext-test.xml b/build/classes/spring-applicationContext-test.xml deleted file mode 100644 index 27b1248b..00000000 --- a/build/classes/spring-applicationContext-test.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/com/dao/mapper/config-details-mapper.xml b/src/com/dao/mapper/config-details-mapper.xml new file mode 100644 index 00000000..439d4f98 --- /dev/null +++ b/src/com/dao/mapper/config-details-mapper.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + id id, service_port port, service_ip ip, service_name name, service_user user, service_password password, service_database databaseName, service_table tableName, service_suffix suffix, service_status status + + + + + + INSERT INTO + services_info( + + + service_port, + + + service_ip, + + + service_name, + + + service_user, + + + service_password, + + + service_database, + + + service_table, + + + service_suffix, + + + service_status, + + + ) + VALUES( + + + #{port}, + + + #{ip}, + + + #{name}, + + + #{user}, + + + #{password}, + + + #{databaseName}, + + + #{tableName}, + + + #{suffix}, + + + #{status}, + + + ) + + + + DELETE FROM services_info + + id =#{id} + + + + + UPDATE + services_info + + + + service_name = #{name}, + + + service_ip = #{ip}, + + + service_port= #{port}, + + + service_user= #{user}, + + + service_password= #{password}, + + + service_database= #{databaseName}, + + + service_table= #{tableName}, + + + service_suffix= #{suffix}, + + + service_status= #{status}, + + + remove= #{remove}, + + + + + id = #{id} + + + + \ No newline at end of file diff --git a/build/classes/com/dao/mapper/data-detaisl-mapper.xml b/src/com/dao/mapper/data-details-mapper.xml similarity index 100% rename from build/classes/com/dao/mapper/data-detaisl-mapper.xml rename to src/com/dao/mapper/data-details-mapper.xml diff --git a/src/com/dao/mapper/data-detaisl-mapper.xml b/src/com/dao/mapper/data-detaisl-mapper.xml deleted file mode 100644 index 52b98767..00000000 --- a/src/com/dao/mapper/data-detaisl-mapper.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - and data_details.data_type=#{PagerOptions.dataType} - - - and - data_details.submitted_batch=#{PagerOptions.submittedBatch} - - - and data_details.city_name=#{PagerOptions.cityName} - - - and - data_details.district_name=#{PagerOptions.districtName} - - - and data_details.data_version=#{PagerOptions.dataVersion} - - - and data_details=#{PagerOptions.systemName} - - - and data_details.data_year=#{PagerOptions.dataYear} - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index ba2295ca..1e42f3f6 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -1,6 +1,9 @@ package com.platform.controller; +import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; @@ -8,22 +11,50 @@ 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.springframework.stereotype.Controller; +import org.springframework.stereotype.Service; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; +import com.base.BaseController; +import com.platform.entities.DataInfoEntity; +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.service.DataInfoService; +import com.platform.service.IGfsService; +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.Configs; import com.platform.utils.UtilsHelper; @Controller -public class DataModelController { +public class DataModelController extends BaseController{ @Resource(name = "dataInfoService") private DataInfoService dfs; + + @Resource(name = "gfsService") + private IGfsService gfsService; + + @Resource(name = "mySqlService") + private IMySqlService mySqlService; + + @Resource(name = "OracleExtract") + private IOracleExtractService OracleExtract; public void setDfsImp(DataInfoService dfs) { this.dfs = dfs; @@ -36,13 +67,13 @@ public class DataModelController { Map paramMap = res.getParameterMap(); Set keySet = paramMap.keySet(); Map params = new HashMap(); - StringBuffer sb = new StringBuffer().append("当前的请求参数:{"); + StringBuffer sb = new StringBuffer().append("��ǰ���������:{"); for (String str : keySet) { - String value = paramMap.get(str)[0]; - if (StringUtils.isNotEmpty(value)){ + String value = paramMap.get(str)[0]; + if (StringUtils.isNotEmpty(value)) { params.put(str, value); sb.append(str).append(":").append(value).append(","); - }else { + } else { sb.append(str).append(":").append("null").append(","); } } @@ -67,7 +98,7 @@ public class DataModelController { String[] oraclesName = paramMap.get("oracleName"); if (oraclesName != null) for (String rcName : oraclesName) { - Configs.CONSOLE_LOGGER.info("执行后台数据库连接\t" + rcName); + Configs.CONSOLE_LOGGER.info("连接成功\t" + rcName); new OracleStatusService().connectToOracle(rcName); } } @@ -80,20 +111,118 @@ public class DataModelController { String operate = paramMap.get("operation")[0]; if (null != oraclesName) { for (String rcName : oraclesName) { - Configs.CONSOLE_LOGGER.info("取消后台数据库连接:\t" + rcName); + Configs.CONSOLE_LOGGER.info("连接成功:\t" + rcName); new OracleStatusService().cancelToOracle(rcName, operate); } } } - @RequestMapping("/extractOracleData") + @RequestMapping("/oracle/{name}/extract") public void extractOracleData(HttpServletRequest res, - HttpServletResponse req) { - + HttpServletResponse req, String name) throws Exception { + 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); + } + OracleExtract.extractOracle(name, colleclist, map); + } - @RequestMapping("/getFolder") - public void getFolder(HttpServletRequest res, HttpServletResponse req) { - System.out.println("ooooooooo"); + @RequestMapping("/volume/list") + @ResponseBody + public List getFolder(HttpServletRequest res, HttpServletResponse req) throws Exception { + System.out.println("get Request"); +// Brick brick1 = new Brick("192.168.0.101", "D:/bootstrap"); +// Brick brick2 = new Brick("192.168.0.103", "D:\book"); +// List bricks = new ArrayList(); +// bricks.add(brick1); +// bricks.add(brick2); + List result = gfsService.getAllVolumes(); + return result; + } + + @RequestMapping(value = "/volume/{name}/move", method= RequestMethod.POST) + @ResponseBody + public Object move(HttpServletRequest res, HttpServletResponse req, String name, + FolderNode selectNode, DataInfoEntity selectItems) throws Exception { + System.out.println("get Request"); + Map paramMap = res.getParameterMap(); +// System.out.println(paramMap); + String[] nodes = paramMap.get("selectNode"); + Map map = null; + for (String string : nodes) { + System.out.println(string); + JSONObject jsonobject = JSONObject.fromObject(string); + map = jsonobject; + } + List listItemPath = new ArrayList(); + String[] items = paramMap.get("selectItems"); + System.out.println("selectItems"); + for (String string : items) { + System.out.println(string); + JSONObject jsobj = JSONObject.fromObject(string); + Map itemmap = jsobj; + listItemPath.add((String)itemmap.get("dataPath")); + } + + System.out.println(name); + System.out.println(nodes); + System.out.println(selectItems); + System.out.println("--------------"); + int result = gfsService.copyFolder(listItemPath, (String)map.get("name"), "app"); + return result; + } + + @RequestMapping("/oracle/list") + @ResponseBody + public List getOracleInfo(HttpServletRequest res, + HttpServletResponse req) throws Exception { + + List result = mySqlService.findAllMySql(); + System.out.println("----------getOracleInfo-----------------------"); + return result; + } + + @RequestMapping("/oracle/{id}/delete") + @ResponseBody + public void deleteOracleInfo(HttpServletRequest res, + HttpServletResponse req, int id) throws Exception { + + mySqlService.deleteMySql(id); + System.out.println("----------deleteOracleInfo-----------------------"); + } + + @RequestMapping("/oracle/{id}/insert") + @ResponseBody + public void insertOracleInfo(HttpServletRequest res, + HttpServletResponse req, GatherOracleInfo oracle) throws Exception { + + mySqlService.insertOracle(oracle); + System.out.println("----------insertOracleInfo-----------------------"); + } + + @RequestMapping("/oracle/{id}/update") + @ResponseBody + public void updateOracleInfo(HttpServletRequest res, + HttpServletResponse req, GatherOracleInfo oracle) throws Exception { + + mySqlService.updateOracle(oracle); + System.out.println("----------updateOracleInfo-----------------------"); } } diff --git a/src/com/platform/controller/FolderController.java b/src/com/platform/controller/FolderController.java index 4a7944dc..4e817bd4 100644 --- a/src/com/platform/controller/FolderController.java +++ b/src/com/platform/controller/FolderController.java @@ -47,37 +47,23 @@ public class FolderController extends BaseController { return result; } - @RequestMapping(value="/copyFolder", method= RequestMethod.POST) - public Object copyFolder(String srcFolder, String dstFolder, String name) throws Exception { - // -1 :error; -2: the filename is not exists ;-3 :destFolderName ; 1: right - int result = gfsService.copyFolder(srcFolder, dstFolder, name); - System.out.println(srcFolder); - System.out.println(dstFolder); - String obj = "right"; - - if (1 != result) { - obj = "err"; - } - return obj; - } - - /** - * <一句话功能简述> 查询集群中所有的 volume 及其 信息 - * <功能详细描述> - * @return - * @throws Exception - * @see [类、类#方法、类#成员] - */ - @RequestMapping(value="/volume/list", method= RequestMethod.POST) - public Object getVolums() throws Exception{ - System.out.println("----------------------------------"); - long a = new Date().getTime(); - List result = gfsService.getAllVolumes(); - System.out.println("----------------------------------"); - System.out.println(new Date().getTime()-a); - return result; - } - +// /** +// * <一句话功能简述> 查询集群中所有的 volume 及其 信息 +// * <功能详细描述> +// * @return +// * @throws Exception +// * @see [类、类#方法、类#成员] +// */ +// @RequestMapping(value="/volume/list", method= RequestMethod.POST) +// public Object getVolums() throws Exception{ +// System.out.println("----------------------------------"); +// long a = new Date().getTime(); +// List result = gfsService.getAllVolumes(); +// System.out.println("----------------------------------"); +// System.out.println(new Date().getTime()-a); +// return result; +// } +// /** * <一句话功能简述> 查询集群中所有的 volume 及其 信息 * <功能详细描述> diff --git a/src/com/platform/dao/GatherOracleDao.java b/src/com/platform/dao/GatherOracleDao.java new file mode 100644 index 00000000..43852cac --- /dev/null +++ b/src/com/platform/dao/GatherOracleDao.java @@ -0,0 +1,39 @@ +package com.platform.dao; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.platform.entities.GatherOracleInfo; + +@Repository(value = "gatherOracleDao") +public interface GatherOracleDao { + + /** + * @return 查询所有的oracle记录 + * @throws Exception 异常 + */ + public List selectAllOracle() throws Exception; + + /** + * @param id + * @return + * @throws Exception + */ + public int deleteOracleById(int id) throws Exception; + + /** + * @param oracle + * @return + * @throws Exception + */ + public int insertOracle(GatherOracleInfo oracle) throws Exception; + + /** + * @param oracle + * @return + * @throws Exception + */ + public int updateOracleById(GatherOracleInfo oracle) throws Exception; + +} diff --git a/src/com/platform/entities/FolderNode.java b/src/com/platform/entities/FolderNode.java index da662d0f..8f584d77 100644 --- a/src/com/platform/entities/FolderNode.java +++ b/src/com/platform/entities/FolderNode.java @@ -8,6 +8,9 @@ public class FolderNode { private String path; private List childNodes; + public FolderNode() { + // TODO Auto-generated constructor stub + } public FolderNode(String name) { this.name = name; diff --git a/src/com/platform/entities/GatherOracleInfo.java b/src/com/platform/entities/GatherOracleInfo.java new file mode 100644 index 00000000..4ceca3b4 --- /dev/null +++ b/src/com/platform/entities/GatherOracleInfo.java @@ -0,0 +1,82 @@ +package com.platform.entities; + +import com.platform.entities.OracleConnectorParams; + +public class GatherOracleInfo extends OracleConnectorParams { + + private String tableName; + + private String suffix; + + private int id; + + private String remove; + + /** + * 0:未知状态， 1：连接成功 ，2：在使用 ，3 ：失败 + */ + private int status; + + public GatherOracleInfo() { + super(); + } + + public GatherOracleInfo(String port, String ip, String name, String user, + String password, String database) { + super(port, ip, name, user, password, database); + // TODO Auto-generated constructor stub + } + + public GatherOracleInfo(String port, String ip, String name, String user, + String password, String database, int _id, String tableName, String suffix, int status) { + super(port, ip, name, user, password, database); + this.tableName = tableName; + this.suffix = suffix; + this.id=_id; + this.status = status; + } + + + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public String getSuffix() { + return suffix; + } + + public void setSuffix(String suffix) { + this.suffix = suffix; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public String getRemove() { + return remove; + } + + public void setRemove(String remove) { + this.remove = remove; + } + +} diff --git a/src/com/platform/entities/OracleConnectorParams.java b/src/com/platform/entities/OracleConnectorParams.java index b265f407..cbb1d3a6 100644 --- a/src/com/platform/entities/OracleConnectorParams.java +++ b/src/com/platform/entities/OracleConnectorParams.java @@ -11,7 +11,11 @@ public class OracleConnectorParams { private String name; private String user; private String password; - private String database; + private String databaseName; + + public OracleConnectorParams() { + // TODO Auto-generated constructor stub + } public OracleConnectorParams(String port, String ip, String name) { maybeInit(); @@ -27,7 +31,7 @@ public class OracleConnectorParams { this.name = name; this.user = user; this.password = password; - this.database = database; + this.databaseName = database; } private void maybeInit() { @@ -35,7 +39,7 @@ public class OracleConnectorParams { Configs.CONFIG_LOCALTION).getProperties(); this.user = properties.getProperty("collect-user"); this.password = properties.getProperty("collect-password"); - this.database = properties.getProperty("collect-database"); + this.databaseName = properties.getProperty("collect-database"); } public String getPort() { @@ -78,12 +82,12 @@ public class OracleConnectorParams { this.password = password; } - public String getDatabase() { - return database; + public String getDatabaseName() { + return databaseName; } - public void setDatabase(String database) { - this.database = database; + public void setDatabaseName(String databaseName) { + this.databaseName = databaseName; } } diff --git a/src/com/platform/entities/VolumeEntity.java b/src/com/platform/entities/VolumeEntity.java index 1d785284..84455003 100644 --- a/src/com/platform/entities/VolumeEntity.java +++ b/src/com/platform/entities/VolumeEntity.java @@ -10,6 +10,7 @@ */ package com.platform.entities; +import java.util.ArrayList; import java.util.List; /** @@ -39,7 +40,7 @@ public class VolumeEntity { private FolderNode folder; /** volume的 块 */ - private List brick; + private List brick = new ArrayList(); /** * @return the allSize diff --git a/src/com/platform/service/IGfsService.java b/src/com/platform/service/IGfsService.java index 9340546a..0b9d9841 100644 --- a/src/com/platform/service/IGfsService.java +++ b/src/com/platform/service/IGfsService.java @@ -45,7 +45,7 @@ public interface IGfsService { * @throws Exception * @see [类、类#方法、类#成员] */ - public int copyFolder(String srcFolder, String dstFolder, String name) throws Exception; + public int copyFolder(List srcFolders, String dstFolder, String name) throws Exception; /** * <一句话功能简述> 获得volume下的 name \ allsize \ usedsize \ folderTree \ brick @@ -65,4 +65,8 @@ public interface IGfsService { */ public VolumeEntity getOneVolume(String volumeName) throws Exception; + public int moveData(String volumeName, String srcPath, String dstPath) throws Exception; + + public int deleteData(String volumeName, String srcPath) throws Exception; + } diff --git a/src/com/platform/service/OracleExtractHelper.java b/src/com/platform/service/OracleExtractHelper.java index 73043995..2a7b89ed 100644 --- a/src/com/platform/service/OracleExtractHelper.java +++ b/src/com/platform/service/OracleExtractHelper.java @@ -1,9 +1,10 @@ package com.platform.service; +import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; -import com.mysql.jdbc.Connection; +import com.platform.entities.GatherOracleInfo; import com.platform.entities.OracleConnectorParams; import com.platform.oracle.OracleConnector; import com.platform.utils.Configs; @@ -39,20 +40,21 @@ public class OracleExtractHelper { /** * 创建dblink * - * @param conn - * @param oc + * @param conn 汇总库的连接 + * @param oc 采集库 * dblink连接参数实体 */ public void createDBLink(Connection conn, OracleConnectorParams oc) { String linkName = "LinkTo" + oc.getName(); - String sql = "CREATE PUBLIC DATABASE LINK LinkTo" + String sql = "CREATE PUBLIC DATABASE LINK " + linkName + " CONNECT TO " - + "IDENTIFIED BY " + + oc.getUser() + + " IDENTIFIED BY " + oc.getPassword() + " USING '(DESCRIPTION =(ADDRESS_LIST =(ADDRESS = (PROTOCOL = TCP)(HOST = " + oc.getIp() + ")(PORT = " + oc.getPort() - + ")))(CONNECT_DATA =(SERVICE_NAME =" + oc.getDatabase() + + ")))(CONNECT_DATA =(SERVICE_NAME =" + oc.getDatabaseName() + ")))';"; if (null != oc) { if (hasSameNameDBLink(conn, linkName)) { // 如果dblink已经存在,先删除dblink，在创建dblink @@ -84,11 +86,11 @@ public class OracleExtractHelper { /** * 创建表空间 * - * @param conn - * @param oc + * @param conn 汇总库连接 + * @param oc 汇总库信息 * @return */ - public boolean createTableSpace(Connection conn, OracleConnectorParams oc) { + public boolean createTableSpace(Connection conn, GatherOracleInfo oc) { String tmpSql = "select TABLESPACE_NAME from dba_tablespaces where TABLESPACE_NAME = '" + Configs.GATHER_TABLESPACE_NAME + "'"; if (oConnector.execOracleSQL(conn, tmpSql)) { @@ -105,10 +107,10 @@ public class OracleExtractHelper { /** * 创建用户并授权 * - * @param conn - * @param oc + * @param conn 汇总库连接 + * @param oc 汇总库信息 */ - public void createUser(Connection conn, OracleConnectorParams oc) { + public void createUser(Connection conn, GatherOracleInfo oc) { String strTUser = oc.getName() + Configs.TABLE_SUFFIX; String sql = "Create user " + strTUser + " default tablespace " + Configs.GATHER_TABLESPACE_NAME + " identified by " @@ -121,8 +123,8 @@ public class OracleExtractHelper { /** * 执行汇总操作 * - * @param conn - * @param oc + * @param conn 汇总库连接 + * @param oc 采集库 */ public void extractColleDB(Connection conn, OracleConnectorParams oc) { String strTUser = oc.getName() + Configs.TABLE_SUFFIX; diff --git a/src/com/platform/service/OracleStatusService.java b/src/com/platform/service/OracleStatusService.java index 0b081a88..adb7ea00 100644 --- a/src/com/platform/service/OracleStatusService.java +++ b/src/com/platform/service/OracleStatusService.java @@ -111,7 +111,7 @@ public class OracleStatusService { client.updateOrAddReplicasLabelById(taskName, "status", "1"); } else { String url = "jdbc:oracle:thin:@" + ocp.getIp() + ":" - + ocp.getPort() + ":" + ocp.getDatabase(); + + ocp.getPort() + "/" + ocp.getDatabaseName(); boolean flag = OracleConnector.canConnect(url, ocp.getUser(), ocp.getPassword()); String message = "失败"; diff --git a/src/com/platform/service/impl/GfsServiceImpl.java b/src/com/platform/service/impl/GfsServiceImpl.java index f45b9952..89bb3714 100644 --- a/src/com/platform/service/impl/GfsServiceImpl.java +++ b/src/com/platform/service/impl/GfsServiceImpl.java @@ -52,9 +52,15 @@ public class GfsServiceImpl implements IGfsService { } @Override - public int copyFolder(String srcFolder, String dstFolder, String name) + public int copyFolder(List srcFolders, String dstFolder, String name) throws Exception { - int status = copydata.copyFolderFiles(srcFolder, dstFolder, name); + int status = 0 ; + if (null != srcFolders) { + + for (String string : srcFolders) { + status = copydata.copyFolderFiles(string, dstFolder, name); + } + } return status; } @@ -99,4 +105,18 @@ public class GfsServiceImpl implements IGfsService { return volume; } + @Override + public int moveData(String volumeName, String srcPath, String dstPath) + throws Exception { + + int result = copydata.copyFolderFiles(srcPath, dstPath, "app"); + return result; + } + + @Override + public int deleteData(String volumeName, String srcPath) throws Exception { + // TODO Auto-generated method stub + return 0; + } + } diff --git a/src/com/platform/utils/VolumeThread.java b/src/com/platform/utils/VolumeThread.java index 4e8549ec..05357c8f 100644 --- a/src/com/platform/utils/VolumeThread.java +++ b/src/com/platform/utils/VolumeThread.java @@ -13,6 +13,10 @@ public class VolumeThread extends Thread implements Runnable{ */ private static String pointPath = "/home"; + public VolumeThread() { + // TODO Auto-generated constructor stub + } + public VolumeThread(String path) { if (null != path && !"".equals(path.trim())) { VolumeThread.pointPath = path; diff --git a/test/com/platform/test/FolderReader.java b/test/com/platform/test/FolderReader.java index cb2f440a..9b00b15c 100644 --- a/test/com/platform/test/FolderReader.java +++ b/test/com/platform/test/FolderReader.java @@ -21,8 +21,8 @@ public class FolderReader { childrens.add(children); } } - folderNode = new FolderNode(file.getName(), file.getAbsolutePath(), - childrens); +// folderNode = new FolderNode(file.getName(), file.getAbsolutePath(), +// childrens); } return folderNode; }