Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

Hos-Framework/Hos-Framework.iml

@@ -9,93 +9,181 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Maven: joda-time:joda-time:2.5" level="project" />
    <orderEntry type="library" name="Maven: org.csource:fastdfs-client-java:1.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-jdbc:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-common:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-shims:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
    <orderEntry type="library" name="Maven: log4j:apache-log4j-extras:1.2.17" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.4.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.1" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-service:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-metastore:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: net.sf.jpam:jpam:1.1" level="project" />
    <orderEntry type="library" name="Maven: org.eclipse.jetty.aggregate:jetty-all:7.6.0.v20120127" level="project" />
    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jaspic_1.0_spec:1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: asm:asm-commons:3.1" level="project" />
    <orderEntry type="library" name="Maven: asm:asm-tree:3.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.thrift:libfb303:0.9.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.thrift:libthrift:0.9.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.7.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-serde:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.avro:avro:1.7.4" level="project" />
    <orderEntry type="library" name="Maven: net.sf.opencsv:opencsv:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.twitter:parquet-hadoop-bundle:1.6.0" level="project" />
    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.8.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.derby:derby:10.10.2.0" level="project" />
    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-api-jdo:3.2.6" level="project" />
    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-core:3.2.10" level="project" />
    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-rdbms:3.2.9" level="project" />
    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
    <orderEntry type="library" name="Maven: javax.jdo:jdo-api:3.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive.shims:hive-shims-common:1.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hive.shims:hive-shims-0.20S:1.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hive.shims:hive-shims-0.23:1.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-annotations:2.7.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.inject.extensions:guice-servlet:3.0" level="project" />
    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.9" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-guice:1.9" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-yarn-common:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-yarn-api:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.2" level="project" />
    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.9" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.9" level="project" />
    <orderEntry type="library" name="Maven: org.mortbay.jetty:jetty-util:6.1.26" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-common:2.6.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.fusesource.leveldbjni:leveldbjni-all:1.8" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.6.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-web-proxy:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.mortbay.jetty:jetty:6.1.26" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hive.shims:hive-shims-scheduler:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.7.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-common:2.7.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.1.1" level="project" />
    <orderEntry type="library" name="Maven: xmlenc:xmlenc:0.52" level="project" />
    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet.jsp:jsp-api:2.1" level="project" />
    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
    <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
    <orderEntry type="library" name="Maven: net.java.dev.jets3t:jets3t:0.9.0" level="project" />
    <orderEntry type="library" name="Maven: com.jamesmurty.utils:java-xmlbuilder:0.4" level="project" />
    <orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.3" level="project" />
    <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.0.4.1" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-auth:2.7.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15" level="project" />
    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-i18n:2.0.0-M15" level="project" />
    <orderEntry type="library" name="Maven: org.apache.directory.api:api-asn1-api:1.0.0-M20" level="project" />
    <orderEntry type="library" name="Maven: org.apache.directory.api:api-util:1.0.0-M20" level="project" />
    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.42" level="project" />
    <orderEntry type="library" name="Maven: org.tukaani:xz:1.0" level="project" />
    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-hdfs:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: commons-daemon:commons-daemon:1.0.13" level="project" />
    <orderEntry type="library" name="Maven: tomcat:jasper-runtime:5.5.23" level="project" />
    <orderEntry type="library" name="Maven: commons-el:commons-el:1.0" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty:3.6.2.Final" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-client:1.0.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-annotations:1.0.1.1" level="project" />
    <orderEntry type="library" name="Maven: com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-common:1.0.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-protocol:1.0.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.jruby.jcodings:jcodings:1.0.8" level="project" />
    <orderEntry type="library" name="Maven: org.jruby.joni:joni:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-mapreduce-client-core:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.solr:solr-solrj:5.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.3" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:ansj_seg:2.0.8" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:ansj-plugin:2.0.2" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:apache-lucene:4.8.0" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:lucene-analyzers:4.10.4" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:nlpcn-lang:1.0" level="project" />
    <orderEntry type="library" name="Maven: basic.java:ktool:1.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:httpcore:4.4.3" level="project" />
    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" 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.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: dom4j:dom4j:1.6.1" 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.jboss:jandex:1.1.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.1.8.RELEASE" level="project" />
    <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.springframework.security:spring-security-acl:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-aspects:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-cas:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.jasig.cas.client:cas-client-core:3.3.3" level="project" />
    <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: org.slf4j:slf4j-api:1.7.12" 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:2.5" 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" />
    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xerces:xercesImpl:2.10.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan:xalan:2.7.1" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
    <orderEntry type="library" name="Maven: velocity:velocity:1.5" level="project" />
    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.0GA" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan:xalan:2.7.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan:serializer:2.7.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:4.0.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-ldap:4.0.2.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.0.2.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.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" />
    <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: com.fasterxml.jackson.core:jackson-annotations:2.4.6" 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: com.google.guava:guava:16.0" 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: com.fasterxml:classmate:1.2.0" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.7" 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.17.0.RELEASE" 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.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" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.4.6" 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" />
@@ -107,20 +195,19 @@
    <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.axis2:axis2-kernel: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: jaxen:jaxen:1.1.6" 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" scope="RUNTIME" 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: 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-fileupload:commons-fileupload:1.3.1" level="project" />
    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ws.commons.schema:XmlSchema:1.4.7" level="project" />
    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.2" level="project" />
@@ -132,26 +219,28 @@
    <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.12" 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: 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.37" 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" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.7" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" 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" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-api:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.0" level="project" />
    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" 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" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-api:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: com.github.spullara.mustache.java:compiler:0.8.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-jsp:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-servlet:3.0.5" level="project" />
