修改目录结构

Hos-Framework-dependencies/Hos-Framework-dependencies.iml

@@ -27,41 +27,13 @@
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc-portlet:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.6.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.5.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.11.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.3.GA" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" level="project" />
@@ -87,7 +59,8 @@
    <orderEntry type="library" name="Maven: org.opensaml:opensaml:2.5.1-1" level="project" />
    <orderEntry type="library" name="Maven: org.opensaml:openws:1.4.2-1" level="project" />
    <orderEntry type="library" name="Maven: org.opensaml:xmltooling:1.3.2-1" level="project" />
    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.6.1" level="project" />
    <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15:1.45" level="project" />
    <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:1.4.4" level="project" />
    <orderEntry type="library" name="Maven: ca.juliusdavies:not-yet-commons-ssl:0.3.9" level="project" />
@@ -104,8 +77,8 @@
    <orderEntry type="library" name="Maven: com.google.inject:guice:2.0" level="project" />
    <orderEntry type="library" name="Maven: org.openid4java:openid4java-nodeps:0.9.6" level="project" />
    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.20" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xerces:xercesImpl:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-remoting:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.0.2.RELEASE" level="project" />
@@ -118,10 +91,11 @@
    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.2.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.hateoas:spring-hateoas:0.20.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.hateoas:spring-hateoas:0.17.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.4.6" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.6" level="project" />
@@ -149,7 +123,7 @@
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.3" level="project" />
    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.woden:woden-api:1.0M9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.woden:woden-impl-dom:1.0M9" level="project" />
@@ -175,8 +149,8 @@
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-extras:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-core:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-api:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-servlet-wildcard:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-servlet:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-mustache:1.0.6" level="project" />
@@ -189,11 +163,11 @@
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-jsp:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-freemarker:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-freemarker:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.15" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-velocity:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-velocity:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-el:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-mvel:3.0.5" level="project" />
@@ -203,7 +177,7 @@
    <orderEntry type="library" name="Maven: jboss:javassist:3.7.ga" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-compat:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:2.4" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.0" level="project" />

Hos-Framework/Hos-Framework.iml

@@ -9,40 +9,13 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.5.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.11.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.3.GA" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" level="project" />
@@ -68,7 +41,8 @@
    <orderEntry type="library" name="Maven: org.opensaml:opensaml:2.5.1-1" level="project" />
    <orderEntry type="library" name="Maven: org.opensaml:openws:1.4.2-1" level="project" />
    <orderEntry type="library" name="Maven: org.opensaml:xmltooling:1.3.2-1" level="project" />
    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.6.1" level="project" />
    <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15:1.45" level="project" />
    <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:1.4.4" level="project" />
    <orderEntry type="library" name="Maven: ca.juliusdavies:not-yet-commons-ssl:0.3.9" level="project" />
@@ -85,8 +59,8 @@
    <orderEntry type="library" name="Maven: com.google.inject:guice:2.0" level="project" />
    <orderEntry type="library" name="Maven: org.openid4java:openid4java-nodeps:0.9.6" level="project" />
    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.20" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xerces:xercesImpl:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-remoting:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.0.2.RELEASE" level="project" />
@@ -99,10 +73,11 @@
    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.2.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.hateoas:spring-hateoas:0.20.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.hateoas:spring-hateoas:0.17.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.4.6" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.6" level="project" />
@@ -130,7 +105,7 @@
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.3" level="project" />
    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.woden:woden-api:1.0M9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.woden:woden-impl-dom:1.0M9" level="project" />
@@ -156,8 +131,8 @@
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-extras:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-core:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-api:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-servlet-wildcard:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-servlet:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-mustache:1.0.6" level="project" />
@@ -170,11 +145,11 @@
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-jsp:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-freemarker:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-freemarker:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.15" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-velocity:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-velocity:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-el:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-mvel:3.0.5" level="project" />
@@ -184,7 +159,7 @@
    <orderEntry type="library" name="Maven: jboss:javassist:3.7.ga" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-compat:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:2.4" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.0" level="project" />

Hos-Framework/src/main/java/com/yihu/ehr/framework/model/TreeView.java

@@ -0,0 +1,46 @@
package com.yihu.ehr.framework.model;
/**
 * select2类
 *
 * @author llh
 */
public class TreeView {
    private String id;
    private String pid;
    private String text;
    private Boolean ischecked;
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getPid() {
        return pid;
    }
    public void setPid(String pid) {
        this.pid = pid;
    }
    public String getText() {
        return text;
    }
    public void setText(String text) {
        this.text = text;
    }
    public Boolean getIschecked() {
        return ischecked;
    }
    public void setIschecked(Boolean ischecked) {
        this.ischecked = ischecked;
    }
}

Hos-Framework/src/main/java/com/yihu/ehr/framework/util/quartz/QuartzManager.java

@@ -5,18 +5,11 @@ package com.yihu.ehr.framework.util.quartz;
 */
import org.quartz.*;
import org.quartz.impl.StdSchedulerFactory;
import org.quartz.impl.StdScheduler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.quartz.CronTriggerFactoryBean;
import org.springframework.stereotype.Component;
import org.quartz.impl.StdScheduler;
import javax.annotation.Resource;
import java.io.FileInputStream;
import java.io.InputStream;
import java.text.ParseException;
import java.util.Date;
import java.util.Properties;
import static org.quartz.JobBuilder.newJob;
import static org.quartz.TriggerBuilder.newTrigger;
@@ -29,7 +22,7 @@ public class QuartzManager {
    private String JOB_GROUP_NAME = "DEFAULT_JOBGROUP_NAME";
    private String TRIGGER_GROUP_NAME = "DEFAULT_JOBGROUP_NAME";
    @Resource(name = "quartzScheduler")
    @Autowired
    private StdScheduler quartzScheduler;
    private JobDetail createJob(String jobName,Class<? extends Job> jobClass) throws Exception {

hos-admin/hos-admin.iml

@@ -1,24 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
    <facet type="web" name="Web">
      <configuration>
        <descriptors>
          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp" />
        </descriptors>
        <webroots>
          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
        </webroots>
        <sourceRoots>
          <root url="file://$MODULE_DIR$/src/main/java" />
          <root url="file://$MODULE_DIR$/src/main/resources" />
        </sourceRoots>
      </configuration>
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -30,173 +11,28 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.10" level="project" />
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
    <orderEntry type="module" module-name="hos-web-framework" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.11.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.5.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jersey:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-server:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.bundles.repackaged:jersey-guava:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-jaxb:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-api:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-utils:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2.external:javax.inject:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-locator:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet-core:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-bean-validation:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-spring3:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:config-types:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-core:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-config:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-runlevel:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:class-model:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2.external:asm-all-repackaged:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.hk2:spring-bridge:2.4.0-b34" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.23.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.8.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.8.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.8.1" level="project" />
    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.1.0" level="project" />
    <orderEntry type="module" module-name="Hos-Framework" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.0.9.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Final" level="project" />
    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc-portlet:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-aspects:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-cas:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.jasig.cas.client:cas-client-core:3.4.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-ldap:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.ldap:spring-ldap-core:2.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-openid:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.google.inject:guice:2.0" level="project" />
    <orderEntry type="library" name="Maven: org.openid4java:openid4java-nodeps:0.9.6" level="project" />
    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-remoting:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.0.0.Beta4" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.0" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.0" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.hateoas:spring-hateoas:0.20.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.1" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.13" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.9.13" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis:axis:1.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis2:axis2:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis2:axis2-adb:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-activation_1.1_spec:1.0.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis2:axis2-kernel:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ws.commons.axiom:axiom-api:1.2.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-javamail_1.4_spec:1.7.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.james:apache-mime4j-core:0.7.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ws.commons.axiom:axiom-compat:1.2.14" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.ws.commons.axiom:axiom-impl:1.2.14" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.1.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:1.1.2" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.3" level="project" />
    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.woden:woden-api:1.0M9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.woden:woden-impl-dom:1.0M9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.woden:woden-impl-commons:1.0M9" level="project" />
    <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis2:org.apache.axis2.osgi:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis2:axis2-transport-http:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis2:axis2-transport-local:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-nop:1.7.13" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.6.2" level="project" />
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.5.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0" level="project" />
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
    <orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.0.1" level="project" />
    <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" />
    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.38" level="project" />
    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.3.0" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.9" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:html2image:0.9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-extras:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-core:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-api:3.0.5" level="project" />
@@ -213,11 +49,12 @@
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-jsp:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-freemarker:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-freemarker:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.23" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-velocity:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-velocity:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-el:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-mvel:3.0.5" level="project" />
@@ -226,89 +63,118 @@
    <orderEntry type="library" name="Maven: ognl:ognl:2.7.3" level="project" />
    <orderEntry type="library" name="Maven: jboss:javassist:3.7.ga" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-compat:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:2.4" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
    <orderEntry type="library" name="Maven: com.google.guava:guava:12.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.16" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.0.33" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.0.33" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.33" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.0.33" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.6" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.33" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.0.33" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.3.11.Final" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.9.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring-boot:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http4:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-core:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http-common:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jms:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.2.2" level="project" />
    <orderEntry type="module" module-name="hos-core" />
    <orderEntry type="library" name="Maven: net.lingala.zip4j:zip4j:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.0" level="project" />
    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" />
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.10" level="project" />
    <orderEntry type="library" name="Maven: commons-dbutils:commons-dbutils:1.6" level="project" />
    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
    <orderEntry type="library" name="Maven: org.csource:fastdfs-client-java:1.0" level="project" />
    <orderEntry type="library" name="Maven: javax.mail:javax.mail-api:1.5.5" level="project" />
    <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
    <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
    <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
    <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
    <orderEntry type="library" name="Maven: javax.xml:jaxrpc-api:1.1" level="project" />
    <orderEntry type="library" name="Maven: org.antlr:antlr4:4.5" level="project" />
    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.5" level="project" />
    <orderEntry type="library" name="Maven: org.abego.treelayout:org.abego.treelayout.core:1.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.antlr:antlr-runtime:3.5.2" level="project" />
    <orderEntry type="library" name="Maven: org.antlr:ST4:4.0.8" level="project" />
    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
    <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" />
    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
    <orderEntry type="library" name="Maven: taglibs:standard:1.1.2" level="project" />
    <orderEntry type="library" name="Maven: net.lingala.zip4j:zip4j:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.htrace:htrace-core:3.1.0-incubating" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-all:4.0.32.Final" level="project" />
    <orderEntry type="library" name="Maven: org.noggit:noggit:0.6" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-redishelper:1.0.0" level="project" />
    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.7.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.1.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:core-rpc:2.2.0" level="project" />
    <orderEntry type="library" name="Maven: commons-net:commons-net:3.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
    <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:html2image:0.9" level="project" />
    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.3.0" level="project" />
    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.10" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.9" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-all:5.13.4" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.mongodb:bson:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.9.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.12.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring-boot:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http4:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-core:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http-common:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jms:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.4.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.4.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.6" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.6" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.6" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.6" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.4.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.3.5.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
  </component>
</module>

hos-admin/pom.xml

@@ -24,94 +24,33 @@
    </properties>
	<dependencies>
		<dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-web</artifactId>
		</dependency>
		<dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-logging</artifactId>
		</dependency>
		<dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-test</artifactId>
			<scope>test</scope>
		</dependency>
		<dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-jersey</artifactId>
			<exclusions>
				<exclusion>
					<artifactId>log4j-over-slf4j</artifactId>
					<groupId>org.slf4j</groupId>
				</exclusion>
			</exclusions>
		</dependency>
		<dependency>
			<groupId>org.mongodb</groupId>
			<artifactId>mongo-java-driver</artifactId>
			<version>3.1.0</version>
		</dependency>
		<dependency>
			<groupId>com.yihu.hos.resource</groupId>
			<artifactId>Hos-Framework</artifactId>
			<version>1.0.7</version>
		</dependency>
		<dependency>
			<groupId>com.yihu.core</groupId>
			<artifactId>html2image</artifactId>
			<version>0.9</version>
		</dependency>
		<!--=============oracle驱动 start =============-->
		<dependency>
			<groupId>com.oracle</groupId>
			<artifactId>ojdbc6</artifactId>
			<version>11.2.0.3.0</version>
		</dependency>
		<!--=============oracle驱动 end =============-->
		<!--jxl导出工具-->
		<dependency>
			<groupId>net.sourceforge.jexcelapi</groupId>
			<artifactId>jxl</artifactId>
			<version>2.6.10</version>
		</dependency>
		<dependency>
			<groupId>com.yihu.core</groupId>
			<artifactId>ehr-dbhelper</artifactId>
			<version>1.1.9</version>
		</dependency>
		<!--<dependency>-->
			<!--<groupId>org.apache.tomcat.embed</groupId>-->
			<!--<artifactId>tomcat-embed-jasper</artifactId>-->
			<!--<scope>compile</scope>-->
		<!--</dependency>-->
		<dependency>
			<groupId>javax.servlet</groupId>
			<artifactId>jstl</artifactId>
			<scope>compile</scope>
		</dependency>
		<dependency>
			<groupId>org.apache.activemq</groupId>
			<artifactId>activemq-all</artifactId>
			<version>5.13.4</version>
			<groupId>com.yihu.hos</groupId>
			<artifactId>hos-web-framework</artifactId>
			<version>1.1.1-SNAPSHOT</version>
		</dependency>
		<!--=============tilesJSP布局框架 start =============-->
		<dependency>
			<groupId>com.yihu.hos.resource</groupId>
			<artifactId>Hos-Framework</artifactId>
			<version>1.0.7</version>
			<groupId>org.apache.tiles</groupId>
			<artifactId>tiles-extras</artifactId>
			<version>3.0.5</version>
		</dependency>
		<!--=============tiles end =============-->
	</dependencies>
	<build>
@@ -123,5 +62,4 @@
		</plugins>
	</build>
</project>

hos-admin/src/main/java/com/yihu/hos/HosAdminApplication.java

@@ -1,13 +1,9 @@
package com.yihu.hos;
import org.apache.activemq.command.ActiveMQQueue;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.jms.annotation.EnableJms;
import javax.jms.Queue;
@SpringBootApplication
@EnableJms
public class HosAdminApplication {
@@ -16,9 +12,9 @@ public class HosAdminApplication {
        SpringApplication application = new SpringApplication(HosAdminApplication.class);
        application.run(args);
    }
    @Bean
    public Queue queue() {
        return new ActiveMQQueue("configuration.queue");
    }
//
//    @Bean
//    public Queue queue() {
//        return new ActiveMQQueue("configuration.queue");
//    }
}

hos-admin/src/main/java/com/yihu/hos/common/ApplicationStart.java

@@ -1,8 +1,8 @@
package com.yihu.hos.common;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.ehr.framework.util.log.Logger;
import com.yihu.ehr.framework.util.log.LoggerFactory;
import com.yihu.hos.web.framework.constrant.DateConvert;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import org.apache.commons.beanutils.ConvertUtils;
import javax.servlet.ServletContextEvent;

hos-admin/src/main/java/com/yihu/hos/common/CommonPageController.java

@@ -1,7 +1,7 @@
package com.yihu.hos.common;
import com.yihu.ehr.framework.util.PKUtil;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.util.PKUtil;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.system.model.SystemUser;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;

hos-admin/src/main/java/com/yihu/hos/common/ObjectVersion.java

@@ -0,0 +1,184 @@
package com.yihu.hos.common;
import java.io.Serializable;
import java.security.SecureRandom;
import java.util.Date;
import java.util.concurrent.atomic.AtomicInteger;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2016/8/8.
 */
public final class ObjectVersion implements Comparable<ObjectVersion>, Serializable {
    private static final long serialVersionUID = 789056789654456072L;
    private static final int BYTE_ARRAY_LENGTH = 6;
    private static final AtomicInteger NEXT_COUNTER = new AtomicInteger((new SecureRandom()).nextInt());
    private static final char[] HEX_CHARS = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
    private final int timestamp;
    private final short counter;
    public static boolean isValid(String hexString) {
        if(hexString == null) {
            throw new IllegalArgumentException();
        } else {
            int len = hexString.length();
            if(len != 12) {
                return false;
            } else {
                for(int i = 0; i < len; ++i) {
                    char c = hexString.charAt(i);
                    if((c < 48 || c > 57) && (c < 97 || c > 102) && (c < 65 || c > 70)) {
                        return false;
                    }
                }
                return true;
            }
        }
    }
    public static int getCurrentCounter() {
        return NEXT_COUNTER.get();
    }
    public ObjectVersion() {
        this(new Date());
    }
    public ObjectVersion(Date date) {
        this(dateToTimestampSeconds(date), (short)NEXT_COUNTER.getAndIncrement());
    }
    public ObjectVersion(Date date, short counter) {
        this(dateToTimestampSeconds(date), counter);
    }
    public ObjectVersion(int timestamp, short counter) {
        this.timestamp = timestamp;
        this.counter = counter;
    }
    public ObjectVersion(String hexString) {
        this(parseHexString(hexString));
    }
    public ObjectVersion(byte[] bytes) {
        if(bytes == null) {
            throw new IllegalArgumentException();
        } else if(bytes.length != 6) {
            throw new IllegalArgumentException("need 6 bytes");
        } else {
            this.timestamp = makeInt(bytes[0], bytes[1], bytes[2], bytes[3]);
            this.counter = (short)makeInt((byte)0, (byte)0, bytes[4], bytes[5]);
        }
    }
    public byte[] toByteArray() {
        byte[] bytes = new byte[]{int3(this.timestamp), int2(this.timestamp), int1(this.timestamp), int0(this.timestamp), int1(this.counter), int0(this.counter)};
        return bytes;
    }
    public Date getDate() {
        return new Date((long)this.timestamp * 1000L);
    }
    public int getTimestamp() {
        return this.timestamp;
    }
    public short getCounter() {
        return this.counter;
    }
    public String toHexString() {
        char[] chars = new char[12];
        int i = 0;
        byte[] var3 = this.toByteArray();
        int var4 = var3.length;
        for(int var5 = 0; var5 < var4; ++var5) {
            byte b = var3[var5];
            chars[i++] = HEX_CHARS[b >> 4 & 15];
            chars[i++] = HEX_CHARS[b & 15];
        }
        return new String(chars);
    }
    public boolean equals(Object o) {
        if(this == o) {
            return true;
        } else if(o != null && this.getClass() == o.getClass()) {
            ObjectVersion objectId = (ObjectVersion)o;
            return this.counter != objectId.counter?false:this.timestamp == objectId.timestamp;
        } else {
            return false;
        }
    }
    public int hashCode() {
        int result = this.timestamp;
        result = 31 * result + this.counter;
        return result;
    }
    public int compareTo(ObjectVersion other) {
        if(other == null) {
            throw new NullPointerException();
        } else {
            byte[] byteArray = this.toByteArray();
            byte[] otherByteArray = other.toByteArray();
            for(int i = 0; i < 6; ++i) {
                if(byteArray[i] != otherByteArray[i]) {
                    return (byteArray[i] & 255) < (otherByteArray[i] & 255)?-1:1;
                }
            }
            return 0;
        }
    }
    public String toString() {
        return this.toHexString();
    }
    private static byte[] parseHexString(String s) {
        if(!isValid(s)) {
            throw new IllegalArgumentException("invalid hexadecimal representation of an ObjectId: [" + s + "]");
        } else {
            byte[] b = new byte[6];
            for(int i = 0; i < b.length; ++i) {
                b[i] = (byte)Integer.parseInt(s.substring(i * 2, i * 2 + 2), 16);
            }
            return b;
        }
    }
    private static int dateToTimestampSeconds(Date time) {
        return (int)(time.getTime() / 1000L);
    }
    private static int makeInt(byte b3, byte b2, byte b1, byte b0) {
        return b3 << 24 | (b2 & 255) << 16 | (b1 & 255) << 8 | b0 & 255;
    }
    private static byte int3(int x) {
        return (byte)(x >> 24);
    }
    private static byte int2(int x) {
        return (byte)(x >> 16);
    }
    private static byte int1(int x) {
        return (byte)(x >> 8);
    }
    private static byte int0(int x) {
        return (byte)x;
    }
}

hos-admin/src/main/java/com/yihu/hos/crawler/controller/CrawlerController.java

@@ -3,10 +3,10 @@ package com.yihu.hos.crawler.controller;
import com.yihu.hos.crawler.model.patient.Patient;
import com.yihu.hos.crawler.service.CrawlerManager;
import com.yihu.hos.crawler.service.CrawlerService;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.standard.service.adapter.AdapterSchemeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

hos-admin/src/main/java/com/yihu/hos/crawler/dao/CrawlerDatasetDao.java

@@ -1,7 +1,7 @@
package com.yihu.hos.crawler.dao;
import com.yihu.hos.crawler.model.flow.CrawlerDataSetModel;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.hibernate.Query;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/crawler/dao/CrawlerFlowDao.java

@@ -1,7 +1,7 @@
package com.yihu.hos.crawler.dao;
import com.yihu.hos.crawler.model.flow.CrawlerFlowModel;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.hibernate.Query;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/crawler/dao/CrawlerFlowHeadDao.java

@@ -2,7 +2,7 @@ package com.yihu.hos.crawler.dao;
import com.yihu.hos.crawler.model.flow.CrawlerFlowHeadModel;
import com.yihu.hos.crawler.model.flow.CrawlerFlowModel;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.hibernate.Query;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/crawler/format/AdapterBase.java

@@ -1,6 +1,6 @@
package com.yihu.hos.crawler.format;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.hos.standard.service.adapter.*;
import com.yihu.hos.standard.service.bo.AdapterVersion;

hos-admin/src/main/java/com/yihu/hos/crawler/format/AdapterScheme.java

@@ -1,12 +1,9 @@
package com.yihu.hos.crawler.format;
import com.yihu.hos.crawler.model.adapter.AdapterMetaData;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterMetadataModel;
import com.yihu.hos.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.hos.standard.service.adapter.AdapterDatasetService;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import net.sf.json.JSONObject;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -43,14 +40,15 @@ public class AdapterScheme  extends AdapterBase{
            adapterMetaDataMap =new HashMap<>();
            Map<String, String> condition = new HashMap<>();
            condition.put("column", "adapter_dataset_code");
            JSONObject jsonpObject = JSONObject.fromObject(condition);
            List<AdapterDatasetModel> adapterDataSets = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, jsonpObject.toString());
            for (AdapterDatasetModel adapterDataSet:adapterDataSets){
                List<AdapterMetadataModel> adapterMetaDataTList = getAdapterMetadataService().getAdapterMetadataByDataset(version, adapterDataSet.getId());
                if (adapterMetaDataTList!=null && adapterMetaDataTList.size()>0){
                    adapterMetaDataMap.put(adapterDataSet.getStdDatasetCode(), adapterMetaDataTList);
                }
            }
            //TODO: Use jackson
//            JSONObject jsonpObject = JSONObject.fromObject(condition);
//            List<AdapterDatasetModel> adapterDataSets = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, jsonpObject.toString());
//            for (AdapterDatasetModel adapterDataSet:adapterDataSets){
//                List<AdapterMetadataModel> adapterMetaDataTList = getAdapterMetadataService().getAdapterMetadataByDataset(version, adapterDataSet.getId());
//                if (adapterMetaDataTList!=null && adapterMetaDataTList.size()>0){
//                    adapterMetaDataMap.put(adapterDataSet.getStdDatasetCode(), adapterMetaDataTList);
//                }
//            }
        }
        return adapterMetaDataMap;
    }

