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

src/main/java/com/yihu/hos/common/CommonPageController.java

@@ -42,9 +42,9 @@ import java.util.*;
@Controller("commonPageController")
public class CommonPageController extends BaseController {
    @Value("${spring.administrators}")
    @Value("${hos.administrators}")
    private String saasAdmin;
    @Value("${spring.clientId}")
    @Value("${hos.clientId}")
    private String clientId;
    @Value("${service-gateway.adminUrl}")
    public String adminUrl;
@@ -84,7 +84,7 @@ public class CommonPageController extends BaseController {
                    IOUtils.closeQuietly(out);
                }
            } else {
                remoteShellService.start();
                remoteShellService.start();//启动
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -129,7 +129,7 @@ public class CommonPageController extends BaseController {
                    IOUtils.closeQuietly(out);
                }
            } else {
                remoteShellService.start();
                remoteShellService.start();//启动远程连接
            }
        } catch (Exception e) {
            e.printStackTrace();

src/main/java/com/yihu/hos/filter/SessionOutTimeFilter.java

@@ -49,12 +49,12 @@ public class SessionOutTimeFilter extends OncePerRequestFilter {
                    || httpServletRequest.getSession().getAttribute("userInfo") == null) {
                // AJAX REQUEST PROCESS
                String attachment = LocalContext.getContext().getAttachment(ContextAttributes.TENANT_NAME);
//                if ("XMLHttpRequest".equalsIgnoreCase(httpServletRequest.getHeader("X-Requested-With"))) {
//                    httpServletResponse.setHeader("sessionStatus", "timeOut");
//                    httpServletResponse.getWriter().print("{}");
//                    httpServletResponse.sendRedirect(httpServletRequest.getContextPath() + "/logoutAction");
//                    return;
//                }
                if ("XMLHttpRequest".equalsIgnoreCase(httpServletRequest.getHeader("X-Requested-With"))) {
                    httpServletResponse.setHeader("sessionStatus", "timeOut");
                    httpServletResponse.getWriter().print("{}");
                    httpServletResponse.sendRedirect(httpServletRequest.getContextPath() + "/logoutAction");
                    return;
                }
                httpServletRequest.getSession().setAttribute("attachment",attachment);
                httpServletResponse.sendRedirect(httpServletRequest.getContextPath() + "/" + attachment + "/loginPage");
                return;

src/main/java/com/yihu/hos/listeners/ApplicationStart.java

@@ -27,7 +27,7 @@ import java.util.List;
public class ApplicationStart implements ServletContextListener {
    static private final Logger logger = LoggerFactory.getLogger(ApplicationStart.class);
    @Value("${spring.administrators}")
    @Value("${hos.administrators}")
    private String saasAdmin;
    @Resource(name = TenantService.BEAN_ID)

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

@@ -123,7 +123,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(condition, order, rows, page);
        DictionaryResult dictionaryResult = standardService.getDictionaryResult( 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 condition, String order, Integer limit, Integer offset) {
    public DictionaryResult getDictionaryResult(String order, Integer limit, Integer offset) {
        try {
            DictionaryResult dictionaryResult = DictionaryResult.success("获取标准列表成功");
            List<DictItem> detailModelList = new ArrayList<DictItem>();
            List<StandardModel> standardModelList = getList(condition, order, limit, offset);
            List<StandardModel> standardModelList = getList(null, order, limit, offset);
            for (StandardModel standardModel : standardModelList) {
                DictItem items = new DictItem();
                Integer id = standardModel.getId();
@@ -425,17 +425,19 @@ public class StandardService extends SQLGeneralDAO {
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(StandardModel.class);
        for (String key : query.keySet()) {
            if (key.equals("type")) {
                Integer type = (Integer) query.get(key);
                String code = getStandardParam(SqlConstants.STANDARD).getCode();
                if (type == 0) {
                    criteria.add(Restrictions.eq("code", code));
                } else if (type == 1) {
                    criteria.add(Restrictions.ne("code", code));
        if (query!=null) {
            for (String key : query.keySet()) {
                if (key.equals("type")) {
                    Integer type = (Integer) query.get(key);
                    String code = getStandardParam(SqlConstants.STANDARD).getCode();
                    if (type == 0) {
                        criteria.add(Restrictions.eq("code", code));
                    } else if (type == 1) {
                        criteria.add(Restrictions.ne("code", code));
                    }
                } else {
                    criteria.add(Restrictions.eq(key, query.get(key)));
                }
            } else {
                criteria.add(Restrictions.eq(key, query.get(key)));
            }
        }
        if (limit != null) {

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

@@ -23,7 +23,7 @@ public class SystemManager {
    @Resource(name = UserManager.BEAN_ID)
    private UserManager userManager;
    @Value("${spring.administrators}")
    @Value("${hos.administrators}")
    private String saasAdmin;
    /*

src/main/resources/application.yml

@@ -20,9 +20,6 @@ spring:
---
spring:
  profiles: dev
  administrators: jkzl
  clientId: 0e3DIdNaQ2
  #SAAS管理员账号,暂时配置在此处
  datasource:
      driverClassName: com.mysql.jdbc.Driver
      url: jdbc:mysql://172.19.103.57:8066/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
@@ -54,6 +51,8 @@ spring:
  aop:
    proxy-target-class: true
hos:
  administrators: jkzl #SAAS管理员账号,暂时配置在此处
  clientId: 0e3DIdNaQ2
  zbus:
    url: 172.19.103.57:9020
  filesystem:
@@ -67,9 +66,6 @@ service-gateway:
---
spring:
  profiles: test
  administrators: jkzl
  clientId: 0e3DIdNaQ2
  #SAAS管理员账号,暂时配置在此处
  datasource:
      driverClassName: com.mysql.jdbc.Driver
      url: jdbc:mysql://172.19.103.42:8066/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
@@ -101,6 +97,8 @@ spring:
  aop:
    proxy-target-class: true
hos:
  administrators: jkzl  #SAAS管理员账号,暂时配置在此处
  clientId: 0e3DIdNaQ2
  zbus:
    url: 172.19.103.37:9020
  filesystem:

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

@@ -74,26 +74,26 @@
                //标准管理
                //标准规范中心
                {id: 2, text: '标准规范', icon: '${staticRoot}/images/index/menu01.png'},
                {id: 21, pid: 2, text: '平台标准', url: '${contextRoot}/integration/initial/standard', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 22, pid: 2, text: '应用标准', url: '${contextRoot}/integration/initial/application', icon: '${staticRoot}/images/index/Ins_icon.png'},
                <%--{id: 21, pid: 2, text: '平台标准', url: '${contextRoot}/integration/initial/standard', icon: '${staticRoot}/images/index/Ins_icon.png'},--%>
                {id: 22, pid: 2, text: '标准管理', url: '${contextRoot}/integration/initial/application', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 23, pid: 2, text: '适配方案', url: '${contextRoot}/adapterPlan/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                //服务管理中心
                {id: 6, text: '服务管理', icon: '${staticRoot}/images/index/menu02.png'},
                {id: 61, pid: 6, text: '服务管理', url: '${contextRoot}/app/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 62, pid: 6, text: '转换管理', url: '${contextRoot}/processor/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                //数据服务总线
                {id: 1, text: '服务总线', icon: '${staticRoot}/images/index/menu03.png'},
                {id: 15, pid: 1, text: '服务管理', url: '${contextRoot}/app/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 16, pid: 1, text: '转换管理', url: '${contextRoot}/processor/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 11, pid: 1, text: '流程编排', url: '${contextRoot}/flow/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 12, pid: 1, text: '任务配置', url: '${contextRoot}/datacollect/configJob', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 13, pid: 1, text: '采集编排', url: '${contextRoot}/crawler/jobLayout', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 14, pid: 1, text: '流程编辑', url: '${contextRoot}/process/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                <%--{id: 13, pid: 1, text: '采集编排', url: '${contextRoot}/crawler/jobLayout', icon: '${staticRoot}/images/index/Ins_icon.png'},--%>
                <%--{id: 14, pid: 1, text: '流程编辑', url: '${contextRoot}/process/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},--%>
                //数据采集
                {id: 6, text: '数据采集', icon: '${staticRoot}/images/index/menu02.png'},
                {id: 61, pid: 6, text: '任务跟踪', url: '${contextRoot}/datacollect/trackJob', targetType: '1', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 62, pid: 6, text: '任务补采', url: '${contextRoot}/datacollect/repeatDatacollect', icon: '${staticRoot}/images/index/Ins_icon.png'},
                //运行监控中心
                {id: 5, text: '运行监控', icon: '${staticRoot}/images/index/menu04.png'},
                {id: 51, pid: 5, text: '系统监控', url: '${contextRoot}/monitor/server/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 52, pid: 5, text: '服务监控', url: '${contextRoot}/monitor/service/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 53, pid: 5, text: '任务跟踪', url: '${contextRoot}/datacollect/trackJob', targetType: '1', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 54, pid: 5, text: '任务补采', url: '${contextRoot}/datacollect/repeatDatacollect', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 55, pid: 5, text: '远程管理', url: '${contextRoot}/shell/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
              <%--{id: 55, pid: 5, text: '远程管理', url: '${contextRoot}/shell/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},--%>
                //资源管理
                <%--{id: 3, text: '资源服务', icon: '${staticRoot}/images/index/menu05.png'},--%>
@@ -112,6 +112,9 @@
                {id: 72, pid: 7, text: '用户管理', url: '${contextRoot}/user/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 73, pid: 7, text: '角色管理', url: '${contextRoot}/role/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 74, pid: 7, text: '权限管理', url: '${contextRoot}/authority/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                //质控规则管理
                {id: 8, text: '质控管理', icon: '${staticRoot}/images/index/menu05.png'},
                {id: 81, pid: 8, text: '规则管理', url: '${contextRoot}/rule/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                //系统配置
                {id: 9, text: '系统配置', icon: '${staticRoot}/images/index/menu07.png'},
                {id: 91, pid: 9, text: '系统参数', url: '${contextRoot}/param/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
@@ -119,9 +122,7 @@
                {id: 93, pid: 9, text: '菜单配置', url: '${contextRoot}/menu/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 94, pid: 9, text: '菜单按钮配置', url: '${contextRoot}/menu/menuAction/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 95, pid: 9, text: '数据源配置', url: '${contextRoot}/datasource/configSources', icon: '${staticRoot}/images/index/Ins_icon.png'},
                //质控规则管理
                {id: 8, text: '质控规则管理', icon: '${staticRoot}/images/index/menu05.png'},
                {id: 81, pid: 8, text: '规则管理', url: '${contextRoot}/rule/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
            ];
            if(userRole=="admin"){
@@ -242,7 +243,7 @@
            });
            //me.openHome();
            //打开默认菜单
            me.openMenuByText("任务跟踪");
//            me.openMenuByText("任务跟踪");
        },
        //加载中
        loading: function () {

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

@@ -45,13 +45,13 @@
  </div>
  <hr/>
  <div class="m-form-group" id="div_stdId">
    <label><span class="red">*&nbsp;</span>平台标准名称：</label>
    <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">
    </div>
  </div>
  <div class="m-form-group" id="div_stdVersion">
    <label><span class="red">*&nbsp;</span>平台标准版本：</label>
    <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" >
    </div>
@@ -64,13 +64,13 @@
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdId">
    <label><span class="red">*&nbsp;</span>应用标准名称：</label>
    <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">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdVersion">
    <label><span class="red">*&nbsp;</span>应用标准版本：</label>
    <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">
    </div>

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

@@ -67,7 +67,7 @@
  }
  .unadapt .l-grid-row-cell {background-color:#F5F5F5}
  .ysadapt .l-grid-row-cell {background-color:#1eaaff}
  .alladapt .l-grid-row-cell {background-color: #da4312;}
  .alladapt .l-grid-row-cell {background-color: #ff9600;}
  .js-example-data-array{width: 90% !important;height:30px;margin-top:5px;}
</style>

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

@@ -34,8 +34,8 @@
            return ' <div style="vertical-align:middle;margin-top: 10px;"><span>未发布  </span><img src="${contextRoot}/develop/images/button/fabuwei_icon.png"/></a></div>';
          }
        }},
        { display: '平台标准名称', name: 'stdName',width: '15%', type: 'int', align: 'center' },
        { display: '平台标准版本', name: 'stdVersionName', width: '10%', align: 'center' },
        { display: '源标准名称', name: 'stdName',width: '15%', type: 'int', align: 'center' },
        { display: '源标准版本', name: 'stdVersionName', width: '10%', align: 'center' },
        { display: '发布机构名称', name: 'publisher', width: '10%', align: 'center' },
        { display: '发布机构标准', name: 'adapterName', width: '10%', align: 'center' },
        { display: '机构标准版本', name: 'adapterVersionName', width: '10%', align: 'center' },