@@ -174,30 +263,43 @@
    <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: net.sf.ezmorph:ezmorph:1.0.6" 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" />
    <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" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" 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: org.apache.commons:commons-lang3:3.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.csource:fastdfs-client-java:1.0.0" 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.4" level="project" />
    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" 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:20151123" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" 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.hamcrest:hamcrest-core:1.3" 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.18.1-GA" level="project" />
    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0.2" 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" />
@@ -209,121 +311,18 @@
    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.6.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.ehr.commons:commons-db:0.0.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.yihu.common:common:1.0.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-jdbc:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-common:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-shims:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
    <orderEntry type="library" name="Maven: log4j:apache-log4j-extras:1.2.17" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.4.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.1" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-service:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-metastore:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: net.sf.jpam:jpam:1.1" level="project" />
    <orderEntry type="library" name="Maven: org.eclipse.jetty.aggregate:jetty-all:7.6.0.v20120127" level="project" />
    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jaspic_1.0_spec:1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: asm:asm-commons:3.1" level="project" />
    <orderEntry type="library" name="Maven: asm:asm-tree:3.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.thrift:libfb303:0.9.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.thrift:libthrift:0.9.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.7.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive:hive-serde:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.avro:avro:1.7.4" level="project" />
    <orderEntry type="library" name="Maven: net.sf.opencsv:opencsv:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.twitter:parquet-hadoop-bundle:1.6.0" level="project" />
    <orderEntry type="library" name="Maven: com.jolbox:bonecp:0.8.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.derby:derby:10.10.2.0" level="project" />
    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-api-jdo:3.2.6" level="project" />
    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-core:3.2.10" level="project" />
    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-rdbms:3.2.9" level="project" />
    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
    <orderEntry type="library" name="Maven: javax.jdo:jdo-api:3.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hive.shims:hive-shims-common:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hive.shims:hive-shims-0.20S:1.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hive.shims:hive-shims-0.23:1.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-annotations:2.7.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.inject.extensions:guice-servlet:3.0" level="project" />
    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.9" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-guice:1.9" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-yarn-common:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-yarn-api:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.2" level="project" />
    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.9" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.9" level="project" />
    <orderEntry type="library" name="Maven: org.mortbay.jetty:jetty-util:6.1.26" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-common:2.6.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.fusesource.leveldbjni:leveldbjni-all:1.8" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.6.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-web-proxy:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.mortbay.jetty:jetty:6.1.26" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hive.shims:hive-shims-scheduler:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.7.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-common:2.7.1" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:core-rpc:2.2.0" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.5" level="project" />
    <orderEntry type="module-library">
      <library name="Maven: jdk.tools:jdk.tools:1.8">
      <library>
        <CLASSES>
          <root url="jar://C:/Program Files/Java/jdk1.8.0_31/lib/tools.jar!/" />
          <root url="file://$MAVEN_REPOSITORY$/org/yihu/common/common/1.0.0-SNAPSHOT" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
        <jarDirectory url="file://$MAVEN_REPOSITORY$/org/yihu/common/common/1.0.0-SNAPSHOT" recursive="false" />
      </library>
    </orderEntry>
    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.1.1" level="project" />
    <orderEntry type="library" name="Maven: xmlenc:xmlenc:0.52" level="project" />
    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet.jsp:jsp-api:2.1" level="project" />
    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
    <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
    <orderEntry type="library" name="Maven: net.java.dev.jets3t:jets3t:0.9.0" level="project" />
    <orderEntry type="library" name="Maven: com.jamesmurty.utils:java-xmlbuilder:0.4" level="project" />
    <orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.3" level="project" />
    <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.0.4.1" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-auth:2.7.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15" level="project" />
    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-i18n:2.0.0-M15" level="project" />
    <orderEntry type="library" name="Maven: org.apache.directory.api:api-asn1-api:1.0.0-M20" level="project" />
    <orderEntry type="library" name="Maven: org.apache.directory.api:api-util:1.0.0-M20" level="project" />
    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.42" level="project" />
    <orderEntry type="library" name="Maven: org.tukaani:xz:1.0" level="project" />
    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" level="project" />
    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-hdfs:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: commons-daemon:commons-daemon:1.0.13" level="project" />
    <orderEntry type="library" name="Maven: tomcat:jasper-runtime:5.5.23" level="project" />
    <orderEntry type="library" name="Maven: commons-el:commons-el:1.0" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty:3.6.2.Final" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-client:1.0.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-annotations:1.0.1.1" level="project" />
    <orderEntry type="library" name="Maven: com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-common:1.0.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-protocol:1.0.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.jruby.jcodings:jcodings:1.0.8" level="project" />
    <orderEntry type="library" name="Maven: org.jruby.joni:joni:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-mapreduce-client-core:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.solr:solr-solrj:5.2.1" level="project" />
    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.3" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:ansj_seg:2.0.8" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:ansj-plugin:2.0.2" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:apache-lucene:4.8.0" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:lucene-analyzers:4.10.4" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:nlpcn-lang:1.0" level="project" />
    <orderEntry type="library" name="Maven: basic.java:ktool:1.0" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:core-rpc:2.2.0" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.5" level="project" />
  </component>
  <component name="org.twodividedbyzero.idea.findbugs">
    <option name="_basePreferences">

Hos-Framework/pom.xml

@@ -501,7 +501,7 @@
        <dependency>
            <groupId>org.csource</groupId>
            <artifactId>fastdfs-client-java</artifactId>
            <version>1.0.0</version>
            <version>1.0</version>
        </dependency>
        <!--=============fastdfs end =============-->
        <!--=============javamail start =============-->

Hos-Framework/src/main/java/com/yihu/ehr/framework/util/file/ConfigureUtil.java

