diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java index a73897c..5e7f115 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java @@ -9,7 +9,7 @@ import java.util.Date; public class UsersQuery extends BaseQuery { private Integer id; private Integer logincenterId; - private Integer type; //0管理员 1用户 + private Integer type; // private Integer orgId; private Integer deptId; private String name; diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java b/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java index 19d37c7..802f9ec 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java @@ -1,22 +1,12 @@ package com.lyms.platform.data.controller; import com.lyms.platform.data.service.DataImportTaskService; -import com.lymsh.mommybaby.earlydata.model.MommyExamineInfo; -import com.lymsh.mommybaby.earlydata.model.OracleCommonQuery; -import com.lymsh.mommybaby.earlydata.model.PlatDataContent; -import com.lymsh.mommybaby.earlydata.model.PlatDataType; -import com.lymsh.mommybaby.earlydata.service.MommyService; -import com.lymsh.mommybaby.earlydata.service.PlatService; -import org.apache.commons.lang.StringUtils; -import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletResponse; -import java.util.Date; -import java.util.List; /** * Created by riecard on 15/10/26. @@ -25,14 +15,6 @@ import java.util.List; @RequestMapping("/task") public class TaskController extends BaseController { - private static final Integer pageSize = 100; - - @Autowired - private PlatService platService; - - @Autowired - private MommyService mommyService; - @Autowired private DataImportTaskService dataImportTaskService; diff --git a/platform-data-api/src/main/resources/spring/applicationContext-dal.xml b/platform-data-api/src/main/resources/spring/applicationContext-dal.xml new file mode 100644 index 0000000..0b857a5 --- /dev/null +++ b/platform-data-api/src/main/resources/spring/applicationContext-dal.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + classpath*:mainOrm/*.xml + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-data-api/src/main/resources/spring/applicationContext-mvc.xml b/platform-data-api/src/main/resources/spring/applicationContext-mvc.xml index 33a0f1c..f28f6d3 100644 --- a/platform-data-api/src/main/resources/spring/applicationContext-mvc.xml +++ b/platform-data-api/src/main/resources/spring/applicationContext-mvc.xml @@ -19,8 +19,6 @@ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd"> - - diff --git a/platform-data-api/src/main/resources/spring/applicationContext.xml b/platform-data-api/src/main/resources/spring/applicationContext.xml index 49f5c8f..fe8d861 100644 --- a/platform-data-api/src/main/resources/spring/applicationContext.xml +++ b/platform-data-api/src/main/resources/spring/applicationContext.xml @@ -11,6 +11,12 @@ + + + + + + @@ -115,4 +121,7 @@ + + + \ No newline at end of file diff --git a/platform-data-api/src/main/resources/spring/applicationContext_biz_patient.xml b/platform-data-api/src/main/resources/spring/applicationContext_biz_patient.xml new file mode 100644 index 0000000..3b84ba0 --- /dev/null +++ b/platform-data-api/src/main/resources/spring/applicationContext_biz_patient.xml @@ -0,0 +1,74 @@ + + + + + + + + + classpath:database.properties + + + + + + + + + + + + + + + + + + + + + + dalInterceptor + + + + + + + + + mysqlDalInterceptor + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-data-api/src/main/resources/spring/spring-mongodb.xml b/platform-data-api/src/main/resources/spring/spring-mongodb.xml new file mode 100644 index 0000000..f03d5c4 --- /dev/null +++ b/platform-data-api/src/main/resources/spring/spring-mongodb.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file