Merge branch 'master' of chenweida/esb into master

Hos-resource/pom.xml

@@ -24,11 +24,6 @@
        </snapshotRepository>
    </distributionManagement>
    <dependencies>
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>ehr-dbhelper</artifactId>
            <version>1.1.7</version>
        </dependency>
        <dependency>
            <groupId>org.mongodb</groupId>
            <artifactId>mongo-java-driver</artifactId>

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

@@ -162,7 +162,7 @@ public class RsResourceController extends BaseController {
        try {
            model.addAttribute("mode", mode);
            model.addAttribute("resourceId", resourceId);
            RsResourceDeatilModel rrsdm= resourceService.getRsResourceDeatilModel(resourceId);
            RsResourceDeatilModel rrsdm = resourceService.getRsResourceDeatilModel(resourceId);
            model.addAttribute("datasetId", rrsdm.getDatasetCode());
            if (!StringUtils.isEmpty(datasetId)) {
                RsResourceDataset ds = resourceService.getLocalDataSetById(datasetId);
@@ -401,7 +401,7 @@ public class RsResourceController extends BaseController {
     * @return
     */
    @RequestMapping("/resource/rsResourceInfo")
    public String rsResourceInfoTemplate(Model model, String id, String mode,String categoryId) {
    public String rsResourceInfoTemplate(Model model, String id, String mode, String categoryId) {
        try {
            RsResourceDeatilModel rsResource = null;
            //mode定义：new modify view三种模式，新增，修改，查看
@@ -515,8 +515,7 @@ public class RsResourceController extends BaseController {
            params.put("page", page);
            params.put("rows", rows);
            return resourceService.getDataSet(params);
        }
        catch (Exception e) {
        } catch (Exception e) {
            e.printStackTrace();
            return Result.error("删除失败！");
        }
@@ -601,9 +600,25 @@ public class RsResourceController extends BaseController {
    @ResponseBody
    public Result createMetaData(HttpServletRequest request) {
        try {
            if(StringUtils.isEmpty(request.getParameter("inp_field_is_PK"))){
                throw new Exception("请选择是否为主键");
            }
            if(StringUtils.isEmpty(request.getParameter("inp_field_is_null"))){
                throw new Exception("请选择是否为空");
            }
            RsResourceMetadata rmd = new RsResourceMetadata();
            BeanUtils.populate(rmd, request.getParameterMap());
            rmd.setCode(request.getParameter("columnCode"));
            rmd.setColumnName(request.getParameter("columnCode"));
            rmd.setColumnLength(request.getParameter("columnLength"));
            rmd.setColumnType(request.getParameter("columnType"));
            rmd.setDefinition(request.getParameter("definition"));
            rmd.setNullable(Integer.valueOf(request.getParameter("inp_field_is_null")));
            rmd.setPrimaryKey(Integer.valueOf(request.getParameter("inp_field_is_PK")));
            rmd.setDataSupportType(2);
            rmd.setLogicDataSource(request.getParameter("logicDataSource"));
            rmd.setResourceId(request.getParameter("resourceId"));
            rmd.setName(request.getParameter("name"));
            // BeanUtils.populate(rmd, request.getParameterMap("logicDataSource"));
            return resourceService.createMetaData(rmd);
        } catch (Exception e) {
            e.printStackTrace();
@@ -616,8 +631,24 @@ public class RsResourceController extends BaseController {
    public Result updateMetaData(HttpServletRequest request) {
        try {
            RsResourceMetadata rmd = new RsResourceMetadata();
            BeanUtils.populate(rmd, request.getParameterMap());
            rmd.setId(request.getParameter("id"));
            rmd.setCode(request.getParameter("columnCode"));
            rmd.setColumnName(request.getParameter("columnCode"));
            rmd.setColumnLength(request.getParameter("columnLength"));
            rmd.setColumnType(request.getParameter("columnType"));
            rmd.setDefinition(request.getParameter("definition"));
            if(StringUtils.isEmpty(request.getParameter("inp_field_is_PK"))){
                throw new Exception("请选择是否为主键");
            }
            if(StringUtils.isEmpty(request.getParameter("inp_field_is_null"))){
                throw new Exception("请选择是否为空");
            }
            rmd.setNullable(Integer.valueOf(request.getParameter("inp_field_is_null")));
            rmd.setPrimaryKey(Integer.valueOf(request.getParameter("inp_field_is_PK")));
            rmd.setDataSupportType(2);
            rmd.setLogicDataSource(request.getParameter("logicDataSource"));
            rmd.setResourceId(request.getParameter("resourceId"));
            rmd.setName(request.getParameter("name"));
            return resourceService.updateMetaData(rmd);
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -206,7 +206,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
        Map<String, Object> paramsTemp = new HashMap<String, Object>();
        paramsTemp.put("condition", JSONObject.fromObject(params).toString());
        List responseParasm = stdService.metadatasAllVersionList(paramsTemp);
        List responseParasm = stdService.metadatasAllVersionList(params);
        JSONArray array = JSONArray.fromObject(responseParasm);
        if (array.size() == 0) {
            throw new Exception("该数据集没有数据元");

Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdMetadataService.java

@@ -21,7 +21,6 @@ import com.yihu.ehr.standard.model.standard.StdDataSetModel;
import com.yihu.ehr.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.ehr.standard.model.standard.StdMetaDataModel;
import com.yihu.ehr.standard.service.bo.StandardVersion;
import jdk.internal.org.objectweb.asm.Type;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
@@ -49,7 +48,8 @@ public class StdMetadataService extends SQLGeneralDAO {
    }
    public List<StdMetaDataModel> getList(String stdVersion, Integer datasetId, String condition, String order, Integer limit, Integer offset) {
        try{
        try {
            Map<String, String> queryMap = RequestParamTransformer.parseJsonToMap(condition);
            Map<String, String> orderMap = RequestParamTransformer.parseJsonToMap(order);
            StandardVersion standardVersion = new StandardVersion(stdVersion);
@@ -319,7 +319,7 @@ public class StdMetadataService extends SQLGeneralDAO {
            detailModelResult.setDetailModelList(detailModelList);
            detailModelResult.setTotalCount(detailModelList.size());
            return detailModelResult;
        }catch (Exception e) {
        } catch (Exception e) {
            return DetailModelResult.error("获取标准数据元下拉列表失败");
        }
    }
@@ -354,7 +354,7 @@ public class StdMetadataService extends SQLGeneralDAO {
                sqlQuery.setParameter("code", code);
                List<StdDataSetModel> modelList = sqlQuery.list();
                sql = Constants.EMPTY;
                Integer count =  1;
                Integer count = 1;
                Map<Integer, String> datasetIdMap = new HashMap<>();
                for (StdDataSetModel model : modelList) {
                    SqlCreator sqlMetadataCreator = new SqlCreator(StdMetaDataModel.class);
@@ -370,8 +370,8 @@ public class StdMetadataService extends SQLGeneralDAO {
                    sql = sql.substring(0, sql.length() - Constants.UNION.length());
                    sqlQuery = getCurrentSession().createSQLQuery(sql);
                    sqlQuery.setResultTransformer(metadataTransformer);
                    for (int i=1; i<count; i++) {
                        sqlQuery.setParameter(i-1, datasetIdMap.get(i));
                    for (int i = 1; i < count; i++) {
                        sqlQuery.setParameter(i - 1, datasetIdMap.get(i));
                    }
                    List<StdMetaDataModel> metadataList = sqlQuery.list();
                    Map<String, StdMetaDataModel> meatadataModelMap = new HashMap<>();
@@ -384,7 +384,7 @@ public class StdMetadataService extends SQLGeneralDAO {
                }
                return distinctModelList;
            } else  {
            } else {
                return new ArrayList<>();
            }
        } catch (Exception e) {
@@ -397,9 +397,9 @@ public class StdMetadataService extends SQLGeneralDAO {
        try {
            SqlCreator sqlCreator = new SqlCreator(AdapterMetadataModel.class);
            sqlCreator.equalCondition("id", stdMetadataId);
            String sql = sqlCreator.selectData("std_metadata_"+version);
            String sql = sqlCreator.selectData("std_metadata_" + version);
            Query query = getQuery(sqlCreator, sql);
            return (StdMetaDataModel)query.uniqueResult();
            return (StdMetaDataModel) query.uniqueResult();
        } catch (Exception e) {
            return null;
        }

Hos-resource/src/main/resources/hbm/resource/RsResourceMetadata.hbm.xml

@@ -1,65 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<!-- 
    Mapping file autogenerated by MyEclipse Persistence Tools
-->
<hibernate-mapping>
    <class name="com.yihu.ehr.resource.model.RsResourceMetadata" table="rs_resource_metadata" >
    <class name="com.yihu.ehr.resource.model.RsResourceMetadata" table="rs_resource_metadata">
        <id name="id" type="java.lang.String">
            <column name="id" />
            <generator class="uuid" />
            <column name="id"/>
            <generator class="uuid"/>
        </id>
        <property name="datasetId" type="java.lang.String">
            <column name="dataset_id" not-null="true">
            <column name="dataset_id">
                <comment>数据集ID</comment>
            </column>
        </property>
        <property name="code" type="java.lang.String">
            <column name="code" length="128"  />
            <column name="code" length="128"/>
        </property>
        <property name="resourceId" type="java.lang.String">
            <column name="resource_id" length="64"  />
            <column name="resource_id" length="64"/>
        </property>
        <property name="deCode" type="java.lang.String">
            <column name="de_code" length="128"  />
            <column name="de_code" length="128"/>
        </property>
        <property name="name" type="java.lang.String">
            <column name="name" />
            <column name="name"/>
        </property>
        <property name="type" type="java.lang.String">
            <column name="type" length="16" />
            <column name="type" length="16"/>
        </property>
        <property name="format" type="java.lang.String">
            <column name="format" length="64" />
            <column name="format" length="64"/>
        </property>
        <property name="dictId" type="java.lang.Integer">
            <column name="dict_id" />
            <column name="dict_id"/>
        </property>
        <property name="definition" type="java.lang.String">
            <column name="definition" />
            <column name="definition"/>
        </property>
        <property name="nullable" type="java.lang.Integer">
            <column name="nullable" />
            <column name="nullable"/>
        </property>
        <property name="columnType" type="java.lang.String">
            <column name="column_type" length="8" />
            <column name="column_type" length="8"/>
        </property>
        <property name="columnName" type="java.lang.String">
            <column name="column_name" length="64"/>
        </property>
        <property name="columnLength" type="java.lang.String">
            <column name="column_length" length="8" />
            <column name="column_length" length="8"/>
        </property>
        <property name="primaryKey" type="java.lang.Integer">
            <column name="primary_key" />
            <column name="primary_key"/>
        </property>
        <property name="dataSupportType" type="java.lang.Integer">
            <column name="data_support_type" />
            <column name="data_support_type"/>
        </property>
        <property name="logicDataSource" type="java.lang.String">
            <column name="logic_data_source" />
            <column name="logic_data_source"/>
        </property>
    </class>

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

@@ -2,14 +2,14 @@
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<div id="div_info_form"  class="m-form-inline f-mt20 " style="padding-top: 5px">
<div id="div_info_form" class="m-form-inline f-mt20 " style="padding-top: 5px">
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>字段名称：</label>
        <div class="m-form-control">
            <input type="hidden" data-type="text">
            <input type="hidden" data-type="text" name="resourceId">
            <input type="hidden" id="inp_resource_id"  name="id">
            <input type="hidden" data-type="text" name="resourceId" value="<%=request.getParameter("resourceId")%>">
            <input type="hidden" id="inp_resource_id" name="id">
            <input type="text" id="inp_field_name" placeholder="请输入字段名称" name="name"/>
        </div>
    </div>
@@ -31,36 +31,39 @@
        <label><span class="red">*&nbsp;</span>字段长度：</label>
        <div class="u-checkbox-wrap m-form-control">
            <input type="text" id="inp_field_length" name="columnLength"  >
            <input type="text" id="inp_field_length" name="columnLength">
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>是否主键</label>
        <div class="u-checkbox-wrap m-form-control ">
            <input type="radio" value="1" name="inp_field_is_PK" name="primaryKey">是
            <input type="radio" checked value="0" name="inp_field_is_PK" name="primaryKey">否
            <input type="radio" value="1" name="inp_field_is_PK">是
            <input type="radio" checked value="0" name="inp_field_is_PK">否
        </div>
        <label style="width: 90px"><span class="red">*&nbsp;</span>是否能空</label>
        <div class="u-checkbox-wrap m-form-control ">
            <input type="radio" checked value="1" name="inp_field_is_null" name="nullable">是
            <input type="radio" value="0" name="inp_field_is_null" name="nullable">否
            <input type="radio" checked  value="1" name="inp_field_is_null" >是
            <input type="radio" value="0" name="inp_field_is_null">否
        </div>
    </div>
    <div class="m-form-group">
        <label>字段说明：</label>
        <div class="u-checkbox-wrap m-form-control ">
            <input type="text" id="inp_field_remark"  name="definition">
            <input type="text" id="inp_field_remark" name="definition">
        </div>
    </div>
    <div class="m-form-group">
        <label>数据来源</label>
        <!--
        <div class="u-checkbox-wrap m-form-control ">
            <input type="radio" checked value="1" name="inp_dataset_from" >逻辑表
            <input type="radio" value="0" name="inp_dataset_from" >事实表
        </div>
            <input type="radio" checked  value="2" name="inp_dataset_from">逻辑表
            <input type="radio" value="1" name="inp_dataset_from">事实表
        </div>-->
        <label id="inp_dataset_from" style="text-align:left">逻辑表</label>
    </div>
    <div id="centerTab1" style="display:none">
        <div style="margin-left: 70px;float: left">
@@ -75,8 +78,10 @@
    <div id="centerTab2">
        <div class="m-form-group">
            <label>逻辑数据来源</label>
            <div class="m-form-control">
                <textarea rows="10" class="l-textarea" style="width:350px;height: 200px" name="logicDataSource"></textarea>
                <textarea rows="10" class="l-textarea" style="width:350px;height: 200px"
                          name="logicDataSource" id="logicDataSource"></textarea>
            </div>
        </div>
    </div>

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

@@ -13,11 +13,13 @@
        $fieldIsPK: $('input[name="inp_field_is_PK"]', this.$form),//是否主键
        $fieldIsNull: $('input[name="inp_field_is_null"]', this.$form),//是否可为空
        $fieldRemark: $("#inp_field_remark"),//字段说明
        $datasetFrom: $('input[name="inp_dataset_from"]', this.$form),//是否可为空
        $datasetFrom:$("#inp_dataset_from"),
       // $datasetFrom: $('input[name="inp_dataset_from"]', this.$form),//是否可为空
        $leftDatagrid: $("#left_datagrid"),//左边的datagrid
        $rightDatagrid: $("#right_datagrid"),//右边的datagrid
        $centerTab1: $("#centerTab1"),//右边的datagrid
        $centerTab2: $("#centerTab2"),//右边的datagrid
        $logicDataSource:$("#logicDataSource"),
        $id: $("#inp_resource_id"),//资源数据源
@@ -39,6 +41,7 @@
                this.$fieldIsPK.attr("disabled", "false");
                this.$fieldIsNull.attr("disabled", "false");
                this.$fieldRemark.attr("disabled", "false");
              //  this.$datasetFrom.attr("disabled", "false");
                this.$btnSave.hide();
            }
        },
@@ -111,20 +114,21 @@
            this.$fieldCode.ligerTextBox({width: 240});
            this.$fieldLength.ligerSpinner({width: 240,type:'int',isNegative:false });
            this.$fieldType.ligerComboBox({dict: true, dictName: "RESOURCE_METADATA_TYPE"});
            this.$fieldIsPK.ligerRadio();
            this.$datasetFrom.ligerRadio();
            this.$fieldIsNull.ligerRadio();
            rsResourceFieldInfoDialog.$fieldIsPK.ligerRadio();
            rsResourceFieldInfoDialog.$fieldIsNull.ligerRadio();
            //this.$datasetFrom.ligerRadio();
            this.$fieldRemark.ligerTextBox({width: 240});
            var data={
                name: '${entity.name}',
                columnType: '${entity.columnType}',
                columnCode: '${entity.code}',
                columnLength: '${entity.columnLength}',
                primaryKey: '${entity.primaryKey}',
                inp_field_is_PK: '${entity.primaryKey}',
                id: '${entity.id}',
                nullable: '${entity.nullable}',
                inp_field_is_null: '${entity.nullable}',
                definition: '${entity.definition}',
                logicDataSource: '${entity.logicDataSource}'
                logicDataSource: '${entity.logicDataSource}',
                inp_dataset_from: '${entity.dataSupportType}'
            };
            $("#div_info_form").ligerAutoForm({
                data:data,
@@ -136,13 +140,14 @@
                }
            });
            rsResourceFieldInfoDialog.$datasetFrom.text('${entity.dataSupportType}'==1?"事实表":"逻辑表")
            /*
            if ("${entity.dataSupportType}" == "1") {
                rsResourceFieldInfoDialog.$centerTab2.hide();
                rsResourceFieldInfoDialog.$centerTab1.show();
            } else if ("${entity.dataSupportType}" == "2") {
                rsResourceFieldInfoDialog.$centerTab1.hide();
                rsResourceFieldInfoDialog.$centerTab2.show();
            }
            }*/
        },
        bindEvents: function () {
            this.$btnSave.click(function () {