Commit 69a0d306ed35270d160da91d0a9401059f8cc6ff

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java View file @ 69a0d30
... ... @@ -27,7 +27,7 @@
27 27 /**
28 28 * Created by Administrator on 2016/10/13.
29 29 */
30   -@Service
  30 +@Service("job-index-syncdataservice")
31 31 public class SyncDataService {
32 32  
33 33 private static BlockingQueue<SimplePatient> patientsQueue = new LinkedBlockingQueue();
platform-job-index/src/main/java/com/lyms/platform/job/index/web/controller/SyncDataController.java View file @ 69a0d30
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.job.index.service.SyncDataService;
4 4 import org.springframework.beans.factory.annotation.Autowired;
  5 +import org.springframework.beans.factory.annotation.Qualifier;
5 6 import org.springframework.stereotype.Controller;
6 7 import org.springframework.web.bind.annotation.RequestMapping;
7 8 import org.springframework.web.bind.annotation.RequestMethod;
... ... @@ -18,6 +19,7 @@
18 19 public class SyncDataController {
19 20  
20 21 @Autowired
  22 + @Qualifier("job-index-syncdataservice")
21 23 private SyncDataService syncDataService;
22 24  
23 25 /**
... ... @@ -37,7 +39,7 @@
37 39 @RequestMapping(value = "/syncBabyData", method = RequestMethod.GET)
38 40 @ResponseBody
39 41 public String syncBabyData(@RequestParam(required = true) String oracleHid,@RequestParam(required = true) Integer mysqlHid) {
40   - syncDataService.syncBabyData(oracleHid,mysqlHid);
  42 + syncDataService.syncBabyData(oracleHid, mysqlHid);
41 43 return "baby starting...........";
42 44 }
43 45 }