From f0957485e0e4494320baccdeaa1dd39f7cf71a38 Mon Sep 17 00:00:00 2001 From: zhonghua1 Date: Thu, 1 Jan 2026 05:36:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=BE=E9=97=AE=E6=9C=8D=E5=8A=A1=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=EF=BC=8C=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rj/controller/AudioFileController.java | 3 +- .../controller/AudioManagementController.java | 38 +++++++++++++++++++ .../rj/controller/TrainingItemController.java | 3 +- .../rj/controller/TrainingMainController.java | 11 +++--- .../java/com/rj/entity/AudioManagement.java | 2 +- 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/rj/controller/AudioFileController.java b/src/main/java/com/rj/controller/AudioFileController.java index 27db0ed..0610073 100644 --- a/src/main/java/com/rj/controller/AudioFileController.java +++ b/src/main/java/com/rj/controller/AudioFileController.java @@ -3,6 +3,7 @@ package com.rj.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import com.rj.common.AudioManagementConstants; import com.rj.entity.*; import com.rj.mapper.DeviceManagementMapper; import com.rj.tenant.TenantContextHolder; @@ -1804,7 +1805,7 @@ public class AudioFileController { newAudio.setTenantId(deviceManagement.getTenantId()); // 租户id newAudio.setDealershipName(deviceManagement.getDealershipName()); newAudio.setDealershipId(deviceManagement.getDealershipId()); - newAudio.setServiceStatus("服务中"); + newAudio.setServiceStatus(AudioManagementConstants.SERVICE_STATUS_IN_SERVICE); newAudio.setCreateTime(TimeZoneUtils.now()); newAudio.setUpdateTime(TimeZoneUtils.now()); diff --git a/src/main/java/com/rj/controller/AudioManagementController.java b/src/main/java/com/rj/controller/AudioManagementController.java index bc903e6..84f1ffc 100644 --- a/src/main/java/com/rj/controller/AudioManagementController.java +++ b/src/main/java/com/rj/controller/AudioManagementController.java @@ -427,6 +427,44 @@ public class AudioManagementController { } } + /** + * 更新录音信息 + */ + @PostMapping("/finishServiceById") + @Operation(summary = "finishService", description = "finishService") + public ResponseEntity> finishServiceById( + @Parameter(description = "录音信息", required = true) + @RequestBody AudioManagement audioManagement) { + Map result = new HashMap<>(); + try { + if (audioManagement.getId() == null || audioManagement.getId().trim().isEmpty()) { + result.put("success", false); + result.put("message", "录音ID不能为空"); + return ResponseEntity.badRequest().body(result); + } + AudioManagement audio = new AudioManagement(); + audio.setUpdateTime(LocalDateTime.now()); + audio.setServiceStatus(AudioManagementConstants.SERVICE_STATUS_SERVICE_FINISH); + audio.setId(audioManagement.getId()); + boolean success = audioManagementService.updateById(audio); + + if (success) { + result.put("success", true); + result.put("message", "录音finishServiceById更新成功"); + result.put("data", audioManagement); + return ResponseEntity.ok(result); + } else { + result.put("success", false); + result.put("message", "录音finishServiceById更新失败"); + return ResponseEntity.badRequest().body(result); + } + } catch (Exception e) { + result.put("success", false); + result.put("message", "更新异常：" + e.getMessage()); + return ResponseEntity.internalServerError().body(result); + } + } + /** * 根据ID删除录音 */ diff --git a/src/main/java/com/rj/controller/TrainingItemController.java b/src/main/java/com/rj/controller/TrainingItemController.java index 174d4de..4e29b2e 100644 --- a/src/main/java/com/rj/controller/TrainingItemController.java +++ b/src/main/java/com/rj/controller/TrainingItemController.java @@ -2,6 +2,7 @@ package com.rj.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.rj.common.AudioManagementConstants; import com.rj.entity.KnowledgeBase; import com.rj.entity.TrainingItem; import com.rj.entity.TrainingMain; @@ -381,7 +382,7 @@ public class TrainingItemController { } TrainingMain trainingMain = new TrainingMain(); trainingMain.setId(trainingItem.getParentId()); - trainingMain.setFinishStatus("finished"); + trainingMain.setFinishStatus(AudioManagementConstants.SERVICE_STATUS_SERVICE_FINISH); trainingMain.setEndTime( LocalDateTime.now()); boolean success = trainingMainService.updateById(trainingMain); diff --git a/src/main/java/com/rj/controller/TrainingMainController.java b/src/main/java/com/rj/controller/TrainingMainController.java index 22698d5..f0d32a8 100644 --- a/src/main/java/com/rj/controller/TrainingMainController.java +++ b/src/main/java/com/rj/controller/TrainingMainController.java @@ -2,6 +2,7 @@ package com.rj.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.rj.common.AudioManagementConstants; import com.rj.entity.TrainingMain; import com.rj.service.IKnowledgeBaseService; import com.rj.service.ITrainingMainService; @@ -48,6 +49,7 @@ public class TrainingMainController { if (trainingMain.getId() == null || trainingMain.getId().trim().isEmpty()) { trainingMain.setId(UUID.randomUUID().toString()); } + trainingMain.setFinishStatus(AudioManagementConstants.SERVICE_STATUS_IN_SERVICE); // trainingMain.setCreateTime(LocalDateTime.now()); boolean success = trainingMainService.save(trainingMain); if (success) { @@ -109,7 +111,7 @@ public class TrainingMainController { @Parameter(description = "陪练标题（模糊查询）") @RequestParam(required = false) String title, @Parameter(description = "陪练的场景（模糊查询）") - @RequestParam(required = false) String scenario, + @RequestParam(required = false) String finishStatus, @Parameter(description = "参与人姓名（模糊查询）") @RequestParam(required = false) String participantName, @Parameter(description = "参与人电话（模糊查询）") @@ -120,14 +122,11 @@ public class TrainingMainController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); // 添加查询条件 - if (tenantId != null && !tenantId.trim().isEmpty()) { - queryWrapper.eq(TrainingMain::getTenantId, tenantId); - } if (title != null && !title.trim().isEmpty()) { queryWrapper.like(TrainingMain::getTitle, title); } - if (scenario != null && !scenario.trim().isEmpty()) { - queryWrapper.like(TrainingMain::getScenario, scenario); + if (finishStatus != null && !finishStatus.trim().isEmpty()) { + queryWrapper.eq(TrainingMain::getFinishStatus, finishStatus); } if (participantName != null && !participantName.trim().isEmpty()) { queryWrapper.like(TrainingMain::getParticipantName, participantName); diff --git a/src/main/java/com/rj/entity/AudioManagement.java b/src/main/java/com/rj/entity/AudioManagement.java index 1823dc7..bdfd422 100644 --- a/src/main/java/com/rj/entity/AudioManagement.java +++ b/src/main/java/com/rj/entity/AudioManagement.java @@ -107,7 +107,7 @@ public class AudioManagement implements Serializable { @TableField("upload_status") private String uploadStatus; - @Schema(description = "同步状态") + @Schema(description = "服务状态") @TableField("service_status") private String serviceStatus;