Merge branch 'master' of chenyj/cyj into master

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

@@ -267,6 +267,7 @@ public class RsResourceController extends BaseController {
            return result;
        }
        try {
            //现在最多导出五十条数据
            String pageSize = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");
            String currPage = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
@@ -277,6 +278,7 @@ public class RsResourceController extends BaseController {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("rows", Integer.valueOf(pageSize));
            params.put("page", Integer.valueOf(currPage));
            if (!StringUtils.isEmpty(resource.getDatasetCode())) {
                RsResourceRestDetail rrd = resourceRestService.getResourceRestDetailByCode(resource.getCode());
                if ("resource.getMongoDBData".equals(rrd.getNamespace())) {
@@ -318,7 +320,6 @@ public class RsResourceController extends BaseController {
                result.setPageSize(Integer.valueOf(pageSize));
                result.setSuccessFlg(true);
            }
        } catch (Exception e) {
            e.printStackTrace();
            result.setSuccessFlg(false);
@@ -602,10 +603,10 @@ public class RsResourceController extends BaseController {
    @ResponseBody
    public Result createMetaData(HttpServletRequest request) {
        try {
            if(StringUtils.isEmpty(request.getParameter("inp_field_is_PK"))){
            if (StringUtils.isEmpty(request.getParameter("inp_field_is_PK"))) {
                throw new Exception("请选择是否为主键");
            }
            if(StringUtils.isEmpty(request.getParameter("inp_field_is_null"))){
            if (StringUtils.isEmpty(request.getParameter("inp_field_is_null"))) {
                throw new Exception("请选择是否为空");
            }
            RsResourceMetadata rmd = new RsResourceMetadata();
@@ -639,10 +640,10 @@ public class RsResourceController extends BaseController {
            rmd.setColumnLength(request.getParameter("columnLength"));
            rmd.setColumnType(request.getParameter("columnType"));
            rmd.setDefinition(request.getParameter("definition"));
            if(StringUtils.isEmpty(request.getParameter("inp_field_is_PK"))){
            if (StringUtils.isEmpty(request.getParameter("inp_field_is_PK"))) {
                throw new Exception("请选择是否为主键");
            }
            if(StringUtils.isEmpty(request.getParameter("inp_field_is_null"))){
            if (StringUtils.isEmpty(request.getParameter("inp_field_is_null"))) {
                throw new Exception("请选择是否为空");
            }
            rmd.setNullable(Integer.valueOf(request.getParameter("inp_field_is_null")));
@@ -663,7 +664,7 @@ public class RsResourceController extends BaseController {
    public Result getMetaDataByDatasetId(HttpServletRequest request) {
        try {
            String datasetCode = request.getParameter("datasetCode");
                String datasetId = request.getParameter("datasetId");
            String datasetId = request.getParameter("datasetId");
            return resourceService.getMetaDataByDatasetId(datasetCode, datasetId);
        } catch (Exception e) {
            e.printStackTrace();
@@ -794,7 +795,6 @@ public class RsResourceController extends BaseController {
                fieldMap.put(String.valueOf(jo.get("key")), String.valueOf(jo.get("value")));
            }
            request.setAttribute("rows", "1000");
            Result e = this.searchRomoteResourceList(request);
            JXLUtil.listMapToExcel(((DataGridResult) e).getDetailModelList(), fieldMap, name, response);
        } catch (Exception e) {

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcebrowse/resourceJs.jsp

@@ -1,6 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script>
    var totalRows = 0;
    var resource = {
        $resourcelayout: null,//layout对象
        $resourcelayoutRight: null,//layout对象
@@ -65,13 +66,13 @@
                //拼凑表头
                for (var i = 0; i < columns.length; i++) {
                    if (columns[i].columnindex > 1) {
                        field[i - 2] = {key: columns[i].columnname, value: columns[i].display,};
                        field[i - 2] = {key: columns[i].columnname, value: columns[i].display};
                    }
                }
                $.fileDownload("${contextRoot}/resource/exportAllExcel", {
                    httpMethod: 'POST',
                    data: {field: JSON.stringify(field), name: resource.tablename,id: resource.currentSelectID,
                        queryParams: resource.$condition.getValue()},
                        queryParams: resource.$condition.getValue(),rows:totalRows},
                    prepareCallback: function (url) {
                        // intervalCode = setInterval("exportProcess('#exportProcess')", 500);//1000为1秒钟
                    },
@@ -159,6 +160,9 @@
                allowAdjustColWidth: true,
                onSuccess: function (msg) {
                    // resource.hideOverlay();
                    if(msg.totalCount != 0) {
                        totalRows = msg.totalCount;
                    }
                }
            });
        },