Merge branch 'master' of http://192.168.1.220:10080/esb/esb

src/main/java/com/yihu/hos/datacollect/service/DatacollectManager.java

@@ -105,9 +105,10 @@ public class DatacollectManager{
                    dto.setJobDataset(ds);
                }
                //String cron = datacollectDao.getCronByJobId(job.getId());
//                String cron = datacollectDao.getCronByJobId(job.getId());
                String cron = job.getJobCron();
                ////执行计划翻译
                //dto.setJobPlan(translationCron(cron));
                dto.setJobPlan(translationCron(cron));
                dtoList.add(dto);
            }

src/main/java/com/yihu/hos/standard/match/dictionary/DictItemStrategyExecute.java

@@ -60,16 +60,17 @@ public class DictItemStrategyExecute implements Runnable {
    @Override
    public void run() {
        try {
            if (dictitemStandardNameStrategy.match(adapterDictEntryModel, version)) {
                updateAdapt(version);
                return;
            }
            if (matchVO != null) {
                if (standardExistStrategy.match(adapterDictEntryModel, matchVO,std_version,adapter_std_version, version)) {
                    updateAdapt(version);
                    return;
                }
            }
            if (dictitemStandardNameStrategy.match(adapterDictEntryModel, version)) {
                updateAdapt(version);
                return;
            }
            updateAdapt(version);
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -80,10 +80,10 @@ public class StandardVersionService extends SQLGeneralDAO {
            List<StandardVersionModel> standardVersionModelList = getVersionList(standardId, condition, order, rows, page);
            DictionaryResult dictionaryResult = new DictionaryResult();
            List<DictItem> detailModelList = new ArrayList<DictItem>();
//            DictItem item = new DictItem();
//            item.setCode("");
//            item.setValue("-无-");
//            detailModelList.add(item);
            DictItem item = new DictItem();
            item.setCode("");
            item.setValue("-无-");
            detailModelList.add(item);
            for (StandardVersionModel standardVersionModel : standardVersionModelList) {
                DictItem items = new DictItem();
                String  id = standardVersionModel.getVersion();

src/main/java/com/yihu/hos/system/service/SystemManager.java

@@ -56,7 +56,7 @@ public class SystemManager {
        //根据用户名/密码到总平台校验
        SystemUser userInfo = userManager.getUserByLoginCode(user);
        if(userInfo==null)
        if(userInfo==null && !user.equals("admin"))
        {
            result = new ActionResult(false,"登录失败！用户不存在！");
            return result;

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

@@ -138,6 +138,9 @@
            <div class="l-button div-btn" id="btn_aoto_adpat">
              <span>自动适配</span>
            </div>
            <div class="l-button div-btn" id="btn_aoto_adpat_dic" style="display: none">
              <span>自动适配</span>
            </div>
            <div id="btn_save_relation" class="l-button div-btn">
              <span>保存</span>
            </div>

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

@@ -89,7 +89,10 @@
        },
        bindEvents : function () {
          this.$btn_switch_dataSet.click(function () {
            
            $("#btn_aoto_adpat").css("display","block");
            $("#btn_aoto_adpat_dic").css("display","none");
            if(cfgModel==0)
              return;
            cfgModel = 0;
@@ -105,7 +108,10 @@
          });
          this.$btn_switch_dict.click(function () {
            
            $("#btn_aoto_adpat").css("display","none");
            $("#btn_aoto_adpat_dic").css("display","block");
            if(cfgModel==1)
              return;
            cfgModel = 1;
@@ -881,6 +887,7 @@
            });
          }
        },
        /**########数据集 BEGIN#########**/
        isAdaptationIng:function(){
          var version = $("#version").val();
          var self=this;//为了获取项目id
@@ -972,8 +979,13 @@
                    var jdu=  res.data.adapt/res.data.all//进度
                    if(jdu!=1){
                      var jduBFB=parseInt(jdu*100)+"%"
                      $("#btn_aoto_adpat span").html("已匹配"+jduBFB)
                      var jduBFB=parseInt(jdu*100)
                      if(isNaN(jduBFB)){
                        $("#btn_aoto_adpat span").html("匹配中...");
                      }else{
                        $("#btn_aoto_adpat span").html("已匹配"+jduBFB+"%")
                      }
                    }else{
                      $("#btn_aoto_adpat span").html("匹配完成");
                      master.reloadGrid();
@@ -1006,6 +1018,138 @@
            }
          })
        },//结束匹配
        /**########数据集 END#########**/
        /**########字典 BEGIN#########**/
        isAdaptationIngDic:function(){
          var version = $("#version").val();
          var self=this;//为了获取项目id
          var url="";//AdapterDatasetController
          var obj="";//为了获取进度条
          var isDataSet = $("#isDataSet").val();
          if(isDataSet=="0"){//字典
            obj=self.$zidianZdsp
            url="${contextRoot}/adapterCenter/isStrategyDic"
          }else{//数据集
            obj=self.$shujujiZdsp
            url="${contextRoot}/adapterCenter/isStrategy"
          }
          var isCanPlay= setInterval(function(){//判断 是否可以开始匹配了
            $.ajax({
              type:"POST",
              dataType:"",
              url:url,
              data:{version:version},
              success:function(res){
                var isPPing=JSON.parse(res.data).isAdapt//是否正在匹配
                if(isPPing=="false"){//如果不是正在匹配
                  self.pipeiDoDic();//开始匹配
                }else{//如果正在匹配
                  self.autoAdaptationDic(obj);//显示进度
                  clearInterval(isCanPlay)
                }
              }
            })
          },3000)
        },
        pipeiDoDic:function(){
          var std_version = $("#std_version").val();
          var version = $("#version").val();
          var adapter_std_version = $("#adapter_std_version").val();
          var parmas = {std_version:std_version,version:version,adapter_std_version:adapter_std_version};
          var self=this;
          var obj;//当前属于字典还是数据集对象,赋值匹配中
          var btnObj//自动匹配的按钮
          var url//链接
          var isDataSet = $("#isDataSet").val();
          if(isDataSet=="0"){//字典
            obj=$("#zidian .boxleft");
            url="${contextRoot}/adapterCenter/strategyDic"
          }else{//数据集
            obj=$("#shujuji .boxleft");
            url="${contextRoot}/adapterCenter/strategy"
          }
          $("#btn_aoto_adpat_dic span").html("匹配中...");
          $.ajax({
            type:"POST",
            dataType:"json",
            url:url,
            data:parmas,
            success:function(data){
              $("#btn_aoto_adpat_dic span").html("自动适配");
            },
            error:function(){
            }
          })
        },//开始匹配
        autoAdaptationDic:function(){
          var self=this;
          var url=""//进度
          var isDataSet = $("#isDataSet").val();
          var version = $("#version").val();
          if(isDataSet=="0"){//字典
            url="${contextRoot}/adapterCenter/getStrategyDicSize"
          }else{//数据集
            url="${contextRoot}/adapterCenter/getStrategySize"
          }
          var timeIng =setInterval(function(){
            var ver =
                    $.ajax({
                      type:"POST",
                      dataType:"json",
                      url:url,
                      data:{version:version},
                      success:function(res){
                        if(res.data==undefined){
                          $("#btn_aoto_adpat_dic span").html("请求中");
                        }else{
                          if(res.data.all==0){//如果判断被除数不能为0  如果为0 直接清空
                            $("#btn_aoto_adpat_dic span").html("匹配完成");
                            clearInterval(timeIng);
                            self.ppeiEnd()//结束匹配
                          }else{
                            var jdu=  res.data.adapt/res.data.all//进度
                            if(jdu!=1){
                              var jduBFB=parseInt(jdu*100)
                              if(isNaN(jduBFB)){
                                $("#btn_aoto_adpat_dic span").html("匹配中...");
                              }else{
                                $("#btn_aoto_adpat_dic span").html("已匹配"+jduBFB+"%")
                              }
                            }else{
                              $("#btn_aoto_adpat_dic span").html("匹配完成");
                              master.reloadGrid();
                              clearInterval(timeIng);
                              self.ppeiEndDic()//结束匹配
                            }
                          }
                        }
                      }
                    })
          },3000)
        },//自动匹配进度
        ppeiEndDic:function(){
          var self=this;
          var url="";
          var isDataSet = $("#isDataSet").val()
          if(isDataSet=="0"){//字典
            url="${contextRoot}/adapterCenter/endStrategyDic"
          }else{//数据集
            url="${contextRoot}/adapterCenter/endStrategy"
          }
          $.ajax({
            type:"POST",
            dataType:"json",
            url:url,
            data:{version:$("#version").val()},
            success:function(res){
            }
          })
        },//结束匹配
        /**########数据集 END#########**/
        uniqueArray:function(a){ /* 判断适配方案id、平台字典id、平台字典项id、应用字典项id是否重复*/
          var temp = new Array();
          for(var i = 0; i < a.length; i ++){
@@ -1035,9 +1179,14 @@
            entryMaster.save();
          });
          //数据集
          $('#btn_aoto_adpat').click(function () {
            entryMaster.isAdaptationIng();
          });
          //字典
          $('#btn_aoto_adpat_dic').click(function () {
            entryMaster.isAdaptationIngDic();
          });
          $("#searchNmEntry").keyup(function (e) {
            if (e.keyCode == 13) {

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

@@ -155,7 +155,11 @@
      }
      // 自适应宽度
     // u.grid.adjustToWidth();
      u.grid.collapseAll();//展开全部expandAll()； 收缩全部collapseAll()
      if($("#inp_search").val()){//当搜索时→展开全部列表
        u.grid.expandAll();
      }else{
        u.grid.collapseAll();//展开全部expandAll()； 收缩全部collapseAll()
      }
      window.grid = u.grid;
    },
    showDialog: function (_tital, _url, _height, _width, callback) {

src/main/webapp/WEB-INF/ehr/jsp/system/flow/editorFlow.jsp

@@ -19,9 +19,10 @@
            <div class="m-form-control ">
                <div class="l-text">
                    <input type="text" class="l-text-field required" placeholder="请输入流程Code" name="code"/>
                    <input type="text" class="l-text-field required" placeholder="请输入流程Code" name="code" id="code"/>
                </div>
            </div>
            <sapn class="code-input-span">只能输入数字和字母</sapn>
        </div>
        <div class="m-form-group">
@@ -97,4 +98,5 @@
    .m-form-bottom{position:absolute;z-index:2;bottom:0;left:0;width:100%;background:#f5f8fa;padding:0; height: auto;}
    .flows{border: 2px solid #c4e1ff;margin-bottom: 10px;width: 550px;}
    .btnIconGrayUp.required{border: #FF7777 1px solid; float: left;}
    .code-input-span{height: 30px;line-height: 30px;font-size: 14px;color: red;display: none;}
</style>

src/main/webapp/WEB-INF/ehr/jsp/system/flow/editorFlowJs.jsp

@@ -141,6 +141,13 @@
                    data.flowClassArray = me.flowClassData;
                    dataList = {"flowClass": JSON.stringify(data)}
                }
                var code = $("#code").val();
                var reg = /^[0-9a-zA-Z]+$/;
                if(!reg.test(code)){
                    return false;
                }
                $.ajax({ //ajax处理
                    type: "POST",
                    url: me.actionUrl,
@@ -456,6 +463,14 @@
        return index;
    }
    $("#code").blur(function(){
        var reg = /^[0-9a-zA-Z]+$/;
        var code = document.getElementById("code").value;
        if(!reg.test(code)){
            $(".code-input-span").css("display","block");
            $(this).addClass("btnIconGrayUp");
        }
    });
    $(function () {
        editorFlow.init();