浏览代码

Merge branch 'master' of chenweida/esb into master

esb 9 年之前
父节点
当前提交
9755113a0e

+ 3 - 1
Hos-Resource-Rest/resource-rest.iml

@ -21,6 +21,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Maven: com.yihu.core:core-rpc:2.0.0" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.4" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.2.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.2.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.2.7.RELEASE" level="project" />
@ -91,7 +92,7 @@
    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.2" level="project" />
    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.4" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.8" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
@ -154,6 +155,7 @@
    <orderEntry type="library" name="Maven: org.apache.axis2:org.apache.axis2.osgi:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis2:axis2-transport-http:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis2:axis2-transport-local:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.json:json:20151123" level="project" />
  </component>
  <component name="org.twodividedbyzero.idea.findbugs">
    <option name="_basePreferences">

+ 41 - 64
Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/util/RPCUtil.java

@ -84,70 +84,47 @@ public class RPCUtil {
     *
     */
    public static void main(String[] args) {
        // TODO Auto-generated method stub
        String apiName = "ZEUS.HosHOPWs.GetReportInfo";
        String apiName="";
        String param="";
                //获取报告单列表
       // apiName = "ZEUS.HosHOPWs.GetReportList";
        //param = "<Req><TransactionCode>5001</TransactionCode><Data><CardType>1</CardType><CardNo>000021341249</CardNo><IdCardNo>352103197603094519</IdCardNo><StartDate>2016-01-01</StartDate><EndDate>2016-04-05</EndDate><Mobile>1885215394</Mobile><PatientName>周春生</PatientName><ReportType>1</ReportType></Data></Req>";
       // apiName = "ZEUS.HosHOPWs.QueryUserInfo";
        String param = "<Req><TransactionCode>5001</TransactionCode><Data><ReportId>201405228-A-110B</ReportId><ReportType>0</ReportType><CardNo>000021341249</CardNo></Data></Req>";
        String apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
                "\"ParamType\"=1," +
                "\"Params\"=\"" + param + "\"," +
                "\"Guid\"=\"" + "00000001111111" + "\"," +
                "\"V\"=\"3.0.0\"," +
                "\"OutType\"=1," +
                "\"HospitalId\"=\"1026333\"}";
        String result = null;
        try {
            result = ServiceBus.getInstance(
                    "172.18.20.21:2181",
                    "EsbCloud").call(apiName, apiparam);
            System.out.println("返回的数据:" + result);
        } catch (Exception e) {
            // TODO Auto-generated catch block
            e.printStackTrace();
        }
        System.out.println("result=" + result);
    }
    /*
    public static void main(String[] args) {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
        String data =
                "<Req>" +
                        "<TransactionCode>yy.yygh.QueryNumbers</TransactionCode>" +
                        "<Data>" +
                        "<CardType>123</CardType>" +
                        "<CardNo>333</CardNo>" +
                        "<PatientId>333</PatientId>" +
                        "</Data>" +
                        "</Req>";
        String SERVER_URL = "http://service.yihu.com:8080/WSGW/services/ServiceGateWay";
        String namespace = "http://com.yihu.wsgw/ServiceGateWay";
        String methos = "service";
        Class[] classes = new Class[]{String.class, String.class, String.class, String.class, Integer.class, Integer.class, String.class};
        Object[] v = new Object[7];
        v[0] = "{ClientVersion:1,ClientId:'EsbCloud',Sign:'Sign',SessionKey:''}";//authInfo
        v[1] = sdf.format(new Date());//sequenceNo
        v[2] = "report.ReportWs.GetReportInfo";//api
        v[3] = data;
        v[4] = 1;//paramType(0: json  1: Xml)
        v[5] = 1;//outType(0: json  1: Xml)
        v[6] = "1.0";//API版本号
        Object s = RPCUtil.getRPCData( classes, v);
        try {
            //新建RPC服务客户端
            RPCServiceClient serviceClient = new RPCServiceClient();
            Options options = serviceClient.getOptions();
            //设置URL
            EndpointReference targetEPR = new EndpointReference(SERVER_URL);
            options.setTo(targetEPR);
            //设置参数的类型
            //设置namespace和方法名
            QName opAddEntry = new QName(namespace, methos);
            //数组的第一个值为返回值
            String xml = (String) (serviceClient.invokeBlocking(opAddEntry, v, classes))[0];
            System.out.println(xml);
        } catch (Exception e) {
            e.printStackTrace();
        //检查/检验报告单
        	//	apiName = "ZEUS.HosHOPWs.GetReportInfo";
        //		param = "<Req><TransactionCode>5002</TransactionCode><Data><ReportId>201405228-A-110B</ReportId><ReportType>0</ReportType><CardNo>000021341249</CardNo></Data></Req>";
        //查询病人信息
        		apiName = "ZEUS.HosHOPWs.QueryUserInfo";
        		param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>1</CardType><CardNo>000021341249</CardNo><Mobile></Mobile><PatientId></PatientId></Data></Req>";
        //挂号事件推送
        //		apiName = "ZEUS.HosHOPWs.PushGuaHaoEvent";
        //		param = "<Req><TransactionCode></TransactionCode><Data><EventType>事件类型:门诊、住院</EventType><EventNo>事件编码:门诊号、住院号</EventNo><CardType>证件类型</CardType><CardNo>证件号</CardNo><PatientId>病人id</PatientId></Data></Req>";
        //检查/检验报告单推送
        //		apiName = "ZEUS.HosHOPWs.PushReport";
        //		param = "<Req><TransactionCode></TransactionCode><Data><CardType>卡类型</CardType><CardNo>卡号</CardNo><ReportType>报告单类型</ReportType><ReportId>报告单号</ReportId></Data></Req>";
        //		apiName = "ZEUS.HosHOPWs.QueryHospital";
        //		param = "<Req><TransactionCode></TransactionCode><Data><HosId>944</HosId></Data></Req>";
            String apiparam = "{\"ChannelId\"=\"100123\"," + "\"ParamType\"=1,"
                    + "\"Params\"=\"" + param + "\"," + "\"Guid\"=\""
                    + "00000001111111" + "\"," + "\"V\"=\"3.0.0\","
                    + "\"OutType\"=1," + "\"HospitalId\"=\"1026333\"}";
            String result = null;
            try {
                result = ServiceBus.getInstance(
                        "172.18.20.21:2181",
                       "EsbCloud")
                        .call(apiName, apiparam);
            } catch (Exception e) {
                // TODO Auto-generated catch block
                e.printStackTrace();
            }
            System.out.println("result=" + result);
        }
    }*/
}

