浏览代码

Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

esb 9 年之前
父节点
当前提交
ca5a8c9044
共有 59 个文件被更改,包括 527 次插入610 次删除
  1. 0 2
      Hos-Framework/Hos-Framework.iml
  2. 3 3
      Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/ApiVersionPrefix.java
  3. 4 4
      Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/DateConvert.java
  4. 4 4
      Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/HBConstants.java
  5. 1 1
      Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/SessionAttributeKeys.java
  6. 36 36
      Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/SystemDictId.java
  7. 22 22
      Hos-Framework/src/main/java/com/yihu/ehr/framework/model/DictItem.java
  8. 1 1
      Hos-Framework/src/main/java/com/yihu/ehr/framework/model/DictionaryResult.java
  9. 1 1
      Hos-Framework/src/main/java/com/yihu/ehr/framework/model/SimpleChartItem.java
  10. 32 32
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/ClassReader.java
  11. 3 3
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/ObjectMapperExt.java
  12. 44 44
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/ObjectVersion.java
  13. 1 1
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/PropertyLoader.java
  14. 35 35
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/compress/Zipper.java
  15. 1 1
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/fastdfs/EnvironmentOptions.java
  16. 3 3
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/fastdfs/FastDFSClientPool.java
  17. 29 29
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/fastdfs/FastDFSUtil.java
  18. 3 3
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/fastdfs/XEnvironmentOption.java
  19. 15 15
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/file/FileUtil.java
  20. 3 3
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/http/HOPClient.java
  21. 4 4
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/http/HttpsInitialise.java
  22. 5 5
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/log/LogService.java
  23. 47 47
      Hos-Framework/src/main/java/com/yihu/ehr/framework/util/wsgateway/GatewayUtil.java
  24. 13 0
      Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectDao.java
  25. 4 0
      Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/intf/IDatacollectDao.java
  26. 9 1
      Hos-resource/src/main/java/com/yihu/ehr/datacollect/model/DtoJobConfig.java
  27. 46 25
      Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatacollectManager.java
  28. 4 0
      Hos-resource/src/main/java/com/yihu/ehr/resource/dao/IRsResourceDao.java
  29. 8 0
      Hos-resource/src/main/java/com/yihu/ehr/resource/dao/impl/RsResourceDaoImpl.java
  30. 23 10
      Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsCategoryServiceImpl.java
  31. 3 3
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/adapter/adapterDataSet/dialogJs.jsp
  32. 3 3
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/adapter/adapterDataSet/dictDialogJs.jsp
  33. 3 3
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/adapter/adapterOrg/adapterOrgDialogJs.jsp
  34. 3 3
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/adapter/orgCollection/dialogJs.jsp
  35. 1 1
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/configJobJs.jsp
  36. 2 2
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimensioncatetory/editorDimensionCatetory.jsp
  37. 2 2
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/patient/addCardInfoDialogJs.jsp
  38. 2 2
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/patient/patientBasicInfoDialogJs.jsp
  39. 4 4
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/patient/patientInfoDialogJs.jsp
  40. 12 21
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryManage.jsp
  41. 0 8
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryManageCss.jsp
  42. 24 36
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryManageJs.jsp
  43. 2 2
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceConfigJs.jsp
  44. 3 3
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/std/dict/dictEntryInfoDialogJs.jsp
  45. 3 3
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/std/dict/stdDictInfoDialogJs.jsp
  46. 3 3
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/std/standardsource/stdInfoDialogJs.jsp
  47. 22 26
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/authority/authority.jsp
  48. 0 21
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/authority/authorityCss.jsp
  49. 0 12
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/authority/authorityJs.jsp
  50. 3 3
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menu.jsp
  51. 2 5
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menuJs.jsp
  52. 11 14
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menuaction/menuAction.jsp
  53. 0 21
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menuaction/menuActionCss.jsp
  54. 1 6
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menuaction/menuActionJs.jsp
  55. 0 21
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/role/editorRoleCss.jsp
  56. 12 16
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/role/role.jsp
  57. 0 21
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/role/roleCss.jsp
  58. 1 9
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/role/roleJs.jsp
  59. 1 1
      Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerOverwrite.js

+ 0 - 2
Hos-Framework/Hos-Framework.iml

@ -9,8 +9,6 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="java" level="project" />
    <orderEntry type="library" name="Hos-Framework" 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" />

+ 3 - 3
Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/ApiVersionPrefix.java

@ -1,14 +1,14 @@
package com.yihu.ehr.framework.constrant;
/**
 * API版本前缀。用于适配Rest控制器的版本。定义好适用的版本之后,可以方便API版本编写。
 * API版本前缀。用于适配Rest控制器的版本。定义好适用的版本之后,可以方便API版本编写。
 *
 * API版本格式为:v大版本.小版本。
 * API版本格式为:v大版本.小版本。
 *
 * @author Sand
 * @version 1.0
 * @created 2015.11.05 11:29
 */
public class ApiVersionPrefix {
    public static final String CommonVersion = "/rest/{api_version:^v[0-9]\\d*\\.\\d*$}";   // 通用
    public static final String CommonVersion = "/rest/{api_version:^v[0-9]\\d*\\.\\d*$}";   // 閫氱敤
}

+ 4 - 4
Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/DateConvert.java

