数据源未适配问题修复

hos-camel2/src/main/java/camel/central/gateway/processor/GatewayProcessor.java

@@ -188,10 +188,11 @@ public class GatewayProcessor implements Processor {
            methodMap.put("3", "put");
            JsonNode jsonNode = objectMapper.readValue(param, JsonNode.class);
            String url = serviceUrl(appApi.getMicroServiceName());
            if (StringUtil.isEmpty(url)) {
                url = appApi.getMicroServiceUri();
            }
//            String url = serviceUrl(appApi.getMicroServiceName());
//            if (StringUtil.isEmpty(url)) {
//                url = appApi.getMicroServiceUri();
//            }
            String url = "http://192.168.1.221:10400";
            final String[] endPoint = {"restlet:" + url + appApi.getMsMethodName() + "?socketTimeout=60000&connectionTimeout=60000&restletMethod=" + methodMap.get(appApi.getMethod())};
            final String[] body = {""};
@@ -201,6 +202,7 @@ public class GatewayProcessor implements Processor {
                    return;
                }
                Object value = nodeValue(paramNode);
                if (p.getType().equals("0")) { //path param
                    endPoint[0] = endPoint[0].replaceAll("\\{[^}]*\\}", value.toString());

src/main/java/com/yihu/hos/standard/controller/StandardController.java

@@ -122,7 +122,7 @@ public class StandardController extends BaseController {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        DictionaryResult dictionaryResult = standardService.getDictionaryResult( order, rows, page);
        DictionaryResult dictionaryResult = standardService.getDictionaryResult(condition, order, rows, page);
        return dictionaryResult;
    }
}

src/main/java/com/yihu/hos/standard/service/standard/StandardService.java

@@ -41,11 +41,11 @@ public class StandardService extends SQLGeneralDAO {
    public static final String BEAN_ID = "StandardService";
    public DictionaryResult getDictionaryResult(String order, Integer limit, Integer offset) {
    public DictionaryResult getDictionaryResult(String condition,String order, Integer limit, Integer offset) {
        try {
            DictionaryResult dictionaryResult = DictionaryResult.success("获取标准列表成功");
            List<DictItem> detailModelList = new ArrayList<DictItem>();
            List<StandardModel> standardModelList = getList(null, order, limit, offset);
            List<StandardModel> standardModelList = getList(condition, order, limit, offset);
            for (StandardModel standardModel : standardModelList) {
                DictItem items = new DictItem();
                Integer id = standardModel.getId();

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

@@ -44,41 +44,41 @@
    </div>
  </div>
  <hr/>
  <div class="m-form-group" id="div_originPublisherOrgCode">
  <div class="m-form-group" id="div_adapterPublisherOrgCode">
    <label><span class="red">*&nbsp;</span>源机构名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 f-pl5" id="sel_originPublisherOrgCode" data-type="select" name="stdPublisherOrgCode" data-attr-scan="stdPublisherOrgCode">
      <input type="text" class="required f-w240 f-pl5" id="sel_publisherOrgCode" data-type="select" name="adapterPublisherOrgCode" data-attr-scan="adapterPublisherOrgCode">
    </div>
  </div>
  <div class="m-form-group" id="div_stdId">
  <div class="m-form-group" id="div_adapterStdId">
    <label><span class="red">*&nbsp;</span>源标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 f-pl5" id="sel_stdId" data-type="select" name="stdId" data-attr-scan="stdId">
      <input type="text" class="required f-w240 f-pl5" id="sel_adapterStdId" data-type="select" name="adapterStdId" data-attr-scan="adapterStdId">
    </div>
  </div>
  <div class="m-form-group" id="div_stdVersion">
  <div class="m-form-group" id="div_adapterStdVersion">
    <label><span class="red">*&nbsp;</span>源标准版本：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 f-pl5" id="sel_stdVersion" data-type="select" name="stdVersion" data-attr-scan="stdVersion" >
      <input type="text" class="required f-w240 f-pl5" id="sel_adapterStdVersion" data-type="select" name="adapterStdVersion" data-attr-scan="adapterStdVersion">
    </div>
  </div>
  <hr/>
  <div class="m-form-group" id="div_adapterPublisherOrgCode">
  <div class="m-form-group" id="div_stdPublisherOrgCode">
    <label><span class="red">*&nbsp;</span>目标机构名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 f-pl5" id="sel_publisherOrgCode" data-type="select" name="adapterPublisherOrgCode" data-attr-scan="adapterPublisherOrgCode">
      <input type="text" class="required f-w240 f-pl5" id="sel_stdPublisherOrgCode" data-type="select" name="stdPublisherOrgCode" data-attr-scan="stdPublisherOrgCode">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdId">
  <div class="m-form-group" id="div_stdId">
    <label><span class="red">*&nbsp;</span>目标标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 f-pl5" id="sel_adapterStdId" data-type="select" name="adapterStdId" data-attr-scan="adapterStdId">
      <input type="text" class="required f-w240 f-pl5" id="sel_stdId" data-type="select" name="stdId" data-attr-scan="stdId">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdVersion">
  <div class="m-form-group" id="div_stdVersion">
    <label><span class="red">*&nbsp;</span>目标标准版本：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 f-pl5" id="sel_adapterStdVersion" data-type="select" name="adapterStdVersion" data-attr-scan="adapterStdVersion">
      <input type="text" class="required f-w240 f-pl5" id="sel_stdVersion" data-type="select" name="stdVersion" data-attr-scan="stdVersion" >
    </div>
  </div>
  <div class="m-form-bottom">

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

@@ -32,7 +32,7 @@
          $("#sel_stdId").removeClass("required");
          $("#sel_stdVersion").removeClass("required");
          $("#sel_originPublisherOrgCode").removeClass("required");
          $("#sel_stdPublisherOrgCode").removeClass("required");
          $("#sel_publisherOrgCode").removeClass("required");
          $("#sel_adapterStdId").removeClass("required");
          $("#sel_adapterStdVersion").removeClass("required");
@@ -122,7 +122,7 @@
          $("#btn_close").click(function () {
            parent.adapterplan.list.dialog_adapter_detail.close();
          });
          //平台标准名称
          //目标标准名称
//          $("#sel_stdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards" ,
//            urlParms:{
//               condition: encodeURIComponent(JSON.stringify({
@@ -138,8 +138,8 @@
//              return false;
//            }});
          //源机构名称
          $("#sel_originPublisherOrgCode").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getPublishers" ,
          //目标机构名称
          $("#sel_stdPublisherOrgCode").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getPublishers" ,
            cancelable:false,
            onSuccess:function(data){
              if(type !="modify" && data!=null&&data.length>0)
@@ -152,12 +152,12 @@
          $("#sel_stdId").ligerComboBox({cancelable:false});
          $("#sel_stdVersion").ligerComboBox({cancelable:false});
          //源机构机构名称change事件
          $("#sel_originPublisherOrgCode").change(function(){
            var publisherOrgCode = $("#sel_originPublisherOrgCode").ligerGetComboBoxManager().getValue();
          //目标机构名称change事件
          $("#sel_stdPublisherOrgCode").change(function(){
            var publisherOrgCode = $("#sel_stdPublisherOrgCode").ligerGetComboBoxManager().getValue();
            if(!Util.isStrEmpty(publisherOrgCode)){
              //源标准名称
              //目标标准名称
              $("#sel_stdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards" ,//?condition={\"type\":1,\"publisherOrgCode\":\""+publisherOrgCode+"\"}
                urlParms:{
                  condition: encodeURIComponent(JSON.stringify({
@@ -176,7 +176,7 @@
            }
          });
          //平台标准名称change事件
          //目标标准名称change事件
          $("#sel_stdId").change(function(){
            var standardId = $("#sel_stdId").ligerGetComboBoxManager().getValue();
            if(!Util.isStrEmpty(standardId)){
@@ -210,12 +210,12 @@
          $("#sel_adapterStdId").ligerComboBox({cancelable:false});
          $("#sel_adapterStdVersion").ligerComboBox({cancelable:false});
          //发布机构名称change事件
          //源机构名称change事件
          $("#sel_publisherOrgCode").change(function(){
            var publisherOrgCode = $("#sel_publisherOrgCode").ligerGetComboBoxManager().getValue();
            if(!Util.isStrEmpty(publisherOrgCode)){
              //应用标准名称
              //源标准名称
              $("#sel_adapterStdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards" ,//?condition={\"type\":1,\"publisherOrgCode\":\""+publisherOrgCode+"\"}
                urlParms:{
                  condition: encodeURIComponent(JSON.stringify({
@@ -234,10 +234,10 @@
            }
          });
          //应用标准名称change事件
          //源标准名称change事件
          $("#sel_adapterStdId").change(function(){
            var standardId = $("#sel_adapterStdId").ligerGetComboBoxManager().getValue();
            //应用标准版本
            //源标准版本
            if(!Util.isStrEmpty(standardId)){
              $("#sel_adapterStdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions" ,//?standardId="+standardId +"&condition="+JSON.stringify({"publishStatus":1})
                urlParms:{