From 0536723801e8152855e8ba22271caebe867cee2b Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Tue, 6 Jan 2026 17:08:25 +0800 Subject: [PATCH] fix: --- .../model/dto/ReportTemplateDto.java | 4 +- .../SimulationReportTemplateServiceImpl.java | 2 +- .../impl/SimulationMessageServiceImpl.java | 83 ++++++++++--------- .../SimulationSystemConfigServiceImpl.java | 2 +- 4 files changed, 50 insertions(+), 41 deletions(-) diff --git a/capability/src/main/java/com/sdm/capability/model/dto/ReportTemplateDto.java b/capability/src/main/java/com/sdm/capability/model/dto/ReportTemplateDto.java index 09569805..f863bb4c 100644 --- a/capability/src/main/java/com/sdm/capability/model/dto/ReportTemplateDto.java +++ b/capability/src/main/java/com/sdm/capability/model/dto/ReportTemplateDto.java @@ -63,8 +63,8 @@ public class ReportTemplateDto { @Schema(description = "创建时间范围") private String[] createTimeArr; - @Schema(description = "是否为个人模板") - private boolean personal; + @Schema(description = "是否为个人模板 1:查询公共模版 2：查询个人") + public int type; @Schema(description = "报告审批模板名称") public String approveTemplateName; diff --git a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java index 0ec21cbb..6218bba2 100644 --- a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java +++ b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java @@ -175,7 +175,7 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl { + try { + log.info("开始异步调用Cid Msg服务..."); + if (req.isSendCid()) { + log.info("[sendMessage] cid url:{}, param:{}", url, JSONUtil.toJsonStr(req)); + String resultString = httpClientUtil.doPostJson(url, JSON.toJSONString(req)); + SdmResponse response = JSON.parseObject(resultString, SdmResponse.class); + log.info("[sendMessage] cid url:{}, response:{}", url, JSONUtil.toJsonStr(response)); } + } catch (Exception e) { + log.error("异步调用Cid Msg服务异常: {}", e.getMessage(), e); } - FreelinkAndDingdingInformReq param = new FreelinkAndDingdingInformReq(); - // 根据userId查询工号 - UserQueryReq userReq = new UserQueryReq(); - userReq.setUserId(ThreadLocalContext.getUserId()); - userReq.setTenantId(ThreadLocalContext.getTenantId()); - SdmResponse sdmResponse = sysUserFeignClient.queryUserDetail(userReq); - if (sdmResponse.getData() != null) { - param.setJobNo(sdmResponse.getData().getUsername()); - } - FreeLinkMsg freeLinkMsg = new FreeLinkMsg(); - if (switchFlag.equals("true")) { - userReq.setUserId(Long.valueOf(req.getUserId())); - SdmResponse response = sysUserFeignClient.queryUserDetail(userReq); - if (response.getData() != null) { - freeLinkMsg.setId(response.getData().getUsername()); - } - } else { - freeLinkMsg.setId(sendUserId); - } - freeLinkMsg.setType("text"); - freeLinkMsg.setMsg(req.getContent()); - freeLinkMsg.setUser("66666"); - freeLinkMsg.setPawd("lyric@123"); - freeLinkMsg.setFreelinkAppId("d7eb3ef7c8e8c93e7c6e978fee848646"); - param.setFreeLinkMsg(freeLinkMsg); - SdmResponse response1 = lyricIntegrateService.pushFreeLinkMsg(param); - return response1; - } catch (Exception e) { - log.error("发送消息通知失败", e); - return SdmResponse.failed("发送消息通知失败"); + }); + // 异步发送即时通消息通知 + CompletableFuture.runAsync(() -> { + sendMsgToFreelink(req); + }); + return SdmResponse.success(); + } + + private void sendMsgToFreelink(SendMsgReq req) { + FreelinkAndDingdingInformReq param = new FreelinkAndDingdingInformReq(); + // 根据userId查询工号 + UserQueryReq userReq = new UserQueryReq(); + userReq.setUserId(ThreadLocalContext.getUserId()); + userReq.setTenantId(ThreadLocalContext.getTenantId()); + SdmResponse sdmResponse = sysUserFeignClient.queryUserDetail(userReq); + if (sdmResponse.getData() != null) { + param.setJobNo(sdmResponse.getData().getUsername()); } + FreeLinkMsg freeLinkMsg = new FreeLinkMsg(); + if (switchFlag.equals("true")) { + userReq.setUserId(Long.valueOf(req.getUserId())); + SdmResponse response = sysUserFeignClient.queryUserDetail(userReq); + if (response.getData() != null) { + freeLinkMsg.setId(response.getData().getUsername()); + } + } else { + freeLinkMsg.setId(sendUserId); + } + freeLinkMsg.setType("text"); + freeLinkMsg.setMsg(req.getContent()); + freeLinkMsg.setUser("66666"); + freeLinkMsg.setPawd("lyric@123"); + freeLinkMsg.setFreelinkAppId("d7eb3ef7c8e8c93e7c6e978fee848646"); + param.setFreeLinkMsg(freeLinkMsg); + lyricIntegrateService.pushFreeLinkMsg(param); } } diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java index 84e0d185..aac17bfb 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java @@ -300,7 +300,7 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS @Transactional(rollbackFor = Exception.class) public SdmResponse addSystemFormConfigure(FormConfigure configure) { SdmResponse response = SdmResponse.success(); - if (CollectionUtils.isNotEmpty(formConfigureService.lambdaQuery().eq(SysFormConfigure::getFormName, configure.formName).list())) { + if (CollectionUtils.isNotEmpty(formConfigureService.lambdaQuery().eq(SysFormConfigure::getFormName, configure.formName).eq(SysFormConfigure::getTenantId, ThreadLocalContext.getTenantId()).list())) { response = SdmResponse.failed("该表单配置已存在"); } else { SysFormConfigure sysFormConfigure = new SysFormConfigure();