+ 6 - 5
Hos-Resource-Rest/src/main/java/com/yihu/hos/qlc/controller/QLCController.java

@ -45,7 +45,7 @@ public class QLCController {
    /**
     * 院方_挂号事件推送
     * localhost:8890/gateway/transfer?api=registeredPush&param={EventType:"",EventNo:"",CardType:"",CardNo:"",PatientId:"",HospitalId:""}&requestId="目前没用随便写"
     * localhost:8081/gateway/transfer?api=17&param={EventType:"1",EventNo:"1",CardType:"1",CardNo:"1",PatientId:"1",HospitalId:"1026333"}&requestId="目前没用随便写"
     */
    @RequestMapping(value = "/queryUserInfo", method = RequestMethod.POST)
    @ApiOperation(value = "挂号事件推送", response = Object.class, produces = "application/json", notes = "院方挂号事件推送")
@ -66,13 +66,13 @@ public class QLCController {
            isEmpty(PatientId, "PatientId is null");
            isEmpty(HospitalId, "HospitalId is null");
            String param = "<Req><TransactionCode>5001</TransactionCode><Data><CardType>" + CardType + "</CardType><CardNo>" + CardNo + "</CardNo><PatientId>" + PatientId + "</PatientId></Data></Req>";
            String param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>"+CardType+"</CardType><CardNo>"+CardNo+"</CardNo><Mobile></Mobile><PatientId></PatientId></Data></Req>";
            String apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
                    "\"ParamType\"=1," +
                    "\"Params\"=\"" + param + "\"," +
                    "\"Guid\"=\"" + "00000001111111" + "\"," +
                    "\"Guid\"=\"00000001111111\"," +
                    "\"V\"=\"3.0.0\"," +
                    "\"OutType\"=0n ," +
                    "\"OutType\"=1," +
                    "\"HospitalId\"=\"" + HospitalId + "\"}";
            s = RPCUtil.getRPCData("ZEUS.HosHOPWs.QueryUserInfo", apiparam);
            //解析xml
@ -91,6 +91,7 @@ public class QLCController {
                Map<String, Object> params = new HashMap<String, Object>();
                params.put("dataset", "HDSA00_01");
                params.put("data", obj.toString());
                params.put("orgCode", HospitalId);
                String monogoUrl = httpClientUtil.doPost(Config.monogoUrl, params, null, null);
                monogoUrlValid(monogoUrl);
                //出發採集上傳
@ -106,7 +107,7 @@ public class QLCController {
        } catch (Exception e) {
            restResponseResult.setStatus("1");
            restResponseResult.setStatusInfo(e.getMessage() + "RPC:返回" + s);
            restResponseResult.setStatusInfo(e.getMessage() + "       RPC:返回" + s);
            return restResponseResult;
        }
        return restResponseResult;

+ 1 - 1
Hos-Resource-Rest/src/main/resources/rpc.properties

@ -1,7 +1,7 @@
rpc.url=172.18.20.21:2181
rpc.appId=EsbCloud
rpc.channelId=100123
rpc.port=8182
rpc.port=2181
http.monogourl=http://localhost:8080/datapush/datapush
http.startCollect=http://localhost:8080/crawler/patient

+ 1 - 1
Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectDao.java

@ -31,7 +31,7 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
        try{
            String sql = "select IFNULL(o.qlc_adapter_version,'') \n" +
                    "from system_organization o\n" +
                    "where o.code = '"+orgCode+"'";
                    "where o.qlc_org_code = '"+orgCode+"'";
            return super.scalarBySql(sql, String.class);
        }
        catch (Exception e)

+ 1 - 1
Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatapushService.java

@ -149,7 +149,7 @@ public class DatapushService implements IDatapushService {
        else{
            msg = "数据入库成功!(表:"+datasetCode+")";
            //日志记录
            datacollectLog.addDataPushLog("1","1",msg);
           // datacollectLog.addDataPushLog("1","1",msg);
            return ActionResult.success(msg);
        }
    }

+ 1 - 1
Hos-resource/src/main/resources/config/dbhelper.properties

@ -1,5 +1,5 @@
defaultName = hos-mysql
defaultUri = mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=UTF-8
defaultUri = jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=UTF-8
defaultUser = hos
defaultPassword = hos