hos-admin/src/main/java/com/yihu/hos/crawler/format/DataSetTransformer.java

@@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.ehr.dbhelper.jdbc.DBHelper;
import com.yihu.ehr.framework.constrant.SqlConstants;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.crawler.model.adapter.AdapterDataSet;
import com.yihu.hos.crawler.model.adapter.AdapterDict;
import com.yihu.hos.crawler.model.adapter.AdapterMetaData;

hos-admin/src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDataSet.java

@@ -1,20 +1,13 @@
package com.yihu.hos.crawler.model.adapter;
import com.yihu.hos.crawler.model.patient.PatientIdentity;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.model.adapter.AdapterMetadataModel;
import com.yihu.hos.standard.model.adapter.AdapterSchemeModel;
import com.yihu.hos.standard.service.adapter.AdapterMetadataService;
import com.yihu.hos.standard.service.adapter.AdapterSchemeService;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.standard.service.bo.StandardVersion;
import net.sf.json.JSONObject;
import java.util.*;
/**
 * @author Air
 * @version 1.0
@@ -44,20 +37,21 @@ public class AdapterDataSet {
            adapterMetaDataMap = new HashMap<>();
            Map<String, Object> condition = new HashMap<>();
            condition.put("column", "adapter_metadata_code");
            JSONObject jsonpObject = JSONObject.fromObject(condition);
            AdapterMetadataService metadataService = SpringBeanUtil.getService(AdapterMetadataService.BEAN_ID);
            List<AdapterMetadataModel> adapterMetaDataModelList = metadataService.getAdapterMetadataNotNullList(adapterVersion, adapterDatasetModel.getStdDatasetId(), jsonpObject.toString());
            List<Integer> stdMetaDataIdList = new ArrayList<>();
            if (!CollectionUtil.isEmpty(adapterMetaDataModelList)) {
                for (AdapterMetadataModel adapterMetadataModel : adapterMetaDataModelList) {
                    stdMetaDataIdList.add(adapterMetadataModel.getStdMetadataId());
                }
                for (AdapterMetadataModel adapterMetadataModel : adapterMetaDataModelList) {
                    AdapterMetaData adapterMetaData = new AdapterMetaData(adapterMetadataModel, adapterVersion, entryMap);
                    adapterMetaDataList.add(adapterMetaData);
                    adapterMetaDataMap.put(adapterMetadataModel.getStdMetadataCode().toUpperCase(), adapterMetaData);
                }
            }
            //TODO: Use Jackson
//            JSONObject jsonpObject = JSONObject.fromObject(condition);
//            AdapterMetadataService metadataService = SpringBeanUtil.getService(AdapterMetadataService.BEAN_ID);
//            List<AdapterMetadataModel> adapterMetaDataModelList = metadataService.getAdapterMetadataNotNullList(adapterVersion, adapterDatasetModel.getStdDatasetId(), jsonpObject.toString());
//            List<Integer> stdMetaDataIdList = new ArrayList<>();
//            if (!CollectionUtil.isEmpty(adapterMetaDataModelList)) {
//                for (AdapterMetadataModel adapterMetadataModel : adapterMetaDataModelList) {
//                    stdMetaDataIdList.add(adapterMetadataModel.getStdMetadataId());
//                }
//                for (AdapterMetadataModel adapterMetadataModel : adapterMetaDataModelList) {
//                    AdapterMetaData adapterMetaData = new AdapterMetaData(adapterMetadataModel, adapterVersion, entryMap);
//                    adapterMetaDataList.add(adapterMetaData);
//                    adapterMetaDataMap.put(adapterMetadataModel.getStdMetadataCode().toUpperCase(), adapterMetaData);
//                }
//            }
        } catch (Exception e) {
            e.printStackTrace();
        }

hos-admin/src/main/java/com/yihu/hos/crawler/model/adapter/AdapterMetaData.java

@@ -1,15 +1,13 @@
package com.yihu.hos.crawler.model.adapter;
import com.yihu.hos.core.datatype.NumberUtil;
import com.yihu.hos.crawler.model.transform.DictDataType;
import com.yihu.hos.crawler.model.standard.StdMetaData;
import com.yihu.ehr.framework.util.operator.NumberUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.model.adapter.AdapterDictModel;
import com.yihu.hos.standard.model.adapter.AdapterMetadataModel;
import com.yihu.hos.standard.model.standard.StdMetaDataModel;
import com.yihu.hos.standard.service.adapter.AdapterDictService;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import java.util.List;
import java.util.Map;

hos-admin/src/main/java/com/yihu/hos/crawler/model/config/SysConfig.java

@@ -2,7 +2,7 @@ package com.yihu.hos.crawler.model.config;
import com.yihu.hos.crawler.model.patient.PatientIdentity;
import com.yihu.hos.crawler.model.patient.PatientIndex;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.hos.core.datatype.StringUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dom4j.Document;

hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/CrawlerDataSetModel.java

@@ -1,6 +1,6 @@
package com.yihu.hos.crawler.model.flow;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.model.Result;
import java.io.Serializable;

hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/CrawlerFlowHeadModel.java

@@ -1,6 +1,6 @@
package com.yihu.hos.crawler.model.flow;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.model.Result;
import java.io.Serializable;

hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/CrawlerFlowModel.java

@@ -1,6 +1,6 @@
package com.yihu.hos.crawler.model.flow;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.model.Result;
import java.io.Serializable;

hos-admin/src/main/java/com/yihu/hos/crawler/origin/FileSystemOrigin.java

@@ -10,10 +10,10 @@ import com.yihu.hos.crawler.model.adapter.AdapterDataSet;
import com.yihu.hos.crawler.model.patient.Patient;
import com.yihu.hos.crawler.model.transform.LogicValues;
import com.yihu.hos.crawler.service.EsbHttp;
import com.yihu.ehr.framework.util.file.FtpFileUtil;
import com.yihu.ehr.framework.util.operator.DateUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.core.file.FtpFileUtil;
import com.yihu.hos.core.datatype.DateUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.system.model.SystemDatasource;
import com.yihu.hos.system.model.SystemOrganization;
import com.yihu.hos.system.service.OrganizationManager;

hos-admin/src/main/java/com/yihu/hos/crawler/service/CrawlerFlowManager.java

@@ -11,10 +11,10 @@ import com.yihu.hos.crawler.model.flow.CrawlerDataSetModel;
import com.yihu.hos.crawler.model.flow.CrawlerFlowHeadModel;
import com.yihu.hos.crawler.model.flow.CrawlerFlowModel;
import com.yihu.hos.crawler.model.patient.Patient;
import com.yihu.ehr.framework.model.DictItem;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.web.framework.model.DictItem;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.model.adapter.AdapterSchemeVersionModel;

hos-admin/src/main/java/com/yihu/hos/crawler/service/CrawlerManager.java

@@ -5,17 +5,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.crawler.model.adapter.AdapterDataSet;
import com.yihu.hos.crawler.model.config.SysConfig;
import com.yihu.hos.crawler.model.patient.Patient;
import com.yihu.ehr.framework.model.DictItem;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.web.framework.model.DictItem;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.hos.standard.service.adapter.AdapterDatasetService;
import com.yihu.hos.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import net.sf.json.JSONObject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -185,8 +184,9 @@ public class CrawlerManager {
                }
                Map<String, String> condition = new HashMap<>();
                condition.put("column", "adapter_dataset_code");
                JSONObject jsonpObject = JSONObject.fromObject(condition);
                adapterDataSetModelList = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, jsonpObject.toString());
                //TODO: Use jackson
//                JSONObject jsonpObject = JSONObject.fromObject(condition);
//                adapterDataSetModelList = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, jsonpObject.toString());
            }
            /**

hos-admin/src/main/java/com/yihu/hos/crawler/service/CrawlerService.java

@@ -2,10 +2,7 @@ package com.yihu.hos.crawler.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.ehr.framework.constrant.SqlConstants;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.crawler.dao.CrawlerDatasetDao;
import com.yihu.hos.crawler.dao.CrawlerFlowDao;
import com.yihu.hos.crawler.dao.CrawlerFlowHeadDao;
@@ -24,9 +21,9 @@ import com.yihu.hos.standard.service.adapter.AdapterMetadataService;
import com.yihu.hos.standard.service.adapter.AdapterSchemeService;
import com.yihu.hos.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DetailModelResult;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -69,43 +66,44 @@ public class CrawlerService {
     * @throws Exception
     */
    public ActionResult saveDataSetRelation(String version, String json) throws Exception {
        JSONObject root = JSONObject.fromObject(json);
        JSONArray jsonList = root.getJSONArray("lines");
        JSONArray entrances = root.getJSONArray("entrances");
        AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(version));
        if (jsonList != null && jsonList.size() > 0) {
            // 删除旧关联关系
            crawlerFlowDao.deleteCrawlerFlowList(versionModel.getId());
            for (Object item : jsonList) {
                JSONObject obj = JSONObject.fromObject(item);
                String from = obj.getString("from");
                String to = obj.getString("to");
                String fromPort = obj.getString("fromPort");
                String toPort = obj.getString("toPort");
                // 保存编排关系
                CrawlerFlowModel crawlerFlow = new CrawlerFlowModel();
                crawlerFlow.setDatasetCode(to);
                crawlerFlow.setInputDatasetCode(from);
                crawlerFlow.setMetadataCode(toPort);
                crawlerFlow.setInputMetadataCode(fromPort);
                crawlerFlow.setSchemeVersionId(versionModel.getId());
                crawlerFlowDao.saveEntity(crawlerFlow);
            }
            // 删除编排头部信息
            crawlerFlowHeadDao.deleteCrawlerFlowHeadList(versionModel.getId());
            for (Object item : entrances) {
                JSONObject obj = JSONObject.fromObject(item);
                String dataSet = obj.getString("dataSet");
                String meta = obj.getString("meta");
                //  保存入口数据集
                CrawlerFlowHeadModel headModel = new CrawlerFlowHeadModel();
                headModel.setSchemeVersionId(versionModel.getId());
                headModel.setDatasetCode(dataSet);
                headModel.setMetadataCode(meta);
                crawlerFlowHeadDao.saveEntity(headModel);
            }
        }
        //TODO: Use jackson
