Merge branch 'master' of shine/esb into master

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

@@ -41,7 +41,7 @@ public interface IDatacollectDao extends XSQLGeneralDAO {
    /**
     * 修改任务状态
     */
    public void validJob(String id,String valid) throws Exception;
    public void validJob(String id, String valid) throws Exception;
    /**
     * 删除任务关联数据集

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

@@ -18,5 +18,5 @@ public interface IDatacollectLogDao extends XSQLGeneralDAO {
    /**
     * 修改
     */
    public void updateJobDatasetKeyvalue(String id,String jobDatasetKeyvalue) throws Exception;
    public void updateJobDatasetKeyvalue(String id, String jobDatasetKeyvalue) throws Exception;
}

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

@@ -25,17 +25,17 @@ public interface IDatacollectManager {
    /**
     * 获取任务列表
     */
    public DataGridResult getJobList(Map<String, Object> conditionMap,int page, int rows) throws Exception;
    public DataGridResult getJobList(Map<String, Object> conditionMap, int page, int rows) throws Exception;
    /**
     * 根据适配方案获取数据集列表
     */
    public DataGridResult getSchemeDataset(String schemeId,String schemeVersion,String jobId) throws Exception;
    public DataGridResult getSchemeDataset(String schemeId, String schemeVersion, String jobId) throws Exception;
    /**
     * 根据适配方案获取字段列表
     */
    public DataGridResult getSchemeDatasetCol(String schemeId,String schemeVersion,String datasetId) throws Exception;
    public DataGridResult getSchemeDatasetCol(String schemeId, String schemeVersion, String datasetId) throws Exception;
    /**
     * 根据任务Id获取相关数据集下拉数据
@@ -45,12 +45,12 @@ public interface IDatacollectManager {
    /**
     * 新增任务
     */
    public ActionResult addJob(RsJobConfig obj,String cron,String jobDataset) throws Exception;
    public ActionResult addJob(RsJobConfig obj, String cron, String jobDataset) throws Exception;
    /**
     * 修改任务
     */
    public ActionResult updateJob(RsJobConfig obj,String cron,String jobDataset) throws Exception;
    public ActionResult updateJob(RsJobConfig obj, String cron, String jobDataset) throws Exception;
    /**
@@ -61,7 +61,7 @@ public interface IDatacollectManager {
    /**
     * 修改任务状态
     */
    public ActionResult validJob(String jobId,String valid) throws Exception;
    public ActionResult validJob(String jobId, String valid) throws Exception;
    /**
     * 数据集数据源管理列表（包含全部数据集）
@@ -77,12 +77,12 @@ public interface IDatacollectManager {
    /**
     * 获取任务日志列表
     */
    public DataGridResult getJobLogDetail(Map<String, Object> conditionMap,int page, int rows) throws Exception;
    public DataGridResult getJobLogDetail(Map<String, Object> conditionMap, int page, int rows) throws Exception;
    /**
     * 获取任务日志列表
     */
    public DataGridResult getJobLog(Map<String, Object> conditionMap,int page, int rows) throws Exception;
    public DataGridResult getJobLog(Map<String, Object> conditionMap, int page, int rows) throws Exception;
    /**
     * 任务详细根据数据集分组

Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsCategoryController.java

@@ -47,6 +47,7 @@ public class RsCategoryController extends BaseController {
            }
            model.addAttribute("resourceId", id);
            model.addAttribute("mode", mode);
            String s=rrrd.getRemark();
            model.addAttribute("model", rrrd);
            model.addAttribute("contentPage", "resource/category/rsCategoryInfoDialog");
        } catch (Exception e) {

Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsResourceController.java

@@ -508,10 +508,15 @@ public class RsResourceController extends BaseController {
            Map<String, Object> params = new HashMap<String, Object>();
            String datasetId = request.getParameter("datasetId");
            String name = request.getParameter("name");
            String page = request.getParameter("page");
            String rows = request.getParameter("rows");
            params.put("datasetId", datasetId);
            params.put("name", name);
            params.put("page", page);
            params.put("rows", rows);
            return resourceService.getDataSet(params);
        } catch (Exception e) {
        }
        catch (Exception e) {
            e.printStackTrace();
            return Result.error("删除失败！");
        }

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

@@ -1,9 +1,13 @@
package com.yihu.ehr.resource.dao;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/21.
 */
public interface IRsResourceDatasetDao extends XSQLGeneralDAO{
    public DataGridResult getDataSet(Map<String, Object> conditionMap) throws Exception;
}

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

@@ -13,5 +13,5 @@ import java.util.Map;
public interface IRsResourceDimensionDao extends XSQLGeneralDAO {
    List<RsResourceDimensionModel> getDimensionByResourceId(String resourceId) throws Exception;
    Result getDimensionList(Map<String,Object > conditionMap) throws Exception;
    Result getDimensionList(Map<String, Object> conditionMap) throws Exception;
}

Hos-resource/src/main/java/com/yihu/ehr/resource/dao/impl/RsResourceDatasetDaoImpl.java

@@ -1,12 +1,27 @@
package com.yihu.ehr.resource.dao.impl;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.resource.dao.IRsResourceDatasetDao;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/21.
 */
@Repository("resourceDatasetDao")
public class RsResourceDatasetDaoImpl extends SQLGeneralDAO implements IRsResourceDatasetDao{
    public DataGridResult getDataSet(Map<String, Object> conditionMap) throws Exception {
        StringBuilder sb = new StringBuilder();
        sb.append(" from RsResourceDataset r ");
        sb.append(" where 1=1 ");
        if (!StringUtils.isEmpty(conditionMap.get("name"))) {
            sb.append(" and r.name like '%" + conditionMap.get("name") + "%'");
        }
        Integer page=Integer.parseInt(conditionMap.get("page").toString());
        Integer rows=Integer.parseInt(conditionMap.get("rows").toString());
        return super.getDataGridResult(sb.toString(), page, rows);
    }
}

Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsResourceServiceImpl.java

@@ -163,7 +163,13 @@ public class RsResourceServiceImpl extends BaseHttpService implements IRsResourc
        DataGridResult re = new DataGridResult();
        if (StringUtils.isEmpty(params.get("datasetId"))) {
            re.setDetailModelList(stdService.datasetsAllVersionList());
            if(params.get("name")!=null)
            {
                return resourceDatasetDao.getDataSet(params);
            }
            else {
                re.setDetailModelList(stdService.datasetsAllVersionList());
            }
        } else {
            RsResourceDataset rd = resourceDatasetDao.getEntity(RsResourceDataset.class, (String) params.get("datasetId"));
            List list = new ArrayList();

Hos-resource/src/main/java/com/yihu/ehr/std/service/intf/IStdService.java

@@ -36,7 +36,7 @@ public interface IStdService {
    /**
     * 通过适配方案+应用数据集ID获取数据集列表
     */
    public List<AdapterDatasetModel> getDatasetByScheme(String schemeVersion,String adapterDatasetId) throws Exception;
    public List<AdapterDatasetModel> getDatasetByScheme(String schemeVersion, String adapterDatasetId) throws Exception;
    /**
     * 通过适配方案获取字段列表

Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IBaseDictDao.java

@@ -16,7 +16,7 @@ public interface IBaseDictDao {
     * 获取字典列表
     * @return
     */
    DataGridResult getSystemDictList(String condition,Integer page, Integer pageSize) throws Exception ;
    DataGridResult getSystemDictList(String condition, Integer page, Integer pageSize) throws Exception ;
    /**
     * 通过ID获取系统字典信息
@@ -41,7 +41,7 @@ public interface IBaseDictDao {
     * 获取表数据
     * @return
     */
    DictionaryResult getRelationDict(String tableName,String codeCol,String valueCole,String extendCol,String Where) throws Exception ;
    DictionaryResult getRelationDict(String tableName, String codeCol, String valueCole, String extendCol, String Where) throws Exception ;
    /**
     * 获取标准字典数据

Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IDatasourceDao.java

@@ -13,7 +13,7 @@ public interface IDatasourceDao extends XSQLGeneralDAO {
    /**
     * 测试连接数据源
     */
    void testDatasource(String type,String config) throws Exception;
    void testDatasource(String type, String config) throws Exception;
    /**
     * 获取数据源列表
@@ -30,5 +30,5 @@ public interface IDatasourceDao extends XSQLGeneralDAO {
    /**
     * 修改数据源状态(暂弃)
     */
    void validDatasource(String id,String valid) throws Exception;
    void validDatasource(String id, String valid) throws Exception;
}

Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IMenuActionDao.java

@@ -14,7 +14,7 @@ public interface IMenuActionDao extends XSQLGeneralDAO {
    void activityMenuAction(String menuactionId, String activityFlag) throws Exception;
    SystemMenuAction getMenuActionByNameAndMenuId(String name,String menuid) throws Exception;
    SystemMenuAction getMenuActionByNameAndMenuId(String name, String menuid) throws Exception;
    SystemMenuAction getMenuActionByNameAndMenuIdWithOutId(String name,String menuid, String id) throws Exception;
    SystemMenuAction getMenuActionByNameAndMenuIdWithOutId(String name, String menuid, String id) throws Exception;
}

Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IOrganizationDao.java

@@ -26,5 +26,5 @@ public interface IOrganizationDao extends XSQLGeneralDAO {
    /**
     * 修改组织状态
     */
    void activityOrg(String orgId,String activityFlag) throws Exception;
    void activityOrg(String orgId, String activityFlag) throws Exception;
}

Hos-resource/src/main/java/com/yihu/ehr/system/service/intf/IBaseDictManager.java

@@ -18,13 +18,13 @@ public interface IBaseDictManager {
     * 获取字典数据(常用)
     * @return
     */
    DictionaryResult getDict(String name,String where,String type) throws Exception;
    DictionaryResult getDict(String name, String where, String type) throws Exception;
    /**
     * 获取字典列表
     * @return
     */
    DataGridResult getSystemDictList(String condition,Integer page, Integer rows) throws Exception;
    DataGridResult getSystemDictList(String condition, Integer page, Integer rows) throws Exception;
    /**
     * 通过ID获取系统字典信息

Hos-resource/src/main/java/com/yihu/ehr/system/service/intf/ISystemManager.java

@@ -9,7 +9,7 @@ import javax.servlet.http.HttpSession;
 */
public interface ISystemManager {
    Result loginAction(HttpSession session,String user, String password) throws Exception;
    Result loginAction(HttpSession session, String user, String password) throws Exception;
}

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

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

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

@@ -63,7 +63,6 @@
                jobTimeFrom:'${jobTimeFrom}',
                jobTimeTo:'${jobTimeTo}'
            };
debugger
            $("#dataForm").ligerAutoForm({
                data:data
            });
@@ -78,6 +77,7 @@ debugger
                me.search();
            });
            $('#btnRepeat').click(function () {
                debugger
                var selected = me.grid.getSelectedRows();
                if(selected && selected.length>0)
                {

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

@@ -10,6 +10,8 @@
        $form:$("#div_form"),
        grid:null,
        chart:null,
        dialog:null,
        repeat:null,
        switchery:null,
        init:function(){
            var me = this;
@@ -62,7 +64,7 @@
                    {display:'补采数据',name:'repeatNum', width: '12%'},
                    {
                        display:'操作',name:'id',width: '16%',render:function(row){
                            return '<a href="javascript:void(0)" onclick="javascript:repeatDatacollect.repeat(\''+row.id+'\')">补采</a>';
                            return '<a href="javascript:void(0)" onclick="javascript:trackJob.repeat()">补采</a>';
                        }
                    }
                ],
@@ -88,17 +90,34 @@
            });
            //任务补采
            $('#btnRepeatJob').click(function(){
                parent.indexPage.openMenuByText("任务补采",{
                    jobId:$("#selJob").ligerComboBox("getValue")
                },false);
            $('#btnRepeatJob').click(function () {
                parent.indexPage.openMenuByText("任务补采", {
                    jobId: $("#selJob").ligerComboBox("getValue")
                }, false);
            });
            //任务编辑
            $('#btnEditJob').click(function(){
                   var title = "编辑任务";
                   var params = {jobId:$("#selJob").ligerComboBox("getValue")};
                   me.dialog=$.ligerDialog.open({
                    height: 556,
                    width: 700,
                    title: title,
                    url: '${contextRoot}/datacollect/editorJob',
                    //load: true,
                    urlParms: params
                });
            });
        },
        repeat:function() {
                parent.indexPage.openMenuByText("任务补采", {jobId: $("#selJob").ligerComboBox("getValue")}, false);
        },
        callbackDialog:function(message){
            $.ligerDialog.success(message);
            this.dialog.close();
        },
        //获取任务相关数据
        search:function(jobId){
            var me = this;

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimension/editorDimension.jsp

@@ -4,28 +4,28 @@
<!--######机构管理页面 > 机构信息对话框模板页######-->
<div id="div_info_form" class="m-form-inline" style="padding-top:10px;" data-role-form>
    <div class="m-form-group">
        <label>维度名称：</label>
        <label><span class="red">*&nbsp;</span>维度名称：</label>
        <div class="m-form-control essential">
        <div class="m-form-control">
            <div class="l-text">
                <input type="text" id="name" class="l-text-field required" placeholder="请输入维度名称" data-attr-scan="name"/>
                <input type="text" id="name" class="l-text-field required" placeholder="请输入维度名称" name="name"/>
            </div>
        </div>
    </div>
    <div class="m-form-group">
        <label>维度类别：</label>
        <label><span class="red">*&nbsp;</span>维度类别：</label>
        <div class="m-form-control essential">
                <input type="text" id="category" data-type="select"  class="l-text-field required" placeholder="" data-attr-scan="category"/>
        <div class="m-form-control ">
                <input type="text" id="category" data-type="select"  class="l-text-field required" placeholder="" name="category"/>
        </div>
    </div>
    <div class="m-form-group">
        <label>维度类型：</label>
        <label><span class="red">*&nbsp;</span>维度类型：</label>
        <div class="m-form-control essential">
                <input type="text" id="type" data-type="select" class="l-text-field required" placeholder="" data-attr-scan="type"/>
        <div class="m-form-control">
                <input type="text" id="type" data-type="select" class="l-text-field required" placeholder="" name="type"/>
        </div>
    </div>
@@ -34,14 +34,14 @@
        <div class="m-form-control">
            <div class="l-text">
                <input type="text"  id="dictCode" class="l-text-field" data-attr-scan="dictCode"/>
                <input type="text"  id="dictCode" class="l-text-field" name="dictCode"/>
            </div>
        </div>
    </div>
    <!-- 隐藏字段 -->
    <div class="m-form-group" style="display: none;">
        <input data-attr-scan="id" hidden="hidden"/>
        <input name="id" hidden="hidden"/>
    </div>
    <div class="m-form-bottom">
        <div id="btnCancel" class="l-button l-button-no">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimension/editorDimensionJs.jsp

@@ -18,34 +18,35 @@
            var me = this;
            $("#category").ligerComboBox({dict: true, dictName: "RESOURCE_DIMENSION"});
            $("#type").ligerComboBox({dict: true, dictName: "RESOURCE_DIMENSION_TYPE"});
            me.$form.attrScan();
            var data;
            var modelString = "${model.id}";
            if (modelString != undefined && modelString != null && modelString.length > 0) {
                me.$form.Fields.fillValues({
                data={
                    id: "${model.id}",
                    name: "${model.name}",
                    category: "${model.category}",
                    type: "${model.type}",
                    dictCode: "${model.dictCode}",
                });
                };
                me.actionUrl = "${contextRoot}/dimension/updateDimension";
            }
            editorDimension.validator = new $.jValidation.Validation(editorDimension.$form, {
                immediate: true, onSubmit: false,
                onElementValidateForAjax: function (elm) {
            this.$form.ligerAutoForm({
                data:data,
                validate:{
                    name:"required",
                    category:"required",
                    type:"required"
                }
            });
        },
        bindEvents: function () {
            var me = this;
            $("#btnSave").click(function () {
                if (!editorDimension.validator.validate()) {
                if (!$("#div_info_form").ligerAutoForm("validate")) {
                    return;
                }
                var data = me.$form.Fields.getValues();
                var data = !$("#div_info_form").ligerAutoForm("getData");
                $.ajax({ //ajax处理
                    type: "POST",
                    url: me.actionUrl,

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryInfoDialog.jsp

@@ -6,7 +6,7 @@
            <label><span class="red">*&nbsp;</span>名称：</label>
            <div class="l-text-wrapper m-form-control ">
                <input type="text" class="l-textbox" placeholder="请输入资源类别名称"  name="name"/>
                <input type="text" class="l-textbox" placeholder="请输入资源类别名称" id="name" name="name"/>
            </div>
        </div>
        <div class="m-form-group">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryInfoDialogJs.jsp

@@ -8,6 +8,7 @@
            this.bindEvents();
        },
        initForm: function () {
            var mode = '${mode}';
            /*
             if(mode == 'view'){
@@ -15,6 +16,7 @@
             }
             */
            //初始化下拉框
            $("#inp_dialog_parent_category").ligerComboBox({
                url: "${contextRoot}/resource/rsCategory/getCategoryWithOutId",
                dataParmName: 'detailModelList',
@@ -30,6 +32,10 @@
                status: '${model.status}',
                remark: '${model.remark}'
            };
            if(data.pid!=""){
                $("#inp_dialog_parent_category").ligerComboBox().setDisabled("true");
            }
            $("#rsCategoryInfoForm").ligerAutoForm({
                data:data,
                validate:{
@@ -48,6 +54,8 @@
                    return;
                }
                var data = $("#rsCategoryInfoForm").ligerAutoForm("getData");
                data.id='${model.id}';
                debugger
                if ('${mode}' == 'new') {
                    $.ajax({ //ajax处理
                        type: "POST",
@@ -60,7 +68,7 @@
                                //调用主页面接口，重新刷新Grid
                                parent.window.rsCategoryManage.dialogCallBack(data.message);
                            } else {
                                $.ligerDialog.error(data.message);
                                $.ligerMethos.AutoForm.showError($("#name"),"资源名称重复");
                            }
                        },
                        error: function (data) {

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceImportDatasetDialogJs.jsp

@@ -185,7 +185,7 @@
                width: 240,
                fitColumn: false,
                height: 360,
                usePager: false,//不显示分页
                //usePager: false,//不显示分页
                onSelectRow: function (rowdata, rowid, rowobj) {
                    this$RightDG.ligerGrid("loadServerData", {datasetCode: rowdata.code, datasetId: rsResourceImportDatasetDialog.datasetId});
                },

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceInfoDialog.jsp

@@ -2,33 +2,31 @@
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<div id="div_info_form" data-role-form class="m-form-inline f-mt20 " data-role-form>
<div id="div_info_form" data-role-form class="m-form-inline f-mt20 " style="padding-top: 5px">
    <div class="m-form-group">
        <label>资源名称<spring:message code="spe.colon"/></label>
        <div class="l-text-wrapper m-form-control essential">
            <input type="hidden" id="inp_resource_id" data-type="text" class="required" data-attr-scan="id">
            <input type="text" id="inp_resource_name" class="required f-w240" placeholder="请输入资源类别名称"  required-title="该项为必输项！" data-attr-scan="name"/>
        <label><span class="red">*&nbsp;</span>资源名称：</label>
        <div class="l-text-wrapper m-form-control">
            <input type="text" id="inp_resource_name" class="required f-w240" placeholder="请输入资源类别名称"  required-title="该项为必输项！" name="name"/>
        </div>
    </div>
    <div class="m-form-group">
        <label>资源代码<spring:message code="spe.colon"/></label>
        <div class="l-text-wrapper m-form-control essential">
            <input type="text" id="inp_resource_code" data-type="select" class="required" data-attr-scan="code">
        <label><span class="red">*&nbsp;</span>资源代码：</label>
        <div class="l-text-wrapper m-form-control">
            <input type="text" id="inp_resource_code" data-type="select" class="required" name="code">
        </div>
    </div>
    <div class="m-form-group">
        <label>类型<spring:message code="spe.colon"/></label>
        <div class="u-checkbox-wrap m-form-control essential">
            <input type="radio" value="1" checked  name="inp_resource_type" data-attr-scan="type" data-rule="checked" >事实表
            <input type="radio" value="2"  name="inp_resource_type" data-attr-scan="type"  >逻辑表
        <label><span class="red">*&nbsp;</span>类型：</label>
        <div class="u-checkbox-wrap m-form-control">
            <input type="radio" value="1" checked  name="inp_resource_type" >事实表
            <input type="radio" value="2"  name="inp_resource_type" >逻辑表
        </div>
    </div>
    <div class="m-form-group">
        <label>提供方式<spring:message code="spe.colon"/></label>
        <div class="u-checkbox-wrap m-form-control essential">
        <label><span class="red">*&nbsp;</span>提供方式</label>
        <div class="u-checkbox-wrap m-form-control">
            <input type="radio" value="1" checked name="inp_resource_support_type" data-attr-scan="supportType" class="checked" >推模式
            <input type="radio" value="2"  name="inp_resource_support_type" data-attr-scan="supportType"  >拉模式
            <input type="radio" value="2"  name="inp_resource_support_type" >拉模式
        </div>
    </div>
    <!--
@@ -39,9 +37,9 @@
        </div>
    </div>-->
    <div class="m-form-group">
        <label>资源分类<spring:message code="spe.colon"/></label>
        <div class="l-text-wrapper m-form-control essential">
            <input type="text" id="inp_resource_category" data-type="select" class="required" data-attr-scan="category">
        <label><span class="red">*&nbsp;</span>资源分类：</label>
        <div class="l-text-wrapper m-form-control ">
            <input type="text" id="inp_resource_category" name="category">
        </div>
    </div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceInfoDialogJs.jsp

@@ -23,7 +23,7 @@
        },
        initForm: function () {
            var mode = '${mode}';
            var data;
            if (mode == 'view') {
                $("input,select", this.$form).prop('disabled', false);
            }
@@ -34,14 +34,12 @@
            this.$resourceRate.ligerTextBox({width: 240});
            this.$resourceCategory.ligerComboBox({dict: true, dictName: "CATEGORY_LIST"});
            this.$form.attrScan();
            if ('${mode}' == 'new') {
                this.$form.Fields.fillValues({
                data={
                    category: '${categoryId}'
                });
                };
            } else {
                this.$form.Fields.fillValues({
                data={
                    name: '${entity.name}',
                    code: '${entity.code}',
                    type: '${entity.type}',
@@ -49,32 +47,31 @@
                    supportType: '${entity.dataSupportType}',
                    category: '${entity.category}',
                    id: '${entity.id}'
                });
                };
            }
            this.$form.show();
            rsResourceInfoDialog.validator = new $.jValidation.Validation(rsResourceInfoDialog.$form, {
                immediate: true, onSubmit: false,
                onElementValidateForAjax: function (elm) {
            this.$form.ligerAutoForm({
                data:data,
                validate:{
                    name:"required",
                    code:"required",
                    inp_resource_support_type:"required",
                    inp_resource_type:"required",
                    category:"required"
                }
            });
        },
        bindEvents: function () {
            var self = this;
            this.$btnSave.click(function () {
                if (!rsResourceInfoDialog.validator.validate()) {
                if (!$("#div_info_form").ligerAutoForm("validate")) {
                    return;
                }
                var data=$("#div_info_form").ligerAutoForm("getData");
                if ('${mode}' == 'new') {
                    $.ajax({ //ajax处理
                        type: "POST",
                        url: "${contextRoot}/resource/resource/createRsResource",
                        dataType: "json",
                        data: self.$form.Fields.getValues(),
                        data: data,
                        cache: false,
                        success: function (data) {
                            if (data.successFlg) {
@@ -92,7 +89,7 @@
                        type: "POST",
                        url: "${contextRoot}/resource/resource/updateRsResource",
                        dataType: "json",
                        data: self.$form.Fields.getValues(),
                        data: data,
                        cache: false,
                        success: function (data) {
                            if (data.successFlg) {

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManageJs.jsp

@@ -2,6 +2,7 @@
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script>
    var rsResoureManege = {
        $searchresourceName: $('#inp_search'),//资源名称文本匡对象
        $catalogDDL: $('#ipt_catalog'),
        $statusDDL: $('#ipt_status'),
@@ -167,25 +168,30 @@
        },
        editor: function (id, mode) {
            var title = '';
            var params=null;
            //只有new 跟 modify两种模式会到这个函数
            if (mode == 'modify') {
                title = '修改资源';
                params={
                    id: id,
                    mode: mode,
                    categoryId:rsResoureManege.$resourceTreeId};
            }
            else {
                title = '注册/新增资源';
                params={
                    id: id,
                    mode: mode,
                    categoryId:rsResoureManege.$resourceTreeId
                }
            }
            this.appInfoDialog = $.ligerDialog.open({
                height: 440,
                width: 500,
                title: title,
                url: '${contextRoot}/resource/resource/rsResourceInfo',
                urlParms: {
                    id: id,
                    mode: mode,
                    categoryId:rsResoureManege.$resourceTreeId
                },
                urlParms: params,
                isHidden: false,
                opener: true
            });
@@ -220,7 +226,7 @@
        },
        dialogCallBack: function (message) {
            $.ligerDialog.success(message);
            rsResoureManege.grid.reload();
            rsResoureManege.reloadGridSearch();
            rsResoureManege.appInfoDialog.close();
        }
    }

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestDetailDialog.jsp

@@ -4,31 +4,31 @@
<!--######机构管理页面 > 机构信息对话框模板页######-->
<div id="div_info_form" class="m-form-inline" style="padding-top:10px;" data-role-form>
    <div class="m-form-group">
        <label>业务资源项名称：</label>
        <label><span class="red">*&nbsp;</span>业务资源项名称：</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"/>
                <input type="text" class="l-text-field required" placeholder="请输入业务资源项名称" name="name"/>
            </div>
        </div>
    </div>
    <div class="m-form-group">
        <label>业务资源项代码：</label>
        <label><span class="red">*&nbsp;</span>业务资源项代码：</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="code"/>
                <input type="text" class="l-text-field required" placeholder="请输入业务资源项代码" name="code"/>
            </div>
        </div>
    </div>
    <div class="m-form-group">
        <label>命名空间：</label>
        <label><span class="red">*&nbsp;</span>命名空间：</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="例:user.getUsername" data-attr-scan="namespace"/>
                <input type="text" class="l-text-field required"  placeholder="例:user.getUsername" name="namespace"/>
            </div>
        </div>
    </div>
@@ -37,15 +37,15 @@
        <label>访问方式：</label>
        <div class="m-form-control">
                <input type="text" id="httpType" data-type="select" class="l-text-field " data-attr-scan="type"/>
                <input type="text" id="httpType" data-type="select" class="l-text-field " name="type"/>
        </div>
    </div>
    <div class="m-form-group">
        <label>所属业务资源：</label>
        <label><span class="red">*&nbsp;</span>所属业务资源：</label>
        <div class="m-form-control essential">
                <input type="text"  data-type="select" id="resourceRestId" class="l-text-field required" class="l-text-field" data-attr-scan="resourceRestId">
        <div class="m-form-control ">
                <input type="text"  data-type="select" id="resourceRestId" class="l-text-field required" class="l-text-field" name="resourceRestId">
        </div>
    </div>
    <div class="m-form-group">
@@ -53,7 +53,7 @@
        <div class="m-form-control ">
            <div class="l-text">
                <input type="text" class="l-text-field" class="l-text-field" data-attr-scan="param">
                <input type="text" class="l-text-field" class="l-text-field" name="param">
            </div>
        </div>
    </div>
@@ -61,7 +61,7 @@
        <label>传入参数类型：</label>
        <div class="m-form-control ">
                <input type="text"  data-type="select" id="paramType" class="l-text-field" class="l-text-field" data-attr-scan="paramType">
                <input type="text"  data-type="select" id="paramType" class="l-text-field" class="l-text-field" name="paramType">
        </div>
    </div>
    <div class="m-form-group">
@@ -69,7 +69,7 @@
        <div class="m-form-control ">
            <div class="l-text">
                <input type="text" class="l-text-field" class="l-text-field" data-attr-scan="returnValue">
                <input type="text" class="l-text-field" class="l-text-field" name="returnValue">
            </div>
        </div>
    </div>
@@ -77,12 +77,12 @@
        <label>返回值类型：</label>
        <div class="m-form-control ">
                <input type="text"   data-type="select" id="returnType"  class="l-text-field" class="l-text-field" data-attr-scan="returnType">
                <input type="text"   data-type="select" id="returnType"  class="l-text-field" class="l-text-field" name="returnType">
        </div>
    </div>
    <!-- 隐藏字段 -->
    <div class="m-form-group" style="display: none;">
        <input data-attr-scan="id" hidden="hidden"/>
        <input name="id" hidden="hidden"/>
    </div>
    <div class="m-form-bottom">
        <div id="btnCancel" class="l-button l-button-no">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestDetailDialogJs.jsp

@@ -21,8 +21,9 @@
            var me = this;
            me.$form.attrScan();
            var modelString = "${model.id}";
            var data;
            if (modelString != undefined && modelString != null && modelString.length > 0) {
                me.$form.Fields.fillValues({
               data={
                    id: "${model.id}",
                    name: "${model.name}",
                    code: "${model.code}",
@@ -33,25 +34,27 @@
                    paramType: "${model.paramType}",
                    returnValue: "${model.returnValue}",
                    returnType: "${model.returnType}"
                });
                };
                me.actionUrl = "${contextRoot}/resourceRest/updateResourceRestDetail";
            }
            resourceRestDetailEditer.validator = new $.jValidation.Validation(resourceRestDetailEditer.$form, {
                immediate: true, onSubmit: false,
                onElementValidateForAjax: function (elm) {
            this.$form.ligerAutoForm({
                data:data,
                validate:{
                    name:"required",
                    code:"required",
                    namespace:"required",
                    resourceRestId:"required"
                }
            });
            })
        },
        bindEvents: function () {
            var me = this;
            $("#btnSave").click(function () {
                if (!resourceRestDetailEditer.validator.validate()) {
                if (!$("#div_info_form").ligerAutoForm("validate")) {
                    return;
                }
                var data = me.$form.Fields.getValues();
                var data = !$("#div_info_form").ligerAutoForm("getData")
                $.ajax({ //ajax处理
                    type: "POST",
                    url: me.actionUrl,

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestDialog.jsp

@@ -4,21 +4,21 @@
<!--######机构管理页面 > 机构信息对话框模板页######-->
<div id="div_info_form" class="m-form-inline" style="padding-top:10px;" data-role-form>
    <div class="m-form-group">
        <label>业务资源名称：</label>
        <label><span class="red">*&nbsp;</span>业务资源名称：</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"/>
                <input type="text" class="l-text-field required" placeholder="请输入业务资源名称" name="name"/>
            </div>
        </div>
    </div>
    <div class="m-form-group">
        <label>业务资源url：</label>
        <label><span class="red">*&nbsp;</span>业务资源url：</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="请输入业务资源url" data-attr-scan="url"/>
                <input type="text" class="l-text-field required" placeholder="请输入业务资源url" name="url"/>
            </div>
        </div>
    </div>
@@ -28,7 +28,7 @@
        <div class="m-form-control">
            <div class="l-text">
                <input type="text" class="l-text-field "  data-attr-scan="username"/>
                <input type="text" class="l-text-field "  name="username"/>
            </div>
        </div>
    </div>
@@ -38,7 +38,7 @@
        <div class="m-form-control">
            <div class="l-text">
                <input type="text" class="l-text-field" data-attr-scan="password"/>
                <input type="text" class="l-text-field" name="password"/>
            </div>
        </div>
    </div>
@@ -48,7 +48,7 @@
        <div class="m-form-control ">
            <div class="l-text">
                <input type="text" class="l-text-field" class="l-text-field" data-attr-scan="remark">
                <input type="text" class="l-text-field" class="l-text-field" name="remark">
            </div>
        </div>
    </div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestDialogJs.jsp

@@ -16,34 +16,36 @@
        initForm: function () {
            var me = this;
            me.$form.attrScan();
            var data;
            var modelString = "${model.id}";
            if(modelString!=undefined && modelString!=null && modelString.length>0)
            {
                me.$form.Fields.fillValues({
               data={
                    id: "${model.id}",
                    url: "${model.url}",
                    name:"${model.name}",
                    username: "${model.username}",
                    password: "${model.password}",
                    remark: "${model.remark}"
                });
                };
                me.actionUrl = "${contextRoot}/resourceRest/updateResourceRest";
            }
            resourceRestEditer.validator =  new $.jValidation.Validation(resourceRestEditer.$form, {immediate: true, onSubmit: false,
                onElementValidateForAjax:function(elm){
            };
            this.$form.ligerAutoForm({
                data:data,
                validate:{
                    name:"required",
                    url:"required"
                }
            });
            })
        },
        bindEvents: function () {
            var me = this;
            $("#btnSave").click(function () {
                if(!resourceRestEditer.validator.validate()){
                if(!$("#div_info_form").ligerAutoForm("validate")){
                    return;
                }
                var data = me.$form.Fields.getValues();
                var data =$("#div_info_form").ligerAutoForm("getData");
                $.ajax({ //ajax处理
                    type: "POST",
                    url : me.actionUrl,

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/adapterDetail.jsp

@@ -10,47 +10,47 @@
<div id="div_adapterplan_info_form" data-role-form class="m-form-inline f-mt20" style="margin-top: 20px;">
  <div class="m-form-group">
    <label>适配方案名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
    <label><span class="red">*&nbsp;</span>适配方案名称：</label>
    <div class="l-text-wrapper m-form-control ">
      <input type="text" class="required f-w240 " id="txt_name" name="name">
    </div>
  </div>
  <div class="m-form-group">
    <label>适配方案说明：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_description" name="txb_description" style="width: 240px;height: 60px;" data-attr-scan="description"  class="useTitle"></textarea>
      <textarea rows="3" id="txt_description" name="txb_description" style="width: 240px;height: 60px;" name="description"  class="useTitle"></textarea>
    </div>
  </div>
  <hr/>
  <div class="m-form-group" id="div_stdId">
    <label>平台标准名称：</label>
    <div class="l-text-wrapper m-form-control essential div-essential">
      <input type="text" class="required f-w240 " id="sel_stdId" data-type="select" data-attr-scan="stdId">
    <label><span class="red">*&nbsp;</span>平台标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_stdId" data-type="select" name="stdId">
    </div>
  </div>
  <div class="m-form-group" id="div_stdVersion">
    <label>平台标准版本：</label>
    <div class="l-text-wrapper m-form-control essential div-essential">
      <input type="text" class="required f-w240 " id="sel_stdVersion" data-type="select" data-attr-scan="stdVersion">
    <label><span class="red">*&nbsp;</span>平台标准版本：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_stdVersion" data-type="select" name="stdVersion">
    </div>
  </div>
  <hr/>
  <div class="m-form-group" id="div_adapterPublisherOrgCode">
    <label>发布机构名称：</label>
    <div class="l-text-wrapper m-form-control essential div-essential">
      <input type="text" class="required f-w240 " id="sel_publisherOrgCode" data-type="select" data-attr-scan="adapterPublisherOrgCode">
    <label><span class="red">*&nbsp;</span>发布机构名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_publisherOrgCode" data-type="select" name="adapterPublisherOrgCode">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdId">
    <label>应用标准名称：</label>
    <div class="l-text-wrapper m-form-control essential div-essential">
      <input type="text" class="required f-w240 " id="sel_adapterStdId" data-type="select" data-attr-scan="adapterStdId">
    <label><span class="red">*&nbsp;</span>应用标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_adapterStdId" data-type="select" name="adapterStdId">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdVersion">
    <label>应用标准版本：</label>
    <div class="l-text-wrapper m-form-control essential div-essential">
      <input type="text" class="required f-w240 " id="sel_adapterStdVersion" data-type="select" data-attr-scan="adapterStdVersion">
    <label><span class="red">*&nbsp;</span>应用标准版本：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_adapterStdVersion" data-type="select" name="adapterStdVersion">
    </div>
  </div>
  <div class="m-form-bottom">
@@ -61,10 +61,10 @@
      <span>确认</span>
    </div>
  </div>
  <input type="hidden" id="type" data-attr-scan="type"/>
  <input type="hidden" id="parent_id" data-attr-scan="parentId"/>
  <input type="hidden" id="status" data-attr-scan="status"/>
  <input type="hidden" id="id" data-attr-scan="id"/>
  <input type="hidden" id="type" name="type"/>
  <input type="hidden" id="parent_id" name="parentId"/>
  <input type="hidden" id="status" name="status"/>
  <input type="hidden" id="id" name="id"/>
  <input type="hidden" id="hd_url" value="${contextRoot}"/>
  <input type="hidden" id="hd_user" value="${User.id}"/>
  <input type="hidden" id="adapterStdVersion"/>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/versionDetail.jsp

@@ -15,15 +15,15 @@
    </div>
  </div>
  <div class="m-form-group">
    <label>适配版本名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
    <label><span class="red">*&nbsp;</span>适配版本名称：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="required f-w240 " id="txt_name" name="name">
    </div>
  </div>
  <div class="m-form-group" id="div_add_baseVersion">
    <label>基础版本名称：</label>
    <div class="m-form-control">
      <input type="text" class="f-w240 " id="sel_baseVersion" data-type="select" data-attr-scan="baseVersion" style="text-align: left"/>
      <input type="text" class="f-w240 " id="sel_baseVersion" data-type="select" name="baseVersion" style="text-align: left"/>
    </div>
  </div>
@@ -35,7 +35,7 @@
      <span>确认</span>
    </div>
  </div>
  <input type="hidden" id="id" data-attr-scan="id"/>
  <input type="hidden" id="id" name="id"/>
  <input type="hidden" id="type" value=""/>
  <input type="hidden" id="hd_url" value="${contextRoot}"/>
</div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/versionDetailJs.jsp

@@ -22,7 +22,6 @@
          validator: null,
          baseversion_select: null,
          init: function () {
            debugger
            var name = $.Util.getUrlQueryString('name');
            var type = $.Util.getUrlQueryString('type');
            var id = $.Util.getUrlQueryString('id');
@@ -58,6 +57,7 @@
            });
          },
          getAdapterVersionInfo: function (versionId,type) {//获取基础版本信息
               var Data;
               versionId = Number(versionId.replace("version",""));
               var u = adapterplan.version;
              $("#versionId").val(versionId+"");
@@ -71,11 +71,10 @@
                    u._getData = data;
                    if (type != '') {//新增或修改
                      u.$addform.attrScan();
                      u.$addform.Fields.fillValues({
                      Data={
                        name: u._getData.name,
                        baseVersion:u._getData.baseVersion==null?"":u._getData.baseVersion
                      });
                      };
                    } else {//查看版本信息
                      $("#lbl_seename").text(u._getData.name);
                    }

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/changePassword.jsp

@@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@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" style="padding-top:10px;">
  <div class="m-form-group">
    <label><span class="red">*&nbsp;</span>旧密码：</label>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/changePasswordJS.jsp

@@ -2,11 +2,9 @@
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script type="text/javascript">
  var changePassword = {
    //form
    actionUrl:"${contextRoot}/user/changePassword",
    init: function () {
      this.initForm();
      this.bindEvents();
@@ -39,8 +37,6 @@
      var me = this;
      $("#btnSave").click(function () {
        if(!$("#div_info_form").ligerAutoForm("validate")){
          return;
@@ -75,6 +71,7 @@
    }
  };
  $(function () {
    changePassword.init();
  });

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

@@ -391,8 +391,9 @@
            for (var i = 0; i < data.length; i++) {
                var obj=JSON.stringify(data[i]);
                var r = eval("("+obj+"." + filedName+")");
                if (r.indexOf(text) > 0) {
                if (r.indexOf(text) >= 0) {
                    this.select(data[i]);
                    break;
                }
            }
        }