dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug2

Browse Source
This commit is contained in:
chenyouting
2026-04-01 17:42:14 +08:00
parent 539caa4b5f
commit 5813425be9
9 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java
View File

@ -131,8 +131,8 @@ public class AppVideoController extends BaseController {
* 删除语音文件
*/
@GetMapping("/deleteAudioFile")
public R<Void> deleteAudioFile(Long fileId,Long deviceId) {
return audioProcessService.deleteAudioFile(fileId,deviceId);
public R<Void> deleteAudioFile(Long id) {
return audioProcessService.deleteAudioFile(id);
}
/**

2
fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileRenameDto.java
View File

@ -6,6 +6,8 @@ import org.springframework.web.multipart.MultipartFile;
@Data
public class AppFileRenameDto {
private Long id;
/**
* 文件id
*/

34
fys-admin/src/main/java/com/fuyuanshen/app/service/AudioProcessService.java
View File

@ -414,19 +414,18 @@ public class AudioProcessService {
}
private Long getUserId(String source,Long deviceId){
Long userId = null;
if("app".equals( source)){
userId = AppLoginHelper.getUserId();
return AppLoginHelper.getUserId();
} else if ("web".equals( source)){
AppDeviceBindRecordBo appDeviceBindRecordBo = new AppDeviceBindRecordBo();
appDeviceBindRecordBo.setDeviceId(deviceId);
appDeviceBindRecordBo.setCommunicationMode(0);
List<AppDeviceBindRecordVo> appDeviceBindRecordVos = appDeviceBindRecordService.queryList(appDeviceBindRecordBo);
if (appDeviceBindRecordVos != null && !appDeviceBindRecordVos.isEmpty()){
userId = appDeviceBindRecordVos.get(0).getBindingUserId();
}
// AppDeviceBindRecordBo appDeviceBindRecordBo = new AppDeviceBindRecordBo();
// appDeviceBindRecordBo.setDeviceId(deviceId);
//// appDeviceBindRecordBo.setCommunicationMode(0);
// List<AppDeviceBindRecordVo> appDeviceBindRecordVos = appDeviceBindRecordService.queryList(appDeviceBindRecordBo);
// if (appDeviceBindRecordVos != null && !appDeviceBindRecordVos.isEmpty()){
// userId = appDeviceBindRecordVos.get(0).getBindingUserId();
// }
}
return userId;
return 0L;
}
/**
* 校验音频文件格式
@ -572,26 +571,29 @@ public class AudioProcessService {
if(deviceId == null){
return null;
}
Long userId = getUserId(source, deviceId);
AppBusinessFileBo bo = new AppBusinessFileBo();
bo.setBusinessId(deviceId);
bo.setCreateBy(userId);
bo.setFileType(3L);
if("web".equals(source)){
bo.setCreateBy(null);
}else{
bo.setCreateBy(userId);
}
return appBusinessFileService.queryAppFileList(bo);
}
public R<Void> deleteAudioFile(Long fileId,Long deviceId) {
public R<Void> deleteAudioFile(Long id) {
UpdateWrapper<AppBusinessFile> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("file_id",fileId);
updateWrapper.eq("business_id",deviceId);
updateWrapper.eq("id",id);
appBusinessFileMapper.delete(updateWrapper);
return R.ok();
}
public R<Void> renameAudioFile(AppFileRenameDto bo) {
UpdateWrapper<AppBusinessFile> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("file_id",bo.getFileId());
updateWrapper.eq("business_id",bo.getDeviceId());
updateWrapper.eq("id",bo.getId());
updateWrapper.set("re_name",bo.getFileName());
appBusinessFileMapper.update(updateWrapper);
return R.ok();

4
fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WebVideoController.java
View File

@ -123,8 +123,8 @@ public class WebVideoController extends BaseController {
* 删除语音文件
*/
@GetMapping("/deleteAudioFile")
public R<Void> deleteAudioFile(Long fileId,Long deviceId) {
return audioProcessService.deleteAudioFile(fileId,deviceId);
public R<Void> deleteAudioFile(Long id) {
return audioProcessService.deleteAudioFile(id);
}
/**

1
fys-admin/src/main/java/com/fuyuanshen/web/controller/device/bjq/WebDeviceHBY100JController.java
View File

@ -38,6 +38,7 @@ public class WebDeviceHBY100JController extends BaseController {
*/
@PostMapping("/updateVoice")
public R<Void> updateVoice(@RequestBody HBY100JUpdateVoiceDto dto) {
dto.setCommunicationMode(0);
deviceHBY100JBizService.updateVoice(dto);
return R.ok();
}

2
fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceHBY100JBizService.java
View File

@ -166,7 +166,7 @@ public class DeviceHBY100JBizService {
if(StringUtils.isNotBlank(voicePlayStatus)){
FuncType6VoicePlayRequest funcType6VoicePlayRequest = JSONObject.parseObject(voicePlayStatus, FuncType6VoicePlayRequest.class);
if(funcType6VoicePlayRequest.getData() != null){
vo.setVolume(funcType6VoicePlayRequest.getData().getVoiceBroadcast());
vo.setVoiceBroadcast(funcType6VoicePlayRequest.getData().getVoiceBroadcast());
}
}

1
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppBusinessFileMapper.java
View File

@ -17,4 +17,5 @@ import java.util.List;
public interface AppBusinessFileMapper extends BaseMapperPlus<AppBusinessFile, AppBusinessFileVo> {
List<AppFileVo> queryAppFileList(AppBusinessFileBo bo);
}

4
fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml
View File

@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fileType != null">
and a.file_type = #{fileType}
</if>
<if test="createBy != null">
and a.create_by = #{createBy}
<if test="createBy != null ">
and (a.create_by = #{createBy} or a.update_by = 0)
</if>
order by a.create_time desc
</select>

10
fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOssServiceImpl.java
View File

@ -213,11 +213,11 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
try {
byte[] imageData = file.getBytes();
// 检查是否需要压缩
if (ImageCompressUtil.needCompress(imageData)) {
// 压缩到100KB以内
imageData = ImageCompressUtil.compressImage(imageData);
// 使用压缩后的数据
}
// if (ImageCompressUtil.needCompress(imageData)) {
// // 压缩到100KB以内
// imageData = ImageCompressUtil.compressImage(imageData);
// // 使用压缩后的数据
// }
uploadResult = storage.uploadSuffix(imageData, suffix, file.getContentType());
} catch (IOException e) {
throw new ServiceException(e.getMessage());