From 4996e593e38a3cdd22d696fba5da232a1bdc3a03 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 6 Aug 2025 16:01:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigServiceDirectiveController.java | 14 +++++++------- .../mq/directive/listener/DirectiveMQListener.java | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java index 1cba911..9abb43a 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java @@ -136,14 +136,14 @@ public class ConfigServiceDirectiveController extends JeecgController customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR - customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("typeId", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("instructionTagId", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("izReimbursement", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("izPreferential", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("categoryId", QueryRuleEnum.EQ); + customeRuleMap.put("typeId", QueryRuleEnum.EQ); + customeRuleMap.put("instructionTagId", QueryRuleEnum.EQ); + customeRuleMap.put("izReimbursement", QueryRuleEnum.EQ); + customeRuleMap.put("izPreferential", QueryRuleEnum.EQ); customeRuleMap.put("chargingFrequency", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("cycleType", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("cycleType", QueryRuleEnum.EQ); + customeRuleMap.put("izEnabled", QueryRuleEnum.EQ); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); queryWrapper.select("id"); //如果有服务指令需要提前查询下对应的服务指令id diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java index 9baba5c..a9218ea 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java @@ -141,7 +141,7 @@ public class DirectiveMQListener { String baseUrl = dto.getApi(); //处理服务指令图片 - if (!dto.getPreviewFileMd5().equals(currentDirective.getPreviewFileMd5())) { + if (StringUtils.isNotBlank(dto.getPreviewFileMd5()) && !dto.getPreviewFileMd5().equals(currentDirective.getPreviewFileMd5())) { String previewFile = dto.getPreviewFile(); if (StringUtils.isNotBlank(previewFile)) { String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(previewFile, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); @@ -167,7 +167,7 @@ public class DirectiveMQListener { } } //处理即时指令图标 - if (!dto.getImmediateFileMd5().equals(currentDirective.getImmediateFileMd5())) { + if (StringUtils.isNotBlank(dto.getImmediateFileMd5()) && !dto.getImmediateFileMd5().equals(currentDirective.getImmediateFileMd5())) { String immediateFile = dto.getImmediateFile(); if (StringUtils.isNotBlank(immediateFile)) { String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(immediateFile, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); @@ -193,7 +193,7 @@ public class DirectiveMQListener { } } //处理指令音频文件 - if (!dto.getMp3FileMd5().equals(currentDirective.getMp3FileMd5())) { + if (StringUtils.isNotBlank(dto.getMp3FileMd5()) && !dto.getMp3FileMd5().equals(currentDirective.getMp3FileMd5())) { String mp3File = dto.getMp3File(); if (StringUtils.isNotBlank(mp3File)) { String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(mp3File, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); @@ -219,7 +219,7 @@ public class DirectiveMQListener { } } //处理指令视频文件 - if (!dto.getMp4FileMd5().equals(currentDirective.getMp4FileMd5())) { + if (StringUtils.isNotBlank(dto.getMp4FileMd5()) && !dto.getMp4FileMd5().equals(currentDirective.getMp4FileMd5())) { String mp4File = dto.getMp4File(); if (StringUtils.isNotBlank(mp4File)) { String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(mp4File, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); @@ -859,7 +859,7 @@ public class DirectiveMQListener { } @DS("master") - public void handleCreateMedia2(DirectiveMQDto mqDto,String apiAddress) { + public void handleCreateMedia2(DirectiveMQDto mqDto, String apiAddress) { try { mqDto.getDirectiveList().stream().forEach(dto -> { //查询现有服务指令