111

src/main/java/com/fdkankan/scene/Interceptor/AfterReturningAspect.java

@@ -29,7 +29,6 @@ public class AfterReturningAspect {
             returning = "result"
     )
     public void afterReturningAdvice(SceneInfoVO result) throws Throwable {
-
         String num = result.getNum();
         SceneEditInfoScrb sceneEditInfoScrb = sceneEditInfoScrbService.getByNum(num);
         if(Objects.nonNull(sceneEditInfoScrb)){
@@ -41,6 +40,8 @@ public class AfterReturningAspect {
             scrbInfo.put("aiSetting", JSON.parseArray(sceneEditInfoScrb.getAiSetting()));
             //专题导航
             scrbInfo.put("navigation", JSON.parseArray(sceneEditInfoScrb.getNavigation()));
+
+            scrbInfo.put("hasLeaveWord", sceneEditInfoScrb.getHasLeaveWord());
         }
     }
 }

src/main/java/com/fdkankan/scene/controller/ScrbEditController.java

@@ -101,8 +101,8 @@ public class ScrbEditController extends BaseController {
      */
 //    @CheckPermit
     @PostMapping("/asr/save")
-    public ResultData asrSave(@RequestParam(value = "num") String num, Long id, @RequestParam(value = "file") MultipartFile file) throws Exception {
-        return scrbService.asrSave(num, id, file);
+    public ResultData asrSave(@RequestParam(value = "num") String num, Long id, @RequestParam(value = "name") String name, @RequestParam(value = "file") MultipartFile file) throws Exception {
+        return scrbService.asrSave(num, id, name, file);
     }
 
     /**

src/main/java/com/fdkankan/scene/dto/TextVoiceTransferDTO.java

@@ -18,4 +18,6 @@ public class TextVoiceTransferDTO extends BaseSceneParamVO {
 
     private String voicePath;
 
+    private  String name;
+
 }

src/main/java/com/fdkankan/scene/entity/SceneEditInfoScrb.java

@@ -56,5 +56,8 @@ public class SceneEditInfoScrb implements Serializable {
     @TableLogic(value = "A", delval = "I")
     private String recStatus;
 
+    @TableField("has_leave_word")
+    private Integer hasLeaveWord;
+
 
 }

src/main/java/com/fdkankan/scene/service/IScrbService.java

@@ -25,7 +25,7 @@ public interface IScrbService {
 
     ResultData ttsSave(TextVoiceTransferDTO dto) throws Exception;
 
-    ResultData asrSave(String num, Long id, MultipartFile file) throws Exception;
+    ResultData asrSave(String num, Long id, String name, MultipartFile file) throws Exception;
 
     void deleteTextVoiceTransfer(TextVoiceTransferDTO dto);
 

src/main/java/com/fdkankan/scene/service/impl/ScrbServiceImpl.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.CommonOperStatus;
+import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.CommonSuccessStatus;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
@@ -134,20 +135,23 @@ public class ScrbServiceImpl implements IScrbService {
             if(Objects.isNull(textVoiceTransfer)){
                 throw new BusinessException(ErrorCode.FAILURE_CODE_5012);
             }
+            textVoiceTransfer.setUpdateTime(new Date());
+            textVoiceTransfer.setName(dto.getName());
             if(!dto.getDocument().equals(textVoiceTransfer.getDocument())){
                 String taskId = ttsUtil.logTextToVoice(dto.getDocument(), dto.getVoiceType().longValue(), dto.getSpeed(), dto.getVolume());
                 textVoiceTransfer.setTaskId(taskId);
-                textVoiceTransferService.updateById(textVoiceTransfer);
             }
         }else{
             textVoiceTransfer = new TextVoiceTransfer();
             textVoiceTransfer.setNum(dto.getNum());
+            textVoiceTransfer.setName(dto.getName());
             textVoiceTransfer.setType("tts");
             textVoiceTransfer.setDocument(dto.getDocument());
             String taskId = ttsUtil.logTextToVoice(dto.getDocument(), dto.getVoiceType().longValue(), dto.getSpeed(), dto.getVolume());
             textVoiceTransfer.setTaskId(taskId);
             textVoiceTransferService.save(textVoiceTransfer);
         }
+        textVoiceTransferService.saveOrUpdate(textVoiceTransfer);
     }
 
     @Override
@@ -161,7 +165,7 @@ public class ScrbServiceImpl implements IScrbService {
             textVoiceTransfer = new TextVoiceTransfer();
             textVoiceTransfer.setNum(dto.getNum());
         }
-
+        textVoiceTransfer.setName(dto.getName());
         textVoiceTransfer.setDocument(dto.getDocument());
         textVoiceTransfer.setType("tts");
         if(StrUtil.isEmpty(dto.getVoicePath())){
@@ -177,7 +181,7 @@ public class ScrbServiceImpl implements IScrbService {
     }
 
     @Override
-    public ResultData asrSave(String num,  Long id, MultipartFile file) throws Exception {
+    public ResultData asrSave(String num,  Long id, String name, MultipartFile file) throws Exception {
 
         TextVoiceTransfer textVoiceTransfer = null;
         if(Objects.nonNull(id)) {
@@ -187,6 +191,7 @@ public class ScrbServiceImpl implements IScrbService {
             textVoiceTransfer = new TextVoiceTransfer();
             textVoiceTransfer.setNum(num);
         }
+        textVoiceTransfer.setName(name);
         String filename = file.getOriginalFilename();
         File localFile = FileUtil.createTempFile(UUID.randomUUID().toString(), "." + FileUtil.extName(filename), new File(String.format(ConstantFilePath.SCENE_USER_PATH_V4, num)), true);
         file.transferTo(localFile);
@@ -261,12 +266,18 @@ public class ScrbServiceImpl implements IScrbService {
         //生成留言json
         List<LeaveWord> list = leaveWordService.list(new LambdaQueryWrapper<LeaveWord>().eq(LeaveWord::getNum, param.getNum()).eq(LeaveWord::getStatus, CommonSuccessStatus.SUCCESS.code()));
         String leaveWordKey = String.format(FileYunPath.SCRB_PATH, param.getNum()) + "leaveWord.json";
+        Integer hasLeaveWord = CommonStatus.NO.code().intValue();
         if(CollUtil.isNotEmpty(list)){
             List<JSONObject> collect = list.stream().map(l -> JSON.parseObject(l.getContent())).collect(Collectors.toList());
             fYunFileService.uploadFile(JSON.toJSONString(collect).getBytes(StandardCharsets.UTF_8), leaveWordKey);
+            hasLeaveWord = CommonStatus.YES.code().intValue();
         }else{//没有留言直接删除
             fYunFileService.deleteFile(leaveWordKey);
         }
+        sceneEditInfoScrbService.update(
+                new LambdaUpdateWrapper<SceneEditInfoScrb>()
+                        .eq(SceneEditInfoScrb::getNum, param.getNum())
+                        .set(SceneEditInfoScrb::getHasLeaveWord, hasLeaveWord));
 
     }