Merge branch 'master' of chendi/esb into master

src/main/java/com/yihu/hos/system/controller/DatasourceController.java

@@ -2,10 +2,15 @@ package com.yihu.hos.system.controller;
import com.yihu.hos.common.Services;
import com.yihu.hos.system.model.SystemDatasource;
import com.yihu.hos.system.model.SystemOrganization;
import com.yihu.hos.system.service.DatasourceManager;
import com.yihu.hos.system.service.OrganizationManager;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import net.sf.json.JSONObject;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,13 +30,15 @@ public class DatasourceController extends BaseController {
    @Resource(name = Services.Datasource)
    DatasourceManager datasource;
    @Resource(name = Services.Organization)
    OrganizationManager organization;
    /*
        数据源配置
         */
    @RequestMapping("configSources")
    public String configSources(Model model) {
        model.addAttribute("contentPage","system/datasource/configSources");
        model.addAttribute("contentPage", "system/datasource/configSources");
        return "partView";
    }
@@ -39,7 +46,7 @@ public class DatasourceController extends BaseController {
    数据源新增/编辑
     */
    @RequestMapping("editorSource")
    public String editorSource(Model model,String sourceId) {
    public String editorSource(Model model, String sourceId) {
        try {
            if (sourceId != null) {
                SystemDatasource obj = datasource.getDatasourcegById(sourceId);
@@ -47,30 +54,38 @@ public class DatasourceController extends BaseController {
            }
            model.addAttribute("contentPage", "system/datasource/editorSource");
            return "pageView";
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            model.addAttribute("contentPage", "system/datasource/editorSource");
            return "pageView";
        }
    }
    /******************************* 数据源配置 ******************************************************/
    /*******************************
     * 数据源配置
     ******************************************************/
    /*
       获取数据源列表
    */
    @RequestMapping("getDatasource")
    @ResponseBody
    public Result getDatasource(String orgId,String name,String type,int page, int rows){
    public Result getDatasource(String orgId, String name, String type, int page, int rows) {
        try {
            Map<String, Object> map = new HashMap<>();
            map.put("orgId", orgId);
            map.put("name", name);
            map.put("type", type);
            return datasource.getDatasource(map,page, rows);
        }
        catch (Exception ex)
        {
            DataGridResult dataGridResult = datasource.getDatasource(map, page, rows);
            if (CollectionUtils.isNotEmpty(dataGridResult.getDetailModelList())) {
                for (Object obj : dataGridResult.getDetailModelList()) {
                    SystemDatasource datasource = (SystemDatasource) obj;
                    SystemOrganization _tempOrg = organization.getOrgById(datasource.getOrgId());
                    if (null != _tempOrg) {
                        datasource.setOrgName(_tempOrg.getFullName());
                    }
                }
            }
            return dataGridResult;
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -80,13 +95,10 @@ public class DatasourceController extends BaseController {
   */
    @RequestMapping("getDatasourceByOrg")
    @ResponseBody
    public Result getDatasourceByOrg(String orgId)
    {
    public Result getDatasourceByOrg(String orgId) {
        try {
            return datasource.getDatasourceByOrg(orgId);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -96,16 +108,13 @@ public class DatasourceController extends BaseController {
     */
    @RequestMapping("addDatasource")
    @ResponseBody
    public Result addDatasource(HttpServletRequest request)
    {
    public Result addDatasource(HttpServletRequest request) {
        try {
            SystemDatasource obj = new SystemDatasource();
            BeanUtils.populate(obj, request.getParameterMap());
            return datasource.addDatasource(obj);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -115,15 +124,13 @@ public class DatasourceController extends BaseController {
     */
    @RequestMapping("updateDatasource")
    @ResponseBody
    public Result updateDatasource(HttpServletRequest request)
    {
    public Result updateDatasource(HttpServletRequest request) {
        try {
            SystemDatasource obj = new SystemDatasource();
            BeanUtils.populate(obj, request.getParameterMap());
            return datasource.updateDatasource(obj);
        } catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -133,13 +140,10 @@ public class DatasourceController extends BaseController {
     */
    @RequestMapping("testDatasource")
    @ResponseBody
    public Result testDatasource(String dataSource, String config)
    {
    public Result testDatasource(String dataSource, String config) {
        try {
            return datasource.testDatasource(dataSource, config);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -149,12 +153,10 @@ public class DatasourceController extends BaseController {
     */
    @RequestMapping("deleteDatasource")
    @ResponseBody
    public Result DeleteDatasource(String id)
    {
    public Result DeleteDatasource(String id) {
        try {
            return datasource.deleteDatasource(id);
        } catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }

src/main/java/com/yihu/hos/system/controller/SystemController.java

@@ -92,7 +92,7 @@ public class SystemController {
            session.removeAttribute("userInfo");
            LocalContext.getContext().removeAttachment(ContextAttributes.TENANT_NAME);
            ActionResult re = new ActionResult(true, "登出成功！");
            re.setData(userCode);
            re.setData(tenantSession.getTenant());
            return re;
        }
        catch (Exception ex)

src/main/java/com/yihu/hos/system/model/SystemDatasource.java

@@ -13,6 +13,8 @@ public class SystemDatasource implements java.io.Serializable {
	private String name;
	private String config;
	private String type;
	// 显示作用，不用持久化到数据库
	private String orgName;
	// Constructors
@@ -75,4 +77,11 @@ public class SystemDatasource implements java.io.Serializable {
		this.type = type;
	}
	public String getOrgName() {
		return orgName;
	}
	public void setOrgName(String orgName) {
		this.orgName = orgName;
	}
}

src/main/webapp/WEB-INF/ehr/jsp/common/loginJs.jsp

@@ -47,6 +47,7 @@
    };
    $(function(){
        //session过期
        if(location.href.indexOf('loginPage')<0)
        {
@@ -55,9 +56,9 @@
        //内嵌页面
        if(self.location!=top.location)
        {
            top.location.href = "${contextRoot}/loginPage";
            <%--top.location.href = "${contextRoot}/loginPage";--%>
            top.location.href = window.location;
        }
        loginPage.init();
    });

src/main/webapp/WEB-INF/ehr/jsp/datacollect/configJobJs.jsp

@@ -20,12 +20,12 @@
                    {display:'数据集',name:'jobDataset', width: '20%'},
                    {display:'执行计划',name:'jobPlan',width: '20%'},
                    {display:'操作', name: 'operator', width: '20%', render: function (row) {
                        var html = '<div class="m-inline-buttons" style="width:120px;">';
                        if(row.valid == '1'){
                            html += '<a href="javascript:void(0)" onclick="javascript:configJob.valid(\''+row.id+'\',\'0\')">失效</a>';
                        }else{
                            html += '<a href="javascript:void(0)" onclick="javascript:configJob.valid(\''+row.id+'\',\'1\')">开启</a>';
                        }
                        var html = '<div class="m-inline-buttons" style="width:80px;">';
//                        if(row.valid == '1'){
//                            html += '<a href="javascript:void(0)" onclick="javascript:configJob.valid(\''+row.id+'\',\'0\')">失效</a>';
//                        }else{
//                            html += '<a href="javascript:void(0)" onclick="javascript:configJob.valid(\''+row.id+'\',\'1\')">开启</a>';
//                        }
                        html += '<a class="m-btn-edit" onclick="javascript:configJob.editor(\''+row.id+'\')"></a>';
                        html += '<a class="m-btn-delete" onclick="configJob.delete(\''+row.id+'\')"></a>';
@@ -60,7 +60,7 @@
                        data:{jobId:jobId},
                        cache:false,
                        success :function(data){
                            if(!data.successFlg) {
                            if(!data.successFlg) {console.log(data);
                                $.ligerDialog.error(data.message);
                            }
                        },

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

@@ -758,13 +758,13 @@
                }
            }
            else{
                //清空数据
                $("#txtM").val("");
                $("#txtH").val("");
                $("#txtD").val("");
                $("#txtMD").val("");
                $('input[name="week_day"]').ligerCheckBox("setValue",null);
                $('input[name="month_day"]').ligerRadio("setValue",null);
//                //清空数据
//                $("#txtM").val("");
//                $("#txtH").val("");
//                $("#txtD").val("");
//                $("#txtMD").val("");
//                $('input[name="week_day"]').ligerCheckBox("setValue",null);
//                $('input[name="month_day"]').ligerRadio("setValue",null);
            }
        },
        //设置时间间隔

src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/indexJs.jsp

@@ -52,8 +52,8 @@
              html += "<a href='#' class=\"m-btn-view\" onclick='adapterplan.list.addVersion(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowindex + "\", \"\")'></a>";
            }else{//未发布版本
              html += "<a href='#' style=\"width: 40px;\" onclick='adapterplan.list.customize(\"" + rowindex + "\",\"" + rowdata.version + "\",\"" + rowdata.pid + "\")'>定制</a>";
              html += "<a href='#' style=\"width: 40px;\" onclick='adapterplan.list.releaseVersion(\"" + rowdata.id + "\", \"" + rowdata.publisher + "\")'>发布</a>";
              html += "<a href='#' style=\"width: 40px;\" onclick='adapterplan.list.config(\"" + rowdata.version + "\",\"" + rowdata.pid + "\",\"" + rowindex + "\",\"" + rowdata.status + "\")'>配置</a>" ;
              html += "<a href='#' style=\"width: 40px;\" onclick='adapterplan.list.releaseVersion(\"" + rowdata.id + "\", \"" + rowdata.publisher + "\")'>发布</a>";
              html += "<a class=\"m-btn-edit\" onclick='adapterplan.list.addVersion(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowindex + "\", \"modify\")'></a> ";
              html += "<a class=\"m-btn-delete\" onclick='adapterplan.list.deleted(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowindex + "\")'></a>";
            }

src/main/webapp/WEB-INF/ehr/jsp/standard/integration/appIndexJs.jsp

@@ -69,8 +69,8 @@
              html +=  "<a href='#' style=\"width: 80px;\" onclick='standard.list.config(\"" + rowdata.code + "\",\"" + rowdata.pid + "\",\"" + rowdata.status + "\",\"" + rowindex + "\")'>查看配置</a>";
              html +=  "<a href='#' class=\"m-btn-view\"  onclick='standard.list.addVersion(\"" + rowdata.pid + "\",\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowdata.code + "\",\"" + rowindex + "\", \"\")'></a>";
            }else{//未发布版本
              html += "<a href='#' style=\"width: 55px;\" onclick='standard.list.releaseVersion(\"" + rowdata.id + "\", \"" + rowdata.publisher + "\")'>发布</a>";
              html += "<a href='#' onclick='standard.list.config(\"" + rowdata.code + "\",\"" + rowdata.pid + "\",\"" + rowdata.status + "\",\"" + rowindex + "\")'>配置</a>";
              html += "<a href='#' style=\"width: 55px;\" onclick='standard.list.releaseVersion(\"" + rowdata.id + "\", \"" + rowdata.publisher + "\")'>发布</a>";
              html += "<a class=\"m-btn-edit\" onclick='standard.list.addVersion(\"" + rowdata.pid + "\",\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowdata.code + "\",\"" + rowindex + "\", \"1\")'></a> ";
              html += "<a class=\"m-btn-delete\" onclick='standard.list.deleted(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowindex + "\")'></a>";
            }
@@ -158,7 +158,7 @@
      if($("#inp_search").val()){//当搜索时→展开全部列表
        u.grid.expandAll();
      }else{
        u.grid.collapseAll();//展开全部expandAll()； 收缩全部collapseAll()
//        u.grid.collapseAll();//展开全部expandAll()； 收缩全部collapseAll()
      }
      window.grid = u.grid;
    },

src/main/webapp/WEB-INF/ehr/jsp/standard/integration/indexJs.jsp

@@ -69,8 +69,8 @@
              html += '<a  href="#" style="width: 80px;" onclick="standard.list.config(\''+rowdata.code+'\',\''+rowdata.pid+'\',\''+rowdata.status+'\',\''+rowindex+'\')">查看配置</a>';
              html += '<a class="m-btn-view" onclick="standard.list.addVersion(\''+rowdata.pid+'\',\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowdata.code+'\',\''+rowindex+'\',\'\')"></a>';
            }else{//未发布版本
              html += '<a  href="#" style="width: 55px;" onclick="standard.list.releaseVersion(\''+rowdata.id+'\',\''+rowdata.publisher+'\')">发布</a>';
              html += '<a  href="#" onclick="standard.list.config(\''+rowdata.code+'\',\''+rowdata.pid+'\',\''+rowdata.status+'\',\''+rowindex+'\')">配置</a>';
              html += '<a  href="#" style="width: 55px;" onclick="standard.list.releaseVersion(\''+rowdata.id+'\',\''+rowdata.publisher+'\')">发布</a>';
              html += '<a class="m-btn-edit" onclick="standard.list.addVersion(\''+rowdata.pid+'\',\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowdata.code+'\',\''+rowindex+'\',\'1\')"></a>';
              html += '<a class="m-btn-delete" onclick="standard.list.deleted(\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowindex+'\')"></a>';
            }

src/main/webapp/WEB-INF/ehr/jsp/system/datasource/configSourcesJs.jsp

@@ -1,30 +1,52 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script>
    /* *************************** 自定义模块 ***************************** */
    var configSources = {
        dialog:null,
        grid:null,
        dialog: null,
        grid: null,
        //初始化
        init: function () {
            var me = this;
            $('.m-retrieve-area').show();
            me.grid = $("#div_grid").ligerGrid({
                url: '${contextRoot}/datasource/getDatasource',
                columns: [
                    {display:'数据源名称',name:'name', width: '25%'},
                    {display:'机构名称',name:'orgId', width: '25%', dict:true,dictName:"SYSTEM_ORGANIZATION"},
                    {display:'数据源类型',name:'type', width: '25%', dict:true,dictName:"DATASOURCE_TYPE"},
                    {display:'操作', name: 'operator', width: '25%', render: function (row) {
                    {display: '数据源名称', name: 'name', width: '25%'},
                    {
                        display: '机构名称',
                        name: 'orgName',
                        width: '25%',
                        dict: false,
                        dictName: "SYSTEM_ORGANIZATION"
                    },
                    {
                        display: '数据源类型',
                        name: 'type',
                        width: '25%',
                        dict: false,
                        dictName: "DATASOURCE_TYPE",
                        render: function (row) {
                            if (row.type == 1) {
                                return "Web Service";
                            } else if (row.type == 2) {
                                return "文件系统";
                            } else {
                                return "数据库";
                            }
                        }
                    },
                    {
                        display: '操作', name: 'operator', width: '25%', render: function (row) {
                        var html = '<div class="m-inline-buttons" style="width:80px;">';
                        html += "<a class=\"m-btn-edit\" onclick=\"configSources.editorSource('"+row.id+"')\"></a>";
                        html += "<a class=\"m-btn-delete\" onclick=\"configSources.deleteSource('"+row.id+"')\"></a>";
                        html += "<a class=\"m-btn-edit\" onclick=\"configSources.editorSource('" + row.id + "')\"></a>";
                        html += "<a class=\"m-btn-delete\" onclick=\"configSources.deleteSource('" + row.id + "')\"></a>";
                        html += '</div>';
                        return html;
                    }}
                    }
                    }
                ],
                onDblClickRow : function (row){
                onDblClickRow: function (row) {
                    me.editorSource(row.id);
                }
            });
@@ -39,18 +61,17 @@
            });
        },
        //编辑弹窗
        editorSource:function(id){
        editorSource: function (id) {
            var me = this;
            var title = "新增数据源";
            var params = null;
            if(id!=undefined&&id!=null)
            {
            if (id != undefined && id != null) {
                title = "编辑数据源";
                params = {sourceId:id};
                params = {sourceId: id};
            }
            me.dialog = $.ligerDialog.open({
                id:'sourceDialog',
                id: 'sourceDialog',
                height: 560,
                width: 600,
                title: title,
@@ -60,29 +81,28 @@
            });
        },
        //删除数据源
        deleteSource:function(id){
        deleteSource: function (id) {
            var message = "确定要删除该数据源吗？";
            jQuery.ligerDialog.confirm(message, function (confirm) {
                if (confirm)
                {
                if (confirm) {
                    $.ajax({ //ajax处理
                        type: "POST",
                        url : "${contextRoot}/datasource/deleteDatasource",
                        dataType : "json",
                        data:{id:id},
                        cache:false,
                        success :function(data){
                            if(data.successFlg) {
                        url: "${contextRoot}/datasource/deleteDatasource",
                        dataType: "json",
                        data: {id: id},
                        cache: false,
                        success: function (data) {
                            if (data.successFlg) {
                                $.ligerDialog.success(data.message);
                                configSources.grid.reload();
                            }
                            else{
                            else {
                                $.ligerDialog.error(data.message);
                            }
                        },
                        error :function(data){
                            $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                        error: function (data) {
                            $.ligerDialog.error("Status:" + data.status + "(" + data.statusText + ")");
                        }
                    });
                }
@@ -90,10 +110,9 @@
        },
        //关闭弹窗
        callbackDialog:function(message){
        callbackDialog: function (message) {
            var me = this;
            if(message!=undefined&&message.length>0)
            {
            if (message != undefined && message.length > 0) {
                $.ligerDialog.success(message);
            }
            me.grid.reload();

src/main/webapp/develop/lib/select2/select2.js

@@ -4272,7 +4272,8 @@
                            return message;
                        },
                        noResults: function () {
                            return 'No results found';
                            //return 'No results found';
                            return "无";
                        },
                        searching: function () {
                            return 'Searching…';