@@ -0,0 +1,36 @@
package com.yihu.ehr.framework.util.file;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.EncodedResource;
import org.springframework.core.io.support.PropertiesLoaderUtils;
import java.io.IOException;
import java.util.Properties;
/**
 *  获取配置文件内容滚工具类
 */
public class ConfigureUtil {
    /**
     * 获取.propertiest文件属性值
     * @param filePath  文件路径
     * @param key        属性名：key
     * @return value     属性值：value
     */
    public static String getProValue(String filePath, String key) {
        Resource resource = null;
        Properties props = null;
        String value = null;
        try {
            resource = new ClassPathResource(filePath);
            EncodedResource encRes = new EncodedResource(resource,"UTF-8");
            props = PropertiesLoaderUtils.loadProperties(encRes);
            value= (String) props.get(key);
        } catch (IOException e) {
            e.printStackTrace();
        }
        return value;
    }
}

Hos-resource/src/main/java/com/yihu/ehr/crawler/format/DataSetTransformer.java

@@ -4,8 +4,6 @@ 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.common.util.log.BusinessLogger;
import com.yihu.common.util.log.DebugLogger;
import com.yihu.ehr.crawler.model.adapter.AdapterDict;
import com.yihu.ehr.crawler.model.adapter.AdapterMetaData;
import com.yihu.ehr.crawler.model.config.SysConfig;
@@ -83,7 +81,7 @@ public class DataSetTransformer implements IDataTransformer {
            ObjectMapper objectMapper = new ObjectMapper();
            jsonObject = objectMapper.readValue(data, ObjectNode.class);
        } catch (IOException e) {
            DebugLogger.fatal("", e);
            //DebugLogger.fatal("", e);
        }
        setPatient();
