ESB测试与修改

Hos-Framework/Hos-Framework.iml

@@ -10,8 +10,6 @@
    <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: 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" />
@@ -112,7 +110,6 @@
    <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: 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" />
@@ -279,7 +276,7 @@
    <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.0" 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" />

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-resource/Hos-Resource.iml

@@ -43,8 +43,6 @@
    </orderEntry>
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.4.RELEASE" level="project" />
    <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: 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" />
@@ -143,7 +141,6 @@
    <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" />
    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.6.0.RELEASE" level="project" />
@@ -318,7 +315,7 @@
    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" 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.csource:fastdfs-client-java:1.0.0" 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" />

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/editorJobJs.jsp

@@ -57,7 +57,7 @@
                    me.save();
                },
                onCanceled:function(){
                    if(parent.config==null)
                    if(parent.trackJob != undefined)
                        parent.trackJob.dialog.close();
                    else
                        parent.configJob.dialog.close();
@@ -655,7 +655,7 @@
                cache:false,
                success :function(data){
                    if(data.successFlg) {
                        if(parent.config==null)
                        if(parent.trackJob != undefined)
                            parent.trackJob.callbackDialog(data.message);
                        else
                            parent.configJob.callbackDialog(data.message);

Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerOverwrite.js

@@ -345,6 +345,7 @@
                        var dict = $.ehrDict.getDictData(_col.dictName, col.dictType, col.dictWhere, function (response) {
                            g.refreshColumn(_col.dictName, response);
                        });
                        dict = $.ehrDict.listToDict(dict);
                        if (dict != null) {
                            if (dict[data] != null) {
                                return dict[data].value;