From 56827966b323ef598d637906472895dc6f044572 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 14 Oct 2016 11:35:44 +0800
Subject: [PATCH] commit

---
 .../index/web/controller/SyncDataController.java   | 28 +++++++++++++++++-----
 .../spring/applicationContext-sync-data.xml        |  6 ++---
 .../main/resources/spring/applicationContext.xml   |  1 +
 3 files changed, 26 insertions(+), 9 deletions(-)

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 @@
 
     <!-- 采用注释的方式配置bean -->
     <context:annotation-config />
-
+    <!--
     <bean id="configProperties"
           class="org.springframework.beans.factory.config.PropertiesFactoryBean">
         <property name="locations">
@@ -22,7 +22,7 @@
           class="org.springframework.beans.factory.config.PreferencesPlaceholderConfigurer">
         <property name="properties" ref="configProperties" />
     </bean>
-
+-->
     <!-- DataSource configuration 项目主数据库 -->
     <bean id="mainDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
         <property name="driverClass" value="${maindata.driver}" />
@@ -98,5 +98,5 @@
     <context:component-scan base-package="com.lyms.platform.biz.service"/>
 
     <import resource="spring-mongodb.xml"/>
-    <import resource="applicationContext-quartz.xml"/>
+    <!--<import resource="applicationContext-quartz.xml"/>-->
 </beans>
\ 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 @@
             <list>
                 <value>classpath:configuration.properties</value>
                 <value>classpath:database.properties</value>
+                <value>classpath:conf.properties</value>
             </list>
         </property>
     </bean>
-- 
1.8.3.1