@ -11,7 +11,7 @@ public class DateConvert implements Converter{
    public static String dateFormat ="yyyy-MM-dd HH:mm:ss";
    /**
     * 时间转化函数
     * 鏃堕棿杞�寲鍑芥暟
     */
    public Object convert(Class arg0, Object arg1) {
        String str = (String)arg1;
@ -19,7 +19,7 @@ public class DateConvert implements Converter{
    }
    /*
        字符串转时间格式
        瀛楃�涓茶浆鏃堕棿鏍煎紡
     */
    public static Date toDate(String str)
    {
@ -59,7 +59,7 @@ public class DateConvert implements Converter{
    }
    /*
        时间格式转字符串
        鏃堕棿鏍煎紡杞�瓧绗︿覆
    */
    public static String toString(Date date)
    {
@ -67,7 +67,7 @@ public class DateConvert implements Converter{
    }
    /*
        时间格式转字符串
        鏃堕棿鏍煎紡杞�瓧绗︿覆
    */
    public static String toString(Date date,String format)
    {

+ 4 - 4
Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/HBConstants.java

@ -1,11 +1,11 @@
package com.yihu.ehr.framework.constrant;
public class HBConstants {
	final static public String T_HFILES = "H_Files";
	final static public String T_HeathArchive = "H_HeathArchive";
	 /*通用列族 */
    final static public String T_HFILES = "H_Files";
    final static public String T_HeathArchive = "H_HeathArchive";
    /*閫氱敤鍒楁棌 */
    public static final String FamilyBasic = "basic";
    public static final String FamilyExtension = "extension";
    /* 数据集表特有列族 */
    /* 鏁版嵁闆嗚〃鐗规湁鍒楁棌 */
    public static final String FamilyMetaData = "meta_data";
}

+ 1 - 1
Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/SessionAttributeKeys.java

@ -1,7 +1,7 @@
package com.yihu.ehr.framework.constrant;
/**
 * Spring MVC 的Web会话常用会话属性常量。
 * Spring MVC 的Web会话常用会话属性常量。
 *
 * @author Sand
 * @version 1.0

+ 36 - 36
Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/SystemDictId.java

@ -1,49 +1,49 @@
package com.yihu.ehr.framework.constrant;
/**
 * 通用字典ID。
 * 通用字典ID。
 *
 * @author Sand
 * @version 1.0
 * @created 2015.07.29 14:38
 */
public class SystemDictId {
/*    public final static long Nation = 1;                         // 民族字典
    public final static long Gender = 2;                         // 性别字典
    public final static long Country = 3;                       // 国家字典
    public final static long MartialStatus = 4;                 // 婚姻状态字典
    public final static long FamilyMemberRelation = 5;          // 家庭关系
    public final static long ResidenceType = 6;                // 户口类型
    public final static long OrganizationType = 7;             // 组织机构类型
    public final static long OrganizationSettledWay = 8;       // 机构接入平台方式
    public final static long CardStatus = 9;                          // 卡状态
    public final static long CardType = 10;                      // 卡类型
    public final static long RSAKeyType = 11;                       // 公私钥类型
    public final static long UserType = 12;                      // 用户类型
    public final static long UserRole = 13;                      // 用户角色*/
/*    public final static long Nation = 1;                         // 姘戞棌瀛楀吀
    public final static long Gender = 2;                         // 鎬у埆瀛楀吀
    public final static long Country = 3;                       // 鍥藉�瀛楀吀
    public final static long MartialStatus = 4;                 // 婚姻状态字典
    public final static long FamilyMemberRelation = 5;          // 瀹跺涵鍏崇郴
    public final static long ResidenceType = 6;                // 鎴峰彛绫诲瀷
    public final static long OrganizationType = 7;             // 缁勭粐鏈烘瀯绫诲瀷
    public final static long OrganizationSettledWay = 8;       // 鏈烘瀯鎺ュ叆骞冲彴鏂瑰紡
    public final static long CardStatus = 9;                          // 卡状态
    public final static long CardType = 10;                      // 卡类型
    public final static long RSAKeyType = 11;                       // 公私钥类型
    public final static long UserType = 12;                      // 鐢ㄦ埛绫诲瀷
    public final static long UserRole = 13;                      // 鐢ㄦ埛瑙掕壊*/
    public final static long AppStatus = 1;                                 // app状态
    public final static long AppCatalog = 2;                             // app类型
    public final static long Gender = 3;                                    // 用户性别
    public final static long MartialStatus = 4;                       // 婚姻状况
    public final static long Nation = 5;                                    // 民族
    public final static long ResidenceType = 6;                  // 户口类型
    public final static long OrgType = 7;                               // 机构类型
    public final static long SettledWay = 8;                        // 结算方式
    public final static long CardStatus = 9;                          // 卡状态
    public final static long CardType = 10;                         // 卡类型
    public final static long RequestState = 11;                       // 请求状态
    public final static long KeyType = 12;                              // 用户区分
    public final static long MedicalRole = 13;                      // 医疗角色
    public final static long UserRole = 14;                         // 用户角色
    public final static long UserType = 15;                         // 用户类别
    public final static long FamilyMemberRelation = 16;                      // 家庭成员关系
    public final static long tags = 17;                                     // 标签
    public final static long yesNo = 18;                                 // 是否
    public final static long hosTableList = 19;                    // 集成开放平台数据收集表
    public final static long loginAddress = 20;                    // 登入地址API Id
    public final static String AddressAPI = "baidu_APIStore_API";       //登入地址API
    public final static String Apikey = "baidu_apikey";                                 //登入地址apikey
    public final static long AppStatus = 1;                                 // app状态
    public final static long AppCatalog = 2;                             // app绫诲瀷
    public final static long Gender = 3;                                    // 鐢ㄦ埛鎬у埆
    public final static long MartialStatus = 4;                       // 濠氬Щ鐘跺喌
    public final static long Nation = 5;                                    // 姘戞棌
    public final static long ResidenceType = 6;                  // 鎴峰彛绫诲瀷
    public final static long OrgType = 7;                               // 鏈烘瀯绫诲瀷
    public final static long SettledWay = 8;                        // 缁撶畻鏂瑰紡
    public final static long CardStatus = 9;                          // 卡状态
    public final static long CardType = 10;                         // 卡类型
    public final static long RequestState = 11;                       // 请求状态
    public final static long KeyType = 12;                              // 鐢ㄦ埛鍖哄垎
    public final static long MedicalRole = 13;                      // 鍖荤枟瑙掕壊
    public final static long UserRole = 14;                         // 鐢ㄦ埛瑙掕壊
    public final static long UserType = 15;                         // 鐢ㄦ埛绫诲埆
    public final static long FamilyMemberRelation = 16;                      // 瀹跺涵鎴愬憳鍏崇郴
    public final static long tags = 17;                                     // 鏍囩�
    public final static long yesNo = 18;                                 // 鏄�惁
    public final static long hosTableList = 19;                    // 闆嗘垚寮€鏀惧钩鍙版暟鎹�敹闆嗚〃
    public final static long loginAddress = 20;                    // 鐧诲叆鍦板潃API Id
    public final static String AddressAPI = "baidu_APIStore_API";       //鐧诲叆鍦板潃API
    public final static String Apikey = "baidu_apikey";                                 //鐧诲叆鍦板潃apikey
}

+ 22 - 22
Hos-Framework/src/main/java/com/yihu/ehr/framework/model/DictItem.java

@ -3,37 +3,37 @@ package com.yihu.ehr.framework.model;
import java.util.List;
/**
 * ×ÖµäÏî
 * 字典项
 * Created by hzp on 2016/1/15
 */
public class DictItem {
        private String value;
        private String code;
        private String extend;
    private String value;
    private String code;
    private String extend;
        public String getValue() {
            return value;
        }
    public String getValue() {
        return value;
    }
        public void setValue(String value) {
            this.value = value;
        }
    public void setValue(String value) {
        this.value = value;
    }
        public String getCode() {
            return code;
        }
    public String getCode() {
        return code;
    }
        public void setCode(String code) {
            this.code = code;
        }
    public void setCode(String code) {
        this.code = code;
    }
        public String getExtend() {
            return extend;
        }
    public String getExtend() {
        return extend;
    }
        public void setExtend(String extend) {
            this.extend = extend;
        }
    public void setExtend(String extend) {
        this.extend = extend;
    }
}

+ 1 - 1
Hos-Framework/src/main/java/com/yihu/ehr/framework/model/DictionaryResult.java

@ -3,7 +3,7 @@ package com.yihu.ehr.framework.model;
import java.util.List;
/**
 * 返回字典对象
 * 杩斿洖瀛楀吀瀵硅薄
 * Created by chenweida on 2016/1/13.
 */
public class DictionaryResult extends Result {

+ 1 - 1
Hos-Framework/src/main/java/com/yihu/ehr/framework/model/SimpleChartItem.java

@ -1,7 +1,7 @@
package com.yihu.ehr.framework.model;
/**
 * 简单表单数据项
 * 绠€鍗曡〃鍗曟暟鎹�」
 * Created by hzp on 2016/1/15
 */
public class SimpleChartItem {

+ 32 - 32
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/ClassReader.java

@ -16,20 +16,20 @@ import java.util.jar.JarFile;
public class ClassReader {
    private static Logger logger = LogManager.getLogger(ClassReader.class.getName());
    /** 
     * 获取某包下(包括该包的所有子包)所有类
     * @param packageName 包名
     * @return 类的完整名称
    /**
     * 鑾峰彇鏌愬寘涓嬶紙鍖呮嫭璇ュ寘鐨勬墍鏈夊瓙鍖咃級鎵€鏈夌被
     * @param packageName 鍖呭悕
     * @return 绫荤殑瀹屾暣鍚嶇О
     */
    public static List<String> getClassNames(String packageName){
        return getClassNames(packageName, true);
    }
    /**
     * 获取某包下所有类
     * @param packageName 包名
     * @param childPackage 是否遍历子包
     * @return 类的完整名称
     * 鑾峰彇鏌愬寘涓嬫墍鏈夌被
     * @param packageName 鍖呭悕
     * @param childPackage 鏄�惁閬嶅巻瀛愬寘
     * @return 绫荤殑瀹屾暣鍚嶇О
     */
    public static List<String> getClassNames(String packageName, boolean childPackage) {
        List<String> fileNames = null;
@ -50,11 +50,11 @@ public class ClassReader {
    }
    /**
     * 从项目文件获取某包下所有类
     * @param filePath 文件路径
     * @param className 类名集合
     * @param childPackage 是否遍历子包
     * @return 类的完整名称
     * 浠庨」鐩�枃浠惰幏鍙栨煇鍖呬笅鎵€鏈夌被
     * @param filePath 鏂囦欢璺�緞
     * @param className 绫诲悕闆嗗悎
     * @param childPackage 鏄�惁閬嶅巻瀛愬寘
     * @return 绫荤殑瀹屾暣鍚嶇О
     */
    private static List<String> getClassNameByFile(String filePath, List<String> className, boolean childPackage) {
        List<String> myClassName = new ArrayList<String>();
@ -79,10 +79,10 @@ public class ClassReader {
    }
    /**
     * 从jar获取某包下所有类
     * @param jarPath jar文件路径
     * @param childPackage 是否遍历子包
     * @return 类的完整名称
     * 浠巎ar鑾峰彇鏌愬寘涓嬫墍鏈夌被
     * @param jarPath jar鏂囦欢璺�緞
     * @param childPackage 鏄�惁閬嶅巻瀛愬寘
     * @return 绫荤殑瀹屾暣鍚嶇О
     */
    private static List<String> getClassNameByJar(String jarPath, boolean childPackage) {
        List<String> myClassName = new ArrayList<String>();
@ -126,11 +126,11 @@ public class ClassReader {
    }
    /**
     * 从所有jar中搜索该包,并获取该包下所有类
     * @param urls URL集合
     * @param packagePath 包路径
     * @param childPackage 是否遍历子包
     * @return 类的完整名称
     * 浠庢墍鏈塲ar涓�悳绱㈣�鍖咃紝骞惰幏鍙栬�鍖呬笅鎵€鏈夌被
     * @param urls URL闆嗗悎
     * @param packagePath 包路径
     * @param childPackage 鏄�惁閬嶅巻瀛愬寘
     * @return 绫荤殑瀹屾暣鍚嶇О
     */
    private static List<String> getClassNameByJars(URL[] urls, String packagePath, boolean childPackage) {
        List<String> myClassName = new ArrayList<String>();
@ -138,14 +138,14 @@ public class ClassReader {
            for (int i = 0; i < urls.length; i++) {
                URL url = urls[i];
                String urlPath = url.getPath();
                // 不必搜索classes文件夹
                if (urlPath.endsWith("classes/")) {  
                    continue;  
                }  
                String jarPath = urlPath + "!/" + packagePath;  
                myClassName.addAll(getClassNameByJar(jarPath, childPackage));  
            }  
        }  
        return myClassName;  
    }  
                // 不必搜索classes文件夹
                if (urlPath.endsWith("classes/")) {
                    continue;
                }
                String jarPath = urlPath + "!/" + packagePath;
                myClassName.addAll(getClassNameByJar(jarPath, childPackage));
            }
        }
        return myClassName;
    }
}  

+ 3 - 3
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/ObjectMapperExt.java

@ -4,11 +4,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.stereotype.Service;
/**
 * 创建一个ObjectMapper派生类,用于注解Bean的创建。
 * 创建一个ObjectMapper派生类,用于注解Bean的创建。
 *
 * 因为性能原因,并且此类是线程安全的,此类被缓存。参见:http://wiki.fasterxml.com/JacksonBestPracticesPerformance
 * 鍥犱负鎬ц兘鍘熷洜锛屽苟涓旀�绫绘槸绾跨▼瀹夊叏鐨勶紝姝ょ被琚�紦瀛樸€傚弬瑙侊細http://wiki.fasterxml.com/JacksonBestPracticesPerformance
 *
 * @implNote 此bean不可用于手工获取的成员变量中。
 * @implNote 此bean不可用于手工获取的成员变量中。
 *
 * @author Sand
 * @version 1.0

+ 44 - 44
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/ObjectVersion.java

@ -6,20 +6,20 @@ import java.util.Date;
import java.util.concurrent.atomic.AtomicInteger;
/**
 * <p>CDA版本对象.</p>
 * <p>CDA鐗堟湰瀵硅薄.</p>
 *
 * <p>由6个字节构成, 分为以下段:</p>
 * <p>由6个字节构成, 分为以下段:</p>
 * <table border="1">
 *     <caption>字节构成</caption>
 *     <caption>瀛楄妭鏋勬垚</caption>
 *     <tr>
 *         <td>0</td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td>
 *     </tr>
 *     <tr>
 *         <td colspan="4">时间</td><td colspan="2">并发量</td>
 *         <td colspan="4">时间</td><td colspan="2">并发量</td>
 *     </tr>
 * </table>
 *
 * <p>本类实例不可修改.</p>
 * <p>鏈�被瀹炰緥涓嶅彲淇�敼.</p>
 */
public final class ObjectVersion implements Comparable<ObjectVersion>, Serializable {
@ -32,11 +32,11 @@ public final class ObjectVersion implements Comparable<ObjectVersion>, Serializa
    private final short counter;
    /**
     * 检查是否为一个合法的 ObjectId 对象.
     * 妫€鏌ユ槸鍚︿负涓€涓�悎娉曠殑 ObjectId 瀵硅薄.
     *
     * @param hexString 一个可能转换为对象ID的字符串.
     * @return 字符串是否为合法的ObjectId.
     * @throws IllegalArgumentException hexString为空的情况下抛出.
     * @param hexString 涓€涓�彲鑳借浆鎹�负瀵硅薄ID鐨勫瓧绗︿覆.
     * @return 瀛楃�涓叉槸鍚︿负鍚堟硶鐨凮bjectId.
     * @throws IllegalArgumentException hexString涓虹┖鐨勬儏鍐典笅鎶涘嚭.
     */
    public static boolean isValid(final String hexString) {
        if (hexString == null) {
@ -67,36 +67,36 @@ public final class ObjectVersion implements Comparable<ObjectVersion>, Serializa
    }
    /**
     * 获取自增长对象的当前值.
     * 获取自增长对象的当前值.
     *
     * @return 当前自增长量.
     * @return 褰撳墠鑷��闀块噺.
     */
    public static int getCurrentCounter() {
        return NEXT_COUNTER.get();
    }
    /**
     * 创建一个ID对象.
     * 鍒涘缓涓€涓狪D瀵硅薄.
     */
    public ObjectVersion() {
        this(new Date());
    }
    /**
     * 以日期初始化一个ID对象.
     * 浠ユ棩鏈熷垵濮嬪寲涓€涓狪D瀵硅薄.
     *
     * @param date 日期对象.
     * @param date 鏃ユ湡瀵硅薄.
     */
    public ObjectVersion(final Date date) {
        this(dateToTimestampSeconds(date), (short)NEXT_COUNTER.getAndIncrement());
    }
    /**
     * 以日期与计数初始化一个ID对象.
     * 浠ユ棩鏈熶笌璁℃暟鍒濆�鍖栦竴涓狪D瀵硅薄.
     *
     * @param date    日期
     * @param counter 计数
     * @throws IllegalArgumentException 在计数值的高位为非零的情况下抛出.
     * @param date    鏃ユ湡
     * @param counter 璁℃暟
     * @throws IllegalArgumentException 在计数值的高位为非零的情况下抛出.
     */
    public ObjectVersion(final Date date,
                         final short counter) {
@ -104,10 +104,10 @@ public final class ObjectVersion implements Comparable<ObjectVersion>, Serializa
    }
    /**
     * 以日期与计数初始化一个ID对象.
     * 浠ユ棩鏈熶笌璁℃暟鍒濆�鍖栦竴涓狪D瀵硅薄.
     *
     * @param timestamp     时间戳
     * @param counter       计数
     * @param timestamp     时间戳
     * @param counter       璁℃暟
     */
    public ObjectVersion(final int timestamp,
                         final short counter) {
@ -116,20 +116,20 @@ public final class ObjectVersion implements Comparable<ObjectVersion>, Serializa
    }
    /**
     * 根据一个 BYTE_ARRAY_LENGTH/2 个字节的字符串构造ID对象.
     * 根据一个 BYTE_ARRAY_LENGTH/2 个字节的字符串构造ID对象.
     *
     * @param hexString 待转换的字符串对象.
     * @throws IllegalArgumentException 若是一个无效的对象版本描述字符串, 抛出此异常.
     * @param hexString 待转换的字符串对象.
     * @throws IllegalArgumentException 若是一个无效的对象版本描述字符串, 抛出此异常.
     */
    public ObjectVersion(final String hexString) {
        this(parseHexString(hexString));
    }
    /**
     * 以字节数组创建一个对象ID.
     * 浠ュ瓧鑺傛暟缁勫垱寤轰竴涓��璞�D.
     *
     * @param bytes 字节数组
     * @throws IllegalArgumentException 在字节数组为空, 或长度小于 BYTE_ARRAY_LENGTH 的时候抛出.
     * @param bytes 瀛楄妭鏁扮粍
     * @throws IllegalArgumentException 在字节数组为空, 或长度小于 BYTE_ARRAY_LENGTH 的时候抛出.
     */
    public ObjectVersion(final byte[] bytes) {
        if (bytes == null) {
@ -144,7 +144,7 @@ public final class ObjectVersion implements Comparable<ObjectVersion>, Serializa
    }
    /**
     * 转换为字节数组. 以 big-endian 顺序存储.
     * 转换为字节数组. 以 big-endian 顺序存储.
     *
     * @return the byte array
     */
@ -161,46 +161,46 @@ public final class ObjectVersion implements Comparable<ObjectVersion>, Serializa
    }
    /**
     * 获取时间戳代表的日期对象.
     * 鑾峰彇鏃堕棿鎴充唬琛ㄧ殑鏃ユ湡瀵硅薄.
     *
     * @return 日期对象
     * @return 鏃ユ湡瀵硅薄
     */
    public Date getDate() {
        return new Date(timestamp * 1000L);
    }
    /**
     * 获取时间戳 (基于 Unix epoch 时间的秒数).
     * 获取时间戳 (基于 Unix epoch 时间的秒数).
     *
     * @return 时间戳
     * @return 时间戳
     */
    public int getTimestamp() {
        return timestamp;
    }
    /**
     * 获取计数.
     * 鑾峰彇璁℃暟.
     *
     * @return 计数
     * @return 璁℃暟
     */
    public short getCounter() {
        return counter;
    }
    /**
     * 将对象转换为一个含30个16进制字符的字符串表示.
     * 将对象转换为一个含30个16进制字符的字符串表示.
     *
     * @return ID对象的16进制字符串表示.
     * @return ID对象的16进制字符串表示.
     */
    public String toHexString() {
      char[] chars = new char[BYTE_ARRAY_LENGTH * 2];
      int i = 0;
      for (byte b : toByteArray()) {
        chars[i++] = HEX_CHARS[b >> 4 & 0xF];
        chars[i++] = HEX_CHARS[b & 0xF];
      }
      return new String(chars);
        char[] chars = new char[BYTE_ARRAY_LENGTH * 2];
        int i = 0;
        for (byte b : toByteArray()) {
            chars[i++] = HEX_CHARS[b >> 4 & 0xF];
            chars[i++] = HEX_CHARS[b & 0xF];
        }
        return new String(chars);
    }
    @Override

+ 1 - 1
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/PropertyLoader.java

@ -8,7 +8,7 @@ import java.io.InputStreamReader;
import java.util.Properties;
/**
 * PropertyÎļþ¼ÓÔØÆ÷.
 * Property文件加载器.
 * @author Sand
 * @version 1.0
 * @created 2015.08.05 14:45

+ 35 - 35
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/compress/Zipper.java

@ -13,21 +13,21 @@ import java.util.ArrayList;
import java.util.List;
/**
 * 文件压缩辅助类
 * 文件压缩辅助类
 *
 * @created Air 2015/5/26.
 */
public class Zipper {
    /**
     * 使用给定密码解压指定的ZIP压缩文件到指定目录
     * 使用给定密码解压指定的ZIP压缩文件到指定目录
     * <p>
     * 如果指定目录不存在,可以自动创建,不合法的路径将导致异常被抛出
     * 如果指定目录不存在,可以自动创建,不合法的路径将导致异常被抛出
     *
     * @param zip    指定的ZIP压缩文件
     * @param dest   解压目录
     * @param passwd ZIP文件的密码
     * @return 解压后文件数组
     * @throws ZipException 压缩文件有损坏或者解压缩失败抛出
     * @param zip    鎸囧畾鐨刏IP鍘嬬缉鏂囦欢
     * @param dest   瑙e帇鐩�綍
     * @param passwd ZIP文件的密码
     * @return 解压后文件数组
     * @throws ZipException 鍘嬬缉鏂囦欢鏈夋崯鍧忔垨鑰呰В鍘嬬缉澶辫触鎶涘嚭
     */
    public static File[] unzip(String zip, String dest, String passwd) throws ZipException {
        File zipFile = new File(zip);
@ -35,12 +35,12 @@ public class Zipper {
    }
    /**
     * 使用给定密码解压指定的ZIP压缩文件到当前目录
     * 使用给定密码解压指定的ZIP压缩文件到当前目录
     *
     * @param zip    指定的ZIP压缩文件
     * @param passwd ZIP文件的密码
     * @return 解压后文件数组
     * @throws ZipException 压缩文件有损坏或者解压缩失败抛出
     * @param zip    鎸囧畾鐨刏IP鍘嬬缉鏂囦欢
     * @param passwd ZIP文件的密码
     * @return 解压后文件数组
     * @throws ZipException 鍘嬬缉鏂囦欢鏈夋崯鍧忔垨鑰呰В鍘嬬缉澶辫触鎶涘嚭
     */
    public static File[] unzip(String zip, String passwd) throws ZipException {
        File zipFile = new File(zip);
@ -49,20 +49,20 @@ public class Zipper {
    }
    /**
     * 使用给定密码解压指定的ZIP压缩文件到指定目录
     * 使用给定密码解压指定的ZIP压缩文件到指定目录
     * <p>
     * 如果指定目录不存在,可以自动创建,不合法的路径将导致异常被抛出
     * 如果指定目录不存在,可以自动创建,不合法的路径将导致异常被抛出
     *
     * @param dest   解压目录
     * @param passwd ZIP文件的密码
     * @return 解压后文件数组
     * @throws ZipException 压缩文件有损坏或者解压缩失败抛出
     * @param dest   瑙e帇鐩�綍
     * @param passwd ZIP文件的密码
     * @return 解压后文件数组
     * @throws ZipException 鍘嬬缉鏂囦欢鏈夋崯鍧忔垨鑰呰В鍘嬬缉澶辫触鎶涘嚭
     */
    public static File[] unzip(File zipFile, String dest, String passwd) throws ZipException {
        ZipFile zFile = new ZipFile(zipFile);
        zFile.setFileNameCharset("GBK");
        if (!zFile.isValidZipFile()) {
            throw new ZipException("压缩文件不合法,可能被损坏.");
            throw new ZipException("压缩文件不合法,可能被损坏.");
        }
        File destDir = new File(dest);
        if (destDir.isDirectory() && !destDir.exists()) {
@ -86,9 +86,9 @@ public class Zipper {
    }
    /**
     * @param unzipFile   需要压缩的文件(文件夹)
     * @param zipFileName 压缩后的文件名
     * @return 成功-File 失败-null
     * @param unzipFile   需要压缩的文件(文件夹)
     * @param zipFileName 压缩后的文件名
     * @return 鎴愬姛-File 澶辫触-null
     * @throws ZipException
     */
    public File zipFile(File unzipFile, String zipFileName) throws ZipException {
@ -96,10 +96,10 @@ public class Zipper {
    }
    /**
     * @param unzipFile   需要压缩的文件(文件夹)
     * @param zipFileName 压缩后的文件名
     * @param pwd         压缩密码
     * @return 成功-File 失败-null
     * @param unzipFile   需要压缩的文件(文件夹)
     * @param zipFileName 压缩后的文件名
     * @param pwd         鍘嬬缉瀵嗙爜
     * @return 鎴愬姛-File 澶辫触-null
     * @throws ZipException
     */
    public File zipFile(File unzipFile, String zipFileName, String pwd) throws ZipException {
@ -134,9 +134,9 @@ public class Zipper {
    }
    /**
     * @param zipFile        需要解压的文件名
     * @param unzipDirectory 解压文件路径
     * @return 成功-File 失败-null
     * @param zipFile        需要解压的文件名
     * @param unzipDirectory 瑙e帇鏂囦欢璺�緞
     * @return 鎴愬姛-File 澶辫触-null
     * @throws ZipException
     */
    public File unzipFile(File zipFile, String unzipDirectory) throws ZipException {
@ -144,17 +144,17 @@ public class Zipper {
    }
    /**
     * @param zipFile        需要解压的文件名
     * @param unzipDirectory 解压文件路径
     * @param pwd            解压密码
     * @return 成功-File 失败-null
     * @param zipFile        需要解压的文件名
     * @param unzipDirectory 瑙e帇鏂囦欢璺�緞
     * @param pwd            瑙e帇瀵嗙爜
     * @return 鎴愬姛-File 澶辫触-null
     * @throws ZipException
     */
    public static File unzipFile(File zipFile, String unzipDirectory, String pwd) throws ZipException {
        ZipFile zFile = new ZipFile(zipFile);
        zFile.setFileNameCharset("GBK");
        if (!zFile.isValidZipFile()) {
            throw new ZipException("无效的压缩文件.");
            throw new ZipException("无效的压缩文件.");
        }
        if (zFile.isEncrypted()) {

+ 1 - 1
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/fastdfs/EnvironmentOptions.java

@ -1,7 +1,7 @@
package com.yihu.ehr.framework.util.fastdfs;
/**
 * 系统环境变量KEY. 配置文件:healtharchive.cfg.xml.
 * 绯荤粺鐜��鍙橀噺KEY. 閰嶇疆鏂囦欢:healtharchive.cfg.xml.
 *
 * @author Sand
 * @version 1.0

+ 3 - 3
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/fastdfs/FastDFSClientPool.java

@ -36,11 +36,11 @@ public class FastDFSClientPool {
            ClientGlobal.init(configFile);
        } catch (FileNotFoundException e) {
            logger.error("FastDFS配置文件打开失败: " + e.getMessage());
            logger.error("FastDFS閰嶇疆鏂囦欢鎵撳紑澶辫触: " + e.getMessage());
        } catch (IOException e) {
            logger.error("FastDFS初始化失败: " + e.getMessage());
            logger.error("FastDFS初始化失败: " + e.getMessage());
        } catch (MyException e) {
            logger.error("FastDFS初始化失败: " + e.getMessage());
            logger.error("FastDFS初始化失败: " + e.getMessage());
        }
    }

+ 29 - 29
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/fastdfs/FastDFSUtil.java

@ -15,7 +15,7 @@ import java.io.InputStream;
import java.net.InetSocketAddress;
/**
 * FastDFS 客户端工具.
 * FastDFS 锟酵伙拷锟剿癸拷锟斤拷.
 *
 * @author szx
 */
@ -27,15 +27,15 @@ public class FastDFSUtil {
    public final static String FileUrlField = "fileUrl";
    /**
     * 以输入流的方式上传文件
     * 锟斤拷锟斤拷锟斤拷锟斤拷锟侥凤拷式锟较达拷锟侥硷拷
     * InputStream in = new FileInputStream("C://Desert.jpg");
     * ObjectNode msg = FileUtil.upload(in,"jpg", "沙漠");
     * in.close();
     *
     * @param in            输入流
     * @param fileExtension 文件扩展名,不要带“.”
     * @param description   文件名称(中文)
     * @return 返回值的格式如下:
     * @param in            锟斤拷锟斤拷锟斤拷
     * @param fileExtension 锟侥硷拷锟斤拷展锟斤拷锟斤拷锟斤拷要锟斤拷锟斤拷.锟斤拷
     * @param description   锟侥硷拷锟斤拷锟狡o拷锟斤拷锟侥o拷
     * @return 锟斤拷锟斤拷值锟侥革拷式锟斤拷锟斤拷:
     * {
     * "groupName": "healthArchiveGroup",
     * "remoteFileName": "/M00/00/24/rBFuH1XdQC6AP3CDAAzodQCbVVc052.jpg",
@ -43,10 +43,10 @@ public class FastDFSUtil {
     * "fileURL": "http://172.19.103.13/healthArchiveGroup/M00/00/24/rBFuH1XdQC6AP3CDAAzodQCbVVc052.jpg"
     * }
     * <p>
     * groupName 及 remoteFileName 可以用于查询在 fastDFS 中文件的信息,如果只是图片显示,可以忽略这两个值。
     * fid 保存了在 fastDFS 上的完整路径,为了避免将来服务器域名发生变更,最好使用本值.服务器的域名另外配置。
     * fileURL 保存了完整的 web 访问路径,为了避免将来服务器域名发生变更,最好不要直接使用本值。
     * 如果需要在下载时,可以显示原始文件名,请在访问file_url时,增加 attname 参数,如:
     * groupName �� remoteFileName �������ڲ�ѯ�� fastDFS ���ļ�����Ϣ�����ֻ��ͼƬ��ʾ�����Ժ���������ֵ��
     * fid 锟斤拷锟斤拷锟斤拷锟斤拷 fastDFS 锟较碉拷锟斤拷锟斤拷路锟斤拷锟斤拷为锟剿憋拷锟解将锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷使锟矫憋拷值.锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟矫★拷
     * fileURL 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 web 锟斤拷锟斤拷路锟斤拷锟斤拷为锟剿憋拷锟解将锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟矫诧拷要直锟斤拷使锟矫憋拷值锟斤拷
     * 锟斤拷锟斤拷锟揭�拷锟斤拷锟斤拷锟绞憋拷锟斤拷锟斤拷锟斤拷锟绞驹�硷拷募锟斤拷锟斤拷锟斤拷锟斤拷诜锟斤拷锟絝ile_url时锟斤拷锟斤拷锟斤拷 attname 锟斤拷锟斤拷锟斤拷锟界:
     * <p>
     * http://host/healthArchiveGroup/M00/00/00/rBFuH1XdIseAUTZZAA1rIuRd3Es062.jpg?attname=a.jpg
     * @throws Exception
@ -62,7 +62,7 @@ public class FastDFSUtil {
            ObjectMapper objectMapper = SpringBeanUtil.getService("objectMapper");
            ObjectNode message = objectMapper.createObjectNode();
            // 网络I/O会有延迟
            // 锟斤拷锟斤拷I/O锟斤拷锟斤拷锟接筹拷
            int count = 0;
            //while (count == 0) {
            //    count = in.available();
@ -123,12 +123,12 @@ public class FastDFSUtil {
    }
    /**
     * 上传本地文件
     * 锟较达拷锟斤拷锟斤拷锟侥硷拷
     * ObjectNode  a = FileUtil.upload("C://Desert.jpg", "沙漠");
     * System.out.println(a.toString());
     *
     * @param fileName    本地文件的绝对路径,如 C://Desert.jpg
     * @param description 文件备注, 可以为空
     * @param fileName    锟斤拷锟斤拷锟侥硷拷锟侥撅拷锟斤拷路锟斤拷锟斤拷锟斤拷 C://Desert.jpg
     * @param description 锟侥硷拷锟斤拷注, 锟斤拷锟斤拷为锟斤拷
     * @return {"groupName":"group1","remoteFileName":"/M00/00/24/rBFuH1XdQC6AP3CDAAzodQCbVVc052.jpg"
     * {
     * "groupName": "healthArchiveGroup",
@ -137,10 +137,10 @@ public class FastDFSUtil {
     * "fileURL": "http://172.19.103.13/healthArchiveGroup/M00/00/24/rBFuH1XdQC6AP3CDAAzodQCbVVc052.jpg"
     * }
     * <p>
     * groupName 及 remoteFileName 可以用于查询在 fastDFS 中文件的信息,如果只是图片显示,可以忽略这两个值。
     * fid 保存了在 fastDFS 上的完整路径,为了避免将来服务器域名发生变更,最好使用本值.服务器的域名另外配置。
     * fileURL 保存了完整的 web 访问路径,为了避免将来服务器域名发生变更,最好不要直接使用本值。
     * 如果需要在下载时,可以显示原始文件名,请在访问file_url时,增加 attname 参数,如:
     * groupName �� remoteFileName �������ڲ�ѯ�� fastDFS ���ļ�����Ϣ�����ֻ��ͼƬ��ʾ�����Ժ���������ֵ��
     * fid 锟斤拷锟斤拷锟斤拷锟斤拷 fastDFS 锟较碉拷锟斤拷锟斤拷路锟斤拷锟斤拷为锟剿憋拷锟解将锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷使锟矫憋拷值.锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟矫★拷
     * fileURL 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 web 锟斤拷锟斤拷路锟斤拷锟斤拷为锟剿憋拷锟解将锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟矫诧拷要直锟斤拷使锟矫憋拷值锟斤拷
     * 锟斤拷锟斤拷锟揭�拷锟斤拷锟斤拷锟绞憋拷锟斤拷锟斤拷锟斤拷锟绞驹�硷拷募锟斤拷锟斤拷锟斤拷锟斤拷诜锟斤拷锟絝ile_url时锟斤拷锟斤拷锟斤拷 attname 锟斤拷锟斤拷锟斤拷锟界:
     * <p>
     * http://host/healthArchiveGroup/M00/00/00/rBFuH1XdIseAUTZZAA1rIuRd3Es062.jpg?attname=a.jpg
     * @throws Exception
@ -158,7 +158,7 @@ public class FastDFSUtil {
            if (fileName.contains(".")) {
                fileExtName = fileName.substring(fileName.lastIndexOf(".") + 1);
            } else {
                throw new RuntimeException("上传失败, 文件缺失扩展名.");
                throw new RuntimeException("锟较达拷失锟斤拷, 锟侥硷拷缺失锟斤拷展锟斤拷.");
            }
            TrackerServer trackerServer = FastDFSClientPool.getInstance().getTrackerServer();
@ -203,11 +203,11 @@ public class FastDFSUtil {
    }
    /**
     * 下载文件, 返回文件字节数组.
     * 锟斤拷锟斤拷锟侥硷拷, 锟斤拷锟斤拷锟侥硷拷锟街斤拷锟斤拷锟斤拷.
     *
     * @param groupName      在fastdfs上的卷名
     * @param remoteFileName 在fastdfs上的路径
     * @return 文件的字节码
     * @param groupName      锟斤拷fastdfs锟较的撅拷锟斤拷
     * @param remoteFileName 锟斤拷fastdfs锟较碉拷路锟斤拷
     * @return 锟侥硷拷锟斤拷锟街斤拷锟斤拷
     * @throws Exception
     */
    public static byte[] download(String groupName, String remoteFileName) throws Exception {
@ -222,12 +222,12 @@ public class FastDFSUtil {
    }
    /**
     * 下载文件到本地路径上.
     * 锟斤拷锟斤拷锟侥硷拷锟斤拷锟斤拷锟斤拷路锟斤拷锟斤拷.
     *
     * @param groupName      在 fastDFS 上的卷名
     * @param remoteFileName 在 fastDFS 上的路径
     * @param localPath      本地路径
     * @return 是否下载成功
     * @param groupName      锟斤拷 fastDFS 锟较的撅拷锟斤拷
     * @param remoteFileName 锟斤拷 fastDFS 锟较碉拷路锟斤拷
     * @param localPath      锟斤拷锟斤拷路锟斤拷
     * @return 锟角凤拷锟斤拷锟截成癸拷
     */
    public static String download(String groupName, String remoteFileName, String localPath) throws IOException, MyException {
        StorageClient client = FastDFSClientPool.getInstance().getStorageClient();
@ -242,7 +242,7 @@ public class FastDFSUtil {
    }
    /**
     * 删除文件。
     * 删锟斤拷锟侥硷拷锟斤拷
     *
     * @param groupName
     * @param remoteFileName

+ 3 - 3
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/fastdfs/XEnvironmentOption.java

@ -3,7 +3,7 @@ package com.yihu.ehr.framework.util.fastdfs;
public interface XEnvironmentOption {
    /**
     * ÅжÏÑ¡ÏîÊÇ·ñÓÐÅäÖÃ.
     * 判断选项是�有�置.
     *
     * @param key
     * @return
@ -11,7 +11,7 @@ public interface XEnvironmentOption {
    public boolean isOptionConfigured(EnvironmentOptions key);
    /**
     * »ñȡѡÏîÖµ.
     * 获�选项值.
     *
     * @param key
     * @return
@ -19,7 +19,7 @@ public interface XEnvironmentOption {
    public String getOption(EnvironmentOptions key);
    /**
     * ÉèÖÃÑ¡ÏîÖµ.
     * 设置选项值.
     *
     * @param key
     * @param value

+ 15 - 15
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/file/FileUtil.java

@ -31,7 +31,7 @@ public class FileUtil {
        int hasRead = 0;
        while ((hasRead = fis.read(bbuf)) > 0) {
            //每读取一次,即写入文件输出流,读了多少,就写多少
            //姣忚�鍙栦竴娆★紝鍗冲啓鍏ユ枃浠惰緭鍑烘祦锛岃�浜嗗�灏戯紝灏卞啓澶氬皯
            fileOutputStream.write(bbuf, 0, hasRead);
        }
@ -44,7 +44,7 @@ public class FileUtil {
    /**
     * 将文件的String类型二进制流转成文件
     * 灏嗘枃浠剁殑String绫诲瀷浜岃繘鍒舵祦杞�垚鏂囦欢
     *
     * @param filePath
     * @param data
@ -65,9 +65,9 @@ public class FileUtil {
        byte[] bbuf = new byte[1024];
        InputStream fis = new ByteArrayInputStream(bytes);
        int hasRead = 0;
        //循环从输入流中取出数据
        //循环从输入流中取出数据
        while ((hasRead = fis.read(bbuf)) > 0) {
            //每读取一次,即写入文件输出流,读了多少,就写多少
            //姣忚�鍙栦竴娆★紝鍗冲啓鍏ユ枃浠惰緭鍑烘祦锛岃�浜嗗�灏戯紝灏卞啓澶氬皯
            fileOutputStream.write(bbuf, 0, hasRead);
        }
        fileOutputStream.close();
@ -75,7 +75,7 @@ public class FileUtil {
    }
    /**
     * InputStream 转 byte[]
     * InputStream 转 byte[]
     *
     * @param input
     * @return
@ -93,9 +93,9 @@ public class FileUtil {
    /**
     * 通过文件途径,将文件转成byte[] 流
     * 通过文件途径,将文件转成byte[] 流
     *
     * @param filepath 文件路径
     * @param filepath 鏂囦欢璺�緞
     * @return
     * @throws IOException
     */
@ -113,9 +113,9 @@ public class FileUtil {
    /**
     * 通过文件途径,将文件转成String二进制流  流
     * 通过文件途径,将文件转成String二进制流  流
     *
     * @param filepath 文件路径
     * @param filepath 鏂囦欢璺�緞
     * @return
     * @throws IOException
     */
@ -129,9 +129,9 @@ public class FileUtil {
    }
    /**
     * file转string
     * @param fileName 文件名
     * @return string类型流
     * file杞瑂tring
     * @param fileName 文件名
     * @return string类型流
     */
    public static String convertFileToString(String fileName) {
@ -166,9 +166,9 @@ public class FileUtil {
    }
    /**
     * 复制一个指定文件夹下的指定文件 到另一个指定文件夹下
     * @param path 复制文件路径
     * @param toPath 文件路径
     * 复制一个指定文件夹下的指定文件 到另一个指定文件夹下
     * @param path 澶嶅埗鏂囦欢璺�緞
     * @param toPath 鏂囦欢璺�緞
     */
    public static void copyAllFileByPath(String path, String toPath) throws IOException {

+ 3 - 3
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/http/HOPClient.java

@ -81,12 +81,12 @@ public class HOPClient {
        try {
            boolean result = FileUtil.writeFile(path, response.body, "UTF-8");
            if (!result) {
                LogService.getLogger(HOPClient.class).error("下载文件失败.");
                LogService.getLogger(HOPClient.class).error("涓嬭浇鏂囦欢澶辫触.");
            }
            return result;
        } catch (IOException e) {
            LogService.getLogger(HOPClient.class).error("下载文件失败.");
            LogService.getLogger(HOPClient.class).error("涓嬭浇鏂囦欢澶辫触.");
        }
        return false;
    }
@ -124,7 +124,7 @@ public class HOPClient {
    private void addParam(String paramName, String paramValue, boolean bMust) throws Exception {
        if (StringUtils.isEmpty(paramValue)) {
            if (bMust) {
                throw new Exception(paramName + "参数不能为空.");
                throw new Exception(paramName + "鍙傛暟涓嶈兘涓虹┖.");
            } else {
                return;
            }

+ 4 - 4
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/http/HttpsInitialise.java

@ -9,7 +9,7 @@ import javax.net.ssl.SSLContext;
import java.io.File;
/**
 * Https相关环境初始化
 * Https相关环境初始化
 *
 * @author Air
 * @version 1.0
@ -44,10 +44,10 @@ public class HttpsInitialise {
    }
    /**
     * 初始化SSLConnectionSocketFactory.
     * 鍒濆�鍖朣SLConnectionSocketFactory.
     *
     * @param password       密码
     * @param trustStorePath 信任库路径
     * @param password       瀵嗙爜
     * @param trustStorePath 信任库路径
     * @throws Exception
     */
    public void  init(String trustStorePath, String password) throws Exception {

+ 5 - 5
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/log/LogService.java

@ -10,11 +10,11 @@ import org.springframework.stereotype.Service;
import java.io.FileInputStream;
/**
 * 日志服务类。目前使用的是 log4j2,即2.X版本的log4j,不能与其他版本混淆,因为它们的配置文件加载方式不一致.
 * 日志服务类。目前使用的是 log4j2,即2.X版本的log4j,不能与其他版本混淆,因为它们的配置文件加载方式不一致.
 *
 * @apiNote 由于涉及到Spring框架的初始化, 它会先于log4j的初始化. 如果在log4j配置未初始化之前在Spring Bean内先生成
 * log4j对象, 可能会造成错误. 例如: Spring MVC 的Controller部分可能会缓存一个Logger对象,但此时log4j是未配置的, 所以会出现异常.
 * 正确的作法是Spring的Bean内不要缓存这个Logger对象,并在lo4j初始化后在运行时去获取Logger对象.
 * @apiNote 鐢变簬娑夊強鍒癝pring妗嗘灦鐨勫垵濮嬪寲, 瀹冧細鍏堜簬log4j鐨勫垵濮嬪寲. 濡傛灉鍦╨og4j閰嶇疆鏈�垵濮嬪寲涔嬪墠鍦⊿pring Bean鍐呭厛鐢熸垚
 * log4j对象, 可能会造成错误. 例如: Spring MVC 的Controller部分可能会缓存一个Logger对象,但此时log4j是未配置的, 所以会出现异常.
 * 姝g‘鐨勪綔娉曟槸Spring鐨凚ean鍐呬笉瑕佺紦瀛樿繖涓狶ogger瀵硅薄,骞跺湪lo4j鍒濆�鍖栧悗鍦ㄨ繍琛屾椂鍘昏幏鍙朙ogger瀵硅薄.
 *
 * @author Air
 * @author Sand
@ -34,7 +34,7 @@ public class LogService {
            Configurator.initialize(null, source);
        } catch (Exception ex) {
            // 此处不能再调用自身作为日志记录服务, 因为此时初始化失败了
            // 此处不能再调用自身作为日志记录服务, 因为此时初始化失败了
            LogManager.getLogger(LogService.class).error(ex.getMessage());
        }
    }

+ 47 - 47
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/wsgateway/GatewayUtil.java

@ -24,14 +24,14 @@ public class GatewayUtil {
    /**
     * 使用Axis Call Client动态调用WebService地址.
     * 浣跨敤Axis Call Client鍔ㄦ€佽皟鐢╓ebService鍦板潃.
     *
     * @param webServiceAddr WebService地址
     * @param webServiceMethod WebService方法
     * @param webServiceAddr WebService鍦板潃
     * @param webServiceMethod WebService鏂规硶
     * @param inputValues 输入参数值
     * @param inputValues 输入参数值
     * @return 成功返回<code>Object</code>, 失败或异常返回null.
     * @return 鎴愬姛杩斿洖<code>Object</code>, 澶辫触鎴栧紓甯歌繑鍥瀗ull.
     */
    public static String getObjectByAxisCallClient(String webServiceAddr, String webServiceMethod,
                                                   Object[] inputValues) {
@ -39,10 +39,10 @@ public class GatewayUtil {
        try {
                Service service = new Service();
            Service service = new Service();
            call = (Call) service.createCall();
            // 设置wsdl
            // 璁剧疆wsdl
            call.setTargetEndpointAddress(new URL(webServiceAddr));
//            List pramerList = new ArrayList();
@ -53,39 +53,39 @@ public class GatewayUtil {
//            myWebServicePramer.setPramerValue(dataXml);
//            pramerList.add(myWebServicePramer);
            // 设置访问的方法名
            // 璁剧疆璁块棶鐨勬柟娉曞悕
            call.setOperationName("service");
            call.addParameter("authInfo", //参数名
                    XMLType.XSD_STRING,//参数类型:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("sequenceNo", //参数名
                    XMLType.XSD_STRING,//参数类型:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("api", //参数名
                    XMLType.XSD_STRING,//参数类型:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("param", //参数名
                    XMLType.XSD_STRING,//参数类型:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("paramType", //参数名
                    XMLType.XSD_INT,//参数类型:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("outType", //参数名
                    XMLType.XSD_INT,//参数类型:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("v", //参数名
                    XMLType.XSD_STRING,//参数类型:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("out", XMLType.XSD_STRING,//参数类型:String
            call.addParameter("authInfo", //参数名
                    XMLType.XSD_STRING,//鍙傛暟绫诲瀷:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("sequenceNo", //参数名
                    XMLType.XSD_STRING,//鍙傛暟绫诲瀷:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("api", //参数名
                    XMLType.XSD_STRING,//鍙傛暟绫诲瀷:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("param", //参数名
                    XMLType.XSD_STRING,//鍙傛暟绫诲瀷:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("paramType", //参数名
                    XMLType.XSD_INT,//鍙傛暟绫诲瀷:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("outType", //参数名
                    XMLType.XSD_INT,//鍙傛暟绫诲瀷:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("v", //参数名
                    XMLType.XSD_STRING,//鍙傛暟绫诲瀷:String
                    ParameterMode.IN);//参数模式:'IN' or 'OUT'
            call.addParameter("out", XMLType.XSD_STRING,//鍙傛暟绫诲瀷:String
                    ParameterMode.OUT);
            call.setReturnType((QName) XMLType.XSD_STRING);
            String result=(String)call.invoke(inputValues);
            return result;
            // 定义参数对象
            // 瀹氫箟鍙傛暟瀵硅薄
            //call.setUseSOAPAction(true);
            //call.setSOAPActionURI(soapActionURI + webServiceMethod);
@ -93,7 +93,7 @@ public class GatewayUtil {
//            OperationDesc oper = new OperationDesc();
//            if (!ArrayUtils.isEmpty(inputNames)) {
//                for (int i = 0; i < inputNames.length; i++) {
//                    // String类型
//                    // String绫诲瀷
//                    oper.addParameter(new QName(targetNamespace, inputNames[i]), new QName(targetNamespace, inputXmlTypes[i]),
//                            inputJavaTypes[i], ParameterDesc.IN, false, false);
//                }
@ -136,7 +136,7 @@ public class GatewayUtil {
//            params.add(new BasicNameValuePair("paramType", "0"));
//            params.add(new BasicNameValuePair("outType", "0"));
//
//            //params.add(new BasicNameValuePair("mobileCode", "136370628"));  //(注意这里的号码必须大于6位)
//            //params.add(new BasicNameValuePair("mobileCode", "136370628"));  //锛堟敞鎰忚繖閲岀殑鍙风爜蹇呴』澶т簬6浣嶏級
//            //params.add(new BasicNameValuePair("userId", ""));
//            request.setEntity(new UrlEncodedFormEntity(params, HTTP.UTF_8));
//            HttpResponse httpResponse = new DefaultHttpClient().execute(request);
@ -149,29 +149,29 @@ public class GatewayUtil {
//        }
//    }
    /**
     * 使用Axis Call Client动态调用WebService地址.
     * 浣跨敤Axis Call Client鍔ㄦ€佽皟鐢╓ebService鍦板潃.
     *
     * @param webServiceAddr   WebService地址
     * @param webserviceNamespace WebService的namespace
     * @param webServiceMethod WebService方法
     * @param inputValues      输入参数值
     * @param inputValuetype      输入参数值类型
     * @return 成功返回<code>Object</code>, 失败或异常返回null.
     * @param webServiceAddr   WebService鍦板潃
     * @param webserviceNamespace WebService鐨刵amespace
     * @param webServiceMethod WebService鏂规硶
     * @param inputValues      输入参数值
     * @param inputValuetype      输入参数值类型
     * @return 鎴愬姛杩斿洖<code>Object</code>, 澶辫触鎴栧紓甯歌繑鍥瀗ull.
     */
    public static String getObjectByAxis2CallClient(String webServiceAddr, String webserviceNamespace, String webServiceMethod,
                                                   Object[] inputValues, Class[] inputValuetype) {
                                                    Object[] inputValues, Class[] inputValuetype) {
        try {
            //新建RPC服务客户端
            //新建RPC服务客户端
            RPCServiceClient serviceClient = new RPCServiceClient();
            Options options = serviceClient.getOptions();
            //设置URL
            //璁剧疆URL
            EndpointReference targetEPR = new EndpointReference(webServiceAddr);
            options.setTo(targetEPR);
            //设置参数的类型
            //设置namespace和方法名
            //设置参数的类型
            //璁剧疆namespace鍜屾柟娉曞悕
            QName opAddEntry = new QName(webserviceNamespace, webServiceMethod);
            //数组的第一个值为返回值
            //数组的第一个值为返回值
            return (String) (serviceClient.invokeBlocking(opAddEntry, inputValues, inputValuetype))[0];
        } catch (Exception e) {
            e.printStackTrace();

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

@ -68,6 +68,19 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
        return super.queryListBySql(sql, RsJobDataset.class);
    }
    /**
     * 获取版本名称
     */
    @Override
    public String getSchemeAndVersion(String schemeVersionId) throws Exception
    {
        String sql = "select  CONCAT_WS(' -- ',s.name,v.name)  from adapter_scheme_version v\n" +
                "left join adapter_scheme s on s.id = v.scheme_id \n" +
                "where v.version='"+schemeVersionId+"'";
        return super.scalarBySql(sql, String.class);
    }
    /**
     * 修改任务状态
     */

+ 4 - 0
Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/intf/IDatacollectDao.java

@ -33,6 +33,10 @@ public interface IDatacollectDao extends XSQLGeneralDAO {
     */
    public List<RsJobDataset> getJobDataset(String jobId) throws Exception;
    /**
     * 获取版本名称
     */
    public String getSchemeAndVersion(String schemeVersionId) throws Exception;
    /**
     * 修改任务状态

+ 9 - 1
Hos-resource/src/main/java/com/yihu/ehr/datacollect/model/DtoJobConfig.java

@ -7,10 +7,18 @@ import java.sql.Timestamp;
 */
public class DtoJobConfig extends RsJobConfig implements java.io.Serializable {
	private String schemeAndVersion;
	private String jobDataset;
	private String jobPlan;
	public String getSchemeAndVersion() {
		return schemeAndVersion;
	}
	public void setSchemeAndVersion(String schemeAndVersion) {
		this.schemeAndVersion = schemeAndVersion;
	}
	public String getJobDataset() {
		return jobDataset;
	}

+ 46 - 25
Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatacollectManager.java

@ -174,6 +174,10 @@ public class DatacollectManager implements IDatacollectManager {
                dto.setSchemeId(job.getSchemeId());
                dto.setValid(job.getValid());
                //获取版本名称
                String schemeAndVersion = datacollectDao.getSchemeAndVersion(job.getSchemeVersion());
                dto.setSchemeAndVersion(schemeAndVersion);
                //获取关联数据集
                List<RsJobDataset> datasetList = datacollectDao.getJobDataset(job.getId());
                if(datasetList!=null && datasetList.size()>0)
@ -217,31 +221,35 @@ public class DatacollectManager implements IDatacollectManager {
        {
            JSONObject jsonItem = JSONObject.fromObject(item);
            String datasetId= jsonItem.getString("adapterDatasetId");
            DtoJobDataset obj = new DtoJobDataset();
            obj.setJobDatasetName(jsonItem.getString("adapterDatasetName"));
            obj.setJobDatasetCode(jsonItem.getString("adapterDatasetCode"));
            obj.setJobDatasetId(datasetId);
            //是否关联任务
            if(jobDataset!=null&&jobDataset.size()>0)
            //配置完整才显示
            if(datasetId.length()>0&&jsonItem.getString("adapterDatasetName").length()>0&&jsonItem.getString("adapterDatasetName")!="null"&&jsonItem.getString("adapterDatasetCode").length()>0&&jsonItem.getString("adapterDatasetCode")!="null")
            {
                for(RsJobDataset jd :jobDataset)
                DtoJobDataset obj = new DtoJobDataset();
                obj.setJobDatasetName(jsonItem.getString("adapterDatasetName"));
                obj.setJobDatasetCode(jsonItem.getString("adapterDatasetCode"));
                obj.setJobDatasetId(datasetId);
                //是否关联任务
                if(jobDataset!=null&&jobDataset.size()>0)
                {
                    if(jd.getJobDatasetId().equals(datasetId))
                    for(RsJobDataset jd :jobDataset)
                    {
                        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;
                        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);
            }
            list.add(obj);
        }
        re.setDetailModelList(list);
@ -313,12 +321,25 @@ public class DatacollectManager implements IDatacollectManager {
                for (Object item : array) {
                    JSONObject obj = JSONObject.fromObject(item);
                    RsJobDataset rs = new RsJobDataset();
                    rs.setJobDatasetCondition(obj.getString("jobDatasetCondition"));
                    rs.setJobDatasetId(obj.getString("jobDatasetId"));
                    rs.setJobDatasetKey(obj.getString("jobDatasetKey"));
                    rs.setJobDatasetKeytype(obj.getString("jobDatasetKeytype"));
                    rs.setJobDatasetKeyvalue(obj.getString("jobDatasetKeyvalue"));
                    rs.setJobDatasetName(obj.getString("jobDatasetName"));
                    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);
                }

+ 4 - 0
Hos-resource/src/main/java/com/yihu/ehr/resource/dao/IRsResourceDao.java

@ -21,4 +21,8 @@ public interface IRsResourceDao extends XSQLGeneralDAO {
    RsResource getResourceById(String id) throws Exception;
    /**
     * 通过分类获取资源
     */
    List<RsResource> getAllRsResourceByCategory(String category) throws Exception;
}

+ 8 - 0
Hos-resource/src/main/java/com/yihu/ehr/resource/dao/impl/RsResourceDaoImpl.java

@ -58,6 +58,14 @@ public class RsResourceDaoImpl extends SQLGeneralDAO implements IRsResourceDao {
        return (List<RsResource>) super.hibernateTemplate.find(" from RsResource r ");
    }
    /**
     * 通过分类获取资源
     */
    @Override
    public List<RsResource> getAllRsResourceByCategory(String category) throws Exception {
        return (List<RsResource>) super.hibernateTemplate.find(" from RsResource r where Category='"+category+"'");
    }
    @Override
    public RsResource getResourceById(String id) throws Exception {
        return super.getEntity(RsResource.class, id);

+ 23 - 10
Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsCategoryServiceImpl.java

@ -3,8 +3,11 @@ package com.yihu.ehr.resource.service.impl;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.resource.dao.IRsCategoryDao;
import com.yihu.ehr.resource.dao.IRsResourceDao;
import com.yihu.ehr.resource.model.RsResource;
import com.yihu.ehr.resource.model.RsResourceCategory;
import com.yihu.ehr.resource.service.IRsCategoryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -15,9 +18,12 @@ import java.util.Map;
@Service("categoryService")
public class RsCategoryServiceImpl implements IRsCategoryService {
    @Resource(name = "rsCategoryDao")
    @Autowired
    private IRsCategoryDao rsCategoryDao;
    @Autowired
    private IRsResourceDao rsResourceDao;
    @Override
    public Result getList(Map<String, Object> conditionMap) throws Exception {
        return rsCategoryDao.getList(conditionMap);
@ -51,19 +57,26 @@ public class RsCategoryServiceImpl implements IRsCategoryService {
        return Result.success("更新成功");
    }
    /**
     * 删除资源分类,存在子节点或所属资源不允许删除
     */
    @Transactional
    public Result deleteCategory(String id) throws Exception {
        RsResourceCategory rc = rsCategoryDao.getEntity(RsResourceCategory.class, id);
        List<RsResourceCategory> allRsResourceCategorys = new ArrayList<RsResourceCategory>();
        allRsResourceCategorys.add(rc);
        //找出所有的子节点
        List<RsResourceCategory> rsResourceCategoryTemp = rsCategoryDao.getCategoryByPid(id);
        for (int i = 0; i < rsResourceCategoryTemp.size(); i++) {
            findChindren(rsResourceCategoryTemp.get(i).getId(), allRsResourceCategorys);
        //判断是否存在子节点
        List<RsResourceCategory> categoryList = rsCategoryDao.getCategoryByPid(id);
        if(categoryList==null || categoryList.size()>0)
        {
            return Result.error("存在子节点,不允许删除!");
        }
        for (RsResourceCategory t : allRsResourceCategorys) {
            rsCategoryDao.deleteEntity(t);
        //判断是否存在资源
        List<RsResource> resourceList =  rsResourceDao.getAllRsResourceByCategory(id);
        if(resourceList==null || resourceList.size()>0)
        {
            return Result.error("存在所属资源,不允许删除!");
        }
        RsResourceCategory rc = rsCategoryDao.getEntity(RsResourceCategory.class, id);
        rsCategoryDao.deleteEntity(rc);
        return Result.success("删除成功");
    }

+ 3 - 3
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/adapter/adapterDataSet/dialogJs.jsp

@ -111,14 +111,14 @@
                                parent.closeDialog('保存成功!');
                            }else{
                                if(data.errorMsg)
                                    $.Notice.error( data.errorMsg);
                                    $.ligerDialog.error( data.errorMsg);
                                else
                                    $.Notice.error( '出错了!');
                                    $.ligerDialog.error( '出错了!');
                            }
                            self.$btnSave.removeAttr('disabled');
                        },
                        error: function () {
                            $.Notice.error( '出错了!');
                            $.ligerDialog.error( '出错了!');
                            self.$btnSave.removeAttr('disabled');
                        }
                    });

+ 3 - 3
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/adapter/adapterDataSet/dictDialogJs.jsp

@ -114,14 +114,14 @@
                                parent.closeDialog('保存成功!');
                            }else{
                                if(data.errorMsg)
                                    $.Notice.error( data.errorMsg);
                                    $.ligerDialog.error( data.errorMsg);
                                else
                                    $.Notice.error( '出错了!');
                                    $.ligerDialog.error( '出错了!');
                            }
                            self.$btnSave.removeAttr('disabled');
                        },
                        error: function () {
                            $.Notice.error( '出错了!');
                            $.ligerDialog.error( '出错了!');
                            self.$btnSave.removeAttr('disabled');
                        }
                    });

+ 3 - 3
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/adapter/adapterOrg/adapterOrgDialogJs.jsp

@ -267,14 +267,14 @@
//                                dialog.close();
                            }else{
                                if(data.errorMsg)
                                    $.Notice.error(data.errorMsg);
                                    $.ligerDialog.error(data.errorMsg);
                                else
                                    $.Notice.error('出错了!');
                                    $.ligerDialog.error('出错了!');
                            }
                            self.$btnSave.removeAttr('disabled');
                        },
                        error: function () {
                            $.Notice.error('出错了!');
                            $.ligerDialog.error('出错了!');
                            self.$btnSave.removeAttr('disabled');
                        }
                    });

+ 3 - 3
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/adapter/orgCollection/dialogJs.jsp

@ -77,14 +77,14 @@
                                parent.closeDialog( '保存成功!');
                            }else{
                                if(data.errorMsg)
                                    $.Notice.error( data.errorMsg);
                                    $.ligerDialog.error( data.errorMsg);
                                else
                                    $.Notice.error( '出错了!');
                                    $.ligerDialog.error( '出错了!');
                            }
                            self.$btnSave.removeAttr('disabled');
                        },
                        error: function () {
                            $.Notice.error( '出错了!');
                            $.ligerDialog.error( '出错了!');
                            self.$btnSave.removeAttr('disabled');
                        }
                    });

+ 1 - 1
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/configJobJs.jsp

@ -16,7 +16,7 @@
                url: '${contextRoot}/datacollect/getJob',
                columns: [
                    {display:'任务名称',name:'jobName', width: '20%'},
                    {display:'适配方案',name:'schemeId', width: '20%',dict:true,dictName:"ADAPTER_SCHEME"},
                    {display:'适配方案',name:'schemeAndVersion', width: '20%'},
                    {display:'数据集',name:'jobDataset', width: '20%'},
                    {display:'执行计划',name:'jobPlan',width: '20%'},
                    {display:'操作', name: 'operator', width: '20%', render: function (row) {

+ 2 - 2
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimensioncatetory/editorDimensionCatetory.jsp

@ -2,12 +2,12 @@
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<!--######机构管理页面 > 机构信息对话框模板页######-->
<div id="div_info_form" class="m-form-inline" style="padding-top:10px;" data-role-form>
<div id="div_info_form" class="m-form-inline" >
    <div class="m-form-group">
        <label>维度类别名称:</label>
        <div class="m-form-control essential">
        <div class="m-form-control">
            <div class="l-text">
                <input type="text" class="l-text-field required" placeholder="请输入维度类别名称" data-attr-scan="name"/>
            </div>

+ 2 - 2
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/patient/addCardInfoDialogJs.jsp

@ -92,10 +92,10 @@
                  data: {idCardNo:'${idCardNo}',objectId: objectId,type:type},
                  success: function (data) {
                    if (data.successFlg) {
                      $.Notice.success('认领成功');
                      $.ligerDialog.success('认领成功');
                      cardInfo.searchNewCard();
                    } else {
                      $.Notice.error('认领失败');
                      $.ligerDialog.error('认领失败');
                    }
                  }
                });

+ 2 - 2
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/patient/patientBasicInfoDialogJs.jsp

@ -199,10 +199,10 @@
                                data: {objectId: objectId,type:type},
                                success: function (data) {
                                    if (data.successFlg) {
                                        $.Notice.success('解绑成功');
                                        $.ligerDialog.success('解绑成功');
                                        cardFormInit.searchCard();
                                    } else {
                                        $.Notice.error('解绑失败');
                                        $.ligerDialog.error('解绑失败');
                                    }
                                }
                            });

+ 4 - 4
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/patient/patientInfoDialogJs.jsp

@ -173,9 +173,9 @@
                        success: function (data) {
                            if(data.successFlg){
                                win.parent.$.Notice.success('修改成功');
                                win.parent.$.ligerDialog.success('修改成功');
                            }else{
                                win.parent.$.Notice.error('修改失败');
                                win.parent.$.ligerDialog.error('修改失败');
                            }
                            win.parent.patientDialogRefresh();
                            dialog.close();
@ -192,9 +192,9 @@
                                data: {idCardNo: patientIdCardNo},
                                success: function (data) {
                                    if (data.successFlg) {
                                        win.parent.$.Notice.success('密码修改成功');
                                        win.parent.$.ligerDialog.success('密码修改成功');
                                    } else {
                                        win.parent.$.Notice.error('密码修改失败');
                                        win.parent.$.ligerDialog.error('密码修改失败');
                                    }
                                    dialog.close();
                                }

+ 12 - 21
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryManage.jsp

@ -4,31 +4,22 @@
<!-- ####### 页面部分 ####### -->
<div class="m-content">
    <div id="div_wrapper">
        <!-- ####### 查询条件部分 ####### -->
        <div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline" data-role-form>
            <div class="m-form-group f-mt10">
                <div class="m-form-control">
                    <!--输入框-->
                    <input type="text" id="inp_search" placeholder="请输入类别名称" class="f-ml10" data-attr-scan="searchNm"/>
                </div>
                <div class="m-form-control f-ml20">
                    <!--按钮:查询 & 新增-->
                    <div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span><spring:message code="btn.search"/></span>
                    </div>
                </div>
                <div class="m-form-control m-form-control-fr">
                    <div id="btn_add" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span>新增</span>
                    </div>
    <!-- ####### 查询条件部分 ####### -->
    <div class="m-form-inline">
        <div class="m-form-group">
            <div class="m-form-control">
                <input type="text" id="inp_search" placeholder="请输入类别名称"/>
            </div>
            <div class="m-form-control right">
                <div id="btn_add" class="l-button">
                    <span>新增</span>
                </div>
            </div>
        </div>
    </div>
        <!--###### 查询明细列表 ######-->
        <div id="div_app_info_grid">
    <!--###### 查询明细列表 ######-->
    <div id="div_app_info_grid">
        </div>
    </div>
</div>

+ 0 - 8
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryManageCss.jsp

@ -1,8 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style>
    .m-form-inline .m-form-group .m-form-control.m-form-control-fr {
        float: right;
    }
</style>

+ 24 - 36
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryManageJs.jsp

@ -2,29 +2,19 @@
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script>
    var rsCategoryManage = {
        $element: $('.m-retrieve-area'),
        $searchNm: $('#inp_search'),
        $catalogDDL: $('#ipt_catalog'),
        $statusDDL: $('#ipt_status'),
        $searchBtn: $('#btn_search'),
        $addBtn: $('#btn_add'),
        appInfoDialog: null,
        grid: null,
        init: function () {
            this.$searchNm.ligerTextBox({width: 240});
            this.$element.show();
            this.$element.attrScan();
            window.form = this.$element;
            var searchNm = $("#inp_search").val();
            var catalog = $("#ipt_catalog").val();
            var status = $("#ipt_status").val();
            var me = this;
            $("#inp_search").ligerSearch({
                onClick:function(value){
                    me.reloadGrid();
                }
            });
            this.grid = $("#div_app_info_grid").ligerGrid({
                url: '${contextRoot}/resource/rsCategory/searchRsCategory',
                parms: {
                    searchNm: searchNm,
                    page: 1,
                    rows: 100000
                },
@ -43,13 +33,14 @@
                    }
                    }
                ],
                enabledEdit: true,
                validate: true,
                unSetValidateAttr: false, scrollToPage: false, tree: {
                unSetValidateAttr: false,
                scrollToPage: false,
                tree: {
                    columnId: 'code',
                    idField: 'id',
                    parentIDField: 'pid'
                },
                rownumbers: false,
                usePager: false,
                onDblClickRow:function(data,rowid,rowdata){
                    rsCategoryManage.editor(data.id,"modify");
@ -58,11 +49,6 @@
            this.bindEvents();
        },
        initCategoryList: function (target) {
            var target = $(target);
            var dataModel = $.DataModel.init();
        },
        dialogCallBack: function (message) {
            $.ligerDialog.success(message);
            rsCategoryManage.grid.reload();
@ -79,7 +65,7 @@
            }
            rsCategoryManage.appInfoDialog = $.ligerDialog.open({
                height: 500,
                height: 450,
                width: 600,
                title: title,
                url: '${contextRoot}/resource/rsCategory/rsCategoryInfo',
@ -92,7 +78,7 @@
            });
        },
        delete: function (id) {
            var message = "删除父类同时删除子类,确定要删除类别吗?";
            var message = "确定要删除该类别吗?";
            jQuery.ligerDialog.confirm(message, function (confirm) {
                if (confirm) {
                    $.ajax({ //ajax处理
@ -107,25 +93,27 @@
                                rsCategoryManage.grid.reload();
                            }
                            else {
                                $.Notice.error("Status:" + data.status + "(" + data.statusText + ")");
                                $.ligerDialog.error(data.message);
                            }
                        },
                        error: function (data) {
                            $.Notice.error("Status:" + data.status + "(" + data.statusText + ")");
                            $.ligerDialog.error("Status:" + data.status + "(" + data.statusText + ")");
                        }
                    });
                }
            });
        },
        reloadGrid:function(){
            var me = this;
            me.grid.loadServerData({
                searchNm: $("#inp_search").val(),
                page: 1,
                rows: 100000
            });
        },
        bindEvents: function () {
            rsCategoryManage.$searchBtn.click(function () {
                rsCategoryManage.grid.loadServerData({
                    searchNm: $("#inp_search").val(),
                    page: 1,
                    rows: 100000
                });
            })
            rsCategoryManage.$addBtn.click(function () {
            $('#btn_add').click(function () {
                rsCategoryManage.editor("", "new");
            })

+ 2 - 2
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceConfigJs.jsp

@ -165,11 +165,11 @@
                                rsResourceConfig.$datagrid.reload();
                            }
                            else {
                                $.Notice.error(data.message);
                                $.ligerDialog.error(data.message);
                            }
                        },
                        error: function (data) {
                            $.Notice.error("Status:" + data.status + "(" + data.statusText + ")");
                            $.ligerDialog.error("Status:" + data.status + "(" + data.statusText + ")");
                        }
                    });
                }

+ 3 - 3
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/std/dict/dictEntryInfoDialogJs.jsp

@ -73,14 +73,14 @@
                                parent.closeDialog('right','保存成功!');
                            }else{
                                if(data.message)
                                    $.Notice.error( data.message);
                                    $.ligerDialog.error( data.message);
                                else
                                    $.Notice.error( '出错了!');
                                    $.ligerDialog.error( '出错了!');
                            }
                            self.$btnSave.removeAttr('disabled');
                        },
                        error: function () {
                            $.Notice.error( '出错了!');
                            $.ligerDialog.error( '出错了!');
                            self.$btnSave.removeAttr('disabled');
                        }
                    });

+ 3 - 3
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/std/dict/stdDictInfoDialogJs.jsp

@ -153,14 +153,14 @@
//                                dialog.close();
                            }else{
                                if(data.message)
                                    $.Notice.error(data.message);
                                    $.ligerDialog.error(data.message);
                                else
                                    $.Notice.error('请选择标准来源');
                                    $.ligerDialog.error('请选择标准来源');
                            }
                            self.$btnSave.removeAttr('disabled');
                        },
                        error: function () {
                            $.Notice.error('出错了!');
                            $.ligerDialog.error('出错了!');
                            self.$btnSave.removeAttr('disabled');
                        }
                    });

+ 3 - 3
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/std/standardsource/stdInfoDialogJs.jsp

@ -80,14 +80,14 @@
//                                dialog.close();
                            }else{
                                if(data.errorMsg)
                                    $.Notice.error( data.errorMsg);
                                    $.ligerDialog.error( data.errorMsg);
                                else
                                    $.Notice.error( '出错了!');
                                    $.ligerDialog.error( '出错了!');
                            }
                            self.$btnSave.removeAttr('disabled');
                        },
                        error: function () {
                            $.Notice.error( '出错了!');
                            $.ligerDialog.error( '出错了!');
                            self.$btnSave.removeAttr('disabled');
                        }
                    });

+ 22 - 26
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/authority/authority.jsp

@ -3,37 +3,33 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<!--######用户管理页面Title设置######-->
<!-- ####### 页面部分 ####### -->
<div class="m-content">
    <div id="div_wrapper">
        <div position="left" >
            <div  style="margin-bottom: 24px;margin-top: 10px;width: 100px">
                <input type="text" style="width: 100px" id="div_wrapper_left_inp_search" placeholder="请输入角色名称"/>
            </div>
            <div id="div_left_grid">
            </div>
<div id="div_wrapper">
    <div position="left"  style="margin-left:10px;margin-top:10px;">
        <div  class="m-form-group">
            <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入角色名称"/>
        </div>
        <!-- ####### 查询条件部分 ####### -->
        <div position="center">
            <div id="buttons" data-toggle="buttons" class="btn-group">
                <label class="btn btn-sm btn-white active">
                    <input type="radio" id="option1" tab="1" name="options">菜单功能权限</label>
            </div>
            <div style="height:35px;">
                <div class="m-form-control m-form-control-fr" style="float: right;margin-left: 10px">
                    <div id="div_allow" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span>全部允许</span>
                    </div>
        <div id="div_left_grid"></div>
    </div>
    <!-- ####### 查询条件部分 ####### -->
    <div position="center" style="margin-left:10px;margin-top:10px;margin-right:10px;">
        <div id="buttons" data-toggle="buttons" class="btn-group">
            <label class="btn btn-sm btn-white active">
                <input type="radio" id="option1" tab="1" name="options">菜单功能权限</label>
        </div>
        <div style="height:35px;">
            <div class="m-form-control right">
                <div id="div_allow" class="l-button">
                    <span>全部允许</span>
                </div>
                <div class="m-form-control m-form-control-fr" style="float: right">
                    <div id="div_forbid" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span>全部禁止</span>
                    </div>
            </div>
            <div class="m-form-control " >
                <div id="div_forbid" class="l-button">
                    <span>全部禁止</span>
                </div>
            </div>
            <div id="div_right_grid">
        </div>
        <div id="div_right_grid">
            </div>
        </div>
    </div>
</div>

+ 0 - 21
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/authority/authorityCss.jsp

@ -1,21 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style>
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group {
        margin-bottom: 0px;
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group span {
        line-height: 2
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group center hr {
        height: 1px;
        border: none;
        border-top: 1px solid #2d9bd2;
        margin-top: 0px;
        margin-bottom: 0px
    }
</style>

+ 0 - 12
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/authority/authorityJs.jsp

@ -47,11 +47,6 @@
                    }
                ],
                usePager: false,//不显示分页
                alternatingRow: true,//奇偶行效果,
                height: "99%",
                heightDiff: -10,
                headerRowHeight: 40,
                rowHeight: 40,
                scrollToPage: false, tree: {
                    columnId: 'name',
                    idField: 'id',
@ -119,14 +114,8 @@
                columns: [
                    {display: '角色名称', id: 'name', name: 'name', width: '90%', align: "center"}
                ],
                alternatingRow: false,
                checkbox: false,
                heightDiff: -10,
                headerRowHeight: 40,
                rowHeight: 40,
                parms: {rows: 10000},
                usePager: false,
                height: "99%",
                onSelectRow: function (rowdata, rowid, rowobj) {
                    authority.currentRoleId = rowdata.id;
                    authority.$rightgrid.loadServerData({id: rowdata.id});
@ -138,7 +127,6 @@
        initlayout: function () {
            this.$layout.ligerLayout({
                height: "98%",
                leftWidth: 200,
                isLeftCollapse: false,//左边区域初始化不可以隐藏
                allowLeftCollapse: false//左边区域不可以隐藏

+ 3 - 3
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menu.jsp

@ -11,9 +11,9 @@
                    <input type="text" id="txtName" class="l-text-field" placeholder="请输入代码或名称"/>
            </div>
            <div class="m-form-control m-form-control-fr" style="float: right">
                <div id="div_new_record" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                    <span><spring:message code="btn.create"/></span>
            <div class="m-form-control right">
                <div id="div_new_record" class="l-button">
                    <span>新增</span>
                </div>
            </div>
        </div>

+ 2 - 5
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menuJs.jsp

@ -51,12 +51,9 @@
                },
                alternatingRow: false,
                rownumbers: false,
                checkbox: false,
                heightDiff: -10,
                headerRowHeight: 40,
                rowHeight: 40,
                usePager: false,
                scrollToPage: false, tree: {
                scrollToPage: false,
                tree: {
                    columnId: 'code',
                    idField: 'id',
                    parentIDField: 'pid'

+ 11 - 14
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menuaction/menuAction.jsp

@ -4,27 +4,24 @@
<!--######用户管理页面Title设置######-->
<!-- ####### 页面部分 ####### -->
<div class="m-content">
    <div id="div_wrapper">
        <div position="left" title="">
            <div class="l-text-wrapper m-form-control" style="margin-bottom: 15px;">
<div id="div_wrapper">
        <div position="left"  style="margin-left:10px;margin-top:10px;">
            <div class="m-form-control">
                <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入菜单名称"/>
            </div>
            <ul id="menu_tree" class="m-snav"></ul>
        </div>
        <!-- ####### 查询条件部分 ####### -->
        <div position="center">
            <div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline">
                <div class="m-form-group f-mt10">
        <div position="center" style="margin-left:10px;margin-top:10px;margin-right:10px;">
            <div class="m-form-inline">
                <div class="m-form-group">
                    <div class="m-form-control">
                            <input type="text" id="txtName" class="l-text-field" placeholder="请输入名称"/>
                        <input type="text" id="txtName" class="l-text-field" placeholder="请输入名称"/>
                    </div>
                    <div class="m-form-control m-form-control-fr" style="float: right">
                        <div id="div_new_record" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                            <span><spring:message code="btn.create"/></span>
                    <div class="m-form-control right">
                        <div id="div_new_record" class="l-button">
                            <span>新增</span>
                        </div>
                    </div>
                </div>
@ -36,5 +33,5 @@
            </div>
        </div>
    </div>
</div>

+ 0 - 21
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menuaction/menuActionCss.jsp

@ -1,21 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style>
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group {
        margin-bottom: 0px;
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group span {
        line-height: 2
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group center hr {
        height: 1px;
        border: none;
        border-top: 1px solid #2d9bd2;
        margin-top: 0px;
        margin-bottom: 0px
    }
</style>

+ 1 - 6
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menuaction/menuActionJs.jsp

@ -51,12 +51,7 @@
                ],
                onDblClickRow: function (row) {
                    me.editorDialog(row.id);
                },
                alternatingRow: false,
                checkbox: false,
                heightDiff: -10,
                headerRowHeight: 40,
                rowHeight: 40
                }
            });
            me.bindEvents();
        },

+ 0 - 21
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/role/editorRoleCss.jsp

@ -1,21 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style>
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group {
        margin-bottom: 0px;
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group span {
        line-height: 2
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group center hr {
        height: 1px;
        border: none;
        border-top: 1px solid #2d9bd2;
        margin-top: 0px;
        margin-bottom: 0px
    }
</style>

+ 12 - 16
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/role/role.jsp

@ -3,27 +3,23 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<!-- ####### 页面部分 ####### -->
<div class="m-content">
    <div id="div_wrapper">
        <!-- ####### 查询条件部分 ####### -->
        <div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline">
            <div class="m-form-group f-mt10">
                <div class="m-form-control">
                        <input type="text" id="txtName" class="l-text-field" placeholder="请输入角色名称"/>
                </div>
    <!-- ####### 查询条件部分 ####### -->
    <div class="m-form-inline">
        <div class="m-form-group">
            <div class="m-form-control">
                <input type="text" id="txtName" class="l-text-field" placeholder="请输入角色名称"/>
            </div>
                <div class="m-form-control m-form-control-fr" style="float: right">
                    <div id="div_new_record" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span><spring:message code="btn.create"/></span>
                    </div>
            <div class="m-form-control right" >
                <div id="div_new_record" class="l-button">
                    <span>新增</span>
                </div>
            </div>
        </div>
    </div>
        <!--######菜单信息表######-->
        <div id="div_grid">
    <!--######菜单信息表######-->
    <div id="div_grid">
        </div>
    </div>
</div>

+ 0 - 21
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/role/roleCss.jsp

@ -1,21 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style>
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group {
        margin-bottom: 0px;
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group span {
        line-height: 2
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group center hr {
        height: 1px;
        border: none;
        border-top: 1px solid #2d9bd2;
        margin-top: 0px;
        margin-bottom: 0px
    }
</style>

+ 1 - 9
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/role/roleJs.jsp

@ -46,15 +46,7 @@
                ],
                onDblClickRow: function (row) {
                    me.editorDialog(row.id);
                },
                alternatingRow: false,
                rownumbers: true,
                checkbox: false,
                pageSize:10,
                page:1,
                heightDiff: -10,
                headerRowHeight: 40,
                rowHeight: 40
                }
            });
            me.bindEvents();

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

@ -76,7 +76,7 @@
                if (re != null) {
                    if (re != "loading") {
                        return re;
                        return me.listToDict(re);
                    }
                }
                else {