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

hos-web-framework/src/main/java/com/yihu/hos/web/framework/dao/SQLGeneralDAO.java

@@ -3,6 +3,7 @@ package com.yihu.hos.web.framework.dao;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeType;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.NumberUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.core.log.Logger;
@@ -26,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.IOException;
import java.io.Serializable;
import java.math.BigInteger;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Collection;
@@ -90,7 +92,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
        return dataGridResult;
    }
    public DataGridResult getDataGridResult( Query query , Integer page, Integer rows) {
    public DataGridResult getDataGridResult(Query query, Integer page, Integer rows) {
        DataGridResult dataGridResult = new DataGridResult();
        if (page != null && rows != null) {
            dataGridResult.setPageSize(rows.intValue());
@@ -457,6 +459,14 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
        return query;
    }
    public Boolean tableIsExist(String sql) {
        BigInteger tableNum = (BigInteger) this.getCurrentSession().createSQLQuery(sql).uniqueResult();
        if (tableNum.intValue() > 0) {
            return true;
        }
        return false;
    }
    protected void doClose(Session session, Statement stmt, ResultSet rs) {
        if (rs != null) {
            try {

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

@@ -62,6 +62,10 @@ public class CommonPageController extends BaseController {
    @RequestMapping("loginPage")
    public String login(Model model, HttpServletRequest request, HttpServletResponse response) {
        HttpSession session = request.getSession();
        String urlType = (String) request.getSession().getAttribute("attachment");
        request.getSession().removeAttribute("attachment");
        //租户类型
        model.addAttribute("urlType", urlType);
        try {
            boolean auth = authenticateService.auth(session, saasAdmin);
            if (!auth) {

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

@@ -49,12 +49,13 @@ 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/standard/service/adapter/AdapterSchemeVersionService.java

@@ -1,13 +1,7 @@
package com.yihu.hos.standard.service.adapter;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.constant.ErrorCode;
import com.yihu.hos.web.framework.constant.SqlConstants;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.model.*;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import com.yihu.hos.standard.model.adapter.AdapterSchemeModel;
import com.yihu.hos.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.hos.standard.model.adapter.resultModel.AdapterSchemeVersionResultDetailModel;
@@ -15,6 +9,12 @@ import com.yihu.hos.standard.model.standard.StandardModel;
import com.yihu.hos.standard.model.standard.StdMetaDataModel;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.standard.service.bo.StandardVersion;
import com.yihu.hos.web.framework.constant.ErrorCode;
import com.yihu.hos.web.framework.constant.SqlConstants;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.model.*;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.Session;
@@ -387,9 +387,13 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
                version.getDictEntryTableName(),
                version.getDatasetRelationTableName()};
        List<String> deleteSqlList = new ArrayList<>();
        boolean temp = false;
        for (int i = 0; i < tables.length; ++i) {
            String table = tables[i];
            deleteSqlList.add(SqlConstants.DROP_TABLE + table);
            temp = tableIsExist("SELECT COUNT(*) FROM information_schema.TABLES WHERE table_name ='"+table+"'");
            if(temp){
                deleteSqlList.add(SqlConstants.DROP_TABLE + table);
            }
        }
        insertBatch(deleteSqlList);
    }

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

@@ -47,7 +47,10 @@
    };
    $(function(){
        var urlType = "${urlType}";
        if(urlType != ''){
            location.href = "${contextRoot}/"+urlType+"/loginPage";
        }
        //session过期
        if(location.href.indexOf('loginPage')<0)
        {

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

@@ -985,6 +985,8 @@
                  }
                }
              },
              error :function(res){
              }
            })
          },3000)
@@ -1002,7 +1004,8 @@
            url:url,
            data:{version:$("#version").val()},
            success:function(res){
            },
            error :function(res){
            }
          })
        },//结束匹配