yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务指令bug修复

This commit is contained in:
1378012178@qq.com 2025-08-06 16:01:06 +08:00
parent fc04239a72
commit 4996e593e3
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java
View File

@ -136,14 +136,14 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
} }
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>(); Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR // 自定义多选的查询规则为：LIKE_WITH_OR
customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("categoryId", QueryRuleEnum.EQ);
customeRuleMap.put("typeId", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("typeId", QueryRuleEnum.EQ);
customeRuleMap.put("instructionTagId", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("instructionTagId", QueryRuleEnum.EQ);
customeRuleMap.put("izReimbursement", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("izReimbursement", QueryRuleEnum.EQ);
customeRuleMap.put("izPreferential", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("izPreferential", QueryRuleEnum.EQ);
customeRuleMap.put("chargingFrequency", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("chargingFrequency", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("cycleType", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("cycleType", QueryRuleEnum.EQ);
customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("izEnabled", QueryRuleEnum.EQ);
QueryWrapper<ConfigServiceDirective> queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); QueryWrapper<ConfigServiceDirective> queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap);
queryWrapper.select("id"); queryWrapper.select("id");
//如果有服务指令需要提前查询下对应的服务指令id //如果有服务指令需要提前查询下对应的服务指令id

10
nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java
View File

@ -141,7 +141,7 @@ public class DirectiveMQListener {
String baseUrl = dto.getApi(); String baseUrl = dto.getApi();
//处理服务指令图片 //处理服务指令图片
if (!dto.getPreviewFileMd5().equals(currentDirective.getPreviewFileMd5())) { if (StringUtils.isNotBlank(dto.getPreviewFileMd5()) && !dto.getPreviewFileMd5().equals(currentDirective.getPreviewFileMd5())) {
String previewFile = dto.getPreviewFile(); String previewFile = dto.getPreviewFile();
if (StringUtils.isNotBlank(previewFile)) { if (StringUtils.isNotBlank(previewFile)) {
String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(previewFile, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); 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(); String immediateFile = dto.getImmediateFile();
if (StringUtils.isNotBlank(immediateFile)) { if (StringUtils.isNotBlank(immediateFile)) {
String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(immediateFile, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); 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(); String mp3File = dto.getMp3File();
if (StringUtils.isNotBlank(mp3File)) { if (StringUtils.isNotBlank(mp3File)) {
String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(mp3File, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); 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(); String mp4File = dto.getMp4File();
if (StringUtils.isNotBlank(mp4File)) { if (StringUtils.isNotBlank(mp4File)) {
String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(mp4File, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey(); 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") @DS("master")
public void handleCreateMedia2(DirectiveMQDto mqDto,String apiAddress) { public void handleCreateMedia2(DirectiveMQDto mqDto, String apiAddress) {
try { try {
mqDto.getDirectiveList().stream().forEach(dto -> { mqDto.getDirectiveList().stream().forEach(dto -> {
//查询现有服务指令 //查询现有服务指令