fix(jg):设备编辑设备履历信息保存修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/event/listener/ChangeLogInsertListener.java

@@ -102,30 +102,38 @@ public class ChangeLogInsertListener {
     @Async
     protected void insertCertLog(JgBizChangeLog changeLog, BaseBizDataChangeEvent event) {
         try {
-            String equId = Stream.concat(
-                    Optional.ofNullable(event.getBizRelationData().getProjectContraptionIds()).orElse(Collections.emptySet()).stream(),
-                    Optional.ofNullable(event.getBizRelationData().getRecords()).orElse(Collections.emptySet()).stream()
-            ).findFirst().orElse(null);
-            String businessTypeName = BusinessTypeEnum
-                    .findNameByEnumName(changeLog.getBizType()).orElse("设备编辑");
-            JgResumeInfoDto resumeInfoDto = new JgResumeInfoDto();
-            resumeInfoDto.setApplyNo(event.getBizRelationData().getBizId());
-            resumeInfoDto.setBusinessType(businessTypeName);
-            resumeInfoDto.setBusinessId(event.getBizRelationData().getBizId());
-            resumeInfoDto.setEquId(equId);
-            resumeInfoDto.setResumeType("1");
-            resumeInfoDto.setChangeContent("设备编辑");
-            resumeInfoDto.setChangeLogId(String.valueOf(changeLog.getSequenceNbr()));
-            resumeInfoDto.setApprovalUnit(event.getBizRelationData().getUnitName());
-            resumeInfoDto.setApprovalUnitCode(event.getBizRelationData().getUnitCode());
-            resumeInfoDto.setRecDate(new Date());
-            resumeInfoDto.setRecUserName(event.getBizRelationData().getRecUserName());
-            resumeInfoDto.setRecUserId(event.getRequestContext().getExcutedUserId());
-            resumeInfoDto.setStatus("正常");
-            resumeInfoDto.setRoutePath(routePath);
-            jgResumeInfoService.createWithModel(resumeInfoDto);
-        } catch (Exception e){
-            log.error(e.getMessage(), e);
+            String bizId = event.getBizRelationData().getBizId();
+            String businessTypeName = BusinessTypeEnum.findNameByEnumName(changeLog.getBizType()).orElse("设备编辑");
+            String approvalUnit = event.getBizRelationData().getUnitName();
+            String approvalUnitCode = event.getBizRelationData().getUnitCode();
+            String recUserName = event.getBizRelationData().getRecUserName();
+            String recUserId = event.getRequestContext().getExcutedUserId();
+            String changeLogId = String.valueOf(changeLog.getSequenceNbr());
+            Date now = new Date();
+            event.getData().stream()
+                    .map(FieldChangeMeta::getChangeId)
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .forEach(equId -> {
+                        JgResumeInfoDto dto = new JgResumeInfoDto();
+                        dto.setApplyNo(bizId);
+                        dto.setBusinessType(businessTypeName);
+                        dto.setBusinessId(bizId);
+                        dto.setEquId(equId);
+                        dto.setResumeType("1");
+                        dto.setChangeContent("设备编辑");
+                        dto.setChangeLogId(changeLogId);
+                        dto.setApprovalUnit(approvalUnit);
+                        dto.setApprovalUnitCode(approvalUnitCode);
+                        dto.setRecDate(now);
+                        dto.setRecUserName(recUserName);
+                        dto.setRecUserId(recUserId);
+                        dto.setStatus("正常");
+                        dto.setRoutePath(routePath);
+                        jgResumeInfoService.createWithModel(dto);
+                    });
+        } catch (Exception e) {
+            log.error("插入设备履历日志异常，bizType: {}, 错误: {}", changeLog.getBizType(), e.getMessage(), e);
         }
     }