Merge branch 'hongdongbao'

src/main/java/com/cmeeting/controller/MeetingInfoController.java

@@ -92,10 +92,10 @@ public class MeetingInfoController {
     @PostMapping("/detail")
     public R detail(@RequestBody MeetingInfoVO vo) {
         RobotSecurityUser user = SecurityUtil.getUser();
+        MeetingInfo meetingInfo = meetingInfoService.getById(vo.getId());
+        BeanUtils.copyProperties(meetingInfo, vo);
         vo.setUserId(user.getId());
         vo.setApplicationId(permissionApplicationId);
-        MeetingInfo meetingInfo = meetingInfoService.getById(vo.getId());
-        BeanUtils.copyProperties(meetingInfo,vo);
         String recordXml = vo.getRecordXml();
         String recordContent = vo.getRecordContent();
         try {
@@ -107,13 +107,6 @@ public class MeetingInfoController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-//            try(InputStream is = minioUtils.getFile(recordXml)){
-//                byte[] bytes = IOUtils.toByteArray(is);
-//                String json = convertXmlToJSON(new String(bytes));
-//                vo.setRecordJson(json);
-//            }catch (Exception ex){
-//                e.printStackTrace();
-//            }
         }
         try {
             if(StringUtils.isNotEmpty(recordContent)){

src/main/java/com/cmeeting/service/impl/MeetingInfoServiceImpl.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cmeeting.ad.entity.RobotSecurityUser;
 import com.cmeeting.ad.util.SecurityUtil;
 import com.cmeeting.constant.RecordTemplateConstant;
+import com.cmeeting.exception.RobotBaseException;
 import com.cmeeting.log.service.ProcessLogService;
 import com.cmeeting.mapper.primary.MeetingInfoMapper;
 import com.cmeeting.mapper.primary.MeetingRecordTemplateMapper;
@@ -141,6 +142,10 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
 
     @Override
     public boolean regenerateXml(MeetingInfoVO vo) {
+        MeetingRecordTemplate meetingRecordTemplate = meetingRecordTemplateMapper.selectById(vo.getTemplateId());
+        if (meetingRecordTemplate == null) {
+            throw new RobotBaseException("param error! template is not exit.");
+        }
         Client client = new Client.Builder()
                 .withAppId(tencentAppId).withSdkId(tencentSdkId)
                 .withSecret(tencentSecretId,tencentSecretKey)
@@ -230,7 +235,6 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
                 throw new RuntimeException("获取的转录文本为空，跳过纪要生成");
             }
             //获取系统模板
-            MeetingRecordTemplate meetingRecordTemplate = meetingRecordTemplateMapper.selectById(2);
             String processedResult = processWithClaude(recordTextBuffer.toString(),meetingDate,meetingRecordTemplate.getPrompt(),meetingId,subMeetingId);
             saveResult(processedResult, recordTextBuffer.toString().getBytes(StandardCharsets.UTF_8), meetingInfo,  meetingRecordTemplate);
             meetingInfoMapper.update(null,