终端可以看到租户管理bug修复

hos-camel2/src/main/java/camel/crawler/processor/DefaultHttpProcessor.java

@@ -8,6 +8,10 @@ import org.apache.camel.Processor;
import java.util.Iterator;
/**
 *  采集上传流程操作类
 *  用于参数解析
 */
public class DefaultHttpProcessor implements Processor {
    private String paramJson;

hos-camel2/src/main/java/camel/crawler/route/CrawlerQuartzRoute.java

@@ -5,6 +5,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
/**
 * 采集上传流程
 *  此类为camel-quartz 采集使用的模板类，
 *  格式要求：1.routeId("routeId")
 *            2."{\"jobId\": \"jobId\"}"
 * @author HZY * @vsrsion 1.0 * Created at 2016/11/17.
 */
public class CrawlerQuartzRoute extends RouteBuilder {

hos-rest/src/main/java/com/yihu/hos/rest/models/crawler/patient/Patient.java

@@ -16,11 +16,20 @@ public class Patient {
    private String reUploadFlg;
    private String jobTimeStamp;
    private String failType; //采集失败类型
    private String dataSet; //从哪个数据集采集
    public Patient() {
    }
    public String getDataSet() {
        return dataSet;
    }
    public void setDataSet(String dataSet) {
        this.dataSet = dataSet;
    }
    public String getPatientId() {
        return patientId;
    }

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/DataCollectDispatcher.java

@@ -138,6 +138,7 @@ public class DataCollectDispatcher {
                        patient.setEventNo(eventNo);
                        patient.setReferenceTime(refTime);
                        patient.setOrgCode(orgCode);
                        patient.setDataSet(key);
                        patientList.add(patient);
                    }
                }

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

@@ -34,6 +34,9 @@ public class SystemManager {
    {
        ActionResult result = null;
        TenantSession tenantSession = (TenantSession)session.getAttribute(ContextAttributes.TENANT_SESSION);
        if (saasAdmin.equals(tenantSession.getTenant())){
            tenantSession.setRole("admin");//标识为中心管理员角色
        }
        //特殊账户
        if(user.equals("admin") && password.equals("JKZL"))
        {
@@ -42,9 +45,8 @@ public class SystemManager {
            userInfo.setUserName("管理员");
            session.setAttribute("userInfo",userInfo);
            tenantSession.setUserCode("admin");//设置租户code
            tenantSession.setRole("admin");//标识为管理员账号
            session.setAttribute(ContextAttributes.TENANT_SESSION, tenantSession);
            LocalContext.getContext().setAttachment(ContextAttributes.TENANT_NAME,tenantSession.getUserCode());
            LocalContext.getContext().setAttachment(ContextAttributes.TENANT_NAME,tenantSession.getTenant());
            LocalContext.getContext().setAttachment(ContextAttributes.SCHEMA, tenantSession.getSchema());
            result = new ActionResult(true,"登录成功!");
@@ -64,9 +66,6 @@ public class SystemManager {
            String userPassword = userInfo.getPassword();
            if(userPassword.equals(DigestUtils.md5Hex(password + saltValue)))
            {
                if (saasAdmin.equals(user)){
                    tenantSession.setRole("admin");//标识为管理员账号
                }
                tenantSession.setUserCode(user);
                session.setAttribute(ContextAttributes.TENANT_SESSION, tenantSession);
                session.setAttribute("userInfo",userInfo);

src/main/java/com/yihu/hos/tenant/service/AuthenticateService.java

@@ -59,8 +59,8 @@ public class AuthenticateService {
//        if (userModel == null || !password.equals(userModel.getPassword())) {
//            return "User Auth Failed";
//        }
        LocalContext.getContext().setAttachment(ContextAttributes.TENANT_NAME,tenantModel.getLoginName());
        httpSession.setAttribute(ContextAttributes.TENANT_SESSION, new TenantSession(tenantModel.getLoginName(), tenantModel.getSchema()));
        LocalContext.getContext().setAttachment(ContextAttributes.TENANT_NAME,tenantModel.getName());
        httpSession.setAttribute(ContextAttributes.TENANT_SESSION, new TenantSession(tenantModel.getName(), tenantModel.getSchema()));
        return true;
    }