diff --git a/WebContent/WEB-INF/config/mybatis-applicationConfig.xml b/WebContent/WEB-INF/config/mybatis-applicationConfig.xml
index 02e5011b..0008848f 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/src/com/dao/mapper/config-details-mapper.xml b/src/com/dao/mapper/config-details-mapper.xml
new file mode 100644
index 00000000..b6a2e259
--- /dev/null
+++ b/src/com/dao/mapper/config-details-mapper.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/com/dao/mapper/data-detaisl-mapper.xml b/src/com/dao/mapper/data-details-mapper.xml
similarity index 100%
rename from src/com/dao/mapper/data-detaisl-mapper.xml
rename to src/com/dao/mapper/data-details-mapper.xml
diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java
index 2f9f628a..6414b3fc 100644
--- a/src/com/platform/controller/DataModelController.java
+++ b/src/com/platform/controller/DataModelController.java
@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.platform.entities.FolderNode;
+import com.platform.entities.GatherOracleInfo;
+import com.platform.entities.OracleConnectorParams;
import com.platform.entities.PagerOptions;
import com.platform.service.DataInfoService;
import com.platform.service.OracleStatusService;
@@ -44,11 +46,11 @@ public class DataModelController {
Map params = new HashMap();
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(",");
}
}
@@ -108,8 +110,29 @@ public class DataModelController {
bricks.add(brick1);
bricks.add(brick2);
List folderNodes = new ArrayList<>();
- folderNodes.add(FolderReader.reader("C:\\Users\\wuming\\workspace\\data-aggregation-platform"));
- Volume volume = new Volume("volume", 1555551024, 153561024, bricks, folderNodes);
+ folderNodes
+ .add(FolderReader
+ .reader("C:\\Users\\wuming\\workspace\\data-aggregation-platform"));
+ Volume volume = new Volume("volume", 1555551024, 153561024, bricks,
+ folderNodes);
return volume;
}
+
+ @RequestMapping("/oracle/list")
+ @ResponseBody
+ public List getOracleInfo(HttpServletRequest res,
+ HttpServletResponse req) {
+ List orpinfo = new ArrayList();
+ //测试下--------------------
+ OracleConnectorParams oracleConnectorParams1 = new GatherOracleInfo("1530", "192.168.0.115", "汇总库1", "System", "oracle", "orcl", 0, "TS_JSSJBS","_20152016", 0);
+ OracleConnectorParams oracleConnectorParams2= new GatherOracleInfo("1521", "192.168.0.110", "汇总库2", "System", "oracle", "orcl", 1, "TS_JSSJBS","_20152016", 1);
+ OracleConnectorParams oracleConnectorParams3 = new GatherOracleInfo("1530", "192.168.0.123", "汇总库3", "System", "oracle", "orcl", 2, "TS_JSSJBS","_20152016", 2);
+ OracleConnectorParams oracleConnectorParams4= new GatherOracleInfo("1521", "192.168.0.120", "汇总库4", "System", "oracle", "orcl", 3, "TS_JSSJBS","_20152016", 3);
+ orpinfo.add(oracleConnectorParams1);
+ orpinfo.add(oracleConnectorParams2);
+ orpinfo.add(oracleConnectorParams3);
+ orpinfo.add(oracleConnectorParams4);
+ //---------------------------------
+ return orpinfo;
+ }
}
diff --git a/src/com/platform/dao/GatherOracleDao.java b/src/com/platform/dao/GatherOracleDao.java
new file mode 100644
index 00000000..f431bcfc
--- /dev/null
+++ b/src/com/platform/dao/GatherOracleDao.java
@@ -0,0 +1,5 @@
+package com.platform.dao;
+
+public interface GatherOracleDao {
+
+}
diff --git a/src/com/platform/entities/GatherOracleInfo.java b/src/com/platform/entities/GatherOracleInfo.java
new file mode 100644
index 00000000..11b7caa1
--- /dev/null
+++ b/src/com/platform/entities/GatherOracleInfo.java
@@ -0,0 +1,60 @@
+package com.platform.entities;
+
+public class GatherOracleInfo extends OracleConnectorParams {
+
+ 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;
+ }
+
+ private String tableName;
+
+ private String suffix;
+
+ private int _id;
+
+ private int status; //oracle连接状态 ; 0：未连接; 1：连接成功 ; 2：使用中; 3连接失败.
+
+ 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 get_id() {
+ return _id;
+ }
+
+ public void set_id(int _id) {
+ this._id = _id;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+}