@@ -145,7 +143,7 @@ public class DataSetTransformer implements IDataTransformer {
    public String transferElem(String dataSetCode, String code, String data) {
        AdapterMetaData adapterMetaData = adapterScheme.getAdapterMetaData(dataSetCode, code);
        if (adapterMetaData == null) {
            BusinessLogger.fatal("获取数据元适配错误，数据集编码：" + dataSetCode + "数据元编码：" + code);
            //BusinessLogger.fatal("获取数据元适配错误，数据集编码：" + dataSetCode + "数据元编码：" + code);
            return Constants.EMPTY;
        }
@@ -155,7 +153,7 @@ public class DataSetTransformer implements IDataTransformer {
            MetaDataVerify metaDataVerify = new MetaDataVerify(metaData, data);
            boolean check = metaDataVerify.check();
            if (!check) {
                BusinessLogger.fatal("保存:数据元校验错误." + metaDataVerify.getErrorInfo());
                //BusinessLogger.fatal("保存:数据元校验错误." + metaDataVerify.getErrorInfo());
                return Constants.EMPTY;    //未校验成功数据,清空
            }

Hos-resource/src/main/java/com/yihu/ehr/crawler/format/DocumentTransformer.java

@@ -2,7 +2,6 @@ package com.yihu.ehr.crawler.format;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.common.util.log.DebugLogger;
import com.yihu.ehr.crawler.model.patient.Patient;
import com.yihu.ehr.crawler.model.transform.TransformType;
@@ -50,7 +49,7 @@ public class DocumentTransformer implements IDataTransformer  {
            ObjectMapper objectMapper = new ObjectMapper();
            jsonObject = objectMapper.readValue(data, ObjectNode.class);
        } catch (IOException e) {
            DebugLogger.fatal("", e);
            //DebugLogger.fatal("", e);
        }
    }

Hos-resource/src/main/java/com/yihu/ehr/crawler/model/patient/PatientCDAUpload.java

@@ -2,10 +2,6 @@ package com.yihu.ehr.crawler.model.patient;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.common.constant.LogAttribute;
import com.yihu.common.util.log.BusinessLogger;
import com.yihu.common.util.log.DebugLogger;
import com.yihu.common.util.operator.ConfigureUtil;
import com.yihu.ehr.crawler.model.config.SysConfig;
import com.yihu.ehr.crawler.service.PatientCDAIndex;
import com.yihu.ehr.framework.util.compress.Zipper;
@@ -45,20 +41,20 @@ public class PatientCDAUpload {
        ZipFile zipFile = zip(patient);
        try {
            if (zipFile == null || zipFile.file == null) {
                BusinessLogger.fatal( "压缩病人档案失败,病人文档未生成,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.FAIL, patient.getJobTimeStamp());
                //BusinessLogger.fatal( "压缩病人档案失败,病人文档未生成,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.FAIL, patient.getJobTimeStamp());
                return false;
            }
            boolean result = upload(patient, zipFile,token);
            if (!result) {
                BusinessLogger.fatal("上传病人档案失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                //BusinessLogger.fatal("上传病人档案失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                FileUtil.deleteDirectory(new File(zipFile.directory));
                return false;
            }
            DebugLogger.trace(zipFile.directory);
            //DebugLogger.trace(zipFile.directory);
            result = FileUtil.deleteDirectory(new File(zipFile.directory));
            if (!result) {
                BusinessLogger.fatal("删除临时文件失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                //BusinessLogger.fatal("删除临时文件失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
            }
        } catch (Exception e) {
            FileUtil.deleteDirectory(new File(zipFile.directory));
@@ -80,7 +76,7 @@ public class PatientCDAUpload {
            String pwd = uuidPwd.toString();
            Key key = RSA.genPublicKey(SysConfig.getInstance().getPublicKey());
            if (key == null) {
                BusinessLogger.fatal("压缩文件错误,无公钥信息.");
                //BusinessLogger.fatal("压缩文件错误,无公钥信息.");
                FileUtil.deleteDirectory(new File( patientCDAIndex.getDirectory()));
                return null;
            }
@@ -96,7 +92,7 @@ public class PatientCDAUpload {
            return zipFile;
        } catch (Exception e) {
            e.printStackTrace();
            DebugLogger.fatal("从data目录生成zip数据时，压缩文件异常", e);
            //DebugLogger.fatal("从data目录生成zip数据时，压缩文件异常", e);
        }
        return null;
@@ -115,12 +111,12 @@ public class PatientCDAUpload {
            header.put("Authorization", "Basic " + HttpHelper.clientKey);
            HttpResponse response = HttpHelper.postFile(uploadMethod, formParams, zipFile.file.getAbsolutePath(), header);
            if (response == null) {
                BusinessLogger.fatal( "上传病人档案请求失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.FAIL, patient.getJobTimeStamp());
                //BusinessLogger.fatal( "上传病人档案请求失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.FAIL, patient.getJobTimeStamp());
                return false;
            }
            if (response.getStatusCode() != 200) {
                BusinessLogger.fatal( "上传病人档案请求失败,错误代码:" + response.getStatusCode() + ",patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.FAIL, patient.getJobTimeStamp());
                //BusinessLogger.fatal( "上传病人档案请求失败,错误代码:" + response.getStatusCode() + ",patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.FAIL, patient.getJobTimeStamp());
                return false;
            }
@@ -129,16 +125,16 @@ public class PatientCDAUpload {
            JsonNode codeNode = rootNode.get("code");
            String result = codeNode.asText();
            if (!result.equals("0")) {
                BusinessLogger.fatal("上传病人档案失败,错误代码:" + result + ",patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.FAIL, patient.getJobTimeStamp());
                //BusinessLogger.fatal("上传病人档案失败,错误代码:" + result + ",patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.FAIL, patient.getJobTimeStamp());
                return false;
            } else {
                BusinessLogger.info( "上传病人档案成功,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.SUCCESS, patient.getJobTimeStamp());
                //BusinessLogger.info( "上传病人档案成功,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.SUCCESS, patient.getJobTimeStamp());
                return true;
            }
        } catch (Exception e) {
            e.printStackTrace();
            BusinessLogger.fatal( "上传病人档案异常,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.FAIL, patient.getJobTimeStamp());
            //BusinessLogger.fatal( "上传病人档案异常,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(), LogAttribute.FAIL, patient.getJobTimeStamp());
            return false;
        }
    }

Hos-resource/src/main/java/com/yihu/ehr/crawler/origin/FileSystemOrigin.java

@@ -20,7 +20,6 @@ import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.ehr.system.model.SystemDatasource;
import com.yihu.ehr.system.model.SystemOrganization;
import com.yihu.ehr.system.service.OrganizationManager;
import com.yihu.ehr.system.service.SystemManager;
import java.io.IOException;
import java.sql.SQLException;

Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerService.java

@@ -358,7 +358,7 @@ public class CrawlerService {
     */
    public List<MappingMetadata> getMappingMetaDatasByDataset(String adapterVersion, Integer dataSetId) {
        List<AdapterMetadataModel> adapterMetadataModels = adapterMetadataService.getAdapterMetadataByDataset(adapterVersion, dataSetId);
        AdapterDatasetModel  adapterDatasetModel= adapterMetadataService.getAdapterMetadata(adapterVersion, dataSetId);
        AdapterDatasetModel  adapterDatasetModel= adapterMetadataService.getAdapterDataset(adapterVersion, dataSetId);
        List<MappingMetadata> resultList = new ArrayList<>();
        if (adapterMetadataModels != null && adapterMetadataModels.size() > 0) {
            for (AdapterMetadataModel metadataModel : adapterMetadataModels) {

Hos-resource/src/main/java/com/yihu/ehr/crawler/storage/DocumentStorage.java

@@ -8,7 +8,7 @@ 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.common.util.log.DebugLogger;
import com.yihu.ehr.common.mongo.MongoDB;
import com.yihu.ehr.crawler.format.IDataTransformer;
import com.yihu.ehr.crawler.model.config.SysConfig;
@@ -88,7 +88,7 @@ public class DocumentStorage extends MongodbStorage {
                }
            } catch (Exception e) {
                DebugLogger.fatal("保存病人档案信息至MongoDB异常:", e);
                //DebugLogger.fatal("保存病人档案信息至MongoDB异常:", e);
                return false;
            }
@@ -129,12 +129,12 @@ public class DocumentStorage extends MongodbStorage {
                            arrayNode=genunStructureData(jsonNode,patientCDAIndex);
                        } catch (IOException e) {
                            e.printStackTrace();
                            DebugLogger.fatal("存储临时文件失败.");
                            //DebugLogger.fatal("存储临时文件失败.");
                            result = false;
                        }
                    }
                } catch (Exception e) {
                    DebugLogger.fatal("", e);
                    //DebugLogger.fatal("", e);
                    result = false;
                }
            }
@@ -158,7 +158,7 @@ public class DocumentStorage extends MongodbStorage {
            boolean writeFile = FileUtil.writeFile(indexPath, mapper.writeValueAsString(resultNode), "UTF-8");
        } catch (Exception e) {
            DebugLogger.fatal("", e);
            //DebugLogger.fatal("", e);
            result = false;
        }
        return result;
@@ -206,7 +206,7 @@ public class DocumentStorage extends MongodbStorage {
                        byte[]  fileContent = Base64.decode(content);
                        boolean writeFile = FileUtil.writeFile(filePath, fileContent, "UTF-8");
                        if (!writeFile) {
                            DebugLogger.fatal("存储临时文件失败.");
                            //DebugLogger.fatal("存储临时文件失败.");
                        } else {
                            stringBuilder.append(fileName).append(",");
                        }

Hos-resource/src/main/java/com/yihu/ehr/crawler/storage/MongodbStorage.java

@@ -7,8 +7,7 @@ import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.model.IndexOptions;
import com.mongodb.client.model.UpdateOptions;
import com.yihu.common.util.log.DebugLogger;
import com.yihu.common.util.operator.ConfigureUtil;
//import com.yihu.common.util.log.DebugLogger;
import com.yihu.ehr.common.mongo.MongoDB;
import com.yihu.ehr.crawler.format.DataSetTransformer;
import com.yihu.ehr.crawler.format.IDataTransformer;
@@ -18,6 +17,7 @@ import com.yihu.ehr.crawler.model.patient.PatientIdentity;
import com.yihu.ehr.crawler.model.patient.PatientIndex;
import com.yihu.ehr.crawler.format.AdapterScheme;
import com.yihu.ehr.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;
@@ -106,7 +106,7 @@ public class MongodbStorage implements IDataStorage {
                }
            } catch (Exception e) {
                DebugLogger.fatal("保存病人档案信息至MongoDB异常:", e);
                //DebugLogger.fatal("保存病人档案信息至MongoDB异常:", e);
                return false;
            }
@@ -161,17 +161,17 @@ public class MongodbStorage implements IDataStorage {
                                resultDoc.put("expiry_date", resource.get("expiry_date"));
                                boolean writeFile = FileUtil.writeFile(filePath, doc.toJson(), "UTF-8");
                                if (!writeFile) {
                                    DebugLogger.fatal("存储临时文件失败：" + cursor.next().toJson());
                                    //DebugLogger.fatal("存储临时文件失败：" + cursor.next().toJson());
                                    result = false;
                                }
                            }
                        } catch (IOException e) {
                            DebugLogger.fatal("存储临时文件失败.", e);
                            //DebugLogger.fatal("存储临时文件失败.", e);
                            result = false;
                        }
                    }
                } catch (Exception e) {
                    DebugLogger.fatal("", e);
                    //DebugLogger.fatal("", e);
                }
            }
@@ -183,13 +183,13 @@ public class MongodbStorage implements IDataStorage {
                String indexPath = patientCDAIndex.createDataSetIndex("index", PatientCDAIndex.FileType.JSON);
                boolean writeFile = FileUtil.writeFile(indexPath, resultDoc.toJson(), "UTF-8");
                if (!writeFile) {
                    DebugLogger.fatal("存储索引临时文件失败：" + resultDoc.toJson());
                    //DebugLogger.fatal("存储索引临时文件失败：" + resultDoc.toJson());
                    result = false;
                }
            }
        } catch (Exception e) {
            DebugLogger.fatal("", e);
            //DebugLogger.fatal("", e);
            result = false;
        }
@@ -206,7 +206,7 @@ public class MongodbStorage implements IDataStorage {
                return document.toJson();
            }
        } catch (Exception e) {
            DebugLogger.fatal("", e);
            //DebugLogger.fatal("", e);
        }
        return null;
@@ -234,14 +234,14 @@ public class MongodbStorage implements IDataStorage {
            try (MongoCursor<Document> cursor = documents.iterator()) {
                while (cursor.hasNext()) {
                    data = cursor.next().toJson();
                    DebugLogger.fatal("存储临时文 ：" + cursor.next().toJson());
                    //DebugLogger.fatal("存储临时文 ：" + cursor.next().toJson());
                }
            } catch (Exception e) {
                DebugLogger.fatal("", e);
                //DebugLogger.fatal("", e);
            }
        } catch (Exception e) {
            DebugLogger.fatal("", e);
            //DebugLogger.fatal("", e);
        }
        return data;
    }
@@ -267,7 +267,7 @@ public class MongodbStorage implements IDataStorage {
                }
            }
        } catch (Exception e) {
            DebugLogger.fatal("", e);
            //DebugLogger.fatal("", e);
        }
        return false;
@@ -302,7 +302,7 @@ public class MongodbStorage implements IDataStorage {
     * @return
     */
    protected String createUrl(String dataSetCode, String patientId, String eventNo) {
        String requestPath = ConfigureUtil.getProValue("archive.properties","hos.archives.request.url");
        String requestPath = ConfigureUtil.getProValue("archive.properties", "hos.archives.request.url");
        return requestPath + dataSetCode + "/" + patientId + "/" + eventNo;
    }
@@ -393,7 +393,7 @@ public class MongodbStorage implements IDataStorage {
                return result;
            }
        } catch (Exception e) {
            DebugLogger.fatal("", e);
            //DebugLogger.fatal("", e);
        } finally {
            if (cursor != null) {
                cursor.close();

Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectDao.java

@@ -115,8 +115,15 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
     */
    public void deleteJobDatasetByJobId(String jobId) throws Exception
    {
        String sql = "delete from rs_job_dataset where job_id='"+jobId+"'";
        super.execute(sql);
        List<RsJobDataset> list = super.queryListBySql("select * from rs_job_dataset where job_id='"+jobId+"'",RsJobDataset.class);
        //判断是否存在数据
        if(list!=null && list.size()>0)
        {
            for(RsJobDataset obj :list)
            {
                super.deleteEntity(obj);
            }
        }
    }

Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectLogDao.java

@@ -36,12 +36,11 @@ public class DatacollectLogDao extends SQLGeneralDAO implements IDatacollectLogD
        super.execute(sql);
    }
    /******************************** 推模式日志 ***************************************/
    /**
     * 推数据新增日志
     */
    @Override
    public void addDataPushLog(String type,String success,String content) throws Exception
    {
        RsDatapushLog log = new RsDatapushLog();
@@ -55,6 +54,7 @@ public class DatacollectLogDao extends SQLGeneralDAO implements IDatacollectLogD
    /**
     * 获取日志列表
     */
    @Override
    public DataGridResult queryDataPushLog(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception
    {
        StringBuilder sb = new StringBuilder();

Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatacollectService.java

@@ -1,12 +1,12 @@
package com.yihu.ehr.datacollect.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.common.Services;
import com.yihu.ehr.datacollect.dao.intf.IDatacollectDao;
import com.yihu.ehr.datacollect.dao.intf.IDatacollectLogDao;
import com.yihu.ehr.datacollect.model.*;
import com.yihu.ehr.datacollect.service.intf.IDatacollectManager;
import com.yihu.ehr.datacollect.service.intf.IDatacollectService;
import com.yihu.ehr.dbhelper.common.DBQuery;
import com.yihu.ehr.dbhelper.common.QueryCondition;
import com.yihu.ehr.dbhelper.common.enums.DBType;
import com.yihu.ehr.dbhelper.common.sqlparser.*;
@@ -14,6 +14,7 @@ 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.model.ActionResult;
import com.yihu.ehr.framework.util.log.LogService;
import com.yihu.ehr.resource.service.IStdService;
import org.json.JSONObject;
import org.json.JSONArray;
@@ -24,7 +25,7 @@ import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.zip.DataFormatException;
import java.util.Map;
/**
 * 数据采集执行服务
@@ -237,32 +238,30 @@ public class DatacollectService implements IDatacollectService {
     * 数据库表采集
     * @return
     */
    private String collectTable(DtoJobDataset ds,String schemeVersion,String logId)
    private String collectTable(DtoJobDataset ds,String schemeVersion,String logId) throws Exception
    {
        try{
            String datasetId = ds.getJobDatasetId();
            String condition=ds.getJobDatasetCondition();
            String key=ds.getJobDatasetKey();
            String keytype=ds.getJobDatasetKeytype();
            String keyvalue=ds.getJobDatasetKeyvalue();
            String orgCode = ds.getOrgCode();
            String datasourceId = ds.getDatasourceId();
            String config = ds.getConfig(); //数据库连接
            DBHelper db = new DBHelper(datasourceId,config);
            DBType dbType = db.dbType;
            //获取数据集映射
            List datasetString = stdService.getDatasetByScheme(schemeVersion, datasetId);
            JSONArray datasetList = new JSONArray(datasetString);
            String stdTableName ="";
            String adapterTableName ="";
            if(datasetList!=null &&datasetList.length()>0)
            {
                stdTableName = datasetList.getJSONObject(0).optString("stdDatasetCode");
                adapterTableName = datasetList.getJSONObject(0).optString("adapterDatasetCode");
            }
        String message = "";
        String datasetId = ds.getJobDatasetId();
        String jobDatasetName = ds.getJobDatasetName();
        String condition=ds.getJobDatasetCondition();
        String key=ds.getJobDatasetKey();
        String keytype=ds.getJobDatasetKeytype();
        String keyvalue=ds.getJobDatasetKeyvalue();
        String orgCode = ds.getOrgCode();
        String datasourceId = ds.getDatasourceId();
        String config = ds.getConfig(); //数据库连接
        DBHelper db = new DBHelper(datasourceId,config);
        DBType dbType = db.dbType;
        //获取数据集映射
        List datasetString = stdService.getDatasetByScheme(schemeVersion, datasetId);
        JSONArray datasetList = new JSONArray(datasetString);
        if(datasetList!=null &&datasetList.length()>0)
        {
            String stdTableName = datasetList.getJSONObject(0).optString("stdDatasetCode");
            String adapterTableName = datasetList.getJSONObject(0).optString("adapterDatasetCode");
            //获取数据集字段映射结构
            List colString = stdService.getDatacolByScheme(schemeVersion,datasetId);
            JSONArray colList = new JSONArray(colString);
@@ -279,7 +278,6 @@ public class DatacollectService implements IDatacollectService {
                    {
                        strSql+= ","+adapterMetadataCode +" as " + col.optString("stdMetadataCode") ;
                    }
                }
                strSql += " from " +adapterTableName;
                String strWhere = " where 1=1";
@@ -321,83 +319,110 @@ public class DatacollectService implements IDatacollectService {
                    }
                }
                strSql += strWhere;
                String sqlCount = "select count(1) as count,max(" + maxKey + ") as max_num from " + adapterTableName + strWhere;
                //总条数和最大值查询
                String sqlCount = "select count(1) as COUNT,max(" + maxKey + ") as MAX_NUM from " + adapterTableName + strWhere;
                JSONObject obj = db.load(sqlCount);
                if(obj==null)
                {
                    if(db.errorMessage.length()>0)
                    {
                        return db.errorMessage;
                        message = db.errorMessage;
                    }
                    else{
                        return "查询异常："+sqlCount;
                        message = "查询异常："+sqlCount;
                    }
                }
                else{
                    int count = obj.getInt("count");
                int count = obj.getInt("COUNT");
                if(count==0) //0条记录，无需采集
                {
                    return "";
                }
                String maxKeyvalue = obj.get("MAX_NUM").toString();
                int countPage = 1;
                if(count > maxNum) //分页采集
                {
                    countPage = count/maxNum+1;
                }
                for(int i=0;i<countPage;i++)
                {
                    int rows = maxNum;
                    if(i+1==countPage){
                        rows = count-i*maxNum;
                    }
                    String sql = getPageSqlByDBType(dbType,strSql,i*maxNum,rows); //获取分页sql语句
                    RsJobLogDetail detail = new RsJobLogDetail();
                    detail.setStartTime(new Date());
                    detail.setJobLogId(logId);
                    detail.setDatasourceId(datasourceId);
                    detail.setConfig(config);
                    detail.setStdDatasetCode(stdTableName);
                    detail.setJobDatasetId(datasetId);
                    detail.setJobDatasetName(ds.getJobDatasetName());
                    detail.setJobId(ds.getJobId());
                    detail.setJobSql(sql);
                    detail.setJobNum(i+1);
                    detail.setJobDatasetRows(rows);
                    detail.setSchemeVersion(schemeVersion);
                    List<JSONObject> list = db.query(sql);
                    String message = intoMongodb(list,schemeVersion,stdTableName,colList); //错误信息
                    if(message.length()>0)
                    if(count==0) //0条记录，无需采集
                    {
                        //任务日志细表异常操作
                        detail.setJobStatus("0");
                        detail.setJobContent(message);
                    }
                    else{
                        detail.setJobStatus("1");
                        detail.setJobContent("采集成功!");
                        message = "0条记录，无需采集。";
                    }
                    detail.setEndTime(new Date());
                    datacollectLogDao.saveEntity(detail);
                }
                    else
                    {
                        String maxKeyvalue = obj.optString("maxNum");
                        int countPage = 1;
                        if(count > maxNum) //分页采集
                        {
                            countPage = count/maxNum+1;
                        }
                        for(int i=0;i<countPage;i++)
                        {
                            int rows = maxNum;
                            if(i+1==countPage){
                                rows = count-i*maxNum;
                            }
                            String sql = getPageSqlByDBType(dbType,strSql,i*maxNum,rows); //获取分页sql语句
                            RsJobLogDetail detail = new RsJobLogDetail();
                            detail.setStartTime(new Date());
                            detail.setJobLogId(logId);
                            detail.setDatasourceId(datasourceId);
                            detail.setConfig(config);
                            detail.setStdDatasetCode(stdTableName);
                            detail.setJobDatasetId(datasetId);
                            detail.setJobDatasetName(ds.getJobDatasetName());
                            detail.setJobId(ds.getJobId());
                            detail.setJobSql(sql);
                            detail.setJobNum(i+1);
                            detail.setJobDatasetRows(rows);
                            detail.setSchemeVersion(schemeVersion);
                            List<JSONObject> list = db.query(sql);
                            String msg = "";
                            if(list!=null)
                            {
                                msg = intoMongodb(list,schemeVersion,stdTableName,colList); //返回信息
                            }
                            else{
                                if(db.errorMessage.length()>0)
                                {
                                    msg = db.errorMessage;
                                }
                                else{
                                    msg = "查询数据为空！";
                                }
                            }
                //修改最大值
                if(maxKeyvalue!=null&& maxKeyvalue.length()>0)
                {
                    datacollectLogDao.updateJobDatasetKeyvalue(ds.getId(),maxKeyvalue);
                            if(msg.length()>0)
                            {
                                //任务日志细表异常操作
                                detail.setJobStatus("0");
                                detail.setJobContent(msg);
                                LogService.getLogger().info(msg); //文本日志
                            }
                            else{
                                detail.setJobStatus("1");
                                detail.setJobContent("采集成功!");
                            }
                            detail.setEndTime(new Date());
                            datacollectLogDao.saveEntity(detail);
                        }
                        //修改最大值
                        if(maxKeyvalue!=null&& maxKeyvalue.length()>0)
                        {
                            datacollectLogDao.updateJobDatasetKeyvalue(ds.getId(),maxKeyvalue);
                            LogService.getLogger().info("修改任务数据集最大值为"+maxKeyvalue+"。"); //文本日志
                        }
                        message = jobDatasetName + "采集成功，"+count+"条数据。";
                    }
                }
            }
            return "";
            else
            {
                message = jobDatasetName + "数据集字段映射为空！";
            }
        }
        catch (Exception ex)
        {
            return ex.getMessage()+"\n";
        else{
            message = jobDatasetName + "数据集映射为空！";
        }
        LogService.getLogger().info(message);
        return message;
    }
    /**
@@ -441,81 +466,73 @@ public class DatacollectService implements IDatacollectService {
     * 执行任务
     */
    @Override
    @Transactional
    public void executeJob(String jobId) {
    public void executeJob(String jobId) throws Exception{
        //获取任务详细信息
        RsJobConfig job = datacollect.getJobById(jobId);
        RsJobLog log = new RsJobLog();
        log.setJobId(jobId);
        log.setJobStartTime(new Date());
        datacollectLogDao.saveEntity(log);
        String logId = log.getId();
        LogService.getLogger().info("任务"+jobId+"开始采集，新增日志"+logId+"。");
        StringBuilder logStr = new StringBuilder();
        int count = 0;
        int success = 0;
        try {
            //获取任务详细信息
            RsJobConfig job = datacollect.getJobById(jobId);
            RsJobLog log = new RsJobLog();
            log.setJobId(jobId);
            log.setJobStartTime(new Date());
            try {
                datacollectLogDao.saveEntity(log);
            }
            catch (Exception e)
            {
                System.out.print(e.getMessage());
            }
            String logId = log.getId();
            StringBuilder logStr = new StringBuilder();
            int count = 0;
            int success = 0;
            try {
                String schemeVersion = job.getSchemeVersion();
                //获取任务相关数据集
                List<DtoJobDataset> list = datacollectDao.getDatacollectDataset(jobId);
                if (list != null && list.size() > 0) {
                    count = list.size();
                    logStr.append("/*********** 开始采集 *******************/\n");
                    //遍历数据集
                    for (DtoJobDataset ds : list) {
                        String type = ds.getType();
                        String message = "";
                        logStr.append(DateConvert.toString(new Date(), dateFormat) + " " + ds.getJobDatasetName());
                        if(type!=null) {
                            if (type.equals("1")) //Web Service
                            {
                                logStr.append("Web Service采集。\n");
                            } else if (type.equals("2"))//文件系统
                            {
                                logStr.append("文件系统采集。\n");
                            } else { //数据库
                                logStr.append("数据库采集。\n");
                                message = collectTable(ds, schemeVersion, logId);
                            }
                        }
                        else{
                            message = ds.getJobDatasetName() + "未关联数据源！";
            String schemeVersion = job.getSchemeVersion();
            //获取任务相关数据集
            List<DtoJobDataset> list = datacollectDao.getDatacollectDataset(jobId);
            LogService.getLogger().info("获取任务相关数据集,数量"+list.size()+"。");
            if (list != null && list.size() > 0) {
                count = list.size();
                logStr.append("/*********** 开始采集 *******************/\n");
                //遍历数据集
                for (DtoJobDataset ds : list) {
                    String type = ds.getType();
                    String message = "";
                    logStr.append(DateConvert.toString(new Date(), dateFormat) + " " + ds.getJobDatasetName());
                    if(type!=null) {
                        if (type.equals("1")) //Web Service
                        {
                            message = "Web Service采集。\n";
                        } else if (type.equals("2"))//文件系统
                        {
                            message = "文件系统采集。\n";
                        } else { //数据库
                            message = collectTable(ds, schemeVersion, logId) + "\n";
                        }
                    }
                    else{
                        message = ds.getJobDatasetName() + "未关联数据源！\n";
                    }
                        if (message.length() > 0) {
                            logStr.append(message);
                        } else {
                            success++;
                        }
                    if (message.length() > 0) {
                        LogService.getLogger().info(message); //文本日志
                        logStr.append(message);
                    } else {
                        success++;
                    }
                    logStr.append("/*********** 结束采集 *******************/\n");
                }
            } catch (Exception ex) {
                logStr.append(ex.getMessage()+"\n");
                logStr.append("/*********** 出现异常，中断采集 *******************/\n");
                logStr.append("/*********** 结束采集 *******************/\n");
            }
            //任务主日志成功
            log.setJobContent(logStr.toString());
            log.setJobEndTime(new Date());
            log.setJobDatasetCount(count);
            log.setJobDatasetSuccess(success);
            datacollectLogDao.updateEntity(log);
        }
        catch (Exception ex)
        {
            //文本日志
            System.out.println(ex.getMessage());
        } catch (Exception ex) {
            LogService.getLogger().info("异常：" + ex.getMessage());
            logStr.append(ex.getMessage() + "\n");
            logStr.append("/*********** 出现异常，中断采集 *******************/\n");
        }
        //任务主日志成功
        log.setJobContent(logStr.toString());
        log.setJobEndTime(new Date());
        log.setJobDatasetCount(count);
        log.setJobDatasetSuccess(success);
        LogService.getLogger().info("任务结束，"+count+"个数据集成功采集"+success+"个。");
        datacollectLogDao.updateEntity(log);
    }
    /**

Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterMetadataService.java

@@ -390,7 +390,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        return metadataModelList;
    }
    public AdapterDatasetModel getAdapterMetadata(String adapterVersion,Integer datasetId){
    public AdapterDatasetModel getAdapterDataset(String adapterVersion,Integer datasetId){
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("id", datasetId);
        String tableName="adapter_dataset_"+adapterVersion;

Hos-resource/src/main/resources/config/dbhelper.properties

@@ -1,7 +1,7 @@
defaultName = hos-mysql
defaultUri = jdbc:mysql://192.168.1.220:3306/hos2?useUnicode=true&characterEncoding=UTF-8
defaultUser = hos2
defaultPassword = hos2
defaultUri = mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=UTF-8
defaultUser = hos
defaultPassword = hos
mongodbUri=mongodb://hos:hos@172.19.103.42/?authSource=admin

Hos-resource/src/main/resources/config/quartz.properties

@@ -35,7 +35,7 @@ org.quartz.jobStore.dataSource:qzDS
#============================================================================
#dataSource
org.quartz.dataSource.qzDS.driver:com.mysql.jdbc.Driver
org.quartz.dataSource.qzDS.URL:jdbc:mysql://172.19.103.71:3306/hos?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&autoReconnectForPools=true
org.quartz.dataSource.qzDS.URL:jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&autoReconnectForPools=true
org.quartz.dataSource.qzDS.user:hos
org.quartz.dataSource.qzDS.password:hos
org.quartz.dataSource.qzDS.maxConnection:100

Hos-resource/src/main/resources/spring/applicationContext.xml

@@ -43,9 +43,9 @@
        <property name="password" value="fujian"/>
        -->
        <property name="url"
                  value="jdbc:mysql://192.168.1.220:3306/hos2_resource?useUnicode=true&amp;characterEncoding=UTF-8"/>
        <property name="username" value="hos2"/>
        <property name="password" value="hos2"/>
                  value="jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&amp;characterEncoding=UTF-8"/>
        <property name="username" value="hos"/>
        <property name="password" value="hos"/>
        <property name="initialSize" value="1"/>
        <property name="maxTotal" value="100"/>
        <property name="maxIdle" value="50"/>

Hos-resource/src/main/webapp/WEB-INF/web.xml

@@ -82,7 +82,7 @@
    </listener>
    <context-param>
        <param-name>log4jConfigLocation</param-name>
        <param-value>/WEB-INF/classes/log4j/log4j2.xml</param-value>
        <param-value>classpath:log4j/log4j2.xml</param-value>
    </context-param>
    <context-param>
        <param-name>log4jRefreshInterval</param-name>