Explorar o código

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

llh %!s(int64=9) %!d(string=hai) anos
pai
achega
8e1b9646d8
Modificáronse 39 ficheiros con 541 adicións e 456 borrados
  1. 1 0
      Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/Constants.java
  2. 6 4
      Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/control/GatewayControl.java
  3. 0 45
      Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/RestRequsetResult.java
  4. 0 73
      Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/RestResponseResult.java
  5. 12 1
      Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/rest/RestResponseResult.java
  6. 28 26
      Hos-Resource-Rest/src/main/java/com/yihu/hos/qlc/controller/QLCController.java
  7. 55 32
      Hos-Resource-Rest/src/main/java/com/yihu/hos/resource/control/ResourceControl.java
  8. 2 2
      Hos-Resource-Rest/src/main/resources/rpc.properties
  9. 6 2
      Hos-resource/pom.xml
  10. 4 2
      Hos-resource/src/main/java/com/yihu/ehr/crawler/controller/CrawlerController.java
  11. 20 4
      Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerManager.java
  12. 2 2
      Hos-resource/src/main/java/com/yihu/ehr/crawler/service/EsbHttp.java
  13. 3 4
      Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectDao.java
  14. 41 3
      Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectLogDao.java
  15. 7 2
      Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/intf/IDatacollectLogDao.java
  16. 58 0
      Hos-resource/src/main/java/com/yihu/ehr/datacollect/model/RsDatapushLog.java
  17. 23 6
      Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatapushService.java
  18. 1 1
      Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsResourceController.java
  19. 1 1
      Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsResourceServiceImpl.java
  20. 1 1
      Hos-resource/src/main/java/com/yihu/ehr/standard/controller/AdapterVersionController.java
  21. 1 2
      Hos-resource/src/main/java/com/yihu/ehr/standard/controller/StandardController.java
  22. 0 12
      Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeDispatchModel.java
  23. 0 20
      Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeModel.java
  24. 0 17
      Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeVersionModel.java
  25. 0 17
      Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StandardModel.java
  26. 0 20
      Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StandardVersionModel.java
  27. 0 3
      Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdCDACatalogModel.java
  28. 0 2
      Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdDatasetCatalogModel.java
  29. 58 0
      Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterSchemeVersionService.java
  30. 45 71
      Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StandardService.java
  31. 27 21
      Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StandardVersionService.java
  32. 29 50
      Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdCDACatalogService.java
  33. 0 9
      Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdPublisherService.java
  34. 1 1
      Hos-resource/src/main/resources/config/http.properties
  35. 20 0
      Hos-resource/src/main/resources/hbm/resource/AdapterScheme.hbm.xml
  36. 18 0
      Hos-resource/src/main/resources/hbm/resource/AdapterSchemeVersion.hbm.xml
  37. 34 0
      Hos-resource/src/main/resources/hbm/resource/RsDatapushLog.hbm.xml
  38. 18 0
      Hos-resource/src/main/resources/hbm/resource/Standard.hbm.xml
  39. 19 0
      Hos-resource/src/main/resources/hbm/resource/StandardVersion.hbm.xml

+ 1 - 0
Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/Constants.java

