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 6b12f96..013db5f 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 @@ -85,9 +85,9 @@ public class ConfigServiceDirective implements Serializable { @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") private java.lang.Integer sort; - /**服务说明*/ - @Excel(name = "服务说明", width = 15) - @ApiModelProperty(value = "服务说明") + /**服务描述*/ + @Excel(name = "服务描述", width = 15) + @ApiModelProperty(value = "服务描述") private java.lang.String serviceContent; /**服务时长(分钟)*/ @Excel(name = "服务时长(分钟)", width = 15) @@ -122,28 +122,28 @@ public class ConfigServiceDirective implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**语音文件*/ - @ApiModelProperty(value = "语音文件") + /**指令音频文件*/ + @ApiModelProperty(value = "指令音频文件") private java.lang.String mp3File; //语音文件是否变更 @TableField(exist = false) private boolean mp3FileChanged; - /**视频文件*/ - @ApiModelProperty(value = "视频文件") + /**指令视频文件*/ + @ApiModelProperty(value = "指令视频文件") private java.lang.String mp4File; //视频文件是否变更 @TableField(exist = false) private boolean mp4FileChanged; - /**预览图片*/ - @ApiModelProperty(value = "预览图片") + /**服务指令图片*/ + @ApiModelProperty(value = "服务指令图片") private java.lang.String previewFile; - //预览图片是否变更 + //服务指令图片是否变更 @TableField(exist = false) private boolean previewFileChanged; - /**即时指令图片*/ - @ApiModelProperty(value = "即时指令图片") + /**即时指令图标*/ + @ApiModelProperty(value = "即时指令图标") private java.lang.String immediateFile; - //即时指令图片是否变更 + //即时指令图标是否变更 @TableField(exist = false) private boolean immediateFileChanged; 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 00f7a4b..ea55f42 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 @@ -11,10 +11,14 @@ import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper; import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; import com.nu.modules.sysconfig.ISysConfigApi; import com.nu.utils.RabbitMQUtil; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.system.api.ISysBaseAPI; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.File; +import java.nio.file.Files; import java.util.List; import java.util.stream.Collectors; @@ -27,6 +31,9 @@ import java.util.stream.Collectors; @Service public class ConfigServiceDirectiveServiceImpl extends ServiceImpl implements IConfigServiceDirectiveService { + @Value(value = "${jeecg.path.upload}") + private String uploadpath; + @Autowired private ISysConfigApi sysConfigApi; @Autowired @@ -227,7 +234,92 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl