Merge branch 'master' of chenweida/esb into master

Hos-Resource-Rest/pom.xml

@@ -45,10 +45,10 @@
            <artifactId>spring-data-mongodb</artifactId>
        </dependency>
        <dependency>
        <groupId>org.mongodb</groupId>
        <artifactId>mongo-java-driver</artifactId>
        <version>3.1.0</version>
    </dependency>
            <groupId>org.mongodb</groupId>
            <artifactId>mongo-java-driver</artifactId>
            <version>3.1.0</version>
        </dependency>
        <dependency>
            <groupId>commons-dbutils</groupId>
            <artifactId>commons-dbutils</artifactId>
@@ -155,6 +155,11 @@
            <version>2.1.2</version>
        </dependency>
        <!--===================swagger end==================-->
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>core-rpc</artifactId>
            <version>2.0.0</version>
        </dependency>
    </dependencies>

Hos-Resource-Rest/src/main/java/com/yihu/hos/esb/control/RouteControl.java

@@ -5,13 +5,13 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/Route")
@RequestMapping("/route")
public class RouteControl {
	/*
		目标路由
	 */
	@RequestMapping("TargetRoute")
	@RequestMapping("targetRoute")
	public String TargetRoute() {
		return "";
@@ -21,7 +21,7 @@ public class RouteControl {
	/*
		多服务者路由
	 */
	@RequestMapping("ListRoute")
	@RequestMapping("listRoute")
	public String ListRoute() {
		return "";
	}
@@ -30,7 +30,7 @@ public class RouteControl {
	/*
		过滤路由
	 */
	@RequestMapping("FilterRoute")
	@RequestMapping("filterRoute")
	public String FilterRoute() {
		return "";
	}

Hos-Resource-Rest/src/main/java/com/yihu/hos/esb/control/TransformerControl.java

@@ -6,33 +6,33 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/Transformer")
@RequestMapping("/transformer")
public class TransformerControl {
	/*
		接收转换
	 */
	@RequestMapping("ReceiveFormat")
	public String ReceiveFormat() {
    /*
        接收转换
     */
    @RequestMapping("receiveFormat")
    public String receiveFormat() {
		return "";
	}
        return "";
    }
	/*
		发送转换
	 */
	@RequestMapping("SendFormat")
	public String SendFormat() {
		return "";
	}
    /*
        发送转换
     */
    @RequestMapping("sendFormat")
    public String sendFormat() {
        return "";
    }
	/*
		自定义转换
	 */
	@RequestMapping("Format")
	public String Format() {
		return "";
	}
    /*
        自定义转换
     */
    @RequestMapping("format")
    public String format() {
        return "";
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/control/GatewayControl.java

@@ -2,8 +2,8 @@ package com.yihu.hos.gateway.control;
import com.yihu.hos.gateway.exception.EHRException;
import com.yihu.hos.gateway.exception.EHRExceptionConstant;
import com.yihu.hos.gateway.model.RestRequsetResult;
import com.yihu.hos.gateway.model.RestResponseResult;
import com.yihu.hos.gateway.model.rest.RestRequsetResult;
import com.yihu.hos.gateway.model.rest.RestResponseResult;
import com.yihu.hos.gateway.service.intf.IGatewayService;
import com.yihu.hos.resource.util.httpclient.HttpClientUtil;
import com.yihu.hos.resource.viewModel.ResourceRestDetailModel;
@@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/27.
@@ -73,6 +71,13 @@ public class GatewayControl {
        return RestResponseResult.getSuccess(resultData, restRequsetResult.getRequestId());
    }
    /**
     * 根据资源对象的信息还有访问的参数通过httpclient得到数据
     * @param resourceRestDetailModel
     * @param param
     * @return
     * @throws EHRException
     */
    private String getResultData(ResourceRestDetailModel resourceRestDetailModel, String param) throws EHRException {
        String returnData = null;
@@ -81,9 +86,9 @@ public class GatewayControl {
        String userNamre = resourceRestDetailModel.getUsername();
        String password = resourceRestDetailModel.getPassword();
        try {
            //根据配置好的类型判断是get还是post
            if (ResourceRestDetailModel.ResourceRest_TYPE_GET.equals(resourceRestDetailModel.getType())) {
                returnData = httpClientUtil.doGet(url, JSONObject.fromObject(param), userNamre, password);
            } else if (ResourceRestDetailModel.ResourceRest_TYPE_POST.equals(resourceRestDetailModel.getType())) {
                returnData = httpClientUtil.doPost(url, JSONObject.fromObject(param), userNamre, password);
            } else {

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/control/rpc/IResourceRpc.java

@@ -0,0 +1,15 @@
package com.yihu.hos.gateway.control.rpc;
import com.coreframework.ioc.By;
import com.yihu.hos.gateway.model.rpc.RPCRequestResult;
import com.yihu.hos.gateway.model.rpc.RPCResponseResult;
/**
 * Created by Administrator on 2016/4/12.
 */
@By(com.yihu.hos.gateway.control.rpc.impl.ResourceRpcImpl.class)
public interface IResourceRpc {
    public String transport(String RPCRequestXml);
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/control/rpc/impl/ResourceRpcImpl.java

@@ -0,0 +1,33 @@
package com.yihu.hos.gateway.control.rpc.impl;
import com.yihu.hos.gateway.control.rpc.IResourceRpc;
import com.yihu.hos.gateway.model.rpc.RPCRequestResult;
import com.yihu.hos.gateway.model.rpc.RPCResponseResult;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
import java.io.StringReader;
/**
 * Created by Administrator on 2016/4/12.
 */
public class ResourceRpcImpl implements IResourceRpc {
    @Override
    public String transport(String RPCRequestXml) {
        try {
            //xml转对象
            JAXBContext context = JAXBContext.newInstance(RPCRequestResult.class);
            Unmarshaller unmarshaller = context.createUnmarshaller();
            RPCRequestResult rpcRequestResult = (RPCRequestResult) unmarshaller.unmarshal(new StringReader(RPCRequestXml));
            //得到业务code
            String trancode = rpcRequestResult.getTransactionCode();
            RPCResponseResult r = RPCResponseResult.success();
        } catch (Exception e) {
        }
        System.out.println(RPCRequestXml);
        return "你也好";
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/qcl/TXData.java

@@ -1,7 +1,6 @@
package com.yihu.hos.gateway.model.qcl;
import org.jdom2.Element;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/rest/RestRequsetResult.java

@@ -0,0 +1,66 @@
package com.yihu.hos.gateway.model.rest;
import com.coreframework.remoting.Url;
import com.coreframework.remoting.reflect.InvokeRequest;
import com.coreframework.remoting.reflect.Rpc;
import com.yihu.hos.gateway.control.rpc.IResourceRpc;
import com.yihu.hos.gateway.control.rpc.impl.ResourceRpcImpl;
import com.yihu.hos.gateway.exception.EHRExceptionConstant;
import java.io.Serializable;
/**
 * Created by chenweida on 2016/1/27.
 */
public class RestRequsetResult implements Serializable {
    private String api;
    private String param;
    private String requestId;
    public String getApi() {
        return api;
    }
    public void setApi(String api) {
        this.api = api;
    }
    public String getParam() {
        return param;
    }
    public void setParam(String param) {
        this.param = param;
    }
    public String getRequestId() {
        return requestId;
    }
    public void setRequestId(String requestId) {
        this.requestId = requestId;
    }
    @Override
    public String toString() {
        return "{" +
                "api:'" + api + '\'' +
                ", param:'" + param + '\'' +
                ", requestId:'" + requestId + '\'' +
                '}';
    }
    public static void main(String[] args) {
        InvokeRequest r=new InvokeRequest(new Url("127.0.0.1",8891),"com.yihu.hos.gateway.control.rpc.IResourceRpc","transport",String.class);
         r.add(String.class,"你好");
         r.setSendTimeOutMills(3000);//设置默认的超时时间
         r.setSyncMode();//设置调用模式为同步模式
         try {
             Object s=Rpc.invoke(r);
             System.out.println(s.toString());
           } catch (Exception e1) {
                e1.printStackTrace();
         }//调用并返回结果
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/rest/RestResponseResult.java

@@ -0,0 +1,75 @@
package com.yihu.hos.gateway.model.rest;
import com.yihu.hos.gateway.exception.EHRExceptionConstant;
import java.io.Serializable;
/**
 * Created by chenweida on 2016/1/27.
 */
public class RestResponseResult implements Serializable{
    private String responseCode = EHRExceptionConstant.EHREXCEPTION_SUCCESS;
    private String responseMessage = EHRExceptionConstant.EHREXCEPTION_SUCCESS_MESSAGE;
    private String responseParams;
    private String requestId;
    public String getResponseCode() {
        return responseCode;
    }
    public void setResponseCode(String responseCode) {
        this.responseCode = responseCode;
    }
    public String getResponseMessage() {
        return responseMessage;
    }
    public void setResponseMessage(String responseMessage) {
        this.responseMessage = responseMessage;
    }
    public String getResponseParams() {
        return responseParams;
    }
    public void setResponseParams(String responseParams) {
        this.responseParams = responseParams;
    }
    public String getRequestId() {
        return requestId;
    }
    public void setRequestId(String requestId) {
        this.requestId = requestId;
    }
    public static RestResponseResult getSuccess(String responseParams, String requestId) {
        RestResponseResult responseModel = new RestResponseResult();
        responseModel.setRequestId(requestId);
        responseModel.setResponseParams(responseParams);
        return responseModel;
    }
    public static RestResponseResult getSuccess(String responseParams) {
        RestResponseResult responseModel = new RestResponseResult();
        responseModel.setResponseParams(responseParams);
        return responseModel;
    }
    public static RestResponseResult getError(String respCode, String respMessage) {
        RestResponseResult responseModel = new RestResponseResult();
        responseModel.setResponseCode(respCode);
        responseModel.setResponseMessage(respMessage);
        return responseModel;
    }
    @Override
    public String toString() {
        return "{" +
                "responseCode:'" + responseCode + '\'' +
                ", responseMessage:'" + responseMessage + '\'' +
                ", responseParams:'" + responseParams + '\'' +
                ", requestId:'" + requestId + '\'' +
                '}';
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/rpc/Page.java

@@ -0,0 +1,33 @@
package com.yihu.hos.gateway.model.rpc;
/**
 * Created by Administrator on 2016/4/12.
 */
public class Page {
    private String PSize;
    private String PIndex;
    public String getPSize() {
        return PSize;
    }
    public void setPSize(String PSize) {
        this.PSize = PSize;
    }
    public String getPIndex() {
        return PIndex;
    }
    public void setPIndex(String PIndex) {
        this.PIndex = PIndex;
    }
    @Override
    public String toString() {
        return "Page{" +
                "PSize='" + PSize + '\'' +
                ", PIndex='" + PIndex + '\'' +
                '}';
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/rpc/RPCRequestResult.java

@@ -0,0 +1,36 @@
package com.yihu.hos.gateway.model.rpc;
import javax.xml.bind.annotation.XmlRootElement;
/**
 * Created by Administrator on 2016/4/12.
 */
@XmlRootElement
public class RPCRequestResult {
    private String transactionCode;
    private Page page;
    public String getTransactionCode() {
        return transactionCode;
    }
    public void setTransactionCode(String transactionCode) {
        this.transactionCode = transactionCode;
    }
    public Page getPage() {
        return page;
    }
    public void setPage(Page page) {
        this.page = page;
    }
    @Override
    public String toString() {
        return "RPCRequestResult{" +
                "transactionCode='" + transactionCode + '\'' +
                ", page=" + page +
                '}';
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/rpc/RPCResponseResult.java

@@ -0,0 +1,59 @@
package com.yihu.hos.gateway.model.rpc;
import com.yihu.hos.gateway.exception.EHRExceptionConstant;
import javax.xml.bind.annotation.XmlRootElement;
/**
 * Created by Administrator on 2016/4/12.
 */
@XmlRootElement
public class RPCResponseResult {
    private String respCode = EHRExceptionConstant.EHREXCEPTION_SUCCESS;
    private String respMessage = EHRExceptionConstant.EHREXCEPTION_SUCCESS_MESSAGE;
    private String rransactionCode;
    private String requestId;
    public String getRespCode() {
        return respCode;
    }
    public void setRespCode(String respCode) {
        this.respCode = respCode;
    }
    public String getRespMessage() {
        return respMessage;
    }
    public void setRespMessage(String respMessage) {
        this.respMessage = respMessage;
    }
    public String getRransactionCode() {
        return rransactionCode;
    }
    public void setRransactionCode(String rransactionCode) {
        this.rransactionCode = rransactionCode;
    }
    public String getRequestId() {
        return requestId;
    }
    public void setRequestId(String requestId) {
        this.requestId = requestId;
    }
    public static RPCResponseResult success(){
        RPCResponseResult rpcResponseResult =new RPCResponseResult();
        return rpcResponseResult;
    }
    public static RPCResponseResult error(){
        RPCResponseResult rpcResponseResult =new RPCResponseResult();
        return rpcResponseResult;
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/resource/base/App.java

@@ -1,5 +1,6 @@
package com.yihu.hos.resource.base;
import com.coreframework.remoting.Server;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.embedded.MultipartConfigFactory;
@@ -52,7 +53,11 @@ public class App {
        //set.add("classpath:applicationContext.xml");  
        app.setSources(set);
        app.run(args);
        //SpringApplication.run(App.class, args);
        //启动RPC服务器
        Server server = Server.getInstance(8891);
        server.start();
    }
    /**

Hos-Resource-Rest/src/main/java/com/yihu/hos/resource/util/springUtil/SpringBeanUtil.java

@@ -0,0 +1,111 @@
package com.yihu.hos.resource.util.springUtil;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.stereotype.Component;
/**
 * 服务管理器。服务管理器是所有顶级服务的生成器。若是单元测试使用此服务工厂，Spring Context会被ServiceFactory创建。
 * 若是在Tomcat中使用此服务工厂，Spring Context会由 Tomcat 创建，并通过 ApplicationContextAware 赋值给 ServiceFactory。
 *
 * @author Sand
 * @version 1.0
 * @created 12-05-2015 17:47:55
 */
@Component
public class SpringBeanUtil implements ApplicationContextAware {
    private static ApplicationContext springContext = null;
    /**
     * 获取Spring应用上下文环境。
     *
     * @return
     */
    public static ApplicationContext getApplicationContext() {
        return springContext;
    }
    @Override
    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
        springContext = applicationContext;
    }
    /**
     * 获取服务。
     *
     * @param serviceName
     * @param <T>
     * @return
     */
    public static <T> T getService(String serviceName) {
        if (springContext == null) {
            springContext = new ClassPathXmlApplicationContext(new String[]
                    {
                            "spring/applicationContext.xml"
                    }
            );
        }
        return (T) springContext.getBean(serviceName);
    }
    /**
     * 获取服务，并用参数初始化对象。
     *
     * @param serviceName
     * @param args
     * @param <T>
     * @return
     */
    public static <T> T getService(String serviceName, Object... args) {
        T ref = getService(serviceName);
        if (ref == null) return null;
        return ref;
    }
    /**
     * 获取平台支持的所有服务名称。
     *
     * @return
     */
    public static String[] getAvailableServiceNames() {
        String[] serviceNames = springContext.getBeanDefinitionNames();
        return serviceNames;
    }
    /**
     * 判断是否支持特定服务。
     *
     * @param serviceName
     * @return
     */
    public static boolean isServiceSupported(String serviceName) {
        return springContext.containsBeanDefinition(serviceName);
    }
    /**
     * 获取服务的实现类。
     *
     * @param serviceName
     * @return
     */
    public static Class getServiceType(String serviceName) {
        return springContext.getType(serviceName);
    }
    /**
     * 判断服务是否为单例模式。
     *
     * @param serviceName
     * @return
     */
    public static boolean isSingleton(String serviceName) {
        return springContext.isSingleton(serviceName);
    }
}

Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsResourceRestController.java

@@ -81,9 +81,13 @@ public class RsResourceRestController {
            String page = StringUtils.isEmpty(request.getParameter("page"))?"1":request.getParameter("page");
            String rows = StringUtils.isEmpty(request.getParameter("rows"))?"10":request.getParameter("rows");
            String resourceRestId = request.getParameter("resourceRestId");
            String id = request.getParameter("id");
            String resourceRestName = request.getParameter("resourceRestName");
            DataGridResult result = new DataGridResult(Integer.valueOf(page), Integer.valueOf(rows));
            Map<String, Object> conditionMap = new HashMap<>();
            conditionMap.put("resourceRestId",resourceRestId);
            conditionMap.put("id",id);
            conditionMap.put("resourceRestName",resourceRestName);
            result = resourceRestService.getResourceRestDetilList(conditionMap, Integer.valueOf(page), Integer.valueOf(rows));
            return result;
        } catch (Exception e) {

Hos-resource/src/main/java/com/yihu/ehr/resource/dao/impl/RsResourceRestDetailDaoImpl.java

@@ -20,8 +20,11 @@ public class RsResourceRestDetailDaoImpl extends SQLGeneralDAO implements IRsRes
        StringBuilder sb = new StringBuilder();
        sb.append(" from RsResourceRestDetail r ");
        sb.append(" where 1=1 ");
        if (!StringUtils.isEmpty(conditionMap.get("resourceRestName"))) {
            sb.append(" and r.name like '%" + conditionMap.get("resourceRestName") + "%'");
        }
        if (!StringUtils.isEmpty(conditionMap.get("resourceRestId"))) {
            sb.append(" and r.name like '%" + conditionMap.get("resourceRestId") + "%'");
            sb.append(" and r.resourceRestId = '" + conditionMap.get("resourceRestId") + "'");
        }
        return super.getDataGridResult(sb.toString(), page, rows);
    }

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestJs.jsp

@@ -12,8 +12,6 @@
        $dictGrid: $("#dict_grid"),//字典datagrid
        $dictItemGrid: $("#dictItem_grid"),//字典datagrid
        $dialog:null,
        grid:null,
        grid1:null,
        init: function () {
            this.initLayout();
            this.initButton();
@@ -21,6 +19,7 @@
        },
        initLayout: function () {
            this.$layout.ligerLayout({
                height:"98%",
                leftWidth: 370,
                isLeftCollapse: false,//左边区域初始化不可以隐藏
                allowLeftCollapse: false//左边区域不可以隐藏
@@ -34,20 +33,25 @@
        },
        initButton: function () {
            $("#dictname").ligerSearch({
            resourceRest.$dictname.ligerSearch({
                width: 200,onClick: function (value) {
                    resourceRest.grid.set({
                    resourceRest.$dictGrid.set({
                        parms: {categoryId: $("#dictname").val()}
                    });
                    resourceRest.grid.reload();
                    resourceRest.grid.changePage("first");
                    resourceRest.$dictGrid.reload();
                    resourceRest.$dictGrid.changePage("first");
                }
            });
            this.$dictItemName.ligerSearch({
            resourceRest.$dictItemName.ligerSearch({
                width: 200,onClick: function (value) {
                    var selectRow=resourceRest.$dictGrid.getSelectedRow();
                    var param={resourceRestName: $("#dictItemName").val()};
                    if(selectRow){
                        param.resourceRestId=selectRow.id;
                    }
                    resourceRest.$dictItemGrid.set({
                        parms: {resourceRestId: $("#dictItemName").val()}
                        parms: param
                    });
                    resourceRest.$dictItemGrid.reload();
                    resourceRest.$dictItemGrid.changePage("first");
@@ -163,7 +167,7 @@
            this.$dialog.close();
        },
        initGrid: function () {
            this.grid=$("#dict_grid").ligerGrid({
            this.$dictGrid=this.$dictGrid.ligerGrid({
                url: '${contextRoot}/resourceRest/getResourceRestList',
                columns: [
                    {display: '业务资源名称', name: 'name', width: '25%'},
@@ -178,6 +182,12 @@
                    }
                    }
                ],
                alternatingRow: false,
                checkbox: false,
                heightDiff: -10,
                headerRowHeight: 40,
                height:"96%",
                rowHeight: 40,
                onDblClickRow:function(data,rowid,rowdata) {
                    resourceRest.editorResourceRestDialog(data.id);
                },
@@ -201,9 +211,15 @@
                    }
                    }
                ],
                alternatingRow: false,
                checkbox: false,
                height:"96%",
                heightDiff: -10,
                onDblClickRow:function(data,rowid,rowdata) {
                    resourceRest.editorResourceRestDetailDialog(data.id);
                }
                },
                headerRowHeight: 40,
                rowHeight: 40,
            });
        },
    };