Merge branch 'dev' into 'master'

Dev

See merge request eshop/biz_service_ebtp_extend!18
This commit is contained in:
张银雪
2021-03-26 14:34:20 +08:00

View File

@ -62,8 +62,8 @@ public class BizBidClientVersionServiceImpl extends BaseServiceImpl<BizBidClient
String objectInfo = documentCenterService.getObjectDetail(objectId); String objectInfo = documentCenterService.getObjectDetail(objectId);
log.info("文档中心文件下载返回数据:"+ JsonUtils.objectToJson(objectInfo)); log.info("文档中心文件下载返回数据:"+ JsonUtils.objectToJson(objectInfo));
Map map = (Map) JSON.parse(objectInfo); Map map = (Map) JSON.parse(objectInfo);
ExportExceptionEnum.FRAME_EXCEPTION_GET_DOCUMENT_CENTER.customValidName("文档获取失败",!(map.containsKey("message") && map.containsKey("success"))); ExportExceptionEnum.FRAME_EXCEPTION_GET_DOCUMENT_CENTER.customValidName("文档获取失败", !(map.containsKey("message") && map.containsKey("success")) || "null".equals(objectInfo));
ExportExceptionEnum.FRAME_EXCEPTION_GET_DOCUMENT_CENTER.customValidName(map.get("message").toString(),!(boolean) map.get("success")); ExportExceptionEnum.FRAME_EXCEPTION_GET_DOCUMENT_CENTER.customValidName("文档中心返回信息:" + map.get("message").toString(), !(boolean) map.get("success"));
Optional<byte[]> optionalBytes = modelConvertor.toByteArray(objectInfo); Optional<byte[]> optionalBytes = modelConvertor.toByteArray(objectInfo);
// log.info("文档中心文件下载返回数据转为byte[]数据:"+ new String(optionalBytes.get())); // log.info("文档中心文件下载返回数据转为byte[]数据:"+ new String(optionalBytes.get()));
ServletOutputStream outputStream = response.getOutputStream(); ServletOutputStream outputStream = response.getOutputStream();
@ -81,8 +81,8 @@ public class BizBidClientVersionServiceImpl extends BaseServiceImpl<BizBidClient
String objectInfo = documentCenterService.getObjectDetail(objectId); String objectInfo = documentCenterService.getObjectDetail(objectId);
log.info("文档中心s文件下载返回数据"+ JsonUtils.objectToJson(objectInfo)); log.info("文档中心s文件下载返回数据"+ JsonUtils.objectToJson(objectInfo));
Map map = (Map) JSON.parse(objectInfo); Map map = (Map) JSON.parse(objectInfo);
ExportExceptionEnum.FRAME_EXCEPTION_GET_DOCUMENT_CENTER.customValidName("文档获取失败",!(map.containsKey("message") && map.containsKey("success"))); ExportExceptionEnum.FRAME_EXCEPTION_GET_DOCUMENT_CENTER.customValidName("文档获取失败", !(map.containsKey("message") && map.containsKey("success")) || "null".equals(objectInfo));
ExportExceptionEnum.FRAME_EXCEPTION_GET_DOCUMENT_CENTER.customValidName(map.get("message").toString(),!(boolean) map.get("success")); ExportExceptionEnum.FRAME_EXCEPTION_GET_DOCUMENT_CENTER.customValidName("文档中心返回信息:" + map.get("message").toString(), !(boolean) map.get("success"));
Optional<byte[]> optionalBytes = modelConvertor.toByteArray(objectInfo); Optional<byte[]> optionalBytes = modelConvertor.toByteArray(objectInfo);
// log.info("文档中心s文件下载返回数据转为byte[]数据:"+ optionalBytes.get()); // log.info("文档中心s文件下载返回数据转为byte[]数据:"+ optionalBytes.get());
ServletOutputStream outputStream = response.getOutputStream(); ServletOutputStream outputStream = response.getOutputStream();