diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/web/controller/SyncDataController.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/web/controller/SyncDataController.java
index 040b3ab..fddfe0e 100644
--- a/platform-job-index/src/main/java/com/lyms/platform/job/index/web/controller/SyncDataController.java
+++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/web/controller/SyncDataController.java
@@ -1,5 +1,7 @@
package com.lyms.platform.job.index.web.controller;
+import com.lyms.platform.common.utils.ExceptionUtils;
+import com.lyms.platform.job.index.restore.data.SyncDataWork;
import com.lyms.platform.job.index.service.SyncDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -11,7 +13,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
/**
- *
* 同步2.1系统到3.0数据
* Created by lqy on
*/
@@ -22,24 +23,39 @@ public class SyncDataController {
@Qualifier("job-index-syncdataservice")
private SyncDataService syncDataService;
+ @Autowired
+ private SyncDataWork syncDataWork;
+
/**
* 孕妇同步
+ *
* @param oracleHid oracle 对应的医院id
- * @param mysqlHid mysql 对应的医院id
+ * @param mysqlHid mysql 对应的医院id
* @return
*/
@RequestMapping(value = "/syncPatientData", method = RequestMethod.GET)
@ResponseBody
- public String syncPatientData(@RequestParam(required = true) String oracleHid,@RequestParam(required = true) Integer mysqlHid) {
- syncDataService.syncPatientData(oracleHid,mysqlHid);
+ public String syncPatientData(@RequestParam(required = true) String oracleHid, @RequestParam(required = true) Integer mysqlHid) {
+ syncDataService.syncPatientData(oracleHid, mysqlHid);
return "patient starting...........";
}
@RequestMapping(value = "/syncBabyData", method = RequestMethod.GET)
@ResponseBody
- public String syncBabyData(@RequestParam(required = true) String oracleHid,@RequestParam(required = true) Integer mysqlHid) {
+ public String syncBabyData(@RequestParam(required = true) String oracleHid, @RequestParam(required = true) Integer mysqlHid) {
syncDataService.syncBabyData(oracleHid, mysqlHid);
return "baby starting...........";
}
-}
+
+ @RequestMapping(value = "/sync", method = RequestMethod.GET)
+ @ResponseBody
+ public String syncDataToMami() {
+ try {
+ syncDataWork.sync();
+ } catch (Exception e) {
+ ExceptionUtils.catchException(e, "syncDataToMami error");
+ }
+ return "baby starting...........";
+ }
+}
\ No newline at end of file
diff --git a/platform-job-index/src/main/resources/spring/applicationContext-sync-data.xml b/platform-job-index/src/main/resources/spring/applicationContext-sync-data.xml
index 1905232..535fb12 100644
--- a/platform-job-index/src/main/resources/spring/applicationContext-sync-data.xml
+++ b/platform-job-index/src/main/resources/spring/applicationContext-sync-data.xml
@@ -8,7 +8,7 @@
-
+
@@ -98,5 +98,5 @@
-
+
\ No newline at end of file
diff --git a/platform-job-index/src/main/resources/spring/applicationContext.xml b/platform-job-index/src/main/resources/spring/applicationContext.xml
index 9e57aef..e70d4ae 100644
--- a/platform-job-index/src/main/resources/spring/applicationContext.xml
+++ b/platform-job-index/src/main/resources/spring/applicationContext.xml
@@ -18,6 +18,7 @@
classpath:configuration.properties
classpath:database.properties
+ classpath:conf.properties