diff --git a/.classpath b/.classpath
index 7e729e64..2b646a7f 100644
--- a/.classpath
+++ b/.classpath
@@ -2,11 +2,6 @@
-
-
-
-
-
@@ -14,5 +9,6 @@
+
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/web.xml b/WebContent/WEB-INF/web.xml
index 99cc03de..207be4ed 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -21,6 +21,7 @@
/*
+
contextConfigLocation
WEB-INF/config/spring-applicationContext.xml
@@ -46,7 +47,7 @@
springmvc
- /*
+ /
@@ -59,7 +60,7 @@
-
+
\ No newline at end of file
diff --git a/src/com/dao/mapper/dataInfoMoveTmpmapper.xml b/src/com/dao/mapper/dataInfoMoveTmpmapper.xml
new file mode 100644
index 00000000..c0545560
--- /dev/null
+++ b/src/com/dao/mapper/dataInfoMoveTmpmapper.xml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ UPDATE
+ move_data_tmp
+
+
+
+ regionalism_code = #{regionalismCode},
+
+
+ system_code= #{systemCode},
+
+
+ dst_path= #{dstPath},
+
+
+ complete_status= #{completeStatus},
+
+ rate= #{rate}
+
+
+
+ id = #{id}
+
+
+
+
+ INSERT INTO
+ move_data_tmp(
+
+
+ id,
+
+
+ regionalism_code,
+
+
+ system_code,
+
+
+ dst_path,
+
+
+ complete_status,
+
+ rate
+
+ )
+ VALUES(
+
+
+ id,
+
+
+ #{regionalismCode},
+
+
+ #{systemCode},
+
+
+ #{dstPath},
+
+
+ #{completeStatus},
+
+ #{rate}
+
+ )
+
+
+
+ DELETE FROM
+ move_data_tmp
+ WHERE
+ id = #{id}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java
index 29414e6d..3db9b91d 100644
--- a/src/com/platform/controller/DataModelController.java
+++ b/src/com/platform/controller/DataModelController.java
@@ -58,7 +58,7 @@ public class DataModelController extends BaseController{
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)) {
@@ -89,7 +89,7 @@ public class DataModelController extends BaseController{
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);
}
}
@@ -102,19 +102,20 @@ public class DataModelController extends BaseController{
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);
}
}
}
+ @SuppressWarnings({ "unchecked", "unused", "rawtypes" })
@RequestMapping("/oracle/{name}/extract")
public void extractOracleData(HttpServletRequest res,
HttpServletResponse req, String name) throws Exception {
System.out.println("------extract-------");
System.out.println(name);
Map paramMap = res.getParameterMap();
- //姹囨�诲簱 瀵硅薄淇℃伅--甯︽湁tableName-
+ //汇总库 对象信息--带有tableName-
String[] nodes = paramMap.get("target");
Map map = null;
for (String string : nodes) {
@@ -123,7 +124,7 @@ public class DataModelController extends BaseController{
System.out.println(map);
}
- // 閲囬泦搴撳璞�--(澶氫釜閲囬泦搴撴娊鍙栧埌1涓眹鎬诲簱鐨�1涓猼ableName涓�)
+ // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下)
String[] inneed = paramMap.get("inneed");
List