修改了外链证书的问题

This commit is contained in:
wucongxing8150 2025-08-29 13:12:06 +08:00
parent d8e89ca0d7
commit 6a2742d539
8 changed files with 56 additions and 37 deletions

View File

@ -106,6 +106,7 @@ public class ClinicalController extends BaseController {
request.getHospitalId(), request.getHospitalId(),
request.getDoctorId(), request.getDoctorId(),
request.getLabelIden(), request.getLabelIden(),
request.getIsNeedLink(),
request.handleOrder() request.handleOrder()
); );
@ -195,6 +196,7 @@ public class ClinicalController extends BaseController {
request.getHospitalId(), request.getHospitalId(),
request.getDoctorId(), request.getDoctorId(),
request.getLabelIden(), request.getLabelIden(),
request.getIsNeedLink(),
request.handleOrder() request.handleOrder()
); );

View File

@ -27,6 +27,7 @@ public interface CaseClinicalArticleDao extends BaseMapper<CaseClinicalArticleMo
@Param("hospitalId") String hospitalId, @Param("hospitalId") String hospitalId,
@Param("doctorId") String doctorId, @Param("doctorId") String doctorId,
@Param("labelIden") String labelIden, @Param("labelIden") String labelIden,
@Param("isNeedLink") Integer isNeedLink,
@Param("order") Map<String, String> order @Param("order") Map<String, String> order
); );

View File

@ -29,6 +29,7 @@ public interface CaseClinicalVideoDao extends BaseMapper<CaseClinicalVideoModel>
@Param("hospitalId") String hospitalId, @Param("hospitalId") String hospitalId,
@Param("doctorId") String doctorId, @Param("doctorId") String doctorId,
@Param("labelIden") String labelIden, @Param("labelIden") String labelIden,
@Param("isNeedLink") Integer isNeedLink,
@Param("order") Map<String, String> order @Param("order") Map<String, String> order
); );

View File

@ -41,6 +41,9 @@ public class getClinicalArticleSearchPage {
@JsonProperty("is_need_num") @JsonProperty("is_need_num")
private Integer isNeedNum = 0; private Integer isNeedNum = 0;
// 是否需要外部链接0: 1:
@JsonProperty("is_need_link")
private Integer isNeedLink = 1;
// 排序字段 // 排序字段
private OrderRequest order; private OrderRequest order;

View File

@ -41,6 +41,10 @@ public class getClinicalVideoSearchPage {
@JsonProperty("is_need_num") @JsonProperty("is_need_num")
private Integer isNeedNum = 0; private Integer isNeedNum = 0;
// 是否需要外部链接0: 1:
@JsonProperty("is_need_link")
private Integer isNeedLink = 1;
// 排序字段 // 排序字段
private OrderRequest order; private OrderRequest order;

View File

@ -919,51 +919,53 @@ public class CaseClinicalVideoService {
// 增加需要增加的医院数据 // 增加需要增加的医院数据
addHospitalSet.add(String.valueOf(caseClinicalDoctor.getHospitalId())); addHospitalSet.add(String.valueOf(caseClinicalDoctor.getHospitalId()));
// 生成用户证书-文章/视频 if (caseClinicalVideo.getIsLink() != 1){
if (qrCodeByte == null || qrCodeByte.length == 0) { // 生成用户证书-文章/视频
// 生成二维码图片 if (qrCodeByte == null || qrCodeByte.length == 0) {
if (caseClinicalVideo.getShareQrcode() == null){ // 生成二维码图片
try { if (caseClinicalVideo.getShareQrcode() == null){
// 生成用户分享二维码-文章/视频 try {
qrCodeByte = userService.CreateUserCaseClinicalUnlimitedQrcode(String.valueOf(caseClinicalVideo.getVideoId()),2); // 生成用户分享二维码-文章/视频
} catch (Exception e) { qrCodeByte = userService.CreateUserCaseClinicalUnlimitedQrcode(String.valueOf(caseClinicalVideo.getVideoId()),2);
// 不处理 } catch (Exception e) {
throw new BusinessException("-1", "无法完成此操作1"); // 不处理
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{ }else{
// 下载二维码图片 try {
qrCodeByte = Oss.getObjectToByte(caseClinicalVideo.getShareQrcode().replaceFirst("^/+", "")); avatarByte = ImageUtil.readImageToBytes("static/cert/avatar.png");
if (qrCodeByte == null) { } catch (Exception e) {
throw new BusinessException("-1", "无法完成此操作2"); throw new BusinessException("-1", e.getMessage());
} }
} }
if (avatarByte == null) {
} throw new BusinessException("-1", "无法完成此操作");
// 下载头像
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) { userService.CreateUserCert(
throw new BusinessException("-1", "无法完成此操作"); 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()){ if (!addHospitalSet.isEmpty()){

View File

@ -77,6 +77,9 @@
<if test="labelIden != null and labelIden != ''"> <if test="labelIden != null and labelIden != ''">
AND l.app_iden = #{labelIden} AND l.app_iden = #{labelIden}
</if> </if>
<if test="isNeedLink == 0">
AND l.is_link = 0
</if>
) AS result ) AS result
JOIN case_clinical_article a ON a.article_id = result.article_id JOIN case_clinical_article a ON a.article_id = result.article_id
<if test="order != null and !order.isEmpty()"> <if test="order != null and !order.isEmpty()">

View File

@ -45,6 +45,9 @@
<if test="labelIden != null and labelIden != ''"> <if test="labelIden != null and labelIden != ''">
AND l.app_iden = #{labelIden} AND l.app_iden = #{labelIden}
</if> </if>
<if test="isNeedLink == 0">
AND l.is_link = 0
</if>
<if test="order != null and !order.isEmpty()"> <if test="order != null and !order.isEmpty()">
ORDER BY ORDER BY
<foreach item="entry" index="key" collection="order" separator=","> <foreach item="entry" index="key" collection="order" separator=",">