@ -67,6 +67,7 @@ public class Constants {
    public static final String CODE_STR = "code";
    public static final String VALUE_STR = "value";
    public static final String STANDARD = "standard";
    public static final String STANDARD_EHR = "standard_ehr";
    public static final String OK = "ok";
    public static final String NO = "no";
    public static final Integer NUMBER_ZREO = 0;

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

@ -19,7 +19,6 @@ import javax.servlet.http.HttpServletRequest;
/**
 * Created by chenweida on 2016/1/27.
 * EHR平台应用 REST请求
 *
 */
@RestController
@RequestMapping("/gateway")
@ -46,6 +45,7 @@ public class GatewayControl {
    public RestResponseResult transfer(HttpServletRequest request) {
        String resultData = null;
        RestRequsetResult restRequsetResult = new RestRequsetResult();
        RestResponseResult restResponseResult = new RestResponseResult();
        try {
            BeanUtils.populate(restRequsetResult, request.getParameterMap());
@ -55,7 +55,8 @@ public class GatewayControl {
            ResourceRestDetailModel resourceRestDetailModel = gatewayService.getResourceRestDetailModelByCode(restRequsetResult.getApi());
            //根据资源对象的信息还有访问的参数通过httpclient得到数据
            resultData = getResultData(resourceRestDetailModel, restRequsetResult.getParam());
            restResponseResult = (RestResponseResult) JSONObject.toBean(JSONObject.fromObject(resultData), RestResponseResult.class);
            restResponseResult.setRequestId(restRequsetResult.getRequestId());
        } catch (Exception e) {
            e.printStackTrace();
            if (e instanceof EHRException) {
@ -68,11 +69,12 @@ public class GatewayControl {
            }
        }
        return RestResponseResult.getSuccess(resultData, restRequsetResult.getRequestId());
        return restResponseResult;
    }
    /**
     * 根据资源对象的信息还有访问的参数通过httpclient得到数据
     *
     * @param resourceRestDetailModel
     * @param param
     * @return
@ -82,7 +84,7 @@ public class GatewayControl {
        String returnData = null;
        //拼凑出URL
        String url = resourceRestDetailModel.getUrl() + resourceRestDetailModel.getNamespace().replace(".","/");
        String url = resourceRestDetailModel.getUrl() + resourceRestDetailModel.getNamespace().replace(".", "/");
        String userNamre = resourceRestDetailModel.getUsername();
        String password = resourceRestDetailModel.getPassword();
        try {

+ 0 - 45
Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/RestRequsetResult.java

@ -1,45 +0,0 @@
package com.yihu.hos.gateway.model;
import com.yihu.hos.gateway.exception.EHRExceptionConstant;
/**
 * Created by chenweida on 2016/1/27.
 */
public class RestRequsetResult {
    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 + '\'' +
                '}';
    }
}

+ 0 - 73
Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/RestResponseResult.java

@ -1,73 +0,0 @@
package com.yihu.hos.gateway.model;
import com.yihu.hos.gateway.exception.EHRExceptionConstant;
/**
 * Created by chenweida on 2016/1/27.
 */
public class RestResponseResult {
    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 + '\'' +
                '}';
    }
}

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

@ -7,11 +7,12 @@ import java.io.Serializable;
/**
 * Created by chenweida on 2016/1/27.
 */
public class RestResponseResult implements Serializable{
public class RestResponseResult implements Serializable {
    private String responseCode = EHRExceptionConstant.EHREXCEPTION_SUCCESS;
    private String responseMessage = "";
    private String responseParams;
    private String requestId;
    private Object responseResult;
    public String getResponseCode() {
        return responseCode;
@ -51,11 +52,13 @@ public class RestResponseResult implements Serializable{
        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);
@ -72,4 +75,12 @@ public class RestResponseResult implements Serializable{
                ", requestId:'" + requestId + '\'' +
                '}';
    }
    public Object getResponseResult() {
        return responseResult;
    }
    public void setResponseResult(Object responseResult) {
        this.responseResult = responseResult;
    }
}

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

@ -2,6 +2,7 @@ package com.yihu.hos.qlc.controller;
import com.yihu.ehr.dbhelper.jdbc.DBHelper;
import com.yihu.hos.config.Config;
import com.yihu.hos.gateway.model.rest.RestResponseResult;
import com.yihu.hos.gateway.util.RPCUtil;
import com.yihu.hos.resource.util.httpclient.HttpClientUtil;
import io.swagger.annotations.Api;
@ -47,14 +48,15 @@ public class QLCController {
     */
    @RequestMapping(value = "/queryUserInfo", method = RequestMethod.POST)
    @ApiOperation(value = "挂号事件推送", response = Object.class, produces = "application/json", notes = "院方挂号事件推送")
    public Object queryUserInfo(@ApiParam(value = "事件类型:门诊、住院", required = true) @RequestParam(value = "EventType") String EventType,
                                @ApiParam(value = "事件编码:门诊号、住院号", required = true) @RequestParam(value = "EventNo") String EventNo,
                                @ApiParam(value = "卡类型", required = true) @RequestParam(value = "CardType") String CardType,
                                @ApiParam(value = "卡号", required = true) @RequestParam(value = "CardNo") String CardNo,
                                @ApiParam(value = "PatientId", required = true) @RequestParam(value = "PatientId") String PatientId,
                                @ApiParam(value = "医院ID", required = true) @RequestParam(value = "HospitalId") String HospitalId,
                                HttpServletRequest request) {
        String returnMessage = "成功";
    public RestResponseResult queryUserInfo(@ApiParam(value = "事件类型:门诊、住院", required = true) @RequestParam(value = "EventType") String EventType,
                                            @ApiParam(value = "事件编码:门诊号、住院号", required = true) @RequestParam(value = "EventNo") String EventNo,
                                            @ApiParam(value = "卡类型", required = true) @RequestParam(value = "CardType") String CardType,
                                            @ApiParam(value = "卡号", required = true) @RequestParam(value = "CardNo") String CardNo,
                                            @ApiParam(value = "PatientId", required = true) @RequestParam(value = "PatientId") String PatientId,
                                            @ApiParam(value = "医院ID", required = true) @RequestParam(value = "HospitalId") String HospitalId,
                                            HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
        try {
            String param = "<Req><TransactionCode>5001</TransactionCode><Data><CardType>" + CardType + "</CardType><CardNo>" + CardNo + "</CardNo><PatientId>" + PatientId + "</PatientId></Data></Req>";
            String apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
@ -89,32 +91,32 @@ public class QLCController {
                params.put("eventNo", PatientId);
                httpClientUtil.doPost(Config.startCollect, params, null, null);
            } else {
                returnMessage = "RPC返回RespCode:" + root.element("RespCode").getText();
                throw new Exception("RPC返回RespCode:" + root.element("RespCode").getText());
            }
        } catch (Exception e) {
            e.printStackTrace();
            return e.getMessage();
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage());
        }
        return returnMessage;
        return restResponseResult;
    }
    /**
     * 院方_检查/检验报告单推送---数据说明
     * localhost:8890/gateway/transfer?api=patientInformationPush&param={CardType:"",CardNo:"",ReportType:"",ReportId:"",State:"",HospitalId:""}&requestId="目前没用随便写"
     * localhost:8890/gateway/transfer?api=patientInformationPush&param={CardType:"",CardNo:"000021341249",ReportType:"0",ReportId:"201405228-A-110B",State:"2",HospitalId:"1026333"}&requestId="目前没用随便写"
     */
    @RequestMapping(value = "/patientInformation", method = RequestMethod.POST)
    @ApiOperation(value = "检查/检验报告单推送-", response = Object.class, produces = "application/json", notes = "检查/检验报告单推送-")
    public Object patientInformation(@ApiParam(value = "卡类型", required = true) @RequestParam(value = "CardType") String CardType,
                                     @ApiParam(value = "卡号", required = true) @RequestParam(value = "CardNo") String CardNo,
                                     @ApiParam(value = "报告单类型1检验报告2检查报告", required = true) @RequestParam(value = "ReportType") String ReportType,
                                     @ApiParam(value = "报告单号", required = true) @RequestParam(value = "ReportId") String ReportId,
                                     @ApiParam(value = "报告单状态1 报告未出 2报告已出", required = true) @RequestParam(value = "State") String State,
                                     @ApiParam(value = "医院ID", required = true) @RequestParam(value = "HospitalId") String HospitalId,
                                     HttpServletRequest request) {
        String returnMessage = "成功";
    public RestResponseResult patientInformation(@ApiParam(value = "卡类型", required = true) @RequestParam(value = "CardType") String CardType,
                                                 @ApiParam(value = "卡号", required = true) @RequestParam(value = "CardNo") String CardNo,
                                                 @ApiParam(value = "报告单类型1检验报告2检查报告", required = true) @RequestParam(value = "ReportType") String ReportType,
                                                 @ApiParam(value = "报告单号", required = true) @RequestParam(value = "ReportId") String ReportId,
                                                 @ApiParam(value = "报告单状态1 报告未出 2报告已出", required = true) @RequestParam(value = "State") String State,
                                                 @ApiParam(value = "医院ID", required = true) @RequestParam(value = "HospitalId") String HospitalId,
                                                 HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
        try {
            if ("1".equals(State)) {
                return "报告未出,结束 ";
                throw new Exception("报告未出,结束" );
            }
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            String data =
@ -166,13 +168,13 @@ public class QLCController {
                }
            } else {
                returnMessage = "RPC返回RespCode:" + root.element("RespCode").getText();
                throw new Exception("RPC返回RespCode:" + root.element("RespCode").getText());
            }
        } catch (Exception e) {
            e.printStackTrace();
            return e.getMessage();
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage());
        }
        return returnMessage;
        return restResponseResult;
    }
    /**

+ 55 - 32
Hos-Resource-Rest/src/main/java/com/yihu/hos/resource/control/ResourceControl.java

@ -1,5 +1,6 @@
package com.yihu.hos.resource.control;
import com.yihu.hos.gateway.model.rest.RestResponseResult;
import com.yihu.hos.resource.service.intf.IResourceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -47,10 +48,11 @@ public class ResourceControl {
     */
    @RequestMapping(value = "/getAuthorizedResource", method = RequestMethod.GET)
    @ApiOperation(value = "授权资源清单接口", response = Object.class, produces = "application/json", notes = "查询授权资源清单")
    public Object getAuthorizedResource(@ApiParam(value = "当前页", required = true) @RequestParam(value = "page") String page,
                                        @ApiParam(value = "每页显示条数", required = true) @RequestParam(value = "rows") String rows,
                                        @ApiParam(value = "参数", required = true) @RequestParam(value = "condition") String condition,
                                        HttpServletRequest request) {
    public RestResponseResult getAuthorizedResource(@ApiParam(value = "当前页", required = true) @RequestParam(value = "page") String page,
                                                    @ApiParam(value = "每页显示条数", required = true) @RequestParam(value = "rows") String rows,
                                                    @ApiParam(value = "参数", required = true) @RequestParam(value = "condition") String condition,
                                                    HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
        String returnDate = "";
        try {
            //String sys_id = request.getParameter("sys_id");//渠道ID
@ -61,11 +63,13 @@ public class ResourceControl {
                rows = "10";
            }
            returnDate = resourceService.getAuthorizedResource(String.valueOf(page), String.valueOf(rows), condition);
            restResponseResult.setResponseResult(returnDate);
        } catch (Exception e) {
            e.printStackTrace();
            return e.getMessage();
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage());
            return restResponseResult;
        }
        return returnDate;
        return restResponseResult;
    }
    /**
@ -108,6 +112,7 @@ public class ResourceControl {
                              @ApiParam(value = "每页显示条数", required = true) @RequestParam(value = "rows") String rows,
                              @ApiParam(value = "参数", required = true) @RequestParam(value = "condition") String condition,
                              HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
        String returnDate = "";
        try {
            if (StringUtils.isEmpty(page)) {
@ -118,17 +123,18 @@ public class ResourceControl {
            }
            returnDate = resourceService.getResource(String.valueOf(page), String.valueOf(rows), condition);
        } catch (Exception e) {
            e.printStackTrace();
            return e.getMessage();
            restResponseResult.setResponseResult(returnDate);
        } catch (Exception e) {  restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage());
            return restResponseResult;
        }
        return returnDate;
        return restResponseResult;
    }
    /**
     * 数据字典查询接口
     * <p/>
     * <p>
     * code     字典代码
     * page     当前页
     * pageSize 每页大小
@ -159,6 +165,7 @@ public class ResourceControl {
    public Object getDictionary(@ApiParam(value = "当前页", required = true) @RequestParam(value = "page") String page,
                                @ApiParam(value = "每页显示条数", required = true) @RequestParam(value = "rows") String rows,
                                @ApiParam(value = "参数", required = true) @RequestParam(value = "condition") String condition, HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
        String returnDate = "";
        try {
            if (StringUtils.isEmpty(page)) {
@ -169,16 +176,18 @@ public class ResourceControl {
            }
            returnDate = resourceService.getDictionary(String.valueOf(page), String.valueOf(rows), condition);
            restResponseResult.setResponseResult(returnDate);
        } catch (Exception e) {
            e.printStackTrace();
            return e.getMessage();
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage());
            return restResponseResult;
        }
        return returnDate;
        return restResponseResult;
    }
    /**
     * 资源元数据查询接口
     * <p/>
     * <p>
     * code 数据集代码
     *
     * @return {
@ -202,6 +211,7 @@ public class ResourceControl {
    public Object getResourceMetadata(@ApiParam(value = "当前页", required = true) @RequestParam(value = "page") String page,
                                      @ApiParam(value = "每页显示条数", required = true) @RequestParam(value = "rows") String rows,
                                      @ApiParam(value = "参数", required = true) @RequestParam(value = "condition") String condition, HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
        String returnDate = "";
        try {
            if (StringUtils.isEmpty(page)) {
@ -211,12 +221,13 @@ public class ResourceControl {
                rows = "10";
            }
            returnDate = resourceService.getResourceMetadata(String.valueOf(page), String.valueOf(rows), condition);
            restResponseResult.setResponseResult(returnDate);
        } catch (Exception e) {
            e.printStackTrace();
            return e.getMessage();
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage());
            return restResponseResult;
        }
        return returnDate;
        return restResponseResult;
    }
    @RequestMapping(value = "/getMongoDBData", method = RequestMethod.GET)
@ -226,6 +237,7 @@ public class ResourceControl {
                                 @ApiParam(value = "参数", required = true) @RequestParam(value = "condition") String condition,
                                 @ApiParam(value = "mongo表名", required = true) @RequestParam(value = "tableCode") String tableCode,
                                 HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
        String returnDate = "";
        try {
            //String sys_id = request.getParameter("sys_id");//渠道ID
@ -239,11 +251,13 @@ public class ResourceControl {
            }
            returnDate = resourceService.getMongoDBData(String.valueOf(page), String.valueOf(rows), tableCode, condition);
            restResponseResult.setResponseResult(returnDate);
        } catch (Exception e) {
            e.printStackTrace();
            return e.getMessage();
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage());
            return restResponseResult;
        }
        return returnDate;
        return restResponseResult;
    }
    @RequestMapping(value = "/collectionData", method = RequestMethod.GET)
@ -252,6 +266,7 @@ public class ResourceControl {
            @ApiParam(value = "mongo表名", required = true) @RequestParam(value = "tableCode") String tableCode,
            @ApiParam(value = "参数", required = true) @RequestParam(value = "condition") String condition,
            HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
        String returnDate = "";
        try {
            //String sys_id = request.getParameter("sys_id");//渠道ID
@ -261,26 +276,31 @@ public class ResourceControl {
                throw new Exception("condition参数格式错误");
            }
            returnDate = resourceService.collectionData(tableCode, condition);
            restResponseResult.setResponseResult(returnDate);
        } catch (Exception e) {
            e.printStackTrace();
            return e.getMessage();
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage());
            return restResponseResult;
        }
        return returnDate;
        return restResponseResult;
    }
    @RequestMapping(value = "/getCurrentTime", method = RequestMethod.GET)
    @ApiOperation(value = "得到系统时间", response = Object.class, produces = "application/json", notes = "得到系统时间")
    public Object collectionData(
            HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
        String returnDate = "";
        try {
            returnDate = Calendar.getInstance().getTimeInMillis() + "";
            restResponseResult.setResponseResult(returnDate);
        } catch (Exception e) {
            e.printStackTrace();
            return e.getMessage();
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage());
            return restResponseResult;
        }
        return returnDate;
        return restResponseResult;
    }
    @RequestMapping(value = "/executeSQL", method = RequestMethod.GET)
@ -288,14 +308,17 @@ public class ResourceControl {
    public Object executeSQL(
            @ApiParam(value = "SQL语句", required = true) @RequestParam(value = "sql") String sql,
            HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
        String returnDate = "";
        try {
            returnDate = resourceService.executeSQL(sql);
            restResponseResult.setResponseResult(returnDate);
        } catch (Exception e) {
            e.printStackTrace();
            return e.getMessage();
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage());
            return restResponseResult;
        }
        return returnDate;
        return restResponseResult;
    }
    /* 文件上传的例子

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

@ -3,5 +3,5 @@ rpc.appId=EsbCloud
rpc.channelId=100123
rpc.port=8081
http.monogourl=http://172.19.103.56:8181/datapush/datapush
http.startCollect=http://172.19.103.56:8181/crawler/patient
http.monogourl=http://localhost:8080/datapush/datapush
http.startCollect=http://localhost:8080/crawler/patient

+ 6 - 2
Hos-resource/pom.xml

@ -27,7 +27,7 @@
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>ehr-dbhelper</artifactId>
            <version>1.1.6</version>
            <version>1.1.7</version>
        </dependency>
        <dependency>
            <groupId>org.mongodb</groupId>
@ -108,7 +108,11 @@
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3.0</version>
        </dependency>
        <dependency>
            <groupId>commons-dbutils</groupId>
            <artifactId>commons-dbutils</artifactId>
            <version>1.6</version>
        </dependency>
        <!--=============oracle驱动 end =============-->
        <!--jxl导出工具-->
        <dependency>

+ 4 - 2
Hos-resource/src/main/java/com/yihu/ehr/crawler/controller/CrawlerController.java

@ -5,7 +5,10 @@ import com.yihu.ehr.crawler.service.CrawlerManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
@ -30,5 +33,4 @@ public class CrawlerController {
        }
        return false;
    }
}

+ 20 - 4
Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerManager.java

@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.crawler.model.adapter.AdapterDataSet;
import com.yihu.ehr.crawler.model.config.SysConfig;
import com.yihu.ehr.crawler.model.patient.Patient;
import com.yihu.ehr.framework.constrant.Constants;
import com.yihu.ehr.framework.constrant.ErrorCode;
import com.yihu.ehr.framework.util.log.LogService;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
@ -12,8 +13,10 @@ import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.ehr.standard.model.adapter.AdapterDatasetModel;
import com.yihu.ehr.standard.service.adapter.AdapterDatasetService;
import com.yihu.ehr.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.ehr.standard.service.bo.AdapterVersion;
import net.sf.json.JSONObject;
import org.hibernate.Query;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@ -27,6 +30,7 @@ public class CrawlerManager {
    private static volatile CrawlerManager instance;
    private static DataCollectDispatcher dispatch;
    private List<AdapterDataSet> adapterDataSetList;
    private String version;
    private List<Patient> patientList;
    public CrawlerManager() {
        dispatch = DataCollectDispatcher.getInstance();
@ -72,7 +76,10 @@ public class CrawlerManager {
    public Boolean collectProcess(Patient patient) {
        SysConfig.getInstance().setOrgCode(patient.getOrgCode());
        getAdapterDataSetList();
        if (!getAdapterDataSetList()) {
            LogService.getLogger().error("适配数据尚未准备");
            return false;
        }
        patient.setReUploadFlg(StringUtil.toString(false));
        LogService.getLogger().trace("采集->注册->打包上传,任务ID:,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
        try {
@ -118,10 +125,14 @@ public class CrawlerManager {
        return true;
    }
    public void getAdapterDataSetList() {
        if (CollectionUtil.isEmpty(adapterDataSetList)) {
    public Boolean getAdapterDataSetList() {
        if (StringUtil.isEmpty(version)) {
            adapterDataSetList = new ArrayList<>();
            String version = "569f253c1cb3";
            AdapterSchemeVersionService adapterSchemeVersionService = SpringBeanUtil.getService(AdapterSchemeVersionService.BEAN_ID);
            version = adapterSchemeVersionService.getEhrAdapterVersionLasted();
            if (StringUtil.isEmpty(version)) {
                return false;
            }
            AdapterVersion adapterVersion = new AdapterVersion(version);
            AdapterDatasetService adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);
            Map<String, String> condition = new HashMap<>();
@ -132,6 +143,7 @@ public class CrawlerManager {
                adapterDataSetList.add(new AdapterDataSet(adapterDatasetModel, adapterVersion));
            }
        }
        return true;
    }
    /**
@ -150,4 +162,8 @@ public class CrawlerManager {
            return null;
        }
    }
    public void setVersion(String version) {
        this.version = version;
    }
}

+ 2 - 2
Hos-resource/src/main/java/com/yihu/ehr/crawler/service/EsbHttp.java

@ -135,7 +135,7 @@ public class EsbHttp {
                return "";
            }
            String rootStr = responseNode.path("responseParams").asText();
            String rootStr = responseNode.path("responseResult").asText();
            if ("".equals(rootStr)) {
                LogService.getLogger().error("获取病人列表错误,集成平台获取病人列表失败.");
                return "";
@ -162,7 +162,7 @@ public class EsbHttp {
                return "";
            }
            String rootStr = responseNode.path("responseParams").asText();
            String rootStr = responseNode.path("responseResult").asText();
            if ("".equals(rootStr)) {
                LogService.getLogger().info("获取病人数据错误,集成平台获取病人数据失败.");
                return "";

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

@ -29,10 +29,9 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
    public String getVersion(String orgCode) throws Exception
    {
        try{
            String sql = "select IFNULL(b.version,'') from adapter_scheme a\n" +
                    "left join adapter_scheme_version b \n" +
                    "on a.id=b.scheme_id \n" +
                    "where a.adapter_publisher_org_code='"+orgCode+"' ORDER BY PUBLISH_TIME DESC LIMIT 1;";
            String sql = "select IFNULL(o.qlc_adapter_version,'') \n" +
                    "from system_organization o\n" +
                    "where o.code = '"+orgCode+"'";
            return super.scalarBySql(sql, String.class);
        }
        catch (Exception e)

+ 41 - 3
Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectLogDao.java

@ -3,14 +3,18 @@ package com.yihu.ehr.datacollect.dao;
import com.yihu.ehr.datacollect.dao.intf.IDatacollectDao;
import com.yihu.ehr.datacollect.dao.intf.IDatacollectLogDao;
import com.yihu.ehr.datacollect.model.DtoJobDataset;
import com.yihu.ehr.datacollect.model.RsDatapushLog;
import com.yihu.ehr.datacollect.model.RsJobDataset;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.resource.model.RsDatasourceDataset;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Map;
@ -38,11 +42,45 @@ public class DatacollectLogDao extends SQLGeneralDAO implements IDatacollectLogD
    /**
     * 推数据新增日志
     */
    public void addDataPushLog() throws Exception
    public void addDataPushLog(String type,String success,String content) throws Exception
    {
        String sql = "";
        //super.execute(sql);
        RsDatapushLog log = new RsDatapushLog();
        log.setType(type);
        log.setSuccess(success);
        log.setContent(content);
        log.setDatetime(new Date());
        this.saveEntity(log);
    }
    /**
     * 获取日志列表
     */
    public DataGridResult queryDataPushLog(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception
    {
        StringBuilder sb = new StringBuilder();
        sb.append("from RsDatapushLog where 1=1 ");
        if (!StringUtils.isEmpty(conditionMap.get("type"))) {
            sb.append(" and type ='"+conditionMap.get("type")+"'");
        }
        if (!StringUtils.isEmpty(conditionMap.get("datetimeFrom"))) {
            Date time = DateConvert.toDate(conditionMap.get("datetimeFrom").toString());
            time.setHours(0);
            time.setMinutes(0);
            time.setSeconds(0);
            sb.append(" and datetime >= '"+DateConvert.toString(time)+"'");
        }
        if (!StringUtils.isEmpty(conditionMap.get("datetimeTo"))) {
            Date time = DateConvert.toDate(conditionMap.get("datetimeTo").toString());
            time.setHours(0);
            time.setMinutes(0);
            time.setSeconds(0);
            GregorianCalendar gc=new GregorianCalendar();
            gc.setTime(time);
            gc.add(5, 1);
            sb.append(" and datetime < '"+DateConvert.toString(gc.getTime())+"'");
        }
        sb.append("order by datetime desc");
        return getDataGridResult(sb.toString(),page,pageSize);
    }
}

+ 7 - 2
Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/intf/IDatacollectLogDao.java

@ -18,11 +18,16 @@ public interface IDatacollectLogDao extends XSQLGeneralDAO {
    /**
     * 修改
     */
    public void updateJobDatasetKeyvalue(String id, String jobDatasetKeyvalue) throws Exception;
    void updateJobDatasetKeyvalue(String id, String jobDatasetKeyvalue) throws Exception;
    /**
     * 推数据新增日志
     */
    public void addDataPushLog() throws Exception;
    void addDataPushLog(String type,String success,String content) throws Exception;
    /**
     * 获取日志列表
     */
    DataGridResult queryDataPushLog(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception;
}

+ 58 - 0
Hos-resource/src/main/java/com/yihu/ehr/datacollect/model/RsDatapushLog.java

@ -0,0 +1,58 @@
package com.yihu.ehr.datacollect.model;
import java.util.Date;
/**
 * RsJobLog entity. @author MyEclipse Persistence Tools
 */
public class RsDatapushLog implements java.io.Serializable {
	// Fields
	private String id;
	private String type;
	private String success;
	private String content;
	private Date datetime;
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	public String getType() {
		return type;
	}
	public void setType(String type) {
		this.type = type;
	}
	public String getSuccess() {
		return success;
	}
	public void setSuccess(String success) {
		this.success = success;
	}
	public String getContent() {
		return content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	public Date getDatetime() {
		return datetime;
	}
	public void setDatetime(Date datetime) {
		this.datetime = datetime;
	}
}

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

@ -77,6 +77,7 @@ public class DatapushService implements IDatapushService {
        String version = datacollect.getVersion(orgCode);
        //通过标准数据集名称获取适配关系
        AdapterDatasetModel dataset = stdService.getDatasetByCode(version,datasetCode);
        String msg = "";
        if(dataset!=null)
        {
            String datasetId = dataset.getStdDatasetId().toString();
@ -112,6 +113,9 @@ public class DatapushService implements IDatapushService {
                    }
                }
                //org_code字段
                obj.put("RSCOM_ORG_CODE",orgCode);
                //MongoDB入库
                boolean b = mongo.insert(datasetCode,obj);
@ -120,21 +124,34 @@ public class DatapushService implements IDatapushService {
                    if(mongo.errorMessage!=null && mongo.errorMessage.length()>0)
                    {
                        System.out.print(mongo.errorMessage);
                        return ActionResult.error("Mongodb保存失败!(表:\"+datasetCode+\")"+mongo.errorMessage);
                        msg = "Mongodb保存失败!(表:"+datasetCode+",数据:"+dataString+")"+mongo.errorMessage;
                    }
                    else {
                        return ActionResult.error("Mongodb保存失败!(表:"+datasetCode+")");
                        msg ="Mongodb保存失败!(表:"+datasetCode+",数据:"+dataString+")";
                    }
                }
                //日志记录
                datacollectLog.addDataPushLog();
                return ActionResult.success("数据入库成功!");
            }
        }
        else{
            msg ="适配标准不完善!";
        }
        return ActionResult.error("适配标准不完善!");
        //是否成功
        if(msg.length()>0)
        {
            //日志记录
            datacollectLog.addDataPushLog("1","0",msg);
            return ActionResult.error(msg);
        }
        else{
            msg = "数据入库成功!(表:"+datasetCode+")";
            //日志记录
            datacollectLog.addDataPushLog("1","1",msg);
            return ActionResult.success(msg);
        }
    }

+ 1 - 1
Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsResourceController.java

@ -308,7 +308,7 @@ public class RsResourceController extends BaseController {
                result.setPageSize(count);
                result.setSuccessFlg(true);
            } else if (response_params.startsWith("{")) {
                Integer count = (Integer) JSONObject.fromObject(response_params).get("totalCount");//得到总数
                Integer count = (Integer) JSONObject.fromObject(response_params).get("count");//得到总数
                //访问服务得到元数据
                //设置动态datagrid值
                String s = JSONObject.fromObject(response_params).get("detailModelList").toString().replace(":null", ":\"\"");

+ 1 - 1
Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsResourceServiceImpl.java

@ -158,7 +158,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
    public String searchRomoteResourceList(String code, Map<String, Object> params) throws Exception {
        String result = HttpHelper.getByGateway(code, params).getBody();
        JSONObject jsonobject = JSONObject.fromObject(result);
        String response_params = (String) jsonobject.get("responseParams");
        String response_params = (String) jsonobject.get("responseResult");
        return response_params;
    }

+ 1 - 1
Hos-resource/src/main/java/com/yihu/ehr/standard/controller/AdapterVersionController.java

@ -80,7 +80,7 @@ public class AdapterVersionController extends BaseController {
    public AdapterSchemeVersionModel publishVersion(
            @ApiParam(name = "version", value = "标准版本")
            @RequestParam(value = "version") String version) {
        return adapterSchemeVersion.update(version);
        return adapterSchemeVersion.publish(version);
    }
    /**

+ 1 - 2
Hos-resource/src/main/java/com/yihu/ehr/standard/controller/StandardController.java

@ -44,8 +44,7 @@ public class StandardController extends BaseController {
    @RequestMapping("/getSysParamList")
    @ApiOperation(value = "获取集成标准系统参数", response = String.class, notes = "获取集成标准系统参数")
    public String getSysParamList() {
        List<Object[]> list = standardService.getSysParamList();
        String code = StringUtil.toString(list.get(0)[0]);
        String code = standardService.getSysParamList();
        return code;
    }

+ 0 - 12
Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeDispatchModel.java

@ -1,8 +1,5 @@
package com.yihu.ehr.standard.model.adapter;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -10,22 +7,13 @@ import java.io.Serializable;
 *
 * @Created by lingfeng 2015/12/23.
 */
@Entity
@Table(name = "adapter_scheme_dispatch")
public class AdapterSchemeDispatchModel implements Serializable {
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")
    private Integer id;
    @Column(name = "scheme_id")
    private Integer schemeId;
    @Column(name = "org_code")
    private String orgCode;
    @Column(name = "org_name")
    private String orgName;
    public Integer getId() {

+ 0 - 20
Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeModel.java

@ -1,8 +1,5 @@
package com.yihu.ehr.standard.model.adapter;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -10,44 +7,27 @@ import java.io.Serializable;
 *
 * @Created by lingfeng 2015/12/23.
 */
@Entity
@Table(name="adapter_scheme")
public class AdapterSchemeModel implements Serializable {
    public static final String TABLE_NAME = "ADAPTER_SCHEME";
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")
    private Integer id;
    @Column(name = "parent_id")
    private Integer parentId;
    @Column(name = "name")
    private String name;
    @Column(name = "type")
    private String type;
    @Column(name = "description")
    private String description;
    @Column(name = "status")
    private Integer status;
    @Column(name = "std_id")
    private Integer stdId;
    @Column(name = "std_version")
    private String stdVersion;
    @Column(name = "adapter_std_id")
    private Integer adapterStdId;
    @Column(name = "adapter_std_version")
    private String adapterStdVersion;
    @Column(name = "adapter_publisher_org_code")
    private String adapterPublisherOrgCode;
    public Integer getId() {

+ 0 - 17
Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeVersionModel.java

@ -1,8 +1,5 @@
package com.yihu.ehr.standard.model.adapter;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@ -11,37 +8,23 @@ import java.util.Date;
 *
 * @created lingfeng 2015/12/23.
 */
@Entity
@Table(name = "adapter_scheme_version")
public class AdapterSchemeVersionModel implements Serializable {
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")
    private Integer id;
    @Column(name = "scheme_id")
    private Integer schemeId;
    @Column(name = "name")
    private String name;
    @Column(name = "version")
    private String version;
    @Column(name = "publish_time")
    private Date publishTime;
    @Column(name = "publish_user")
    private String publishUser;
    @Column(name = "base_version")
    private String baseVersion;
    @Column(name = "publish_status")
    private Integer publishStatus;
    @Column(name = "path")
    private String path;
    public AdapterSchemeVersionModel(){

+ 0 - 17
Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StandardModel.java

@ -1,8 +1,5 @@
package com.yihu.ehr.standard.model.standard;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -10,38 +7,24 @@ import java.io.Serializable;
 *
 * @created Airhead 2015/12/23.
 */
@Entity
@Table(name = "std_info")
public class StandardModel implements Serializable {
    public static final String TABLE_NAME = "STD_INFO";
    @Id
    @GenericGenerator(name = "generator", strategy = "")
    @Column(name = "id")
    private Integer id;
    @Column(name = "name")
    private String name;
    @Column(name = "code")
    private String code;
    @Column(name = "publisher")
    private String publisher;
    @Column(name = "publisher_org_code")
    private String publisherOrgCode;
    @Column(name = "summary")
    private String summary;
    @Column(name = "ref_standard")
    private String refStandard;
    @Column(name = "ref_standard_version")
    private String refStandardVersion;
    @Column(name = "version_status")
    private Integer versionStatus;
    public StandardModel(){

+ 0 - 20
Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StandardVersionModel.java

@ -11,42 +11,26 @@ import java.util.Date;
 *
 * @created Airhead 2015/12/23.
 */
@Entity
@Table(name = "std_version")
public class StandardVersionModel implements Serializable {
    public static final String TABLE_NAME = "STD_VERSION";
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")
    private Integer id;
    @Column(name = "version")
    private String version;
    @Column(name = "std_id")
    private Integer standardId;
    @Column(name = "name")
    private String name;
    @Column(name = "publish_time")
    private Date publishTime;
    @Column(name = "publish_user")
    private String publishUser;
    @Column(name = "base_version")
    private String baseVersion;
    @Column(name = "primary_version")
    private String primaryVersion;
    @Column(name = "publish_status")
    private Integer publishStatus;
    @Column(name = "path")
    private String path;
    public StandardVersionModel(){
@ -66,10 +50,6 @@ public class StandardVersionModel implements Serializable {
        this.path = standardVersionModel.path;
    }
    public static String getTableName() {
        return TABLE_NAME;
    }
    public Integer getId() {
        return id;
    }

+ 0 - 3
Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdCDACatalogModel.java

@ -10,10 +10,7 @@ import java.io.Serializable;
 *
 * @created Airhead 2015/12/23.
 */
@Entity
@Table(name = "std_cda_catalog")
public class StdCDACatalogModel implements Serializable {
    public static String TABLE_NAME="STD_CDA_CATALOG";
    @Id
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")

+ 0 - 2
Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdDatasetCatalogModel.java

@ -10,8 +10,6 @@ import java.io.Serializable;
 *
 * @created Airhead 2015/12/23.
 */
@Entity
@Table(name = "std_dataset_catalog")
public class StdDatasetCatalogModel implements Serializable {
    public static String TABLE_NAME = "STD_DATASET_CATALOG";

+ 58 - 0
Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterSchemeVersionService.java

@ -1,6 +1,7 @@
package com.yihu.ehr.standard.service.adapter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.crawler.service.CrawlerManager;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.constrant.Constants;
import com.yihu.ehr.framework.constrant.ErrorCode;
@ -11,6 +12,7 @@ import com.yihu.ehr.framework.util.sql.SqlCreator;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeModel;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.ehr.standard.model.adapter.resultModel.SchemeVersionResultDetailModel;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.model.standard.StdMetaDataModel;
import com.yihu.ehr.standard.service.bo.AdapterVersion;
import com.yihu.ehr.standard.service.bo.StandardVersion;
@ -75,6 +77,22 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        return false;
    }
    public AdapterSchemeVersionModel publish(String version) {
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterSchemeVersionModel versionModel = objectMapper.readValue(version, AdapterSchemeVersionModel.class);
            AdapterSchemeModel adapterSchemeModel = getEhrAdapter();
            if (adapterSchemeModel != null) {
                if (versionModel.getSchemeId() == adapterSchemeModel.getId()) {
                    CrawlerManager.getInstance().setVersion(Constants.EMPTY);
                }
            }
        } catch (Exception e) {
            throw new ApiException(ErrorCode.UpdateSchemeVersionFailed);
        }
        return update(version);
    }
    public AdapterSchemeVersionModel update(String version) {
        Boolean existFlg = false;
        try {
@ -175,6 +193,12 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        try {
            AdapterSchemeVersionModel adapterSchemeVersionModel = getEntity(AdapterSchemeVersionModel.class, versionId);
            //TODO:generate standard version file;
            AdapterSchemeModel adapterSchemeModel = getEhrAdapter();
            if (adapterSchemeModel != null) {
                if (adapterSchemeVersionModel.getSchemeId() == adapterSchemeModel.getId()) {
                    CrawlerManager.getInstance().setVersion(Constants.EMPTY);
                }
            }
            adapterSchemeVersionModel.setPublishTime(new Date());
            adapterSchemeVersionModel.setPublishUser(publisher);
            adapterSchemeVersionModel.setPublishStatus(1);
@ -352,5 +376,39 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        sql.append(Constants.RIGHT_BRACKET);
        return sql.toString();
    }
    public String getEhrAdapterVersionLasted() {
        AdapterSchemeModel adapterSchemeModel = getEhrAdapter();
        if (adapterSchemeModel == null) {
            return Constants.EMPTY;
        }
        String adapterSchemeVersionHql = "SELECT VERSION FROM ADAPTER_SCHEME_VERSION WHERE PUBLISH_TIME=(select max(PUBLISH_TIME) from ADAPTER_SCHEME_VERSION WHERE SCHEME_ID = :schemeId)";
        Query adapterSchemeVersionQuery = getCurrentSession().createSQLQuery(adapterSchemeVersionHql);
        adapterSchemeVersionQuery.setParameter("schemeId", adapterSchemeModel.getId());
        String version = (String) adapterSchemeVersionQuery.uniqueResult();
        return version;
    }
    public AdapterSchemeModel getEhrAdapter() {
        String paramSql = "select s.param_value from system_param s where s.param_key = '"+Constants.STANDARD_EHR+"'";
        Query paramQuery = getCurrentSession().createSQLQuery(paramSql);
        String code = (String) paramQuery.uniqueResult();
        if (StringUtil.isEmpty(code)) {
            return null;
        }
        String standardHql = "FROM StandardModel WHERE code = :code";
        Query standardQuery = getCurrentSession().createQuery(standardHql);
        standardQuery.setParameter("code", code);
        StandardModel standardModel = (StandardModel) standardQuery.uniqueResult();
        if (standardModel == null) {
            return null;
        }
        String adapterSchemeHql = "FROM AdapterSchemeModel WHERE adapterStdId = :adapterStdId";
        Query adapterSchemeQuery = getCurrentSession().createQuery(adapterSchemeHql);
        adapterSchemeQuery.setParameter("adapterStdId", standardModel.getId());
        AdapterSchemeModel adapterSchemeModel = (AdapterSchemeModel) adapterSchemeQuery.uniqueResult();
        return adapterSchemeModel;
    }
}

+ 45 - 71
Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StandardService.java

@ -9,16 +9,15 @@ import com.yihu.ehr.framework.exception.ApiException;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.sql.RequestParamTransformer;
import com.yihu.ehr.framework.util.sql.SqlCreator;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.model.standard.StandardVersionModel;
import com.yihu.ehr.standard.model.standard.resultModel.StandardResultDetailModel;
import com.yihu.ehr.system.dao.intf.IOrganizationDao;
import com.yihu.ehr.system.model.SystemOrganization;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -61,7 +60,7 @@ public class StandardService extends SQLGeneralDAO {
                this.add(standardModel);
                return standardModel;
            }
        } catch (IOException e) {
        } catch (Exception e) {
            e.printStackTrace();
        }
        if (existCodeFlg) {
@ -110,11 +109,7 @@ public class StandardService extends SQLGeneralDAO {
            }
            existFlg = existStandardVersionValid(standardModel.getId());
            if (!publishedFlg && !existFlg) {
                Session session = getCurrentSession();
                String sql = "delete from " + StandardModel.TABLE_NAME + " where id = :id";
                Query query = session.createSQLQuery(sql);
                query.setLong("id", standardId);
                query.executeUpdate();
                deleteEntity(StandardModel.class, standardId);
                return;
            }
        } catch (Exception e) {
@ -167,7 +162,7 @@ public class StandardService extends SQLGeneralDAO {
            }
            return standardModel;
        } catch (IOException e) {
        } catch (Exception e) {
            e.printStackTrace();
        }
        if (existCodeFlg) {
@ -181,23 +176,19 @@ public class StandardService extends SQLGeneralDAO {
    public StandardModel get(Integer standardId) {
        try {
            SqlCreator sqlCreator = new SqlCreator(StandardModel.class);
            sqlCreator.equalCondition("id", standardId);
            String sql = sqlCreator.selectData(StandardModel.TABLE_NAME);
            Query query = getQuery(sqlCreator, sql);
            return (StandardModel) query.uniqueResult();
        } catch (DataAccessException e) {
            return getEntity(StandardModel.class, standardId);
        } catch (Exception e) {
            e.printStackTrace();
        }
        throw new ApiException(ErrorCode.StandardGetFailed);
    }
    public List<Object[]> getSysParamList() {
        String paramSql = "select s.param_value,s.org_id from system_param s where s.param_key = '"+ Constants.STANDARD+"'";
    public String getSysParamList() {
        String paramSql = "select s.param_value from system_param s where s.param_key = '"+ Constants.STANDARD +"'";
        Query paramQuery = getCurrentSession().createSQLQuery(paramSql);
        List<Object[]> list = paramQuery.list();
        return list;
        String code = (String) paramQuery.uniqueResult();
        return code;
    }
    public List<StandardResultDetailModel> getStandardListFormat(List<SystemOrganization> publisherModelList,
@ -298,25 +289,21 @@ public class StandardService extends SQLGeneralDAO {
                e.printStackTrace();
            }
        }
        List<Object[]> list = getSysParamList();
        String code = StringUtil.toString(list.get(0)[0]);
        String publishOrgCode = StringUtil.toString(list.get(0)[1]);
        String code = getSysParamList();
        String publisherHql = "FROM SystemOrganization";
        SqlCreator sqlCreator = new SqlCreator(StandardModel.class);
        if (type == 0) {
            sqlCreator.equalCondition("code", code);
            publisherHql = publisherHql + " WHERE code = :code";
        } else {
            sqlCreator.neCondition("code", code);
            publisherHql = publisherHql + " WHERE code != :code";
        }
        Query query = getCurrentSession().createQuery(publisherHql);
        query.setParameter("code", publishOrgCode);
        List<SystemOrganization> publisherModelList = query.list();
        String sql = sqlCreator.selectData(StandardModel.TABLE_NAME);
        Query sessionQuery = getQuery(sqlCreator, sql);
        List<StandardModel> standardModelList = sessionQuery.list();
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(StandardModel.class);
        if (type == 0) {
            criteria.add(Restrictions.eq("code", code));
        } else if (type == 1) {
            criteria.add(Restrictions.ne("code", code));
        }
        List<StandardModel> standardModelList = criteria.list();
        Map<String, String> codeToIdMap = new HashMap<>();
        List<Integer> idList = new ArrayList<>();
        for (StandardModel standardModel : standardModelList) {
@ -360,60 +347,47 @@ public class StandardService extends SQLGeneralDAO {
        throw new ApiException(ErrorCode.StandardForkFailed);
    }
    private void update(StandardModel standardModel) throws IOException {
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(standardModel));
        SqlCreator sqlCreator = new SqlCreator(StandardModel.class);
        String sql = sqlCreator.updateDataByTableKey(StandardModel.TABLE_NAME, jsonNode);
        Query query = getExeuteQuery(sqlCreator, sql);
        query.executeUpdate();
    private void update(StandardModel standardModel) throws Exception {
        updateEntity(standardModel);
    }
    private void add(StandardModel standardModel) throws IOException {
        ObjectMapper objectMapper = new ObjectMapper();
        Session session = getCurrentSession();
        String sql = "select max(id) from " + StandardModel.TABLE_NAME;
        Query query = session.createSQLQuery(sql);
        Object object = query.uniqueResult();
        standardModel.setId(object == null ? 1 : Integer.parseInt(object.toString()) + 1);
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(standardModel));
        SqlCreator sqlCreator = new SqlCreator(StandardModel.class);
        sql = sqlCreator.insertData(StandardModel.TABLE_NAME, jsonNode);
        query = getExeuteQuery(sqlCreator, sql);
        query.executeUpdate();
    private void add(StandardModel standardModel) throws Exception {
        saveEntity(standardModel);
    }
    private List<StandardModel> getList(Map<String, String> query, Map<String, String> order, Integer limit, Integer offset) {
        SqlCreator sqlCreator = new SqlCreator(StandardModel.class);
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(StandardModel.class);
        for (String key : query.keySet()) {
            if (key.equals("type")) {
                Integer type = Integer.parseInt(query.get(key));
                List<Object[]> list = getSysParamList();
                String code = StringUtil.toString(list.get(0)[0]);
                String code = getSysParamList();
                if (type == 0) {
                    sqlCreator.equalCondition("code", code);
                    criteria.add(Restrictions.eq("code", code));
                } else if (type == 1) {
                    sqlCreator.neCondition("code", code);
                    criteria.add(Restrictions.ne("code", code));
                }
            } else {
                sqlCreator.equalCondition(key, query.get(key));
                criteria.add(Restrictions.eq(key, query.get(key)));
            }
        }
        for (String key : order.keySet()) {
            sqlCreator.order(key, order.get(key));
        }
        String sql = sqlCreator.selectData(StandardModel.TABLE_NAME);
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            criteria.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult((offset - 1) * limit);
                criteria.setFirstResult((offset - 1) * limit);
            }
        }
        if (order != null) {
            for (String key : order.keySet()) {
                if (order.get(key).equals(Constants.ASC)) {
                    criteria.addOrder(Order.asc(key));
                } else if (order.get(key).equals(Constants.DESC)) {
                    criteria.addOrder(Order.desc(key));
                }
            }
        }
        return (List<StandardModel>) sessionQuery.list();
        return (List<StandardModel>) criteria.list();
    }
    public boolean existStandardVersionValid(Integer standardId) {

+ 27 - 21
Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StandardVersionService.java

@ -10,9 +10,14 @@ import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.sql.RequestParamTransformer;
import com.yihu.ehr.framework.util.sql.SqlCreator;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeModel;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.model.standard.StandardVersionModel;
import com.yihu.ehr.standard.service.bo.StandardVersion;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -209,11 +214,12 @@ public class StandardVersionService extends SQLGeneralDAO {
    }
    private StandardVersionModel myGet(Integer versionId) {
        SqlCreator sqlCreator = new SqlCreator(StandardVersionModel.class);
        sqlCreator.equalCondition("id", versionId);
        String sql = sqlCreator.selectData(StandardVersionModel.TABLE_NAME);
        Query query = getQuery(sqlCreator, sql);
        return (StandardVersionModel) query.uniqueResult();
        try {
            return (StandardVersionModel) getEntity(StandardVersionModel.class, versionId);
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }
    private void delete(StandardVersionModel standardVersionModel) throws Exception {
@ -242,26 +248,27 @@ public class StandardVersionService extends SQLGeneralDAO {
    }
    private List<StandardVersionModel> getList(Integer standardId, Map<String, String> query, Map<String, String> order, Integer limit, Integer offset) {
        SqlCreator sqlCreator = new SqlCreator(StandardVersionModel.class);
        sqlCreator.equalCondition("standardId", standardId);
        sqlCreator.equalCondition("publishStatus", 1);
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(StandardVersionModel.class);
        criteria.add(Restrictions.eq("standardId", standardId));
        criteria.add(Restrictions.eq("publishStatus", 1));
        for (String key : query.keySet()) {
            sqlCreator.equalCondition(key, query.get(key));
        }
        for (String key : order.keySet()) {
            sqlCreator.order(key, order.get(key));
        }
        String sql = sqlCreator.selectData(StandardVersionModel.TABLE_NAME);
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            criteria.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult((offset - 1) * limit);
                criteria.setFirstResult((offset - 1) * limit);
            }
        }
        return (List<StandardVersionModel>) sessionQuery.list();
        if (order != null) {
            for (String key : order.keySet()) {
                if (order.get(key).equals(Constants.ASC)) {
                    criteria.addOrder(Order.asc(key));
                } else if (order.get(key).equals(Constants.DESC)) {
                    criteria.addOrder(Order.desc(key));
                }
            }
        }
        return (List<StandardVersionModel>) criteria.list();
    }
    private void deleteVersionTables(StandardVersion version) {
@ -323,7 +330,6 @@ public class StandardVersionService extends SQLGeneralDAO {
        }
        for (int i = 0; i < baseTables.length; ++i) {
            String baseTable = baseTables[i];
            String newTable = newTables[i];
            updateSql.add(Constants.UPDATE + newTable + Constants.SET + " STD_ID = " + standardId);
        }

+ 29 - 50
Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdCDACatalogService.java

@ -1,22 +1,21 @@
package com.yihu.ehr.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.constrant.Constants;
import com.yihu.ehr.framework.constrant.ErrorCode;
import com.yihu.ehr.framework.exception.ApiException;
import com.yihu.ehr.framework.util.operator.NumberUtil;
import com.yihu.ehr.framework.util.sql.RequestParamTransformer;
import com.yihu.ehr.framework.util.sql.SqlCreator;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.model.standard.StdCDACatalogModel;
import org.hibernate.Query;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.springframework.dao.DataAccessException;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@ -58,7 +57,7 @@ public class StdCDACatalogService extends SQLGeneralDAO {
            this.add(standardModel);
            return standardModel.getId();
        } catch (IOException e) {
        } catch (Exception e) {
            e.printStackTrace();
        }
@ -71,7 +70,7 @@ public class StdCDACatalogService extends SQLGeneralDAO {
                StdCDACatalogModel stdCdaCatalogModel = get(catalogId);
                deleteEntity(stdCdaCatalogModel);
            }
        } catch (DataAccessException e) {
        } catch (Exception e) {
            throw new ApiException(ErrorCode.StandardCDACatalogDeleteFailed);
        }
    }
@ -83,7 +82,7 @@ public class StdCDACatalogService extends SQLGeneralDAO {
            this.update(standardModel);
            return standardModel;
        } catch (IOException e) {
        } catch (Exception e) {
            e.printStackTrace();
        }
@ -92,64 +91,44 @@ public class StdCDACatalogService extends SQLGeneralDAO {
    public StdCDACatalogModel get(Integer catalogId) {
        try {
            Integer id = NumberUtil.toInteger(catalogId);
            if (id != null) {
                SqlCreator sqlCreator = new SqlCreator(StdCDACatalogModel.class);
                sqlCreator.equalCondition("id",catalogId);
                String sql = sqlCreator.selectData(StdCDACatalogModel.TABLE_NAME);
                Query query = getQuery(sqlCreator, sql);
                return (StdCDACatalogModel) query.uniqueResult();
            }
        } catch (DataAccessException e) {
            return getEntity(StdCDACatalogModel.class, catalogId);
        } catch (Exception e) {
            e.printStackTrace();
        }
        throw new ApiException(ErrorCode.StandardCDACatalogGetFailed);
    }
    private void update(StdCDACatalogModel stdCDACatalogModel) throws IOException {
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(stdCDACatalogModel));
        SqlCreator sqlCreator = new SqlCreator(StdCDACatalogModel.class);
        String sql = sqlCreator.updateDataByTableKey(StdCDACatalogModel.TABLE_NAME, jsonNode);
        Query query = getExeuteQuery(sqlCreator, sql);
        query.executeUpdate();
    private void update(StdCDACatalogModel stdCDACatalogModel) throws Exception {
        updateEntity(stdCDACatalogModel);
    }
    private void add(StdCDACatalogModel stdCDACatalogModel) throws IOException {
        ObjectMapper objectMapper = new ObjectMapper();
        Session session = getCurrentSession();
        String sql = "select max(id) from " + StdCDACatalogModel.TABLE_NAME;
        Query query = session.createSQLQuery(sql);
        Object object = query.uniqueResult();
        stdCDACatalogModel.setId(object == null ? 1 : Integer.parseInt(object.toString()) + 1);
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(stdCDACatalogModel));
        SqlCreator sqlCreator = new SqlCreator(StdCDACatalogModel.class);
        sql = sqlCreator.insertData(StdCDACatalogModel.TABLE_NAME, jsonNode);
        query = getExeuteQuery(sqlCreator, sql);
        query.executeUpdate();
    private void add(StdCDACatalogModel stdCDACatalogModel) throws Exception {
        saveEntity(stdCDACatalogModel);
    }
    private List<StdCDACatalogModel> getList(Map<String, String> query, Map<String, String> order, Integer limit, Integer offset) {
        SqlCreator sqlCreator = new SqlCreator(StdCDACatalogModel.class);
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(StandardModel.class);
        for (String key : query.keySet()) {
            sqlCreator.equalCondition(key, query.get(key));
        }
        for (String key : order.keySet()) {
            sqlCreator.order(key, order.get(key));
            criteria.add(Restrictions.eq(key, query.get(key)));
        }
        String sql = sqlCreator.selectData(StdCDACatalogModel.TABLE_NAME);
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            criteria.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult((offset - 1) * limit);
                criteria.setFirstResult((offset - 1) * limit);
            }
        }
        if (order != null) {
            for (String key : order.keySet()) {
                if (order.get(key).equals(Constants.ASC)) {
                    criteria.addOrder(Order.asc(key));
                } else if (order.get(key).equals(Constants.DESC)) {
                    criteria.addOrder(Order.desc(key));
                }
            }
        }
        return (List<StdCDACatalogModel>) sessionQuery.list();
        return (List<StdCDACatalogModel>) criteria.list();
    }
}

+ 0 - 9
Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdPublisherService.java

@ -1,21 +1,12 @@
package com.yihu.ehr.standard.service.standard;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.constrant.Constants;
import com.yihu.ehr.framework.constrant.ErrorCode;
import com.yihu.ehr.framework.exception.ApiException;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.sql.RequestParamTransformer;
import com.yihu.ehr.framework.util.sql.SqlCreator;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.model.standard.StandardVersionModel;
import com.yihu.ehr.system.model.SystemOrganization;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;

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

@ -9,5 +9,5 @@ sslPassword = 123456
clientId = 1FtXTrSL8D
clientKey = MUZ0WFRyU0w4RDp1c3ZOeWxWc0ZvdFVlQ2tE
httpGateway=http://172.19.103.56:8890/gateway/transfer
httpGateway=http://localhost:8890/gateway/transfer

+ 20 - 0
Hos-resource/src/main/resources/hbm/resource/AdapterScheme.hbm.xml

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
    <class name="com.yihu.ehr.standard.model.adapter.AdapterSchemeModel" table="adapter_scheme">
        <id name="id" column="id">
            <generator class="increment"/>
        </id>
        <property name="parentId" column="parent_id"/>
        <property name="name" column="name"/>
        <property name="type" column="type"/>
        <property name="description" column="description"/>
        <property name="status" column="status"/>
        <property name="stdId" column="std_id"/>
        <property name="stdVersion" column="std_version"/>
        <property name="adapterStdId" column="adapter_std_id"/>
        <property name="adapterStdVersion" column="adapter_std_version"/>
        <property name="adapterPublisherOrgCode" column="adapter_publisher_org_code"/>
    </class>
</hibernate-mapping>

+ 18 - 0
Hos-resource/src/main/resources/hbm/resource/AdapterSchemeVersion.hbm.xml

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
    <class name="com.yihu.ehr.standard.model.adapter.AdapterSchemeVersionModel" table="adapter_scheme_version">
        <id name="id" column="id">
            <generator class="increment"/>
        </id>
        <property name="schemeId" column="scheme_id"/>
        <property name="name" column="name"/>
        <property name="version" column="version"/>
        <property name="publishTime" column="publish_time"/>
        <property name="publishUser" column="publish_user"/>
        <property name="baseVersion" column="base_version"/>
        <property name="publishStatus" column="publish_status"/>
        <property name="path" column="path"/>
    </class>
</hibernate-mapping>

+ 34 - 0
Hos-resource/src/main/resources/hbm/resource/RsDatapushLog.hbm.xml

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<!-- 
    Mapping file autogenerated by MyEclipse Persistence Tools
-->
<hibernate-mapping>
    <class name="com.yihu.ehr.datacollect.model.RsDatapushLog" table="rs_datapush_log">
        <id name="id" type="java.lang.String">
            <column name="id" length="50" />
            <generator class="uuid" />
        </id>
        <property name="type" type="java.lang.String">
            <column name="type" length="50" not-null="true">
                <comment>日志类型 1数据采集 2档案上传 3人口注册</comment>
            </column>
        </property>
        <property name="content" type="java.lang.String">
            <column name="content" length="2000" not-null="true">
                <comment>日志内容</comment>
            </column>
        </property>
        <property name="success" type="java.lang.String">
            <column name="success" length="50" not-null="true">
                <comment>是否成功</comment>
            </column>
        </property>
        <property name="datetime" type="java.sql.Timestamp">
            <column name="datetime" length="0">
                <comment>日志时间</comment>
            </column>
        </property>
    </class>
</hibernate-mapping>

+ 18 - 0
Hos-resource/src/main/resources/hbm/resource/Standard.hbm.xml

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
    <class name="com.yihu.ehr.standard.model.standard.StandardModel" table="std_info">
        <id name="id" column="id">
            <generator class="increment"/>
        </id>
        <property name="name" column="name"/>
        <property name="code" column="code"/>
        <property name="publisher" column="publisher"/>
        <property name="publisherOrgCode" column="publisher_org_code"/>
        <property name="summary" column="summary"/>
        <property name="refStandard" column="ref_standard"/>
        <property name="refStandardVersion" column="ref_standard_version"/>
        <property name="versionStatus" column="version_status"/>
    </class>
</hibernate-mapping>

+ 19 - 0
Hos-resource/src/main/resources/hbm/resource/StandardVersion.hbm.xml

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
    <class name="com.yihu.ehr.standard.model.standard.StandardVersionModel" table="std_version">
        <id name="id" column="id">
            <generator class="increment"/>
        </id>
        <property name="name" column="name"/>
        <property name="version" column="version"/>
        <property name="standardId" column="std_id"/>
        <property name="publishTime" column="publish_time"/>
        <property name="publishUser" column="publish_user"/>
        <property name="baseVersion" column="base_version"/>
        <property name="primaryVersion" column="primary_version"/>
        <property name="publishStatus" column="publish_status"/>
        <property name="path" column="path"/>
    </class>
</hibernate-mapping>