Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/PrescriptionController.java

@@ -275,10 +275,11 @@ public class PrescriptionController extends BaseController{
	@ApiOperation("请求实名软证书并进行数字签名")
	public Result requestRealNameSoftCertAndSign(@ApiParam(name="strUserIdcardNum",value="用户身份证号") @RequestParam String strUserIdcardNum,
												 @ApiParam(name="strRealNameSoftCertCalledPasswd",value="证书被调用保护口令") @RequestParam String strRealNameSoftCertCalledPasswd,
												 @ApiParam(name="strOriginalData",value="原文(若原文大于 1KB，需先对原文取 MD5摘要值，而后以该 MD5摘要值入参)") @RequestParam String strOriginalData)
												 @ApiParam(name="strOriginalData",value="原文(若原文大于 1KB，需先对原文取 MD5摘要值，而后以该 MD5摘要值入参)") @RequestParam String strOriginalData,
												 @ApiParam(name="prescriptionCode",value="处方code") @RequestParam String prescriptionCode)
	{
		try {
			String re = caService.requestRealNameSoftCertAndSign(strUserIdcardNum,strRealNameSoftCertCalledPasswd,strOriginalData);
			String re = caService.requestRealNameSoftCertAndSign(strUserIdcardNum,strRealNameSoftCertCalledPasswd,strOriginalData,prescriptionCode);
			return Result.success("请求实名软证书并进行数字签名成功！",re);
		} catch (Exception ex) {
@@ -290,10 +291,11 @@ public class PrescriptionController extends BaseController{
	@RequestMapping(value = "IsApplied",method = RequestMethod.POST)
	@ResponseBody
	@ApiOperation("判断是否有实名证书")
	public Result isApplied(@ApiParam(name="strUserIdcardNum",value="用户身份证号") @RequestParam String strUserIdcardNum)
	public Result isApplied(@ApiParam(name="strUserIdcardNum",value="用户身份证号") @RequestParam String strUserIdcardNum,
							@ApiParam(name="doctorCode",value="医生code") @RequestParam String doctorCode)
	{
		try {
			String re = caService.isApplied(strUserIdcardNum);
			String re = caService.isApplied(strUserIdcardNum,doctorCode);
			return Result.success("判断是否有实名证书成功！",re);
		} catch (Exception ex) {
@@ -305,10 +307,11 @@ public class PrescriptionController extends BaseController{
	@RequestMapping(value = "GetRealNameSoftCertExpiredDatetime",method = RequestMethod.POST)
	@ResponseBody
	@ApiOperation("获取实名软证书的过期时间")
	public Result getRealNameSoftCertExpiredDatetime(@ApiParam(name="strUserIdcardNum",value="用户身份证号") @RequestParam String strUserIdcardNum)
	public Result getRealNameSoftCertExpiredDatetime(@ApiParam(name="strUserIdcardNum",value="用户身份证号") @RequestParam String strUserIdcardNum,
													 @ApiParam(name="doctorCode",value="医生code") @RequestParam String doctorCode)
	{
		try {
			String re = caService.getRealNameSoftCertExpiredDatetime(strUserIdcardNum);
			String re = caService.getRealNameSoftCertExpiredDatetime(strUserIdcardNum,doctorCode);
			return Result.success("获取实名软证书的过期时间成功！",re);
		} catch (Exception ex) {
@@ -322,10 +325,11 @@ public class PrescriptionController extends BaseController{
	@ApiOperation("修改实名软证书调用保护口令")
	public Result modifyRealNameSoftCertCalledPasswd(@ApiParam(name="strUserIdcardNum",value="用户身份证号") @RequestParam String strUserIdcardNum,
													 @ApiParam(name="strOldCalledPasswd",value="旧证书调用保护口令") @RequestParam String strOldCalledPasswd,
													 @ApiParam(name="strNewCalledPasswd",value="新证书调用保护口令") @RequestParam String strNewCalledPasswd)
													 @ApiParam(name="strNewCalledPasswd",value="新证书调用保护口令") @RequestParam String strNewCalledPasswd,
													 @ApiParam(name="doctorCode",value="医生code") @RequestParam String doctorCode)
	{
		try {
			String re = caService.modifyRealNameSoftCertCalledPasswd(strUserIdcardNum,strOldCalledPasswd,strNewCalledPasswd);
			String re = caService.modifyRealNameSoftCertCalledPasswd(strUserIdcardNum,strOldCalledPasswd,strNewCalledPasswd,doctorCode);
			return Result.success("修改实名软证书调用保护口令成功！",re);
		} catch (Exception ex) {
@@ -340,10 +344,11 @@ public class PrescriptionController extends BaseController{
	@ApiOperation("验证签名(带多服务器负载均衡)")
	public Result verifySignOnMultiServer(@ApiParam(name="strSignData",value="签名值") @RequestParam String strSignData,
								   @ApiParam(name="strCertData",value="证书主体数据") @RequestParam String strCertData,
								   @ApiParam(name="strOriginalData ",value="原文数据") @RequestParam String strOriginalData)
								   @ApiParam(name="strOriginalData ",value="原文数据") @RequestParam String strOriginalData,
										  @ApiParam(name="prescriptionCode ",value="处方code") @RequestParam String prescriptionCode)
	{
		try {
			String re = caService.verifySignOnMultiServer(strSignData,strCertData,strOriginalData);
			String re = caService.verifySignOnMultiServer(strSignData,strCertData,strOriginalData,prescriptionCode);
			return Result.success("验证签名成功！",re);
		} catch (Exception ex) {

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionCAService.java

@@ -32,7 +32,7 @@ public class PrescriptionCAService {
    @Autowired
    private ObjectMapper objectMapper;
    private String getHeaderXml(String api)
    private String getHeaderXml(String api,String srcBusinessStreamNO)
    {
        return "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
            "<root>\n" +
@@ -48,7 +48,7 @@ public class PrescriptionCAService {
            "   <srcBusinessNodeCode>node01</srcBusinessNodeCode>\n" +
            "   <srcBusinessNodeName>审核</srcBusinessNodeName>\n" +
            "   <srcOperatorAccount>Zhuangsd</srcOperatorAccount>\n" +
            "   <srcBusinessStreamNO>11111</srcBusinessStreamNO>\n" +
            "   <srcBusinessStreamNO>"+srcBusinessStreamNO+"</srcBusinessStreamNO>\n" +
            "   <srcDataExtProperty></srcDataExtProperty>\n" +
            "</root>";
    }
@@ -56,7 +56,7 @@ public class PrescriptionCAService {
    /**
     * CA认证服务二次封装
     */
    private String postCAServer(String api, Map<String,String> params) throws Exception
    private String postCAServer(String api, Map<String,String> params,String srcBusinessStreamNO) throws Exception
    {
        String urlString = SystemConfig.sysPropertiesSets.get("ca_url");
@@ -74,7 +74,7 @@ public class PrescriptionCAService {
        msgBody += "</root>";
        String msgHeader = getHeaderXml(api);
        String msgHeader = getHeaderXml(api,srcBusinessStreamNO);
        Map<String,String> p = new HashMap<>();
        p.put("msgHeader",msgHeader);
@@ -86,7 +86,7 @@ public class PrescriptionCAService {
    /**
     * 判断是否有实名证书
     **/
    public String isApplied(String strUserIdcardNum)  throws Exception
    public String isApplied(String strUserIdcardNum,String srcBusinessStreamNO)  throws Exception
    {
        Boolean isSuccess = true;
        String re = "";
@@ -98,7 +98,7 @@ public class PrescriptionCAService {
            params.put("strUserIdcardNum",strUserIdcardNum);
            body = objectMapper.writeValueAsString(params);
            re = postCAServer(action, params);
            re = postCAServer(action, params,srcBusinessStreamNO);
            if(StringUtil.isEmpty(re))
            {
@@ -131,7 +131,7 @@ public class PrescriptionCAService {
    /**
     * 请求实名软证书并进行数字签名
     **/
    public String requestRealNameSoftCertAndSign(String strUserIdcardNum,String strRealNameSoftCertCalledPasswd,String strOriginalData) throws Exception
    public String requestRealNameSoftCertAndSign(String strUserIdcardNum,String strRealNameSoftCertCalledPasswd,String strOriginalData,String srcBusinessStreamNO) throws Exception
    {
        Boolean isSuccess = true;
        String re = "";
@@ -147,7 +147,7 @@ public class PrescriptionCAService {
            body = objectMapper.writeValueAsString(params);
            re = postCAServer(action, params);
            re = postCAServer(action, params,srcBusinessStreamNO);
            if(StringUtil.isEmpty(re))
            {
@@ -183,7 +183,7 @@ public class PrescriptionCAService {
    /**
     * 获取实名软证书的过期时间
     **/
    public String getRealNameSoftCertExpiredDatetime(String strUserIdcardNum)  throws Exception
    public String getRealNameSoftCertExpiredDatetime(String strUserIdcardNum,String srcBusinessStreamNO)  throws Exception
    {
        Boolean isSuccess = true;
        String re = "";
@@ -196,7 +196,7 @@ public class PrescriptionCAService {
            body = objectMapper.writeValueAsString(params);
            re = postCAServer(action, params);
            re = postCAServer(action, params,srcBusinessStreamNO);
            if(StringUtil.isEmpty(re))
            {
@@ -229,7 +229,7 @@ public class PrescriptionCAService {
    /**
     * 修改实名软证书调用保护口令
     **/
    public String modifyRealNameSoftCertCalledPasswd(String strUserIdcardNum,String strOldCalledPasswd,String strNewCalledPasswd) throws Exception
    public String modifyRealNameSoftCertCalledPasswd(String strUserIdcardNum,String strOldCalledPasswd,String strNewCalledPasswd,String srcBusinessStreamNO) throws Exception
    {
        Boolean isSuccess = true;
        String re = "";
@@ -244,7 +244,7 @@ public class PrescriptionCAService {
            params.put("strNewCalledPasswd",strNewCalledPasswd);
            body = objectMapper.writeValueAsString(params);
            re = postCAServer(action, params);
            re = postCAServer(action, params,srcBusinessStreamNO);
            if(StringUtil.isEmpty(re))
            {
@@ -283,7 +283,7 @@ public class PrescriptionCAService {
    /**
     * 验证签名(带多服务器负载均衡)
     **/
    public String verifySignOnMultiServer(String strSignData,String strCertData,String strOriginalData) throws Exception
    public String verifySignOnMultiServer(String strSignData,String strCertData,String strOriginalData,String srcBusinessStreamNO) throws Exception
    {
        Boolean isSuccess = true;
        String re = "";
@@ -297,7 +297,7 @@ public class PrescriptionCAService {
            params.put("strOriginalData",strOriginalData);
            body = objectMapper.writeValueAsString(params);
            re = postCAServer(action, params);
            re = postCAServer(action, params,srcBusinessStreamNO);
            if(StringUtil.isEmpty(re))
            {