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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/express/SFExpressApiController.java

@@ -37,15 +37,15 @@ public class SFExpressApiController extends BaseController {
    @ApiOperation("接受顺丰推送过来的路由信息")
    @ObserverRequired
    public String SFRoutePushService (
            @ApiParam(name="xml", value="入参报文") @RequestParam(value = "xml",required = true) String xml){
            @ApiParam(name="content", value="入参报文") @RequestParam(value = "content",required = true) String content){
        try {
            logger.info("顺丰路由信息推送，xml="+xml);
            xml = URLDecoder.decode(xml,"utf-8");
            sfexpressService.SFRoutePushService(xml);
            logger.info("顺丰路由信息推送，xml="+content);
            content = URLDecoder.decode(content,"utf-8");
            sfexpressService.SFRoutePushService(content);
            return successxml;
        }catch (Exception e){
            logger.error("接收顺丰路由信息推送失败，入参xml:"+xml);
            logger.error("接收顺丰路由信息推送失败，入参xml:"+content);
            //日志文件中记录异常信息
            error(e);
            //返回接口异常信息处理结果