1、添加统计会议纪要推送数据

2、修改获取会议纪要和转写文件接口的解密逻辑

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

@@ -96,7 +96,10 @@ public class MeetingInfoController {
         try {
             if(StringUtils.isNotEmpty(recordXml)){
                 //xml转json，用于前端的表单回显
-                String xml = minioUtils.getFileText(recordXml);
+                InputStream inputStream = minioUtils.getFile(meetingInfo.getRecordXml());
+                // 解密
+                String xml = AESUtils.decrypt(IoUtil.read(inputStream, StandardCharsets.UTF_8), aesKey);
+
                 String json = convertXmlToJSON(xml);
                 vo.setRecordJson(json);
             }
@@ -112,7 +115,10 @@ public class MeetingInfoController {
         }
         try {
             if(StringUtils.isNotEmpty(recordContent)){
-                vo.setRecordContent(minioUtils.getFileText(recordContent.replaceAll(fileDownloadPath,"")));
+                InputStream inputStream = minioUtils.getFile(meetingInfo.getRecordContent());
+                // 解密
+                String content = AESUtils.decrypt(IoUtil.read(inputStream, StandardCharsets.UTF_8), aesKey);
+                vo.setRecordContent(content);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -164,7 +170,10 @@ public class MeetingInfoController {
     public void downloadMeetingMinutes(@RequestBody MeetingInfoVO vo, HttpServletResponse response){
         try {
             MeetingInfo meetingInfo = meetingInfoService.getById(vo.getId());
-            String xml = minioUtils.getFileText(meetingInfo.getRecordXml());
+            InputStream inputStream = minioUtils.getFile(meetingInfo.getRecordXml());
+            // 解密
+            String xml = AESUtils.decrypt(IoUtil.read(inputStream, StandardCharsets.UTF_8), aesKey);
+
             Map<String, Object> dataModel = convertXmlToMap(xml);
             //追加参会人员信息
             Map<String,Object> participantsMap = new ConcurrentHashMap<>();
@@ -203,7 +212,9 @@ public class MeetingInfoController {
     public R exportMeetingMinutes(@RequestBody MeetingInfoVO vo, HttpServletResponse response){
         try {
             MeetingInfo meetingInfo = meetingInfoService.getById(vo.getId());
-            String xml = minioUtils.getFileText(meetingInfo.getRecordXml());
+            InputStream inputStream = minioUtils.getFile(meetingInfo.getRecordXml());
+            // 解密
+            String xml = AESUtils.decrypt(IoUtil.read(inputStream, StandardCharsets.UTF_8), aesKey);
             Map<String, Object> dataModel = convertXmlToMap(xml);
             //追加参会人员信息
             Map<String,Object> participantsMap = new ConcurrentHashMap<>();

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

@@ -465,7 +465,7 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
                     newNum++;
                 } else if (meetingInfo.getStatus() == MeetingState.GENERATE_ERROR.getCode()) {
                     generatErrorNum++;
-                } else if (meetingInfo.getStatus() == MeetingState.NOTE_GENERATED.getCode()) {
+                } else if (meetingInfo.getIsGenerated()) {
                     noteGeneratedNum++;
                 } else if (meetingInfo.getStatus() == MeetingState.PUSH_SUCCESS.getCode()) {
                     pushSuccessNum++;