//        JSONObject root = JSONObject.fromObject(json);
//        JSONArray jsonList = root.getJSONArray("lines");
//        JSONArray entrances = root.getJSONArray("entrances");
//        AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(version));
//        if (jsonList != null && jsonList.size() > 0) {
//            // 删除旧关联关系
//            crawlerFlowDao.deleteCrawlerFlowList(versionModel.getId());
//            for (Object item : jsonList) {
//                JSONObject obj = JSONObject.fromObject(item);
//                String from = obj.getString("from");
//                String to = obj.getString("to");
//                String fromPort = obj.getString("fromPort");
//                String toPort = obj.getString("toPort");
//                // 保存编排关系
//                CrawlerFlowModel crawlerFlow = new CrawlerFlowModel();
//                crawlerFlow.setDatasetCode(to);
//                crawlerFlow.setInputDatasetCode(from);
//                crawlerFlow.setMetadataCode(toPort);
//                crawlerFlow.setInputMetadataCode(fromPort);
//                crawlerFlow.setSchemeVersionId(versionModel.getId());
//                crawlerFlowDao.saveEntity(crawlerFlow);
//            }
//            // 删除编排头部信息
//            crawlerFlowHeadDao.deleteCrawlerFlowHeadList(versionModel.getId());
//
//            for (Object item : entrances) {
//                JSONObject obj = JSONObject.fromObject(item);
//                String dataSet = obj.getString("dataSet");
//                String meta = obj.getString("meta");
//                //  保存入口数据集
//                CrawlerFlowHeadModel headModel = new CrawlerFlowHeadModel();
//                headModel.setSchemeVersionId(versionModel.getId());
//                headModel.setDatasetCode(dataSet);
//                headModel.setMetadataCode(meta);
//                crawlerFlowHeadDao.saveEntity(headModel);
//            }
//        }
        return new ActionResult(true, "保存成功！");
    }
