111

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

@@ -36,7 +36,7 @@ public class AfterReturningAspect {
             Map<String,Object> scrbInfo = new HashMap<>();
             result.setScrbInfo(scrbInfo);
             //基础设置
-            scrbInfo.put("baseSetting", JSON.parseArray(sceneEditInfoScrb.getBaseSetting()));
+            scrbInfo.put("baseSetting", JSON.parseObject(sceneEditInfoScrb.getBaseSetting()));
             //数字人
             scrbInfo.put("aiSetting", JSON.parseArray(sceneEditInfoScrb.getAiSetting()));
             //专题导航

src/main/java/com/fdkankan/scene/constant/FileYunPath.java

@@ -6,7 +6,7 @@ public class FileYunPath extends UploadFilePath {
 
     public final static String TEMP_PATH = "temp/%s/";
 
-    public final static String SCRB_EDIT_PATH = EDIT_PATH + "scrb/";
+    public final static String SCRB_PATH = VIEW_PATH + "scrb/";
 
 
 }

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

@@ -9,7 +9,7 @@ import java.util.List;
 @Data
 public class ScrbSaveDTO extends BaseSceneParamVO {
 
-    private List<JSONObject> baseSetting;
+    private JSONObject baseSetting;
 
     private List<JSONObject> aiSetting;
 

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

@@ -8,6 +8,7 @@ import com.fdkankan.scene.entity.TextVoiceTransfer;
 import com.fdkankan.web.response.ResultData;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 public interface IScrbService {
@@ -28,7 +29,7 @@ public interface IScrbService {
 
     void deleteTextVoiceTransfer(TextVoiceTransferDTO dto);
 
-    void save(ScrbSaveDTO param);
+    void save(ScrbSaveDTO param) throws IOException;
 
 
 }

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

@@ -14,10 +14,12 @@ import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
+import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.scene.constant.FileYunPath;
 import com.fdkankan.scene.dto.AsrCallbackDTO;
 import com.fdkankan.scene.dto.ScrbSaveDTO;
 import com.fdkankan.scene.dto.TextVoiceTransferDTO;
+import com.fdkankan.scene.entity.LeaveWord;
 import com.fdkankan.scene.entity.SceneEditInfoScrb;
 import com.fdkankan.scene.entity.TextVoiceTransfer;
 import com.fdkankan.scene.service.*;
@@ -31,10 +33,13 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -55,6 +60,8 @@ public class ScrbServiceImpl implements IScrbService {
 
     @Autowired
     private ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private ILeaveWordService leaveWordService;
 
 
     @Override
@@ -88,7 +95,7 @@ public class ScrbServiceImpl implements IScrbService {
             String localVoicePath = String.format(ConstantFilePath.SCENE_USER_PATH_V4, textVoiceTransfer.getNum()) + taskId + "." + "mp3";
             FileUtil.mkParentDirs(localVoicePath);
             HttpUtil.downloadFile(url, localVoicePath);
-            String obsPath = String.format(FileYunPath.SCRB_EDIT_PATH, textVoiceTransfer.getNum()) + FileUtil.getName(localVoicePath);
+            String obsPath = String.format(FileYunPath.SCRB_PATH, textVoiceTransfer.getNum()) + FileUtil.getName(localVoicePath);
             fYunFileService.uploadFile(localVoicePath, obsPath);
             textVoiceTransfer.setVoicePath(obsPath);
             textVoiceTransfer.setResCode(status);
@@ -183,7 +190,7 @@ public class ScrbServiceImpl implements IScrbService {
         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);
-        String ossPath = String.format(FileYunPath.SCRB_EDIT_PATH, num) + localFile.getName();
+        String ossPath = String.format(FileYunPath.SCRB_PATH, num) + localFile.getName();
         String url = fYunFileService.uploadFile(localFile.getAbsolutePath(), ossPath);
         String taskId = asrUtil.voiceToText(url);
         textVoiceTransfer.setTaskId(taskId);
@@ -211,7 +218,7 @@ public class ScrbServiceImpl implements IScrbService {
     }
 
     @Override
-    public void save(ScrbSaveDTO param) {
+    public void save(ScrbSaveDTO param) throws IOException {
         if(CollUtil.isNotEmpty(param.getBaseSetting())){
             sceneEditInfoScrbService.update(
                     new LambdaUpdateWrapper<SceneEditInfoScrb>()
@@ -242,6 +249,17 @@ public class ScrbServiceImpl implements IScrbService {
                             .eq(SceneEditInfoScrb::getNum, param.getNum())
                             .set(SceneEditInfoScrb::getNavigation, null));
         }
+
+        //生成留言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";
+        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);
+        }else{//没有留言直接删除
+            fYunFileService.deleteFile(leaveWordKey);
+        }
+
     }
 
 }