顾问服务结束,逻辑处理
This commit is contained in:
@@ -3,6 +3,7 @@ package com.rj.controller;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.fasterxml.jackson.core.type.TypeReference;
|
import com.fasterxml.jackson.core.type.TypeReference;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import com.rj.common.AudioManagementConstants;
|
||||||
import com.rj.entity.*;
|
import com.rj.entity.*;
|
||||||
import com.rj.mapper.DeviceManagementMapper;
|
import com.rj.mapper.DeviceManagementMapper;
|
||||||
import com.rj.tenant.TenantContextHolder;
|
import com.rj.tenant.TenantContextHolder;
|
||||||
@@ -1804,7 +1805,7 @@ public class AudioFileController {
|
|||||||
newAudio.setTenantId(deviceManagement.getTenantId()); // 租户id
|
newAudio.setTenantId(deviceManagement.getTenantId()); // 租户id
|
||||||
newAudio.setDealershipName(deviceManagement.getDealershipName());
|
newAudio.setDealershipName(deviceManagement.getDealershipName());
|
||||||
newAudio.setDealershipId(deviceManagement.getDealershipId());
|
newAudio.setDealershipId(deviceManagement.getDealershipId());
|
||||||
newAudio.setServiceStatus("服务中");
|
newAudio.setServiceStatus(AudioManagementConstants.SERVICE_STATUS_IN_SERVICE);
|
||||||
newAudio.setCreateTime(TimeZoneUtils.now());
|
newAudio.setCreateTime(TimeZoneUtils.now());
|
||||||
newAudio.setUpdateTime(TimeZoneUtils.now());
|
newAudio.setUpdateTime(TimeZoneUtils.now());
|
||||||
|
|
||||||
|
|||||||
@@ -427,6 +427,44 @@ public class AudioManagementController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新录音信息
|
||||||
|
*/
|
||||||
|
@PostMapping("/finishServiceById")
|
||||||
|
@Operation(summary = "finishService", description = "finishService")
|
||||||
|
public ResponseEntity<Map<String, Object>> finishServiceById(
|
||||||
|
@Parameter(description = "录音信息", required = true)
|
||||||
|
@RequestBody AudioManagement audioManagement) {
|
||||||
|
Map<String, Object> 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删除录音
|
* 根据ID删除录音
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.rj.controller;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.rj.common.AudioManagementConstants;
|
||||||
import com.rj.entity.KnowledgeBase;
|
import com.rj.entity.KnowledgeBase;
|
||||||
import com.rj.entity.TrainingItem;
|
import com.rj.entity.TrainingItem;
|
||||||
import com.rj.entity.TrainingMain;
|
import com.rj.entity.TrainingMain;
|
||||||
@@ -381,7 +382,7 @@ public class TrainingItemController {
|
|||||||
}
|
}
|
||||||
TrainingMain trainingMain = new TrainingMain();
|
TrainingMain trainingMain = new TrainingMain();
|
||||||
trainingMain.setId(trainingItem.getParentId());
|
trainingMain.setId(trainingItem.getParentId());
|
||||||
trainingMain.setFinishStatus("finished");
|
trainingMain.setFinishStatus(AudioManagementConstants.SERVICE_STATUS_SERVICE_FINISH);
|
||||||
trainingMain.setEndTime( LocalDateTime.now());
|
trainingMain.setEndTime( LocalDateTime.now());
|
||||||
boolean success = trainingMainService.updateById(trainingMain);
|
boolean success = trainingMainService.updateById(trainingMain);
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.rj.controller;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.rj.common.AudioManagementConstants;
|
||||||
import com.rj.entity.TrainingMain;
|
import com.rj.entity.TrainingMain;
|
||||||
import com.rj.service.IKnowledgeBaseService;
|
import com.rj.service.IKnowledgeBaseService;
|
||||||
import com.rj.service.ITrainingMainService;
|
import com.rj.service.ITrainingMainService;
|
||||||
@@ -48,6 +49,7 @@ public class TrainingMainController {
|
|||||||
if (trainingMain.getId() == null || trainingMain.getId().trim().isEmpty()) {
|
if (trainingMain.getId() == null || trainingMain.getId().trim().isEmpty()) {
|
||||||
trainingMain.setId(UUID.randomUUID().toString());
|
trainingMain.setId(UUID.randomUUID().toString());
|
||||||
}
|
}
|
||||||
|
trainingMain.setFinishStatus(AudioManagementConstants.SERVICE_STATUS_IN_SERVICE);
|
||||||
// trainingMain.setCreateTime(LocalDateTime.now());
|
// trainingMain.setCreateTime(LocalDateTime.now());
|
||||||
boolean success = trainingMainService.save(trainingMain);
|
boolean success = trainingMainService.save(trainingMain);
|
||||||
if (success) {
|
if (success) {
|
||||||
@@ -109,7 +111,7 @@ public class TrainingMainController {
|
|||||||
@Parameter(description = "陪练标题(模糊查询)")
|
@Parameter(description = "陪练标题(模糊查询)")
|
||||||
@RequestParam(required = false) String title,
|
@RequestParam(required = false) String title,
|
||||||
@Parameter(description = "陪练的场景(模糊查询)")
|
@Parameter(description = "陪练的场景(模糊查询)")
|
||||||
@RequestParam(required = false) String scenario,
|
@RequestParam(required = false) String finishStatus,
|
||||||
@Parameter(description = "参与人姓名(模糊查询)")
|
@Parameter(description = "参与人姓名(模糊查询)")
|
||||||
@RequestParam(required = false) String participantName,
|
@RequestParam(required = false) String participantName,
|
||||||
@Parameter(description = "参与人电话(模糊查询)")
|
@Parameter(description = "参与人电话(模糊查询)")
|
||||||
@@ -120,14 +122,11 @@ public class TrainingMainController {
|
|||||||
LambdaQueryWrapper<TrainingMain> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<TrainingMain> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
|
||||||
// 添加查询条件
|
// 添加查询条件
|
||||||
if (tenantId != null && !tenantId.trim().isEmpty()) {
|
|
||||||
queryWrapper.eq(TrainingMain::getTenantId, tenantId);
|
|
||||||
}
|
|
||||||
if (title != null && !title.trim().isEmpty()) {
|
if (title != null && !title.trim().isEmpty()) {
|
||||||
queryWrapper.like(TrainingMain::getTitle, title);
|
queryWrapper.like(TrainingMain::getTitle, title);
|
||||||
}
|
}
|
||||||
if (scenario != null && !scenario.trim().isEmpty()) {
|
if (finishStatus != null && !finishStatus.trim().isEmpty()) {
|
||||||
queryWrapper.like(TrainingMain::getScenario, scenario);
|
queryWrapper.eq(TrainingMain::getFinishStatus, finishStatus);
|
||||||
}
|
}
|
||||||
if (participantName != null && !participantName.trim().isEmpty()) {
|
if (participantName != null && !participantName.trim().isEmpty()) {
|
||||||
queryWrapper.like(TrainingMain::getParticipantName, participantName);
|
queryWrapper.like(TrainingMain::getParticipantName, participantName);
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ public class AudioManagement implements Serializable {
|
|||||||
@TableField("upload_status")
|
@TableField("upload_status")
|
||||||
private String uploadStatus;
|
private String uploadStatus;
|
||||||
|
|
||||||
@Schema(description = "同步状态")
|
@Schema(description = "服务状态")
|
||||||
@TableField("service_status")
|
@TableField("service_status")
|
||||||
private String serviceStatus;
|
private String serviceStatus;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user