From 2e03763f871667d517134e5d429a45fb457b7e60 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 11 Jul 2025 15:42:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=88=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigServiceDirectiveController.java | 21 ++++--- .../entity/ConfigServiceDirective.java | 34 +++++------ .../IConfigServiceDirectiveService.java | 12 ++-- .../ConfigServiceDirectiveServiceImpl.java | 61 +++---------------- .../src/main/resources/application-dev.yml | 5 +- .../src/main/resources/application-uat.yml | 2 - 6 files changed, 44 insertions(+), 91 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 97f894a..ed1b15a 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 @@ -38,7 +38,7 @@ import java.util.stream.Collectors; */ @Api(tags = "服务指令") @RestController -@RequestMapping("/services/serviceDirective/configServiceDirective") +@RequestMapping("/services/serviceDirective") @Slf4j public class ConfigServiceDirectiveController extends JeecgController { @Autowired @@ -78,18 +78,18 @@ public class ConfigServiceDirectiveController extends JeecgController page = new Page(pageNo, pageSize); @@ -109,8 +109,9 @@ public class ConfigServiceDirectiveController extends JeecgController add(@RequestBody ConfigServiceDirective configServiceDirective) { - //处理媒体资源 - configServiceDirectiveService.handleMedia(configServiceDirective); + //处理媒体资源（放在保存方法之前） + configServiceDirectiveService.handleMediaFile(configServiceDirective); + log.info("服务指令保存时，pre:{},immedia:{},mp3:{},mp4:{}",configServiceDirective.getPreviewFile(),configServiceDirective.getImmediateFile(),configServiceDirective.getMp3File(),configServiceDirective.getMp4File()); configServiceDirectiveService.save(configServiceDirective); if (StringUtils.isNotBlank(configServiceDirective.getBodyTags())) { configServiceDirectiveService.saveBodyTags(configServiceDirective); @@ -123,7 +124,6 @@ public class ConfigServiceDirectiveController extends JeecgController edit(@RequestBody ConfigServiceDirective configServiceDirective) { - //处理媒体资源 - configServiceDirectiveService.handleMedia(configServiceDirective); + //处理媒体资源（放在保存方法之前） + configServiceDirectiveService.handleMediaFile(configServiceDirective); + log.info("服务指令保存时，pre:{},immedia:{},mp3:{},mp4:{}",configServiceDirective.getPreviewFile(),configServiceDirective.getImmediateFile(),configServiceDirective.getMp3File(),configServiceDirective.getMp4File()); configServiceDirectiveService.updateById(configServiceDirective); if (StringUtils.isNotBlank(configServiceDirective.getBodyTags())) { configServiceDirectiveService.saveBodyTags(configServiceDirective); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java index 71f9423..6b12f96 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java @@ -128,36 +128,24 @@ public class ConfigServiceDirective implements Serializable { //语音文件是否变更 @TableField(exist = false) private boolean mp3FileChanged; - //语音文件路径 - @TableField(exist = false) - private java.lang.String mp3FileMedia; /**视频文件*/ @ApiModelProperty(value = "视频文件") private java.lang.String mp4File; //视频文件是否变更 @TableField(exist = false) private boolean mp4FileChanged; - //视频文件路径 - @TableField(exist = false) - private java.lang.String mp4FileMedia; /**预览图片*/ @ApiModelProperty(value = "预览图片") private java.lang.String previewFile; //预览图片是否变更 @TableField(exist = false) private boolean previewFileChanged; - //预览图片路径 - @TableField(exist = false) - private java.lang.String previewFileMedia; /**即时指令图片*/ @ApiModelProperty(value = "即时指令图片") private java.lang.String immediateFile; //即时指令图片是否变更 @TableField(exist = false) private boolean immediateFileChanged; - //即时指令图片路径 - @TableField(exist = false) - private java.lang.String immediateFileMedia; //合并单元格用：类别合并的行数 @TableField(exist = false) @@ -174,12 +162,6 @@ public class ConfigServiceDirective implements Serializable { //情绪标签id,id,id @TableField(exist = false) private String emotionTags; - @TableField(exist = false) - //服务类别名称 - private String categoryName; - //服务类型名称 - @TableField(exist = false) - private String typeName; //体型标签 @@ -195,4 +177,20 @@ public class ConfigServiceDirective implements Serializable { //情绪标签字符串 @TableField(exist = false) private String emotionTagsName; + + //分类标签中文名称 + @TableField(exist = false) + private String instructionName; + //服务类别中文名称 + @TableField(exist = false) + private String categoryName; + //服务类型中文名称 + @TableField(exist = false) + private String typeName; + //周期类型中文名称 + @TableField(exist = false) + private String cycleTypeName; + //媒体资源存储路径名 + @TableField(exist = false) + private String mediaFileSavePath; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java index ed47e8c..6e0aed9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java @@ -10,35 +10,39 @@ import java.util.List; /** * @Description: 服务指令 * @Author: 张明远 - * @Date: 2025-03-13 + * @Date: 2025-03-13 * @Version: V1.0 */ public interface IConfigServiceDirectiveService extends IService { void merge(List records); - List pageList(ConfigServiceDirective configServiceDirective,IPage list); + List pageList(ConfigServiceDirective configServiceDirective, IPage list); /** * 存储体型标签数据 + * * @param configServiceDirective */ void saveBodyTags(ConfigServiceDirective configServiceDirective); /** * 存储情绪标签数据 + * * @param configServiceDirective */ void saveEmotionTags(ConfigServiceDirective configServiceDirective); /** * 移除改服务指令下体型标签 + * * @param configServiceDirective */ void removeBodyTags(ConfigServiceDirective configServiceDirective); /** * 移除改服务指令下情绪标签 + * * @param configServiceDirective */ void removeEmotionTags(ConfigServiceDirective configServiceDirective); @@ -53,7 +57,5 @@ public interface IConfigServiceDirectiveService extends IService directives); - void handleMedia(ConfigServiceDirective configServiceDirective); - -// List selectMediaList(String dataSourceCode, List idList); + void handleMediaFile(ConfigServiceDirective configServiceDirective); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index 8c16ce9..00f7a4b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -1,6 +1,5 @@ package com.nu.modules.servicedirective.service.impl; -import cn.hutool.json.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,13 +14,9 @@ import com.nu.utils.RabbitMQUtil; import org.jeecg.common.system.api.ISysBaseAPI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; import java.util.List; -import java.util.Map; -import java.util.Objects; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Description: 服务指令 @@ -32,8 +27,6 @@ import java.util.stream.Stream; @Service public class ConfigServiceDirectiveServiceImpl extends ServiceImpl implements IConfigServiceDirectiveService { -// @Autowired -// private IMediaManageApi mediaManageApi; @Autowired private ISysConfigApi sysConfigApi; @Autowired @@ -56,23 +49,6 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl emotionTagList = record.getEmotionTagList(); record.setEmotionTags(emotionTagList.stream().map(DirectiveEmotionTag::getId).collect(Collectors.joining(","))); }); - //处理媒体资源转换 - { - List meidsIds = list.stream().flatMap(directive -> Stream.of(directive.getMp3File(), directive.getMp4File(), directive.getPreviewFile(), directive.getImmediateFile())).filter(Objects::nonNull).distinct().collect(Collectors.toList()); - -// if (!CollectionUtils.isEmpty(meidsIds)) { -// List mediaObjs = mediaManageApi.queryByIds(meidsIds); -// -// Map idToFilePathMap = mediaObjs.stream().collect(Collectors.toMap(media -> media.getStr("id"), media -> media.getStr("filePath"))); -// -// list.stream().forEach(record -> { -// record.setPreviewFileMedia(idToFilePathMap.get(record.getPreviewFile())); -// record.setImmediateFileMedia(idToFilePathMap.get(record.getImmediateFile())); -// record.setMp3FileMedia(idToFilePathMap.get(record.getMp3File())); -// record.setMp4FileMedia(idToFilePathMap.get(record.getMp4File())); -// }); -// } - } } //处理单元格合并所需数据 merge(list); @@ -242,35 +218,16 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl params = Maps.newHashMap(); -// params.put("sysFunc", "directive"); -// if (configServiceDirective.isImmediateFileChanged()) { -// params.put("fileName", configServiceDirective.getDirectiveName() + "预览图片"); -// params.put("descr", "服务指令用户上传图片：" + configServiceDirective.getDirectiveName() + "预览图片"); -// configServiceDirective.setImmediateFile((mediaManageApi.saveByPath(configServiceDirective.getImmediateFileMedia(), params))); -// } -// if (configServiceDirective.isPreviewFileChanged()) { -// params.put("fileName", configServiceDirective.getDirectiveName() + "即时指令图片"); -// params.put("descr", "服务指令用户上传图片：" + configServiceDirective.getDirectiveName() + "即时指令图片"); -// configServiceDirective.setPreviewFile(mediaManageApi.saveByPath(configServiceDirective.getPreviewFileMedia(), params)); -// } -// if (configServiceDirective.isMp3FileChanged()) { -// params.put("fileName", configServiceDirective.getDirectiveName() + "音频文件"); -// params.put("descr", "服务指令用户上传音频：" + configServiceDirective.getDirectiveName() + "音频文件"); -// configServiceDirective.setMp3File(mediaManageApi.saveByPath(configServiceDirective.getMp3FileMedia(), params)); -// } -// if (configServiceDirective.isMp4FileChanged()) { -// params.put("fileName", configServiceDirective.getDirectiveName() + "视频文件"); -// params.put("descr", "服务指令用户上传视频：" + configServiceDirective.getDirectiveName() + "视频文件"); -// configServiceDirective.setMp4File(mediaManageApi.saveByPath(configServiceDirective.getMp4FileMedia(), params)); -// } + public void handleMediaFile(ConfigServiceDirective configServiceDirective) { + } -// @Override -// public List selectMediaList(String dataSourceCode, List idList) { -// return mediaManageApi.selectByDirectiveIds(dataSourceCode, idList); -// } - } diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml index 3802166..c774979 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml @@ -205,7 +205,7 @@ spring: password: #rabbitmq 配置 rabbitmq: - host: 192.168.2.199 + host: 192.168.2.1991 prot: 5672 username: hldy password: hldy @@ -254,13 +254,10 @@ jeecg: pc: http://localhost:3100 app: http://localhost:8051 path: - #服务指令上传目录 - directivepath: /cache/nu/opt/upFiles/directive #文件上传根目录 设置 upload: /cache/ope/opt/upFiles #webapp文件路径 webapp: /cache/ope/opt/webapp - webapp1: /abc shiro: excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml index 9bd6ef7..17a5e78 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml @@ -253,8 +253,6 @@ jeecg: pc: http://localhost:3100 app: http://localhost:8051 path: - #服务指令上传目录 - directivepath: /opt/upFiles/directive #文件上传根目录 设置 upload: /opt/ope/upFiles #webapp文件路径