@@ -124,7 +122,9 @@ public class CrawlerService {
        String condition = null;
        if (datasetName != null && !"".equals(datasetName)) {
            map.put("name", datasetName);
            condition = net.sf.json.JSONObject.fromObject(map).toString();
            //TODO: Use Jackson
//            condition = net.sf.json.JSONObject.fromObject(map).toString();
        }
        List<AdapterDatasetModel> adapterDatasetModelList = adapterDatasetService.getDatasetList(AdapterDatasetModel.class, versionModel.getVersion(), condition, null, null, null);
        // 筛选掉 未适配数据
@@ -176,56 +176,56 @@ public class CrawlerService {
     * @throws Exception
     */
    public void saveJobData(String json, Integer rows, Integer page) throws Exception {
        JSONArray jsonList = JSONArray.fromObject(json);
        //清空当页数据
        deleteCurrentPage(rows, page);
        for (Object item : jsonList) {
            JSONObject obj = JSONObject.fromObject(item);
            if (obj.containsKey("schemeId") && obj.containsKey("versionId")) {
                String schemeId = obj.getString("schemeId");
                String versionId = obj.getString("versionId");
                AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(versionId));
                if (versionModel != null) {
                    AdapterVersion adapterVersion = new AdapterVersion(versionModel.getVersion());
                    //删除已存在的数据集
                    crawlerDatasetDao.deleteCrawlerDatasetList(versionModel.getId());
                    List<AdapterDatasetModel> adapterDatasetModelList;
                    //根据id字符串获取编排数据集
                    if (obj.containsKey("dataSets")) {
                        List<Integer> newDatasetIdList = new ArrayList<>();
                        String dataSetStr = obj.getString("dataSets");
                        if (StringUtils.isNotBlank(dataSetStr)) {
                            String[] IdList = dataSetStr.split(",");
                            for (String aIdList : IdList) {
                                if (!Objects.equals(aIdList, "")) {
                                    Integer DaSetId = Integer.valueOf(aIdList);
                                    newDatasetIdList.add(DaSetId);
                                }
                            }
                        }
                        adapterDatasetModelList = adapterDatasetService.getListByAdapterDatasetIdList(adapterVersion, newDatasetIdList);
                        for (AdapterDatasetModel model : adapterDatasetModelList) {
                            CrawlerDataSetModel dataSetModel = new CrawlerDataSetModel();
                            dataSetModel.setSchemeId(Integer.valueOf(schemeId));
                            dataSetModel.setSchemeVersionId(versionModel.getId());
                            dataSetModel.setDatasetId(model.getStdDatasetId());
                            dataSetModel.setDatasetCode(model.getStdDatasetCode());
                            dataSetModel.setDatasetName(model.getStdDatasetName());
                            crawlerDatasetDao.saveEntity(dataSetModel);
                        }
                    }
                    //如果保存传入编排映射关系，进行保存操作
                    if (obj.containsKey("relation") && !Objects.equals(obj.getString("relation"), "")) {
                        saveDataSetRelation(versionId, obj.getString("relation"));
                    }
                }
            }
        }
        //TODO: Use jackson
//        JSONArray jsonList = JSONArray.fromObject(json);
//
//        //清空当页数据
//        deleteCurrentPage(rows, page);
//
//        for (Object item : jsonList) {
//            JSONObject obj = JSONObject.fromObject(item);
//            if (obj.containsKey("schemeId") && obj.containsKey("versionId")) {
//                String schemeId = obj.getString("schemeId");
//                String versionId = obj.getString("versionId");
//                AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(versionId));
//                if (versionModel != null) {
//                    AdapterVersion adapterVersion = new AdapterVersion(versionModel.getVersion());
//                    //删除已存在的数据集
//                    crawlerDatasetDao.deleteCrawlerDatasetList(versionModel.getId());
//                    List<AdapterDatasetModel> adapterDatasetModelList;
//                    //根据id字符串获取编排数据集
//                    if (obj.containsKey("dataSets")) {
//                        List<Integer> newDatasetIdList = new ArrayList<>();
//                        String dataSetStr = obj.getString("dataSets");
//                        if (StringUtils.isNotBlank(dataSetStr)) {
//                            String[] IdList = dataSetStr.split(",");
//                            for (String aIdList : IdList) {
//                                if (!Objects.equals(aIdList, "")) {
//                                    Integer DaSetId = Integer.valueOf(aIdList);
//                                    newDatasetIdList.add(DaSetId);
//                                }
//                            }
//                        }
//
//                        adapterDatasetModelList = adapterDatasetService.getListByAdapterDatasetIdList(adapterVersion, newDatasetIdList);
//                        for (AdapterDatasetModel model : adapterDatasetModelList) {
//                            CrawlerDataSetModel dataSetModel = new CrawlerDataSetModel();
//                            dataSetModel.setSchemeId(Integer.valueOf(schemeId));
//                            dataSetModel.setSchemeVersionId(versionModel.getId());
//                            dataSetModel.setDatasetId(model.getStdDatasetId());
//                            dataSetModel.setDatasetCode(model.getStdDatasetCode());
//                            dataSetModel.setDatasetName(model.getStdDatasetName());
//                            crawlerDatasetDao.saveEntity(dataSetModel);
//                        }
//                    }
//
//                    //如果保存传入编排映射关系，进行保存操作
//                    if (obj.containsKey("relation") && !Objects.equals(obj.getString("relation"), "")) {
//                        saveDataSetRelation(versionId, obj.getString("relation"));
//                    }
//                }
//            }
//        }
    }
@@ -397,21 +397,22 @@ public class CrawlerService {
     * @return
     */
    public String getRelations(Integer schemeVersionId, String datasetIdStr, String lineStr) {
        JSONObject jsonObject = new JSONObject();
        try {
            List<MappingDataset> datasets = getSchemeDatasetByChecked(schemeVersionId, datasetIdStr);
            List<FlowLines> lines = getFlowLines(schemeVersionId);
            if (StringUtil.isEmpty(lineStr)) {
                lines = getFlowLines(schemeVersionId);
            } else {
                lines = lineCache.get(schemeVersionId);
            }
            jsonObject.put("tables", datasets);
            jsonObject.put("rels", lines);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return jsonObject.toString();
        return "";  //TODO: Use jackson
//        JSONObject jsonObject = new JSONObject();
//        try {
//            List<MappingDataset> datasets = getSchemeDatasetByChecked(schemeVersionId, datasetIdStr);
//            List<FlowLines> lines = getFlowLines(schemeVersionId);
//            if (StringUtil.isEmpty(lineStr)) {
//                lines = getFlowLines(schemeVersionId);
//            } else {
//                lines = lineCache.get(schemeVersionId);
//            }
//            jsonObject.put("tables", datasets);
//            jsonObject.put("rels", lines);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return jsonObject.toString();
    }

hos-admin/src/main/java/com/yihu/hos/crawler/service/DataCollectDispatcher.java

@@ -4,10 +4,10 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.ehr.framework.constrant.SqlConstants;
import com.yihu.ehr.framework.util.file.FileUtil;
import com.yihu.ehr.framework.util.operator.DateUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.core.file.FileUtil;
import com.yihu.hos.core.datatype.DateUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.crawler.format.DataSetTransformer;
import com.yihu.hos.crawler.model.adapter.AdapterDataSet;
import com.yihu.hos.crawler.model.adapter.AdapterMetaData;

hos-admin/src/main/java/com/yihu/hos/crawler/service/EsbHttp.java

@@ -3,12 +3,12 @@ package com.yihu.hos.crawler.service;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.ehr.framework.constrant.SqlConstants;
import com.yihu.ehr.framework.util.encrypt.MD5;
import com.yihu.ehr.framework.util.httpclient.HttpClientUtil;
import com.yihu.ehr.framework.util.httpclient.HttpHelper;
import com.yihu.ehr.framework.util.httpclient.HttpResponse;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.core.encrypt.MD5;
import com.yihu.hos.core.httpclient.HttpClientUtil;
import com.yihu.hos.core.httpclient.HttpHelper;
import com.yihu.hos.core.httpclient.HttpResponse;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.crawler.model.adapter.AdapterDataSet;
import com.yihu.hos.crawler.model.config.SysConfig;
import com.yihu.hos.crawler.model.patient.Patient;

hos-admin/src/main/java/com/yihu/hos/crawler/service/OldPatientCDAUpload.java

@@ -4,12 +4,12 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.crawler.model.config.SysConfig;
import com.yihu.hos.crawler.model.patient.Patient;
import com.yihu.ehr.framework.util.compress.Zipper;
import com.yihu.ehr.framework.util.encrypt.MD5;
import com.yihu.ehr.framework.util.encrypt.RSA;
import com.yihu.ehr.framework.util.file.FileUtil;
import com.yihu.ehr.framework.util.httpclient.HttpHelper;
import com.yihu.ehr.framework.util.httpclient.HttpResponse;
import com.yihu.hos.core.compress.Zipper;
import com.yihu.hos.core.encrypt.MD5;
import com.yihu.hos.core.encrypt.RSA;
import com.yihu.hos.core.file.FileUtil;
import com.yihu.hos.core.httpclient.HttpHelper;
import com.yihu.hos.core.httpclient.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.apache.logging.log4j.LogManager;

hos-admin/src/main/java/com/yihu/hos/crawler/service/PatientCDAUpload.java

@@ -2,9 +2,9 @@ package com.yihu.hos.crawler.service;
import com.yihu.hos.crawler.model.config.SysConfig;
import com.yihu.hos.crawler.model.patient.Patient;
import com.yihu.ehr.framework.util.compress.Zipper;
import com.yihu.ehr.framework.util.encrypt.RSA;
import com.yihu.ehr.framework.util.file.FileUtil;
import com.yihu.hos.core.compress.Zipper;
import com.yihu.hos.core.encrypt.RSA;
import com.yihu.hos.core.file.FileUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

hos-admin/src/main/java/com/yihu/hos/crawler/storage/DocumentStorage.java

@@ -8,18 +8,16 @@ import com.mongodb.client.FindIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.model.UpdateOptions;
//import com.yihu.common.util.log.DebugLogger;
import com.yihu.hos.common.mongo.MongoDB;
import com.yihu.hos.crawler.format.IDataTransformer;
import com.yihu.hos.crawler.model.config.SysConfig;
import com.yihu.hos.crawler.model.patient.Patient;
import com.yihu.hos.core.datatype.DateUtil;
import com.yihu.hos.core.encode.Base64;
import com.yihu.hos.core.file.FileUtil;
import com.yihu.hos.crawler.format.AdapterScheme;
import com.yihu.hos.crawler.format.DocumentTransformer;
import com.yihu.hos.crawler.format.IDataTransformer;
import com.yihu.hos.crawler.model.patient.Patient;
import com.yihu.hos.crawler.service.EsbHttp;
import com.yihu.hos.crawler.service.PatientCDAIndex;
import com.yihu.ehr.framework.util.encode.Base64;
import com.yihu.ehr.framework.util.file.FileUtil;
import com.yihu.ehr.framework.util.operator.DateUtil;
import org.bson.Document;
import java.io.IOException;
@@ -31,6 +29,8 @@ import static com.mongodb.client.model.Filters.and;
import static com.mongodb.client.model.Filters.eq;
import static com.mongodb.client.model.Projections.excludeId;
//import com.yihu.common.util.log.DebugLogger;
/**
 * Created by Administrator on 2015/10/15.
 */

hos-admin/src/main/java/com/yihu/hos/crawler/storage/MongodbStorage.java

@@ -17,10 +17,10 @@ import com.yihu.hos.crawler.model.patient.PatientIdentity;
import com.yihu.hos.crawler.model.patient.PatientIndex;
import com.yihu.hos.crawler.format.AdapterScheme;
import com.yihu.hos.crawler.service.PatientCDAIndex;
import com.yihu.ehr.framework.util.file.ConfigureUtil;
import com.yihu.ehr.framework.util.file.FileUtil;
import com.yihu.ehr.framework.util.operator.DateUtil;
import com.yihu.ehr.framework.util.operator.NumberUtil;
import com.yihu.hos.web.framework.util.file.ConfigureUtil;
import com.yihu.hos.core.file.FileUtil;
import com.yihu.hos.core.datatype.DateUtil;
import com.yihu.hos.core.datatype.NumberUtil;
import org.bson.Document;
import java.io.IOException;

hos-admin/src/main/java/com/yihu/hos/datacollect/controller/DataCollectController.java

@@ -4,15 +4,14 @@ import com.yihu.hos.common.Services;
import com.yihu.hos.datacollect.model.RsJobConfig;
import com.yihu.hos.datacollect.service.intf.IDatacollectManager;
import com.yihu.hos.datacollect.service.intf.IDatacollectService;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.hos.web.framework.constrant.DateConvert;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.standard.service.adapter.AdapterSchemeService;
import com.yihu.hos.system.service.intf.IDatasourceManager;
import net.sf.json.JSONArray;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -77,11 +76,12 @@ public class DataCollectController extends BaseController {
            }
            //获取方案列表
            List data = stdService.getSchemeVersion();
            JSONArray jsonArray = JSONArray.fromObject(data);
            model.addAttribute("schemeList", "{\"detailModelList\":" + (CollectionUtil.isEmpty(data) ? "[]" : jsonArray) + "}");
            model.addAttribute("contentPage", "/datacollect/editorJob");
            //TODO: Use jackson
//            List data = stdService.getSchemeVersion();
//            JSONArray jsonArray = JSONArray.fromObject(data);
//            model.addAttribute("schemeList", "{\"detailModelList\":" + (CollectionUtil.isEmpty(data) ? "[]" : jsonArray) + "}");
//
//            model.addAttribute("contentPage", "/datacollect/editorJob");
            return "pageView";
        } catch (Exception ex) {
            model.addAttribute("contentPage", "/datacollect/editorJob");

hos-admin/src/main/java/com/yihu/hos/datacollect/controller/DataPushController.java

@@ -1,8 +1,8 @@
package com.yihu.hos.datacollect.controller;
import com.yihu.hos.datacollect.service.intf.IDatapushService;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

hos-admin/src/main/java/com/yihu/hos/datacollect/dao/DatacollectDao.java

@@ -3,10 +3,10 @@ package com.yihu.hos.datacollect.dao;
import com.yihu.hos.datacollect.dao.intf.IDatacollectDao;
import com.yihu.hos.datacollect.model.DtoJobDataset;
import com.yihu.hos.datacollect.model.RsJobDataset;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.SimpleChartItem;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.constrant.DateConvert;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.SimpleChartItem;
import com.yihu.hos.resource.model.RsDatasourceDataset;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;

hos-admin/src/main/java/com/yihu/hos/datacollect/dao/DatacollectLogDao.java

@@ -1,21 +1,15 @@
package com.yihu.hos.datacollect.dao;
import com.yihu.hos.datacollect.dao.intf.IDatacollectDao;
import com.yihu.hos.datacollect.dao.intf.IDatacollectLogDao;
import com.yihu.hos.datacollect.model.DtoJobDataset;
import com.yihu.hos.datacollect.model.RsDatapushLog;
import com.yihu.hos.datacollect.model.RsJobDataset;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.resource.model.RsDatasourceDataset;
import com.yihu.hos.web.framework.constrant.DateConvert;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Map;
/**

hos-admin/src/main/java/com/yihu/hos/datacollect/dao/intf/IDatacollectDao.java

@@ -2,9 +2,9 @@ package com.yihu.hos.datacollect.dao.intf;
import com.yihu.hos.datacollect.model.DtoJobDataset;
import com.yihu.hos.datacollect.model.RsJobDataset;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.SimpleChartItem;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.SimpleChartItem;
import com.yihu.hos.resource.model.RsDatasourceDataset;
import java.util.List;

hos-admin/src/main/java/com/yihu/hos/datacollect/dao/intf/IDatacollectLogDao.java

@@ -1,12 +1,8 @@
package com.yihu.hos.datacollect.dao.intf;
import com.yihu.hos.datacollect.model.DtoJobDataset;
import com.yihu.hos.datacollect.model.RsJobDataset;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.resource.model.RsDatasourceDataset;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import java.util.List;
import java.util.Map;
/**

hos-admin/src/main/java/com/yihu/hos/datacollect/service/DatacollectManager.java

@@ -1,22 +1,15 @@
package com.yihu.hos.datacollect.service;
import com.yihu.hos.common.Services;
import com.yihu.hos.datacollect.dao.intf.IDatacollectDao;
import com.yihu.hos.datacollect.model.*;
import com.yihu.hos.datacollect.service.intf.IDatacollectManager;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.hos.common.Services;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.DictItem;
import com.yihu.ehr.framework.model.SimpleChartItem;
import com.yihu.ehr.framework.util.quartz.QuartzManager;
import com.yihu.hos.resource.model.RsDatasourceDataset;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.standard.StdDataSetModel;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.DictItem;
import com.yihu.hos.web.framework.model.SimpleChartItem;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -34,138 +27,40 @@ public class DatacollectManager implements IDatacollectManager {
    @Resource(name = Services.StdService)
    private IStdService stdManager;
    @Autowired
    private QuartzManager quartzManager;
//    @Autowired
//    private QuartzManager quartzManager;
    /*********************** 任务管理 ****************************************/
    /**
     * 根据JobId获取Cron表达式
     */
    @Override
    public String getCronByJobId(String jobId) throws Exception
    {
    public String getCronByJobId(String jobId) throws Exception {
        return datacollectDao.getCronByJobId(jobId);
    }
    /**
     * 根据ID获取任务详细
     *
     * @return
     */
    @Override
    public RsJobConfig getJobById(String id) throws Exception
    {
    public RsJobConfig getJobById(String id) throws Exception {
        return datacollectDao.getEntity(RsJobConfig.class, id);
    }
    /**
     * 翻译Cron表达式
     * @return
     */
    private String translationCron(String cron){
        try {
            if (cron != null && cron.length() > 0) {
                String re = "";
                String[] items = cron.split(" ");
                if (!items[5].equals("?")) //周
                {
                    String[] weekDay = items[5].split(",");
                    for(String day :weekDay)
                    {
                        String WeekDay = day;
                        if(day.equals("1"))
                        {
                            WeekDay = "日";
                        }
                        else if(day.equals("2"))
                        {
                            WeekDay = "一";
                        }
                        else if(day.equals("3"))
                        {
                            WeekDay = "二";
                        }
                        else if(day.equals("4"))
                        {
                            WeekDay = "三";
                        }
                        else if(day.equals("5"))
                        {
                            WeekDay = "四";
                        }
                        else if(day.equals("6"))
                        {
                            WeekDay = "五";
                        }
                        else if(day.equals("7"))
                        {
                            WeekDay = "六";
                        }
                        re+="星期" + WeekDay +",";
                    }
                    re = re.substring(0,re.length()-1);
                }
                else{
                    if (!items[3].equals("*"))
                    {
                        String v = items[3];
                        if(v.indexOf('/')>0) //天
                        {
                            String[] varry = v.split("/");
                            re = "每隔" + varry[1] + "天";
                        }
                        else{//月
                            if(v.equals("1"))
                            {
                                re = "每月第一天";
                            }
                            else if(v.equals("L")){
                                re = "每月最后一天";
                            }
                            else{
                                re = "每月第"+v+"天";
                            }
                        }
                    }
                    else{
                        String v1 = items[1];
                        String v2 = items[2];
                        if(v1.indexOf('/')>0) //分
                        {
                            String[] varry = v1.split("/");
                            re =  "每隔" + varry[1] + "分";
                        }
                        else{ //时
                            String[] varry = v2.split("/");
                            re =  "每隔" + varry[1] + "时";
                        }
                    }
                }
                return re+"执行";
            }
            return cron;
        }
        catch (Exception ex)
        {
            return cron;
        }
    }
    /**
     * 获取任务列表
     */
    @Override
    public DataGridResult getJobList(Map<String, Object> conditionMap,int page, int rows) throws Exception
    {
        DataGridResult re = datacollectDao.getJobList(conditionMap,page,rows);
    public DataGridResult getJobList(Map<String, Object> conditionMap, int page, int rows) throws Exception {
        DataGridResult re = datacollectDao.getJobList(conditionMap, page, rows);
        //获取任务列表
        List<RsJobConfig> list = re.getDetailModelList();
        if(list!=null && list.size()>0)
        {
        if (list != null && list.size() > 0) {
            List<DtoJobConfig> dtoList = new ArrayList<>();
            for(RsJobConfig job :list)
            {
            for (RsJobConfig job : list) {
                DtoJobConfig dto = new DtoJobConfig();
                dto.setId(job.getId());
                dto.setJobContent(job.getJobContent());
@@ -184,14 +79,12 @@ public class DatacollectManager implements IDatacollectManager {
                //获取关联数据集
                List<RsJobDataset> datasetList = datacollectDao.getJobDataset(job.getId());
                if(datasetList!=null && datasetList.size()>0)
                {
                if (datasetList != null && datasetList.size() > 0) {
                    String ds = "";
                    for(RsJobDataset dataset :datasetList)
                    {
                    for (RsJobDataset dataset : datasetList) {
                        ds += dataset.getJobDatasetName() + ",";
                    }
                    ds= ds.substring(0,ds.length()-1);
                    ds = ds.substring(0, ds.length() - 1);
                    dto.setJobDataset(ds);
                }
@@ -211,97 +104,95 @@ public class DatacollectManager implements IDatacollectManager {
     * 根据适配方案获取数据集列表
     */
    @Override
    public DataGridResult getSchemeDataset(String schemeId,String schemeVersion,String jobId) throws Exception
    {
        //获取适配数据集总和
        List<AdapterDatasetModel> datasetString = stdManager.getDatasetByScheme(schemeVersion);
        JSONArray jsonArray =  JSONArray.fromObject(datasetString);
        //获取任务数据集
        List<RsJobDataset> jobDataset = datacollectDao.getJobDataset(jobId);
        DataGridResult re = new DataGridResult();
        List<DtoJobDataset> list = new ArrayList<>();
        for(Object item : jsonArray)
        {
            JSONObject jsonItem = JSONObject.fromObject(item);
            String datasetId= jsonItem.getString("adapterDatasetId");
            //配置完整才显示
            if(datasetId.length()>0&&jsonItem.getString("adapterDatasetName").length()>0&&jsonItem.getString("adapterDatasetName")!="null"&&jsonItem.getString("adapterDatasetCode").length()>0&&jsonItem.getString("adapterDatasetCode")!="null")
            {
                DtoJobDataset obj = new DtoJobDataset();
                obj.setJobDatasetName(jsonItem.getString("adapterDatasetName"));
                obj.setJobDatasetCode(jsonItem.getString("adapterDatasetCode"));
                obj.setJobDatasetId(datasetId);
                //是否关联任务
                if(jobDataset!=null&&jobDataset.size()>0)
                {
                    for(RsJobDataset jd :jobDataset)
                    {
                        if(jd.getJobDatasetId().equals(datasetId))
                        {
                            obj.setId(jd.getId());
                            obj.setJobId(jobId);
                            obj.setJobDatasetKeyvalue(jd.getJobDatasetKeyvalue());
                            obj.setJobDatasetKey(jd.getJobDatasetKey());
                            obj.setJobDatasetKeytype(jd.getJobDatasetKeytype());
                            obj.setChecked("1");
                            obj.setJobDatasetCondition(jd.getJobDatasetCondition());
                            break;
                        }
                    }
                }
                list.add(obj);
            }
        }
        re.setDetailModelList(list);
        return re;
    public DataGridResult getSchemeDataset(String schemeId, String schemeVersion, String jobId) throws Exception {
        return null; //TODO: Use jackson
//        //获取适配数据集总和
//        List<AdapterDatasetModel> datasetString = stdManager.getDatasetByScheme(schemeVersion);
//        JSONArray jsonArray =  JSONArray.fromObject(datasetString);
//        //获取任务数据集
//        List<RsJobDataset> jobDataset = datacollectDao.getJobDataset(jobId);
//
//        DataGridResult re = new DataGridResult();
//        List<DtoJobDataset> list = new ArrayList<>();
//        for(Object item : jsonArray)
//        {
//            JSONObject jsonItem = JSONObject.fromObject(item);
//            String datasetId= jsonItem.getString("adapterDatasetId");
//            //配置完整才显示
//            if(datasetId.length()>0&&jsonItem.getString("adapterDatasetName").length()>0&&jsonItem.getString("adapterDatasetName")!="null"&&jsonItem.getString("adapterDatasetCode").length()>0&&jsonItem.getString("adapterDatasetCode")!="null")
//            {
//                DtoJobDataset obj = new DtoJobDataset();
//                obj.setJobDatasetName(jsonItem.getString("adapterDatasetName"));
//                obj.setJobDatasetCode(jsonItem.getString("adapterDatasetCode"));
//                obj.setJobDatasetId(datasetId);
//
//                //是否关联任务
//                if(jobDataset!=null&&jobDataset.size()>0)
//                {
//                    for(RsJobDataset jd :jobDataset)
//                    {
//                        if(jd.getJobDatasetId().equals(datasetId))
//                        {
//                            obj.setId(jd.getId());
//                            obj.setJobId(jobId);
//                            obj.setJobDatasetKeyvalue(jd.getJobDatasetKeyvalue());
//                            obj.setJobDatasetKey(jd.getJobDatasetKey());
//                            obj.setJobDatasetKeytype(jd.getJobDatasetKeytype());
//                            obj.setChecked("1");
//                            obj.setJobDatasetCondition(jd.getJobDatasetCondition());
//                            break;
//                        }
//                    }
//
//                }
//                list.add(obj);
//            }
//        }
//        re.setDetailModelList(list);
//
//        return re;
    }
    /**
     * 根据适配方案获取字段列表
     */
    @Override
    public DataGridResult getSchemeDatasetCol(String schemeId,String schemeVersion,String datasetId) throws Exception
    {
        //获取适配字段
        List datacolString = stdManager.getDatacolByScheme(schemeVersion, datasetId);
        JSONArray datacolList = JSONArray.fromObject(datacolString);
        DataGridResult re = new DataGridResult();
        List<DtoDatasetCol> list = new ArrayList<>();
        for(Object item : datacolList)
        {
            JSONObject jsonItem = JSONObject.fromObject(item);
            DtoDatasetCol obj = new DtoDatasetCol();
            obj.setCode(jsonItem.getString("adapterMetadataCode"));
            obj.setText(jsonItem.getString("adapterMetadataName"));
            obj.setType(jsonItem.getString("adapterMetadataType"));
            obj.setDict(jsonItem.getString("stdDictId"));
            list.add(obj);
        }
        re.setDetailModelList(list);
        return re;
    public DataGridResult getSchemeDatasetCol(String schemeId, String schemeVersion, String datasetId) throws Exception {
        return null; //TODO: Use jackson
//        //获取适配字段
//        List datacolString = stdManager.getDatacolByScheme(schemeVersion, datasetId);
//        JSONArray datacolList = JSONArray.fromObject(datacolString);
//
//        DataGridResult re = new DataGridResult();
//        List<DtoDatasetCol> list = new ArrayList<>();
//        for(Object item : datacolList)
//        {
//            JSONObject jsonItem = JSONObject.fromObject(item);
//            DtoDatasetCol obj = new DtoDatasetCol();
//            obj.setCode(jsonItem.getString("adapterMetadataCode"));
//            obj.setText(jsonItem.getString("adapterMetadataName"));
//            obj.setType(jsonItem.getString("adapterMetadataType"));
//            obj.setDict(jsonItem.getString("stdDictId"));
//
//            list.add(obj);
//        }
//        re.setDetailModelList(list);
//
//        return re;
    }
    /**
     * 根据任务Id获取相关数据集下拉数据
     */
    @Override
    public DataGridResult getJobDatasetByJobId(String jobId) throws Exception
    {
    public DataGridResult getJobDatasetByJobId(String jobId) throws Exception {
        //获取任务数据集
        List<RsJobDataset> jobDataset = datacollectDao.getJobDataset(jobId);
        DataGridResult re = new DataGridResult();
        List<DictItem> list = new ArrayList<>();
        for(RsJobDataset obj :jobDataset)
        {
        for (RsJobDataset obj : jobDataset) {
            DictItem item = new DictItem();
            item.setValue(obj.getJobDatasetName());
            item.setCode(obj.getJobDatasetId());
@@ -311,62 +202,18 @@ public class DatacollectManager implements IDatacollectManager {
        return re;
    }
    /**
     * 保存任务关联数据集
     */
    private void saveJobDataset(String jobId,String jobDataset) throws Exception{
        if(jobDataset!=null&&jobDataset.length()>0) {
            //清空任务关联数据集
            datacollectDao.deleteJobDatasetByJobId(jobId);
            JSONArray array = JSONArray.fromObject(jobDataset);
            if (array != null && array.size() > 0) {
                for (Object item : array) {
                    JSONObject obj = JSONObject.fromObject(item);
                    RsJobDataset rs = new RsJobDataset();
                    if(obj.get("jobDatasetCondition")!=null&&obj.getString("jobDatasetCondition")!="null")
                    {
                        rs.setJobDatasetCondition(obj.getString("jobDatasetCondition"));
                    }
                    if(obj.get("jobDatasetId")!=null&&obj.getString("jobDatasetId")!="null") {
                        rs.setJobDatasetId(obj.getString("jobDatasetId"));
                    }
                    if(obj.get("jobDatasetKey")!=null&&obj.getString("jobDatasetKey")!="null") {
                        rs.setJobDatasetKey(obj.getString("jobDatasetKey"));
                    }
                    if(obj.get("jobDatasetKeytype")!=null&&obj.getString("jobDatasetKeytype")!="null") {
                        rs.setJobDatasetKeytype(obj.getString("jobDatasetKeytype"));
                    }
                    if(obj.get("jobDatasetKeyvalue")!=null&&obj.getString("jobDatasetKeyvalue")!="null") {
                        rs.setJobDatasetKeyvalue(obj.getString("jobDatasetKeyvalue"));
                    }
                    if(obj.get("jobDatasetName")!=null&&obj.getString("jobDatasetName")!="null") {
                        rs.setJobDatasetName(obj.getString("jobDatasetName"));
                    }
                    rs.setJobId(jobId);
                    datacollectDao.saveEntity(rs);
                }
            }
        }
        else{
            return;
        }
    }
    /**
     * 新增任务
     */
    @Override
    @Transactional
    public ActionResult addJob(RsJobConfig obj,String cron,String jobDataset) throws Exception
    {
    public ActionResult addJob(RsJobConfig obj, String cron, String jobDataset) throws Exception {
        datacollectDao.saveEntity(obj);
        saveJobDataset(obj.getId(),jobDataset);
        saveJobDataset(obj.getId(), jobDataset);
        //quartz新增任务
        quartzManager.addJob(obj.getId(),obj.getJobContentType(),obj.getJobContent(),obj.getJobNextTime(),cron);
        return new ActionResult(true,"新增成功！");
//        quartzManager.addJob(obj.getId(), obj.getJobContentType(), obj.getJobContent(), obj.getJobNextTime(), cron);
        return new ActionResult(true, "新增成功！");
    }
    /**
@@ -374,14 +221,13 @@ public class DatacollectManager implements IDatacollectManager {
     */
    @Override
    @Transactional
    public ActionResult updateJob(RsJobConfig obj,String cron,String jobDataset) throws Exception
    {
    public ActionResult updateJob(RsJobConfig obj, String cron, String jobDataset) throws Exception {
        datacollectDao.updateEntity(obj);
        saveJobDataset(obj.getId(),jobDataset);
        saveJobDataset(obj.getId(), jobDataset);
        //quartz修改cron表达式
        quartzManager.modifyJob(obj.getId(),obj.getJobContentType(),obj.getJobContent(),obj.getJobNextTime(),cron);
        return new ActionResult(true,"修改成功！");
//        quartzManager.modifyJob(obj.getId(), obj.getJobContentType(), obj.getJobContent(), obj.getJobNextTime(), cron);
        return new ActionResult(true, "修改成功！");
    }
    /**
@@ -389,29 +235,25 @@ public class DatacollectManager implements IDatacollectManager {
     */
    @Override
    @Transactional
    public ActionResult updateJob(RsJobConfig obj) throws Exception
    {
    public ActionResult updateJob(RsJobConfig obj) throws Exception {
        datacollectDao.updateEntity(obj);
        return new ActionResult(true,"修改成功！");
        return new ActionResult(true, "修改成功！");
    }
    /**
     * 修改任务状态
     */
    @Transactional
    public ActionResult validJob(String jobId,String valid) throws Exception
    {
    public ActionResult validJob(String jobId, String valid) throws Exception {
        datacollectDao.validJob(jobId, valid);
        //暂停Quartz任务
        if(valid.equals("0"))
        {
            quartzManager.pauseJob(jobId);
        }
        else{ //恢复Quartz任务
            quartzManager.resumeJob(jobId);
        if (valid.equals("0")) {
//            quartzManager.pauseJob(jobId);
        } else { //恢复Quartz任务
//            quartzManager.resumeJob(jobId);
        }
        return new ActionResult(true,"状态修改成功！");
        return new ActionResult(true, "状态修改成功！");
    }
    /**
@@ -424,51 +266,47 @@ public class DatacollectManager implements IDatacollectManager {
        datacollectDao.deleteEntity(RsJobConfig.class, jobId);
        //删除Quartz任务
        quartzManager.removeJob(jobId);
//        quartzManager.removeJob(jobId);
        return new ActionResult(true, "删除成功！");
    }
    /************************* 数据集数据源管理 ***************************************************/
    /**
     * 数据集数据源管理列表（包含全部数据集）
     */
    @Override
    public DataGridResult getDatasetSource(String stdVersion) throws Exception
    {
        //获取版本下全部数据集
        List<StdDataSetModel> stdDataSetModelList = stdManager.getDatasetByVersion(stdVersion);
        JSONArray datasetList = JSONArray.fromObject(stdDataSetModelList);
        //获取已配数据集
        List<RsDatasourceDataset> jobDataset = datacollectDao.getDatasourceDataset(stdVersion);
        DataGridResult re = new DataGridResult();
        List<JSONObject> list = new ArrayList<>();
        for(Object item : datasetList)
        {
            JSONObject obj = JSONObject.fromObject(item);
            JSONObject dd = new JSONObject();
            dd.put("datasetId",obj.getString("id"));
            dd.put("datasetCode",obj.getString("code"));
            dd.put("datasetName", obj.getString("name"));
            dd.put("stdVersion", stdVersion);
            if(jobDataset!=null&&jobDataset.size()>0)
            {
                for(RsDatasourceDataset rdd:jobDataset)
                {
                    if(rdd.getDatasetId().equals(obj.getString("id"))) {
                        dd.put("orgId", rdd.getOrgId());
                        dd.put("datasourceId", rdd.getDatasourceId());
                        dd.put("id", rdd.getId());
                        break;
                    }
                }
            }
            list.add(dd);
        }
        re.setDetailModelList(list);
        return re;
    public DataGridResult getDatasetSource(String stdVersion) throws Exception {
        return null; //TODO: Use jackson
//        //获取版本下全部数据集
//        List<StdDataSetModel> stdDataSetModelList = stdManager.getDatasetByVersion(stdVersion);
//        JSONArray datasetList = JSONArray.fromObject(stdDataSetModelList);
//        //获取已配数据集
//        List<RsDatasourceDataset> jobDataset = datacollectDao.getDatasourceDataset(stdVersion);
//
//        DataGridResult re = new DataGridResult();
//        List<JSONObject> list = new ArrayList<>();
//        for (Object item : datasetList) {
//            JSONObject obj = JSONObject.fromObject(item);
//            JSONObject dd = new JSONObject();
//            dd.put("datasetId", obj.getString("id"));
//            dd.put("datasetCode", obj.getString("code"));
//            dd.put("datasetName", obj.getString("name"));
//            dd.put("stdVersion", stdVersion);
//
//            if (jobDataset != null && jobDataset.size() > 0) {
//                for (RsDatasourceDataset rdd : jobDataset) {
//                    if (rdd.getDatasetId().equals(obj.getString("id"))) {
//                        dd.put("orgId", rdd.getOrgId());
//                        dd.put("datasourceId", rdd.getDatasourceId());
//                        dd.put("id", rdd.getId());
//                        break;
//                    }
//                }
//            }
//            list.add(dd);
//        }
//        re.setDetailModelList(list);
//
//        return re;
    }
    /**
@@ -476,78 +314,71 @@ public class DatacollectManager implements IDatacollectManager {
     */
    @Override
    @Transactional
    public ActionResult saveDatasetSource(String json) throws Exception
    {
        JSONArray jsonList = JSONArray.fromObject(json);
        for(Object item : jsonList)
        {
            JSONObject obj = JSONObject.fromObject(item);
            if(obj.containsKey("id") && obj.getString("id").length()>0)
            {
                String id = obj.getString("id");
                //修改
                RsDatasourceDataset dd = (RsDatasourceDataset)JSONObject.toBean(obj,RsDatasourceDataset.class);
                datacollectDao.updateEntity(dd);
//                if(obj.containsKey("datasourceId") && obj.getString("datasourceId").length()>0)
//                {
//                    RsDatasourceDataset dd = (RsDatasourceDataset)JSONObject.toBean(obj,RsDatasourceDataset.class);
//                    datacollectDao.updateEntity(dd);
//                }
//                //删除
//                else{
//                    datacollectDao.deleteEntity(RsDatasourceDataset.class,id);
//                }
            }
            else{
                //新增
                RsDatasourceDataset dd = (RsDatasourceDataset)JSONObject.toBean(obj,RsDatasourceDataset.class);
                datacollectDao.saveEntity(dd);
            }
        }
        return new ActionResult(true,"保存成功！");
    public ActionResult saveDatasetSource(String json) throws Exception {
        //TODO: Use jackson
//        JSONArray jsonList = JSONArray.fromObject(json);
//
//
//        for (Object item : jsonList) {
//            JSONObject obj = JSONObject.fromObject(item);
//            if (obj.containsKey("id") && obj.getString("id").length() > 0) {
//                String id = obj.getString("id");
//                //修改
//                RsDatasourceDataset dd = (RsDatasourceDataset) JSONObject.toBean(obj, RsDatasourceDataset.class);
//                datacollectDao.updateEntity(dd);
////                if(obj.containsKey("datasourceId") && obj.getString("datasourceId").length()>0)
////                {
////                    RsDatasourceDataset dd = (RsDatasourceDataset)JSONObject.toBean(obj,RsDatasourceDataset.class);
////                    datacollectDao.updateEntity(dd);
////                }
////                //删除
////                else{
////                    datacollectDao.deleteEntity(RsDatasourceDataset.class,id);
////                }
//            } else {
//                //新增
//                RsDatasourceDataset dd = (RsDatasourceDataset) JSONObject.toBean(obj, RsDatasourceDataset.class);
//                datacollectDao.saveEntity(dd);
//            }
//        }
        return new ActionResult(true, "保存成功！");
    }
    /********************** 任务日志管理 *******************************************/
    /************************* 数据集数据源管理 ***************************************************/
    /**
     * 获取任务详细日志列表
     */
    @Override
    public DataGridResult getJobLogDetail(Map<String, Object> conditionMap,int page, int rows) throws Exception
    {
        return datacollectDao.getJobLogDetail(conditionMap, page,rows);
    public DataGridResult getJobLogDetail(Map<String, Object> conditionMap, int page, int rows) throws Exception {
        return datacollectDao.getJobLogDetail(conditionMap, page, rows);
    }
    /**
     * 获取任务日志列表
     */
    @Override
    public DataGridResult getJobLog(Map<String, Object> conditionMap,int page, int rows) throws Exception
    {
    public DataGridResult getJobLog(Map<String, Object> conditionMap, int page, int rows) throws Exception {
        DataGridResult re = datacollectDao.getJobLog(conditionMap, page, rows);
        List<RsJobLog> logList = re.getDetailModelList();
        List<DtoJobLog> list = new ArrayList<>();
        for(RsJobLog log:logList)
        {
        for (RsJobLog log : logList) {
            DtoJobLog dto = new DtoJobLog();
            BeanUtils.copyProperties(log,dto);
            List<Map<String,Object>> maps = datacollectDao.getJobLogCount(log.getId());
            BeanUtils.copyProperties(log, dto);
            List<Map<String, Object>> maps = datacollectDao.getJobLogCount(log.getId());
            if(maps!=null && maps.size()>0)
            {
            if (maps != null && maps.size() > 0) {
                int count = Integer.parseInt(String.valueOf(maps.get(0).get("count")));
                int success =  Integer.parseInt(String.valueOf(maps.get(0).get("success")));
                int repeat_num =  Integer.parseInt(String.valueOf(maps.get(0).get("repeat_num")));
                int success = Integer.parseInt(String.valueOf(maps.get(0).get("success")));
                int repeat_num = Integer.parseInt(String.valueOf(maps.get(0).get("repeat_num")));
                dto.setCount(count);
                dto.setSuccess(success);
                dto.setRepeatNum(repeat_num);
            }
            else{
            } else {
                dto.setCount(0);
                dto.setSuccess(0);
                dto.setRepeatNum(0);
@@ -559,12 +390,15 @@ public class DatacollectManager implements IDatacollectManager {
        return re;
    }
    /********************** 任务日志管理 *******************************************/
    /**
     * 任务详细根据数据集分组
     *
     * @return
     */
    @Override
    public DataGridResult getJobLogDataset(String logId) throws Exception{
    public DataGridResult getJobLogDataset(String logId) throws Exception {
        DataGridResult re = new DataGridResult();
        List<SimpleChartItem> maps = datacollectDao.getJobLogDataset(logId);
        re.setDetailModelList(maps);
@@ -572,4 +406,119 @@ public class DatacollectManager implements IDatacollectManager {
        return re;
    }
    /**
     * 翻译Cron表达式
     *
     * @return
     */
    private String translationCron(String cron) {
        try {
            if (cron != null && cron.length() > 0) {
                String re = "";
                String[] items = cron.split(" ");
                if (!items[5].equals("?")) //周
                {
                    String[] weekDay = items[5].split(",");
                    for (String day : weekDay) {
                        String WeekDay = day;
                        if (day.equals("1")) {
                            WeekDay = "日";
                        } else if (day.equals("2")) {
                            WeekDay = "一";
                        } else if (day.equals("3")) {
                            WeekDay = "二";
                        } else if (day.equals("4")) {
                            WeekDay = "三";
                        } else if (day.equals("5")) {
                            WeekDay = "四";
                        } else if (day.equals("6")) {
                            WeekDay = "五";
                        } else if (day.equals("7")) {
                            WeekDay = "六";
                        }
                        re += "星期" + WeekDay + ",";
                    }
                    re = re.substring(0, re.length() - 1);
                } else {
                    if (!items[3].equals("*")) {
                        String v = items[3];
                        if (v.indexOf('/') > 0) //天
                        {
                            String[] varry = v.split("/");
                            re = "每隔" + varry[1] + "天";
                        } else {//月
                            if (v.equals("1")) {
                                re = "每月第一天";
                            } else if (v.equals("L")) {
                                re = "每月最后一天";
                            } else {
                                re = "每月第" + v + "天";
                            }
                        }
                    } else {
                        String v1 = items[1];
                        String v2 = items[2];
                        if (v1.indexOf('/') > 0) //分
                        {
                            String[] varry = v1.split("/");
                            re = "每隔" + varry[1] + "分";
                        } else { //时
                            String[] varry = v2.split("/");
                            re = "每隔" + varry[1] + "时";
                        }
                    }
                }
                return re + "执行";
            }
            return cron;
        } catch (Exception ex) {
            return cron;
        }
    }
    /**
     * 保存任务关联数据集
     */
    private void saveJobDataset(String jobId, String jobDataset) throws Exception {
        //TODO: Use jackson
//        if(jobDataset!=null&&jobDataset.length()>0) {
//            //清空任务关联数据集
//            datacollectDao.deleteJobDatasetByJobId(jobId);
//
//            JSONArray array = JSONArray.fromObject(jobDataset);
//
//            if (array != null && array.size() > 0) {
//                for (Object item : array) {
//                    JSONObject obj = JSONObject.fromObject(item);
//                    RsJobDataset rs = new RsJobDataset();
//                    if(obj.get("jobDatasetCondition")!=null&&obj.getString("jobDatasetCondition")!="null")
//                    {
//                        rs.setJobDatasetCondition(obj.getString("jobDatasetCondition"));
//                    }
//                    if(obj.get("jobDatasetId")!=null&&obj.getString("jobDatasetId")!="null") {
//                        rs.setJobDatasetId(obj.getString("jobDatasetId"));
//                    }
//                    if(obj.get("jobDatasetKey")!=null&&obj.getString("jobDatasetKey")!="null") {
//                        rs.setJobDatasetKey(obj.getString("jobDatasetKey"));
//                    }
//                    if(obj.get("jobDatasetKeytype")!=null&&obj.getString("jobDatasetKeytype")!="null") {
//                        rs.setJobDatasetKeytype(obj.getString("jobDatasetKeytype"));
//                    }
//                    if(obj.get("jobDatasetKeyvalue")!=null&&obj.getString("jobDatasetKeyvalue")!="null") {
//                        rs.setJobDatasetKeyvalue(obj.getString("jobDatasetKeyvalue"));
//                    }
//                    if(obj.get("jobDatasetName")!=null&&obj.getString("jobDatasetName")!="null") {
//                        rs.setJobDatasetName(obj.getString("jobDatasetName"));
//                    }
//                    rs.setJobId(jobId);
//                    datacollectDao.saveEntity(rs);
//                }
//            }
//        }
//        else{
//            return;
//        }
    }
}

hos-admin/src/main/java/com/yihu/hos/datacollect/service/DatacollectService.java

@@ -10,12 +10,12 @@ import com.yihu.ehr.dbhelper.common.sqlparser.ParserSql;
import com.yihu.ehr.dbhelper.common.sqlparser.ParserSqlserver;
import com.yihu.ehr.dbhelper.jdbc.DBHelper;
import com.yihu.ehr.dbhelper.mongodb.MongodbHelper;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.ehr.framework.constrant.SqlConstants;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.util.log.Logger;
import com.yihu.ehr.framework.util.log.LoggerFactory;
import com.yihu.ehr.framework.util.webservice.WebserviceUtil;
import com.yihu.hos.web.framework.constrant.DateConvert;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import com.yihu.hos.core.webservice.WebserviceUtil;
import com.yihu.hos.common.Services;
import com.yihu.hos.crawler.model.config.SysConfig;
import com.yihu.hos.crawler.model.patient.PatientIdentity;

hos-admin/src/main/java/com/yihu/hos/datacollect/service/DatapushService.java

@@ -1,16 +1,15 @@
package com.yihu.hos.datacollect.service;
import com.yihu.ehr.dbhelper.mongodb.MongodbHelper;
import com.yihu.hos.common.Services;
import com.yihu.hos.datacollect.dao.intf.IDatacollectDao;
import com.yihu.hos.datacollect.dao.intf.IDatacollectLogDao;
import com.yihu.hos.datacollect.model.*;
import com.yihu.hos.datacollect.service.intf.IDatapushService;
import com.yihu.ehr.dbhelper.mongodb.MongodbHelper;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.resultModel.AdapterMetadataResultDetailModel;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.Result;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;

hos-admin/src/main/java/com/yihu/hos/datacollect/service/intf/IDatacollectManager.java

@@ -1,8 +1,8 @@
package com.yihu.hos.datacollect.service.intf;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.datacollect.model.RsJobConfig;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import java.util.Map;

hos-admin/src/main/java/com/yihu/hos/datacollect/service/intf/IDatacollectService.java

@@ -1,11 +1,7 @@
package com.yihu.hos.datacollect.service.intf;
import com.yihu.hos.datacollect.model.RsJobConfig;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DataGridResult;
import java.util.Map;
import com.yihu.hos.web.framework.model.ActionResult;
/**
 * Created by hzp on 2015/12/25.

hos-admin/src/main/java/com/yihu/hos/datacollect/service/intf/IDatapushService.java

@@ -1,7 +1,7 @@
package com.yihu.hos.datacollect.service.intf;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.model.Result;
/**
 * Created by hzp on 2016/4/14.

hos-admin/src/main/java/com/yihu/hos/resource/controller/RsCategoryController.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.controller;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.resource.model.RsResourceCategory;
import com.yihu.hos.resource.service.IRsCategoryService;
import org.apache.commons.beanutils.BeanUtils;

hos-admin/src/main/java/com/yihu/hos/resource/controller/RsDimensionController.java

@@ -1,21 +1,18 @@
package com.yihu.hos.resource.controller;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.resource.model.RsDemensionCategory;
import com.yihu.hos.resource.model.RsDimension;
import com.yihu.hos.resource.service.IRsDimensionService;
import com.yihu.hos.web.framework.model.Result;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;

hos-admin/src/main/java/com/yihu/hos/resource/controller/RsResourceController.java

@@ -1,16 +1,13 @@
package com.yihu.hos.resource.controller;
import com.yihu.hos.common.JXLUtil;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.resource.model.*;
import com.yihu.hos.resource.service.IRsResourceRestService;
import com.yihu.hos.resource.service.IRsResourceService;
import com.yihu.hos.resource.viewresult.RsResourceDeatilModel;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -220,7 +217,9 @@ public class RsResourceController extends BaseController {
            RsAppResourceDetail rard = resourceService.getAppResourceDetailId(id);
            model.addAttribute("appResourceDetail", rard);
            model.addAttribute("metadataName", resourceService.getRsResourceMetadata(rard.getMetadataId()));
            model.addAttribute("resultSelect", JSONArray.fromObject(resourceService.getDimensionByResourceId(resourceId)).toString());
            //TODO: Use jackson
//            model.addAttribute("resultSelect", JSONArray.fromObject(resourceService.getDimensionByResourceId(resourceId)).toString());
            model.addAttribute("resourceId", resourceId);
            model.addAttribute("contentPage", "/resource/resourceregister/rsResourceDimensionDialog");
        } catch (Exception e) {
@@ -299,30 +298,32 @@ public class RsResourceController extends BaseController {
            }
            //访问服务得到数据
            String response_params = resourceService.searchRomoteResourceList(resource.getCode(), params);
            if (response_params.startsWith("[")) {
                //如果是数组
                Integer count = JSONArray.fromObject(response_params).size();//得到总数
                //访问服务得到元数据
                //设置动态datagrid值
                result.setDetailModelList(JSONArray.fromObject(response_params.toString().replace(":null", ":\"\"")));
                result.setTotalCount(count);
                result.setCurrPage(Integer.valueOf(currPage));
                result.setPageSize(count);
                result.setSuccessFlg(true);
            } else if (response_params.startsWith("{")) {
                Integer count = (Integer) JSONObject.fromObject(response_params).get("count");//得到总数
                //访问服务得到元数据
                //设置动态datagrid值
                String s = JSONObject.fromObject(response_params).get("detailModelList").toString().replace(":null", ":\"\"");
                result.setDetailModelList(JSONArray.fromObject(s));
                result.setTotalCount(count);
                result.setCurrPage(Integer.valueOf(currPage));
                result.setPageSize(Integer.valueOf(pageSize));
                result.setSuccessFlg(true);
            } else {
                result.setSuccessFlg(false);
                result.setMessage("获取数据失败");
            }
            //TODO: Use jackson
//            if (response_params.startsWith("[")) {
//                //如果是数组
//                Integer count = JSONArray.fromObject(response_params).size();//得到总数
//                //访问服务得到元数据
//                //设置动态datagrid值
//                result.setDetailModelList(JSONArray.fromObject(response_params.toString().replace(":null", ":\"\"")));
//                result.setTotalCount(count);
//                result.setCurrPage(Integer.valueOf(currPage));
//                result.setPageSize(count);
//                result.setSuccessFlg(true);
//            } else if (response_params.startsWith("{")) {
//                Integer count = (Integer) JSONObject.fromObject(response_params).get("count");//得到总数
//                //访问服务得到元数据
//                //设置动态datagrid值
//                String s = JSONObject.fromObject(response_params).get("detailModelList").toString().replace(":null", ":\"\"");
//                result.setDetailModelList(JSONArray.fromObject(s));
//                result.setTotalCount(count);
//                result.setCurrPage(Integer.valueOf(currPage));
//                result.setPageSize(Integer.valueOf(pageSize));
//                result.setSuccessFlg(true);
//            } else {
//                result.setSuccessFlg(false);
//                result.setMessage("获取数据失败");
//            }
        } catch (Exception e) {
            e.printStackTrace();
            result.setSuccessFlg(false);
@@ -365,7 +366,9 @@ public class RsResourceController extends BaseController {
        } catch (Exception e) {
            e.printStackTrace();
        }
        return JSONObject.fromObject(mapParam).toString();
        return "";  //TODO: Use jackson
//        return JSONObject.fromObject(mapParam).toString();
    }
    /**
@@ -788,39 +791,41 @@ public class RsResourceController extends BaseController {
    @RequestMapping("/exportAllExcel")
    public void exportAllExcel(HttpServletRequest request, HttpServletResponse response) {
        try {
            String field = request.getParameter("field");
            String name = request.getParameter("name");
            Map<String, String> fieldMap = new HashMap<String, String>();
            for (Object o : JSONArray.fromObject(field)) {
                JSONObject jo = ((JSONObject) o);
                fieldMap.put(String.valueOf(jo.get("key")), String.valueOf(jo.get("value")));
            }
            Result e = this.searchRomoteResourceList(request);
            JXLUtil.listMapToExcel(((DataGridResult) e).getDetailModelList(), fieldMap, name, response);
        } catch (Exception e) {
            e.printStackTrace();
        }
        //TODO: Use jackson
//        try {
//            String field = request.getParameter("field");
//
//            String name = request.getParameter("name");
//            Map<String, String> fieldMap = new HashMap<String, String>();
//            for (Object o : JSONArray.fromObject(field)) {
//                JSONObject jo = ((JSONObject) o);
//                fieldMap.put(String.valueOf(jo.get("key")), String.valueOf(jo.get("value")));
//
//            }
//            Result e = this.searchRomoteResourceList(request);
//            JXLUtil.listMapToExcel(((DataGridResult) e).getDetailModelList(), fieldMap, name, response);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
    }
    @RequestMapping("/exportSomeExcel")
    public void exportSomeExcel(HttpServletRequest request, HttpServletResponse response) {
        try {
            String field = request.getParameter("field");
            String data = request.getParameter("data");
            String name = request.getParameter("name");
            Map<String, String> fieldMap = new HashMap<String, String>();
            for (Object o : JSONArray.fromObject(field)) {
                JSONObject jo = ((JSONObject) o);
                fieldMap.put(String.valueOf(jo.get("key")), String.valueOf(jo.get("value")));
            }
            JXLUtil.listMapToExcel(JSONArray.fromObject(data), fieldMap, name, response);
        } catch (Exception e) {
            e.printStackTrace();
        }
        //TODO: Use jackson
//        try {
//            String field = request.getParameter("field");
//            String data = request.getParameter("data");
//            String name = request.getParameter("name");
//            Map<String, String> fieldMap = new HashMap<String, String>();
//            for (Object o : JSONArray.fromObject(field)) {
//                JSONObject jo = ((JSONObject) o);
//                fieldMap.put(String.valueOf(jo.get("key")), String.valueOf(jo.get("value")));
//
//            }
//            JXLUtil.listMapToExcel(JSONArray.fromObject(data), fieldMap, name, response);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
    }
}

hos-admin/src/main/java/com/yihu/hos/resource/controller/RsResourceRestController.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.controller;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsResourceRest;
import com.yihu.hos.resource.model.RsResourceRestDetail;
import com.yihu.hos.resource.service.IRsResourceRestService;

hos-admin/src/main/java/com/yihu/hos/resource/controller/StdController.java

@@ -1,8 +1,8 @@
package com.yihu.hos.resource.controller;
import com.yihu.hos.common.Services;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.resource.service.IStdService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsAppResourceDao.java

@@ -1,6 +1,6 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.resource.model.RsAppResource;
import java.util.List;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsAppResourceDetailDao.java

@@ -1,6 +1,6 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.resource.model.RsAppResourceDetail;
import java.util.List;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsCategoryDao.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsDemensionCategory;
import com.yihu.hos.resource.model.RsResourceCategory;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsDemensionCategoryDao.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsDemensionCategory;
import java.util.List;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsDimensionDao.java

@@ -1,7 +1,6 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
/**
 * Created by chenweida on 2016/1/26.

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsResourceCategoryDao.java

@@ -1,6 +1,6 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.resource.model.RsResourceCategory;
import java.util.List;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsResourceDao.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.model.RsResource;
import java.util.List;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsResourceDatasetDao.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import java.util.Map;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsResourceDimensionDao.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.viewresult.RsResourceDimensionModel;
import java.util.List;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsResourceMetadataDao.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsResourceMetadata;
import java.util.List;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsResourceRestDao.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import java.util.Map;

hos-admin/src/main/java/com/yihu/hos/resource/dao/IRsResourceRestDetailDao.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.model.RsResourceRestDetail;
import java.util.Map;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsAppResourceDaoImpl.java

@@ -1,6 +1,6 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.resource.dao.IRsAppResourceDao;
import com.yihu.hos.resource.model.RsAppResource;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsAppResourceDetailDaoImpl.java

@@ -1,6 +1,6 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.resource.dao.IRsAppResourceDetailDao;
import com.yihu.hos.resource.model.RsAppResourceDetail;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsCategoryDaoImpl.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsCategoryDao;
import com.yihu.hos.resource.model.RsDemensionCategory;
import com.yihu.hos.resource.model.RsResourceCategory;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsDemensionCategoryDaoImpl.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsDemensionCategoryDao;
import com.yihu.hos.resource.model.RsDemensionCategory;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsDimensionDaoImpl.java

@@ -1,8 +1,7 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.hos.resource.dao.IRsDimensionDao;
import com.yihu.hos.resource.dao.IRsResourceDimensionDao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.springframework.stereotype.Repository;
/**

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsResourceCategoryDaoImpl.java

@@ -1,6 +1,6 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.resource.dao.IRsResourceCategoryDao;
import com.yihu.hos.resource.model.RsResourceCategory;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsResourceDaoImpl.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.dao.IRsResourceDao;
import com.yihu.hos.resource.model.RsResource;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsResourceDatasetDaoImpl.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.dao.IRsResourceDatasetDao;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsResourceDimensionDaoImpl.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsResourceDimensionDao;
import com.yihu.hos.resource.viewresult.RsResourceDimensionModel;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsResourceMetadataDaoImpl.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsResourceMetadataDao;
import com.yihu.hos.resource.model.RsResourceMetadata;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsResourceRestDaoImpl.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.dao.IRsResourceRestDao;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;

hos-admin/src/main/java/com/yihu/hos/resource/dao/impl/RsResourceRestDetailDaoImpl.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.dao.IRsResourceRestDetailDao;
import com.yihu.hos.resource.model.RsResourceRestDetail;
import org.springframework.stereotype.Repository;

hos-admin/src/main/java/com/yihu/hos/resource/service/IRsCategoryService.java

@@ -1,6 +1,6 @@
package com.yihu.hos.resource.service;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsResourceCategory;
import java.util.Map;

hos-admin/src/main/java/com/yihu/hos/resource/service/IRsDimensionService.java

@@ -1,6 +1,6 @@
package com.yihu.hos.resource.service;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsDemensionCategory;
import com.yihu.hos.resource.model.RsDimension;

hos-admin/src/main/java/com/yihu/hos/resource/service/IRsResourceRestService.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.service;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsResourceRest;
import com.yihu.hos.resource.model.RsResourceRestDetail;

hos-admin/src/main/java/com/yihu/hos/resource/service/IRsResourceService.java

@@ -1,9 +1,9 @@
package com.yihu.hos.resource.service;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.model.TreeResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.model.TreeResult;
import com.yihu.hos.resource.model.RsAppResourceDetail;
import com.yihu.hos.resource.model.RsResource;
import com.yihu.hos.resource.model.RsResourceDataset;

hos-admin/src/main/java/com/yihu/hos/resource/service/IStdService.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.service;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.model.adapter.resultModel.AdapterMetadataResultDetailModel;

hos-admin/src/main/java/com/yihu/hos/resource/service/impl/RsCategoryServiceImpl.java

@@ -1,18 +1,16 @@
package com.yihu.hos.resource.service.impl;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.resource.dao.IRsCategoryDao;
import com.yihu.hos.resource.dao.IRsResourceDao;
import com.yihu.hos.resource.model.RsResource;
import com.yihu.hos.resource.model.RsResourceCategory;
import com.yihu.hos.resource.service.IRsCategoryService;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

hos-admin/src/main/java/com/yihu/hos/resource/service/impl/RsDimensionServiceImpl.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.service.impl;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsDemensionCategoryDao;
import com.yihu.hos.resource.dao.IRsDimensionDao;
import com.yihu.hos.resource.dao.IRsResourceDimensionDao;

hos-admin/src/main/java/com/yihu/hos/resource/service/impl/RsResourceRestServiceImpl.java

@@ -1,7 +1,7 @@
package com.yihu.hos.resource.service.impl;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsResourceRestDao;
import com.yihu.hos.resource.dao.IRsResourceRestDetailDao;
import com.yihu.hos.resource.model.RsResourceRest;

hos-admin/src/main/java/com/yihu/hos/resource/service/impl/RsResourceServiceImpl.java

@@ -1,11 +1,5 @@
package com.yihu.hos.resource.service.impl;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.model.TreeResult;
import com.yihu.ehr.framework.util.PKUtil;
import com.yihu.ehr.framework.util.httpclient.HttpHelper;
import com.yihu.hos.resource.dao.*;
import com.yihu.hos.resource.model.*;
import com.yihu.hos.resource.service.IRsResourceService;
@@ -15,8 +9,11 @@ import com.yihu.hos.resource.viewresult.RsResourceDeatilModel;
import com.yihu.hos.resource.viewresult.RsResourceDimensionModel;
import com.yihu.hos.system.dao.intf.IAppDao;
import com.yihu.hos.system.model.SystemApp;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.model.TreeResult;
import com.yihu.hos.web.framework.util.PKUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -326,13 +323,15 @@ public class RsResourceServiceImpl implements IRsResourceService {
     */
    @Override
    public String searchRomoteResourceList(String code, Map<String, Object> params) throws Exception {
        String result = HttpHelper.getByGateway(code, params).getBody();
        JSONObject jsonobject = JSONObject.fromObject(result);
        Object response_params = jsonobject.get("responseResult");
        if (response_params.equals("null")) {
            return "";
        }
        return (String) response_params;
//        String result = HttpHelper.getByGateway(code, params).getBody();
        return ""; //TODO: Use jackson
//        JSONObject jsonobject = JSONObject.fromObject(result);
//        Object response_params = jsonobject.get("responseResult");
//        if (response_params.equals("null")) {
//            return "";
//        }
//        return (String) response_params;
    }
    @Override
@@ -352,10 +351,12 @@ public class RsResourceServiceImpl implements IRsResourceService {
        } else {
            RsResourceDataset rd = resourceDatasetDao.getEntity(RsResourceDataset.class, (String) params.get("datasetId"));
            List list = new ArrayList();
            JSONObject jo = JSONObject.fromObject(rd);
            jo.put("checked", "true");
            list.add(jo);
            re.setDetailModelList(list);
            //TODO: Use jackson
//            JSONObject jo = JSONObject.fromObject(rd);
//            jo.put("checked", "true");
//            list.add(jo);
//            re.setDetailModelList(list);
        }
        return re;
    }
@@ -379,35 +380,37 @@ public class RsResourceServiceImpl implements IRsResourceService {
        params.put("code", dataset.getCode());
        Map<String, Object> paramsTemp = new HashMap<String, Object>();
        paramsTemp.put("condition", JSONObject.fromObject(params).toString());
        List responseParasm = stdService.metadatasAllVersionList(params);
        JSONArray array = JSONArray.fromObject(responseParasm);
        if (array.size() == 0) {
            throw new Exception("该数据集没有数据元");
        }
        //保存数据集
        //保存数据元
        for (int i = 0; i < array.size(); i++) {
            JSONObject jsonObject = array.getJSONObject(i);
            RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
            rsResourceMetadata.setDatasetId(dataSetId);
            rsResourceMetadata.setCode((String) jsonObject.get("code"));
            rsResourceMetadata.setDeCode((String) jsonObject.get("deCode"));
            rsResourceMetadata.setResourceId(reourceId);
            rsResourceMetadata.setName((String) jsonObject.get("name"));
            rsResourceMetadata.setType((String) jsonObject.get("type"));
            rsResourceMetadata.setFormat((String) jsonObject.get("format"));
            rsResourceMetadata.setDictId((Integer) jsonObject.get("dictId"));
            rsResourceMetadata.setDefinition((String) jsonObject.get("definition"));
            rsResourceMetadata.setNullable((Integer) jsonObject.get("nullable"));
            rsResourceMetadata.setColumnLength((String) jsonObject.get("columnLength"));
            rsResourceMetadata.setColumnType((String) jsonObject.get("columnType"));
            rsResourceMetadata.setColumnName((String) jsonObject.get("columnName"));
            rsResourceMetadata.setPrimaryKey((Integer) jsonObject.get("primaryKey"));
            rsResourceMetadata.setDataSupportType(1);
            resourceMetadataDao.saveEntity(rsResourceMetadata);
        }
        //TODO: Use jackson
//        paramsTemp.put("condition", JSONObject.fromObject(params).toString());
//
//        List responseParasm = stdService.metadatasAllVersionList(params);
//        JSONArray array = JSONArray.fromObject(responseParasm);
//        if (array.size() == 0) {
//            throw new Exception("该数据集没有数据元");
//        }
//        //保存数据集
//        //保存数据元
//        for (int i = 0; i < array.size(); i++) {
//            JSONObject jsonObject = array.getJSONObject(i);
//            RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
//            rsResourceMetadata.setDatasetId(dataSetId);
//            rsResourceMetadata.setCode((String) jsonObject.get("code"));
//            rsResourceMetadata.setDeCode((String) jsonObject.get("deCode"));
//            rsResourceMetadata.setResourceId(reourceId);
//            rsResourceMetadata.setName((String) jsonObject.get("name"));
//            rsResourceMetadata.setType((String) jsonObject.get("type"));
//            rsResourceMetadata.setFormat((String) jsonObject.get("format"));
//            rsResourceMetadata.setDictId((Integer) jsonObject.get("dictId"));
//            rsResourceMetadata.setDefinition((String) jsonObject.get("definition"));
//            rsResourceMetadata.setNullable((Integer) jsonObject.get("nullable"));
//            rsResourceMetadata.setColumnLength((String) jsonObject.get("columnLength"));
//            rsResourceMetadata.setColumnType((String) jsonObject.get("columnType"));
//            rsResourceMetadata.setColumnName((String) jsonObject.get("columnName"));
//            rsResourceMetadata.setPrimaryKey((Integer) jsonObject.get("primaryKey"));
//            rsResourceMetadata.setDataSupportType(1);
//            resourceMetadataDao.saveEntity(rsResourceMetadata);
//        }
        return Result.success("导入成功");
    }
@@ -464,18 +467,20 @@ public class RsResourceServiceImpl implements IRsResourceService {
        //得到所有的数据元
        List responseParasm = stdService.metadatasAllVersionList(params);
        JSONArray jr = JSONArray.fromObject(responseParasm);
        if (!StringUtils.isEmpty(datasetId)) {
            List<RsResourceMetadata> md = resourceMetadataDao.getMetadataByLocalDatssetId(datasetId);
            for (int i = 0; i < JSONArray.fromObject(responseParasm).size(); i++) {
                for (int j = 0; j < md.size(); j++) {
                    if (JSONArray.fromObject(responseParasm).getJSONObject(i).get("code").equals(md.get(j).getCode())) {
                        jr.getJSONObject(i).put("checked", "true");
                    }
                }
            }
        }
        r.setDetailModelList(jr);
        //TODO: Use jackson
//        JSONArray jr = JSONArray.fromObject(responseParasm);
//        if (!StringUtils.isEmpty(datasetId)) {
//            List<RsResourceMetadata> md = resourceMetadataDao.getMetadataByLocalDatssetId(datasetId);
//            for (int i = 0; i < JSONArray.fromObject(responseParasm).size(); i++) {
//                for (int j = 0; j < md.size(); j++) {
//                    if (JSONArray.fromObject(responseParasm).getJSONObject(i).get("code").equals(md.get(j).getCode())) {
//                        jr.getJSONObject(i).put("checked", "true");
//                    }
//                }
//            }
//        }
//        r.setDetailModelList(jr);
        return r;
    }
@@ -486,36 +491,40 @@ public class RsResourceServiceImpl implements IRsResourceService {
            //第一次导入
            String datasetID = PKUtil.getUuid();//得到ID
            RsResourceDataset rsResourceDataset = new RsResourceDataset();
            org.apache.commons.beanutils.BeanUtils.populate(rsResourceDataset, JSONObject.fromObject(dataset));
            rsResourceDataset.setId(datasetID);
            resourceDatasetDao.saveEntity(rsResourceDataset);
            JSONArray array = JSONArray.fromObject(metaData);
            if (array.size() == 0) {
                throw new Exception("该数据集没有数据元");
            }
            for (int i = 0; i < array.size(); i++) {
                JSONObject jsonObject = array.getJSONObject(i);
                RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
                org.apache.commons.beanutils.BeanUtils.populate(rsResourceMetadata, jsonObject);
                rsResourceMetadata.setDataSupportType(1);
                rsResourceMetadata.setDatasetId(datasetID);
                rsResourceMetadata.setResourceId(reourceId);
                resourceMetadataDao.saveEntity(rsResourceMetadata);
            }
            //TODO: Use jackson
//            org.apache.commons.beanutils.BeanUtils.populate(rsResourceDataset, JSONObject.fromObject(dataset));
//            rsResourceDataset.setId(datasetID);
//            resourceDatasetDao.saveEntity(rsResourceDataset);
//            JSONArray array = JSONArray.fromObject(metaData);
//            if (array.size() == 0) {
//                throw new Exception("该数据集没有数据元");
//            }
//            for (int i = 0; i < array.size(); i++) {
//                JSONObject jsonObject = array.getJSONObject(i);
//                RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
//                org.apache.commons.beanutils.BeanUtils.populate(rsResourceMetadata, jsonObject);
//                rsResourceMetadata.setDataSupportType(1);
//                rsResourceMetadata.setDatasetId(datasetID);
//                rsResourceMetadata.setResourceId(reourceId);
//                resourceMetadataDao.saveEntity(rsResourceMetadata);
//            }
            resource.setDatasetCode(datasetID);
        } else {
            //修改
            resourceMetadataDao.deleteLogicDataSupportMetaDataByLocalDataSetId(datasetId);
            JSONArray array = JSONArray.fromObject(metaData);
            for (int i = 0; i < array.size(); i++) {
                JSONObject jsonObject = array.getJSONObject(i);
                RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
                org.apache.commons.beanutils.BeanUtils.populate(rsResourceMetadata, jsonObject);
                rsResourceMetadata.setDataSupportType(1);
                rsResourceMetadata.setResourceId(reourceId);
                rsResourceMetadata.setDatasetId(resource.getDatasetCode());
                resourceMetadataDao.saveEntity(rsResourceMetadata);
            }
            //TODO: Use jackson
//            JSONArray array = JSONArray.fromObject(metaData);
//            for (int i = 0; i < array.size(); i++) {
//                JSONObject jsonObject = array.getJSONObject(i);
//                RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
//                org.apache.commons.beanutils.BeanUtils.populate(rsResourceMetadata, jsonObject);
//                rsResourceMetadata.setDataSupportType(1);
//                rsResourceMetadata.setResourceId(reourceId);
//                rsResourceMetadata.setDatasetId(resource.getDatasetCode());
//                resourceMetadataDao.saveEntity(rsResourceMetadata);
//            }
        }
        return Result.success("导入成功");
    }

hos-admin/src/main/java/com/yihu/hos/resource/service/impl/StdService.java

@@ -1,9 +1,6 @@
package com.yihu.hos.resource.service.impl;
import com.yihu.hos.common.Services;
import com.yihu.ehr.framework.model.DictItem;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
@@ -18,10 +15,10 @@ import com.yihu.hos.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.standard.service.standard.StdDatasetService;
import com.yihu.hos.standard.service.standard.StdMetadataService;
import com.yihu.hos.web.framework.model.DictionaryResult;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -69,7 +66,9 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("adapterDatasetId", adapterDatasetId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        return datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        return null; //TODO: Use jackson
        //return datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
    }
@@ -79,7 +78,9 @@ public class StdService implements IStdService {
    public List<AdapterMetadataResultDetailModel> getDatacolByScheme(String schemeVersion, String datasetId) throws Exception {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("adapterDatasetId", datasetId);
        return metadataService.getInfoList(schemeVersion, net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        return null; //TODO: Use jackson
//        return metadataService.getInfoList(schemeVersion, net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
    }
    /**
@@ -89,7 +90,9 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDictId", dictId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        return dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        return null; //TODO: Use jackson
//        return dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
    }
    /**
@@ -100,22 +103,24 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDictId", dictId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        List<AdapterDictEntryModel> dictentryList = dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        List<DictItem> list = new ArrayList<>();
        if (!CollectionUtil.isEmpty(dictentryList)) {
            for (AdapterDictEntryModel adapterDictEntryModel : dictentryList) {
                String code = adapterDictEntryModel.getAdapterEntryCode();
                if (code != null) {
                    DictItem dict = new DictItem();
                    dict.setCode(code);
                    dict.setValue(adapterDictEntryModel.getAdapterEntryValue());
                    list.add(dict);
                }
            }
        }
        re.setDetailModelList(list);
        //TODO: Use jackson
//        List<AdapterDictEntryModel> dictentryList = dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
//
//
//        List<DictItem> list = new ArrayList<>();
//        if (!CollectionUtil.isEmpty(dictentryList)) {
//            for (AdapterDictEntryModel adapterDictEntryModel : dictentryList) {
//                String code = adapterDictEntryModel.getAdapterEntryCode();
//                if (code != null) {
//                    DictItem dict = new DictItem();
//                    dict.setCode(code);
//                    dict.setValue(adapterDictEntryModel.getAdapterEntryValue());
//                    list.add(dict);
//                }
//            }
//        }
//        re.setDetailModelList(list);
        return re;
    }
@@ -130,13 +135,15 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDatasetCode", stdDatasetCode);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        List<AdapterDatasetModel> list = datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        if (list != null && list.size() > 0) {
            return list.get(0);
        } else {
            return null;
        }
        return null; //TODO: Use jackson
//        List<AdapterDatasetModel> list = datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
//
//        if (list != null && list.size() > 0) {
//            return list.get(0);
//        } else {
//            return null;
//        }
    }
    /******************************** 标准版本 *****************************************************/
@@ -155,7 +162,8 @@ public class StdService implements IStdService {
     * @throws Exception
     */
    public List<StdMetaDataModel> metadatasAllVersionList(Map<String, Object> params) {
        return stdMetadataService.getAllVersionMetadataList(net.sf.json.JSONObject.fromObject(params).toString());
        return null; //TODO: Use jackson
//        return stdMetadataService.getAllVersionMetadataList(net.sf.json.JSONObject.fromObject(params).toString());
    }
    /**

hos-admin/src/main/java/com/yihu/hos/resource/viewresult/RsResourceFieldDetailModel.java

@@ -1,7 +1,5 @@
package com.yihu.hos.resource.viewresult;
import org.apache.axis2.databinding.types.soapencoding.Integer;
/**
 * Created by chenweida on 2015/12/26.
 */

hos-admin/src/main/java/com/yihu/hos/service/ArchiveUploadJob.java

@@ -4,9 +4,9 @@ import com.yihu.hos.common.Services;
import com.yihu.hos.crawler.service.CrawlerManager;
import com.yihu.hos.datacollect.model.RsJobConfig;
import com.yihu.hos.datacollect.service.intf.IDatacollectManager;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.util.DateUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.core.datatype.DateUtil;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

hos-admin/src/main/java/com/yihu/hos/service/CrawlerFlowUploadJob.java

@@ -4,9 +4,9 @@ import com.yihu.hos.common.Services;
import com.yihu.hos.crawler.service.CrawlerFlowManager;
import com.yihu.hos.datacollect.model.RsJobConfig;
import com.yihu.hos.datacollect.service.intf.IDatacollectManager;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.util.DateUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.core.datatype.DateUtil;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

hos-admin/src/main/java/com/yihu/hos/service/DatacollectJob.java

@@ -1,12 +1,10 @@
package com.yihu.hos.service;
import com.yihu.hos.common.Services;
import com.yihu.hos.datacollect.service.intf.IDatacollectManager;
import com.yihu.hos.datacollect.service.intf.IDatacollectService;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.web.framework.constrant.DateConvert;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import javax.annotation.Resource;
import java.util.Date;
/**

hos-admin/src/main/java/com/yihu/hos/service/TestJob.java

@@ -2,7 +2,7 @@ package com.yihu.hos.service;
import com.yihu.hos.common.Services;
import com.yihu.hos.datacollect.service.intf.IDatacollectService;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.hos.web.framework.constrant.DateConvert;
import javax.annotation.Resource;
import java.util.Date;

hos-admin/src/main/java/com/yihu/hos/services/ServiceFlowEventService.java

@@ -3,22 +3,18 @@ package com.yihu.hos.services;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jms.core.JmsMessagingTemplate;
import org.springframework.stereotype.Component;
import javax.jms.Queue;
/**
 * @created Airhead 2016/8/2.
 */
@Component
public class ServiceFlowEventService {
    @Autowired
    private JmsMessagingTemplate jmsMessagingTemplate;
    @Autowired
    private Queue queue;
//    @Autowired
//    private JmsMessagingTemplate jmsMessagingTemplate;
//
//    @Autowired
//    private Queue queue;
    /**
     * 当外界组件通知一个新的processor处理器被定义时，该事件被触发。

hos-admin/src/main/java/com/yihu/hos/standard/controller/AdapterDatasetController.java

@@ -1,8 +1,8 @@
package com.yihu.hos.standard.controller;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.adapter.AdapterDatasetService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

hos-admin/src/main/java/com/yihu/hos/standard/controller/AdapterDictController.java

@@ -1,8 +1,8 @@
package com.yihu.hos.standard.controller;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.adapter.AdapterDictService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

hos-admin/src/main/java/com/yihu/hos/standard/controller/AdapterDictEntryController.java

@@ -1,8 +1,8 @@
package com.yihu.hos.standard.controller;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.adapter.AdapterDictEntryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

hos-admin/src/main/java/com/yihu/hos/standard/controller/AdapterMetadataController.java

@@ -1,8 +1,8 @@
package com.yihu.hos.standard.controller;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.adapter.AdapterMetadataService;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import io.swagger.annotations.Api;

hos-admin/src/main/java/com/yihu/hos/standard/controller/AdapterPlanController.java

@@ -1,6 +1,6 @@
package com.yihu.hos.standard.controller;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;

hos-admin/src/main/java/com/yihu/hos/standard/controller/IntegrationController.java

@@ -1,6 +1,6 @@
package com.yihu.hos.standard.controller;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;

hos-admin/src/main/java/com/yihu/hos/standard/controller/PublisherController.java

@@ -1,10 +1,9 @@
package com.yihu.hos.standard.controller;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.standard.StdPublisherService;
import com.yihu.hos.system.model.SystemOrganization;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

hos-admin/src/main/java/com/yihu/hos/standard/controller/SchemeController.java

@@ -1,8 +1,8 @@
package com.yihu.hos.standard.controller;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.adapter.AdapterSchemeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

hos-admin/src/main/java/com/yihu/hos/standard/controller/SchemeVersionController.java

@@ -1,10 +1,10 @@
package com.yihu.hos.standard.controller;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.model.TreeResult;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.model.TreeResult;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.adapter.AdapterSchemeVersionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;