diff --git a/src/main/java/com/example/caseData/controller/ClinicalController.java b/src/main/java/com/example/caseData/controller/ClinicalController.java index 516253c..f60a124 100644 --- a/src/main/java/com/example/caseData/controller/ClinicalController.java +++ b/src/main/java/com/example/caseData/controller/ClinicalController.java @@ -106,6 +106,7 @@ public class ClinicalController extends BaseController { request.getHospitalId(), request.getDoctorId(), request.getLabelIden(), + request.getIsNeedLink(), request.handleOrder() ); @@ -195,6 +196,7 @@ public class ClinicalController extends BaseController { request.getHospitalId(), request.getDoctorId(), request.getLabelIden(), + request.getIsNeedLink(), request.handleOrder() ); diff --git a/src/main/java/com/example/caseData/dao/CaseClinicalArticleDao.java b/src/main/java/com/example/caseData/dao/CaseClinicalArticleDao.java index 1ac7670..e7478de 100644 --- a/src/main/java/com/example/caseData/dao/CaseClinicalArticleDao.java +++ b/src/main/java/com/example/caseData/dao/CaseClinicalArticleDao.java @@ -27,6 +27,7 @@ public interface CaseClinicalArticleDao extends BaseMapper order ); diff --git a/src/main/java/com/example/caseData/dao/CaseClinicalVideoDao.java b/src/main/java/com/example/caseData/dao/CaseClinicalVideoDao.java index 17ce617..afa8249 100644 --- a/src/main/java/com/example/caseData/dao/CaseClinicalVideoDao.java +++ b/src/main/java/com/example/caseData/dao/CaseClinicalVideoDao.java @@ -29,6 +29,7 @@ public interface CaseClinicalVideoDao extends BaseMapper @Param("hospitalId") String hospitalId, @Param("doctorId") String doctorId, @Param("labelIden") String labelIden, + @Param("isNeedLink") Integer isNeedLink, @Param("order") Map order ); diff --git a/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalArticleSearchPage.java b/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalArticleSearchPage.java index ea477ed..d417e6e 100644 --- a/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalArticleSearchPage.java +++ b/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalArticleSearchPage.java @@ -41,6 +41,9 @@ public class getClinicalArticleSearchPage { @JsonProperty("is_need_num") private Integer isNeedNum = 0; + // 是否需要外部链接(0:否 1:是) + @JsonProperty("is_need_link") + private Integer isNeedLink = 1; // 排序字段 private OrderRequest order; diff --git a/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalVideoSearchPage.java b/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalVideoSearchPage.java index a7184be..3147558 100644 --- a/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalVideoSearchPage.java +++ b/src/main/java/com/example/caseData/request/clinicalRequest/getClinicalVideoSearchPage.java @@ -41,6 +41,10 @@ public class getClinicalVideoSearchPage { @JsonProperty("is_need_num") private Integer isNeedNum = 0; + // 是否需要外部链接(0:否 1:是) + @JsonProperty("is_need_link") + private Integer isNeedLink = 1; + // 排序字段 private OrderRequest order; diff --git a/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java b/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java index 7ee72f0..b10e851 100644 --- a/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java +++ b/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java @@ -919,51 +919,53 @@ public class CaseClinicalVideoService { // 增加需要增加的医院数据 addHospitalSet.add(String.valueOf(caseClinicalDoctor.getHospitalId())); - // 生成用户证书-文章/视频 - if (qrCodeByte == null || qrCodeByte.length == 0) { - // 生成二维码图片 - if (caseClinicalVideo.getShareQrcode() == null){ - try { - // 生成用户分享二维码-文章/视频 - qrCodeByte = userService.CreateUserCaseClinicalUnlimitedQrcode(String.valueOf(caseClinicalVideo.getVideoId()),2); - } catch (Exception e) { - // 不处理 - throw new BusinessException("-1", "无法完成此操作1"); + if (caseClinicalVideo.getIsLink() != 1){ + // 生成用户证书-文章/视频 + if (qrCodeByte == null || qrCodeByte.length == 0) { + // 生成二维码图片 + if (caseClinicalVideo.getShareQrcode() == null){ + try { + // 生成用户分享二维码-文章/视频 + qrCodeByte = userService.CreateUserCaseClinicalUnlimitedQrcode(String.valueOf(caseClinicalVideo.getVideoId()),2); + } catch (Exception e) { + // 不处理 + throw new BusinessException("-1", "无法完成此操作1"); + } + }else{ + // 下载二维码图片 + qrCodeByte = Oss.getObjectToByte(caseClinicalVideo.getShareQrcode().replaceFirst("^/+", "")); + if (qrCodeByte == null) { + throw new BusinessException("-1", "无法完成此操作2"); + } } + + + } + + // 下载头像 + byte[] avatarByte = new byte[0]; + if (caseClinicalDoctor.getAvatar() != null && !caseClinicalDoctor.getAvatar().isEmpty()) { + avatarByte = Oss.getObjectToByte(caseClinicalDoctor.getAvatar().replaceFirst("^/+", "")); }else{ - // 下载二维码图片 - qrCodeByte = Oss.getObjectToByte(caseClinicalVideo.getShareQrcode().replaceFirst("^/+", "")); - if (qrCodeByte == null) { - throw new BusinessException("-1", "无法完成此操作2"); + try { + avatarByte = ImageUtil.readImageToBytes("static/cert/avatar.png"); + } catch (Exception e) { + throw new BusinessException("-1", e.getMessage()); } } - - } - - // 下载头像 - byte[] avatarByte = new byte[0]; - if (caseClinicalDoctor.getAvatar() != null && !caseClinicalDoctor.getAvatar().isEmpty()) { - avatarByte = Oss.getObjectToByte(caseClinicalDoctor.getAvatar().replaceFirst("^/+", "")); - }else{ - try { - avatarByte = ImageUtil.readImageToBytes("static/cert/avatar.png"); - } catch (Exception e) { - throw new BusinessException("-1", e.getMessage()); + if (avatarByte == null) { + throw new BusinessException("-1", "无法完成此操作"); } - } - if (avatarByte == null) { - throw new BusinessException("-1", "无法完成此操作"); + userService.CreateUserCert( + String.valueOf(caseClinicalVideo.getVideoId()), + 2, + String.valueOf(caseClinicalDoctor.getDoctorId()), + qrCodeByte, + avatarByte + ); } - - userService.CreateUserCert( - String.valueOf(caseClinicalVideo.getVideoId()), - 2, - String.valueOf(caseClinicalDoctor.getDoctorId()), - qrCodeByte, - avatarByte - ); } if (!addHospitalSet.isEmpty()){ diff --git a/src/main/resources/mapper/CaseClinicalArticleMapper.xml b/src/main/resources/mapper/CaseClinicalArticleMapper.xml index d4e25e6..56606f7 100644 --- a/src/main/resources/mapper/CaseClinicalArticleMapper.xml +++ b/src/main/resources/mapper/CaseClinicalArticleMapper.xml @@ -77,6 +77,9 @@ AND l.app_iden = #{labelIden} + + AND l.is_link = 0 + ) AS result JOIN case_clinical_article a ON a.article_id = result.article_id diff --git a/src/main/resources/mapper/CaseClinicalVideoMapper.xml b/src/main/resources/mapper/CaseClinicalVideoMapper.xml index 5a05d58..6f1ffe3 100644 --- a/src/main/resources/mapper/CaseClinicalVideoMapper.xml +++ b/src/main/resources/mapper/CaseClinicalVideoMapper.xml @@ -45,6 +45,9 @@ AND l.app_iden = #{labelIden} + + AND l.is_link = 0 + ORDER BY