From 6ac14e5adc8920ced875f944fcce76d1b94a8a2f Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 19 Mar 2026 10:56:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=95=BF=E8=80=85=E7=9B=91?= =?UTF-8?q?=E6=8A=A4=E4=BA=BA=E5=A4=B4=E5=83=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nu/dto/ElderInfoMQDto.java | 2 + .../modules/elderinfo/entity/ElderInfo.java | 5 + .../service/impl/ElderInfoServiceImpl.java | 5 + .../entity/ElderModifyInfo.java | 2 + .../listener/ElderInfoMQListener.java | 198 +----------------- 5 files changed, 16 insertions(+), 196 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java index b2d14bd3..cfdc2d61 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java @@ -300,5 +300,7 @@ public class ElderInfoMQDto implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date checkinTime; + private String headPath;//长者头像 + private String guardianHeadPath;//监护人头像 } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java index 6ef05bef..b3fe0d71 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java @@ -365,6 +365,11 @@ public class ElderInfo implements Serializable { @ApiModelProperty(value = "长者变更信息对应子表id nu_biz_elder_modify_info.id") private String elderModifyId; + + private String headPath;//长者头像 + private String guardianHeadPath;//监护人头像 + + @TableField(exist = false) private String queryModifyType; diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java index f386d088..690840c9 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java @@ -254,6 +254,7 @@ public class ElderInfoServiceImpl extends ServiceImpl { -// //去管理平台拉取资源 -// { -// JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url"); -// String baseUrl = opeOpenUrl.getString("configValue"); -// if (baseUrl.endsWith("/")) { -// baseUrl = baseUrl.substring(0, baseUrl.length() - 1); -// } -// //身份证正面 -// String idCardPositive = dto.getIdCardPositive(); -// { -// if (StringUtils.isNotBlank(idCardPositive)) { -// if (StringUtils.isNotBlank(idCardPositive)) { -// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); -// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) { -// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1); -// } -// String filePath = idCardPositive.substring(0, idCardPositive.lastIndexOf("/")); -// String fileName = idCardPositive.substring(idCardPositive.lastIndexOf("/") + 1); -// if (filePath.startsWith("/") || filePath.startsWith("\\")) { -// filePath = filePath.substring(1); -// } -// try { -// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName); -// } catch (Exception e) { -// e.printStackTrace(); -// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog(); -// mediaAsyncErrorLog.setMediaid(idCardPositive); -// mediaAsyncErrorLogService.save(mediaAsyncErrorLog); -// log.error("家属添加老人信息-身份证正面文件拉取错误,老人id" + elderInfo.getId()); -// } -// } -// } -// } -// //身份证反面 -// String idCardNegative = dto.getIdCardNegative(); -// { -// if (StringUtils.isNotBlank(idCardNegative)) { -// if (StringUtils.isNotBlank(idCardNegative)) { -// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); -// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) { -// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1); -// } -// String filePath = idCardNegative.substring(0, idCardNegative.lastIndexOf("/")); -// String fileName = idCardNegative.substring(idCardNegative.lastIndexOf("/") + 1); -// if (filePath.startsWith("/") || filePath.startsWith("\\")) { -// filePath = filePath.substring(1); -// } -// try { -// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName); -// } catch (Exception e) { -// e.printStackTrace(); -// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog(); -// mediaAsyncErrorLog.setMediaid(idCardNegative); -// mediaAsyncErrorLogService.save(mediaAsyncErrorLog); -// log.error("家属添加老人信息-身份证反面文件拉取错误,老人id" + elderInfo.getId()); -// } -// } -// } -// } -// } -// }).start(); } -// /** -// * 更新长者信息 -// * -// * @param dto -// */ -// @RabbitListener(bindings = @QueueBinding(value = @Queue(name = "#{elderInfoAsyncDQNP.getUpdateElderInfoQueueName()}"), exchange = @Exchange(name = "hldy.elder", type = ExchangeTypes.DIRECT), key = "#{elderInfoAsyncDQNP.getUpdateElderInfoKeyName()}"), errorHandler = "elderInfoMQErrorHandler") -// @Transactional(rollbackFor = {Exception.class}) -// public void handleUpdateElderInfo(ElderInfoMQDto dto) { -// ElderInfo elderInfo = new ElderInfo(); -// BeanUtils.copyProperties(dto, elderInfo); -// elderInfoService.updateById(elderInfo); -// -// //去管理平台拉取资源 -// { -// -// JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url"); -// String baseUrl = opeOpenUrl.getString("configValue"); -// if (baseUrl.endsWith("/")) { -// baseUrl = baseUrl.substring(0, baseUrl.length() - 1); -// } -// //身份证正面 -// String idCardPositive = dto.getIdCardPositive(); -// { -// if (StringUtils.isNotBlank(idCardPositive)) { -// if (StringUtils.isNotBlank(idCardPositive)) { -// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); -// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) { -// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1); -// } -// String filePath = idCardPositive.substring(0, idCardPositive.lastIndexOf("/")); -// String fileName = idCardPositive.substring(idCardPositive.lastIndexOf("/") + 1); -// if (filePath.startsWith("/") || filePath.startsWith("\\")) { -// filePath = filePath.substring(1); -// } -// try { -// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName); -// } catch (Exception e) { -// e.printStackTrace(); -// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog(); -// mediaAsyncErrorLog.setMediaid(idCardPositive); -// mediaAsyncErrorLogService.save(mediaAsyncErrorLog); -// log.error("修改老人信息-身份证正面文件拉取错误,老人id" + elderInfo.getId()); -// } -// } -// } -// } -// //身份证反面 -// String idCardNegative = dto.getIdCardNegative(); -// { -// if (StringUtils.isNotBlank(idCardNegative)) { -// if (StringUtils.isNotBlank(idCardNegative)) { -// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); -// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) { -// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1); -// } -// String filePath = idCardNegative.substring(0, idCardNegative.lastIndexOf("/")); -// String fileName = idCardNegative.substring(idCardNegative.lastIndexOf("/") + 1); -// if (filePath.startsWith("/") || filePath.startsWith("\\")) { -// filePath = filePath.substring(1); -// } -// try { -// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName); -// } catch (Exception e) { -// e.printStackTrace(); -// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog(); -// mediaAsyncErrorLog.setMediaid(idCardNegative); -// mediaAsyncErrorLogService.save(mediaAsyncErrorLog); -// log.error("修改老人信息-身份证反面文件拉取错误,老人id" + elderInfo.getId()); -// } -// } -// } -// } -// } -// } /** * 修改长者的联系人信息 @@ -265,6 +129,7 @@ public class ElderInfoMQListener { elderModifyInfo.setGuardianPhone(elder.getGuardianPhone());//监护人手机号 elderModifyInfo.setGuardianHomeAddress(elder.getGuardianHomeAddress());//监护人身份证住址 elderModifyInfo.setGuardianWorkUnit(elder.getGuardianWorkUnit());//监护人工作单位 + elderModifyInfo.setGuardianHeadPath(elder.getGuardianHeadPath());//长者头像 } if ("jhr".equals(dto.getModifyType())) { elderModifyInfo.setName(elder.getName());//长者姓名 @@ -281,69 +146,10 @@ public class ElderInfoMQListener { elderModifyInfo.setStartTime(elder.getStartTime());//有效开始日期 elderModifyInfo.setEndTime(elder.getEndTime());//有效结束日期 elderModifyInfo.setIssuingAuthority(elder.getIssuingAuthority());//发证单位 + elderModifyInfo.setHeadPath(elder.getHeadPath());//长者头像 } elderModifyInfoService.save(elderModifyInfo); - //去管理平台拉取资源 -// { -// JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url"); -// String baseUrl = opeOpenUrl.getString("configValue"); -// if (baseUrl.endsWith("/")) { -// baseUrl = baseUrl.substring(0, baseUrl.length() - 1); -// } -// //身份证正面 -// String idCardPositive = dto.getIdCardPositive(); -// { -// if (StringUtils.isNotBlank(idCardPositive)) { -// if (StringUtils.isNotBlank(idCardPositive)) { -// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); -// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) { -// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1); -// } -// String filePath = idCardPositive.substring(0, idCardPositive.lastIndexOf("/")); -// String fileName = idCardPositive.substring(idCardPositive.lastIndexOf("/") + 1); -// if (filePath.startsWith("/") || filePath.startsWith("\\")) { -// filePath = filePath.substring(1); -// } -// try { -// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName); -// } catch (Exception e) { -// e.printStackTrace(); -// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog(); -// mediaAsyncErrorLog.setMediaid(idCardPositive); -// mediaAsyncErrorLogService.save(mediaAsyncErrorLog); -// log.error("修改老人相关信息-身份证正面文件拉取错误,老人id" + modifyTableId); -// } -// } -// } -// } -// //身份证反面 -// String idCardNegative = dto.getIdCardNegative(); -// { -// if (StringUtils.isNotBlank(idCardNegative)) { -// if (StringUtils.isNotBlank(idCardNegative)) { -// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); -// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) { -// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1); -// } -// String filePath = idCardNegative.substring(0, idCardNegative.lastIndexOf("/")); -// String fileName = idCardNegative.substring(idCardNegative.lastIndexOf("/") + 1); -// if (filePath.startsWith("/") || filePath.startsWith("\\")) { -// filePath = filePath.substring(1); -// } -// try { -// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName); -// } catch (Exception e) { -// e.printStackTrace(); -// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog(); -// mediaAsyncErrorLog.setMediaid(idCardNegative); -// mediaAsyncErrorLogService.save(mediaAsyncErrorLog); -// log.error("修改老人相关信息-身份证反面文件拉取错误,老人id" + modifyTableId); -// } -// } -// } -// } -// } //修改老人信息表相关状态 ElderInfo elderInfo = new ElderInfo(); elderInfo.setId(dto.getId());