1.编辑功能调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/BizRelationDataDto.java

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import lombok.Data;
+
+@Data
+public class BizRelationDataDto {
+
+    /**
+     * 业务唯一标识
+     */
+    private String bizId;
+
+
+    /**
+     * 业务类型枚举
+     */
+    private String bizType;
+
+    /**
+     * 业务表
+     */
+    private String bizTable;
+
+    /**
+     * 说明
+     */
+    private String changeReason;
+
+    /**
+     * 附件
+     */
+    private String changeAttachment;
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgBizChangeLogDto.java

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2025-04-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgBizChangeLogDto", description="")
+public class JgBizChangeLogDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "业务唯一标识")
+    private String bizId;
+
+    @ApiModelProperty(value = "业务类型")
+    private String bizType;
+
+    @ApiModelProperty(value = "业务表名")
+    private String bizTable;
+
+    @ApiModelProperty(value = "变更原因")
+    private String changeReason;
+
+    @ApiModelProperty(value = "变更附件")
+    private String changeAttachment;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgBizChangeLog.java

+package com.yeejoin.amos.boot.module.jg.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2025-04-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_biz_change_log")
+public class JgBizChangeLog extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 业务唯一标识
+     */
+	@TableField("biz_id")
+    private String bizId;
+
+    /**
+     * 业务类型
+     */
+	@TableField("biz_type")
+    private String bizType;
+
+    /**
+     * 业务表名
+     */
+	@TableField("biz_table")
+    private String bizTable;
+
+    /**
+     * 变更原因
+     */
+	@TableField("change_reason")
+    private String changeReason;
+
+    /**
+     * 变更附件
+     */
+	@TableField("change_attachment")
+    private String changeAttachment;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgBizChangeLogMapper.java

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgBizChangeLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2025-04-14
+ */
+public interface JgBizChangeLogMapper extends BaseMapper<JgBizChangeLog> {
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgBizChangeLogService.java

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2025-04-14
+ */
+public interface IJgBizChangeLogService {
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgBizChangeLogMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgBizChangeLogMapper">
+
+</mapper>

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

 package com.yeejoin.amos.boot.module.jg.biz.event;
 
+import com.yeejoin.amos.boot.module.jg.api.dto.BizRelationDataDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.ChangeDataDto;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
@@ -17,15 +18,12 @@ public class ChangeDataEvent extends ApplicationEvent {
 
     private final RequestContextModel requestContext;
 
-    /**
-     * Create a new {@code ApplicationEvent}.
-     *
-     * @param source the object on which the event initially occurred or with
-     *               which the event is associated (never {@code null})
-     */
-    public ChangeDataEvent(Object source, List<ChangeDataDto> data, RequestContextModel requestContext) {
+    private final BizRelationDataDto bizRelationData;
+
+    public ChangeDataEvent(Object source, BizRelationDataDto bizRelationData, List<ChangeDataDto> data, RequestContextModel requestContext) {
         super(source);
         this.data = data;
+        this.bizRelationData = bizRelationData;
         this.requestContext = requestContext;
     }
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.event.listener;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.jg.api.dto.ChangeDataDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.ESDataChangeLogDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgBizChangeLog;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESDataChangeLogDao;
 import com.yeejoin.amos.boot.module.jg.biz.event.ChangeDataEvent;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgBizChangeLogServiceImpl;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.event.EventListener;
@@ -14,7 +18,9 @@ import org.typroject.tyboot.core.foundation.context.RequestContextModel;
 
 import javax.annotation.PostConstruct;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -26,19 +32,25 @@ import java.util.stream.Collectors;
  */
 @Component
 @Slf4j
+@RequiredArgsConstructor
 public class ChangeDataEventListener {
 
+    private static final Map<String, String> bizTypeTableMap = new HashMap<>();
+
+    static {
+        bizTypeTableMap.put("useRegister", "tzs_jg_use_registration");
+        bizTypeTableMap.put("singleManageEquipEdit", "idx_biz_jg_use_info");
+    }
+
     @Value("${changeData.deal.thread.number:1}")
     private int threadNumber;
 
     private final ESDataChangeLogDao esDataChangeLogDao;
 
-    private final BlockingQueue<ChangeDataEvent> queue = new LinkedBlockingQueue<>();
+    private final JgBizChangeLogServiceImpl  bizChangeLogService;
 
-    public ChangeDataEventListener(ESDataChangeLogDao esDataChangeLogDao) {
-        this.esDataChangeLogDao = esDataChangeLogDao;
+    private final BlockingQueue<ChangeDataEvent> queue = new LinkedBlockingQueue<>();
 
-    }
 
     @EventListener(value = ChangeDataEvent.class)
     public void handleTransactionalEvent(ChangeDataEvent event) {
@@ -68,6 +80,14 @@ public class ChangeDataEventListener {
         List<ChangeDataDto> changeDataDtos = event.getData();
         RequestContextModel requestContextModel = event.getRequestContext();
         Date date = new Date();
+        // 1.主表保存
+        JgBizChangeLog changeLog  = saveLog(event);
+        // 2.子表字段保存
+        List<ESDataChangeLogDto> logs = saveColumnsChange2Es(changeDataDtos, requestContextModel, date, changeLog);
+        log.info("es 操作日志数据入库成功：{}条", logs.size());
+    }
+
+    private List<ESDataChangeLogDto> saveColumnsChange2Es(List<ChangeDataDto> changeDataDtos, RequestContextModel requestContextModel, Date date, JgBizChangeLog changeLog) {
         List<ESDataChangeLogDto> logs = changeDataDtos.parallelStream().map(changeDataDto -> {
             ESDataChangeLogDto changeLogDto = new ESDataChangeLogDto();
             changeLogDto.setColumnKey(changeDataDto.getColumnKey());
@@ -80,10 +100,22 @@ public class ChangeDataEventListener {
             changeLogDto.setChangeId(changeDataDto.getChangeId());
             changeLogDto.setColumnFamily(changeDataDto.getColumnFamily());
             changeLogDto.setBizType(changeDataDto.getBizType());
-            changeLogDto.setBatchId(requestContextModel.getTraceId());
+            changeLogDto.setBatchId(changeLog.getSequenceNbr() + "");
             return changeLogDto;
         }).collect(Collectors.toList());
-        esDataChangeLogDao.saveAll(logs);
-        log.info("es 操作日志数据入库成功：{}条", logs.size());
+        if(!logs.isEmpty()){
+            esDataChangeLogDao.saveAll(logs);
+        }
+        return logs;
+    }
+
+    private JgBizChangeLog saveLog(ChangeDataEvent event) {
+        JgBizChangeLog changeLog = new JgBizChangeLog();
+        BeanUtil.copyProperties(event.getBizRelationData(), changeLog);
+        changeLog.setBizTable(bizTypeTableMap.get(changeLog.getBizType()));
+        changeLog.setRecDate(new Date());
+        changeLog.setRecUserId(event.getRequestContext().getExcutedUserId());
+        bizChangeLogService.save(changeLog);
+        return changeLog;
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgBizChangeLogServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgBizChangeLog;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgBizChangeLogMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgBizChangeLogService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgBizChangeLogDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2025-04-14
+ */
+@Service
+public class JgBizChangeLogServiceImpl extends BaseService<JgBizChangeLogDto,JgBizChangeLog,JgBizChangeLogMapper> implements IJgBizChangeLogService {
+    /**
+     * 分页查询
+     */
+    public Page<JgBizChangeLogDto> queryForJgBizChangeLogPage(Page<JgBizChangeLogDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgBizChangeLogDto> queryForJgBizChangeLogList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -2146,6 +2146,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 detail.put("equListName", projectContraption.getEquListName());
                 detail.put("equCategoryName", projectContraption.getEquCategoryName());
                 detail.put("equDefineName", projectContraption.getEquDefineName());
+                // 编辑功能会使用到
                 detail.putIfAbsent("EQU_LIST_CODE", projectContraption.getEquList());
                 detail.putIfAbsent("EQU_CATEGORY_CODE", projectContraption.getEquCategory());
                 detail.putIfAbsent("EQU_DEFINE_CODE", projectContraption.getEquDefine());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SingleManageEquipEditHandleImpl.java

@@ -58,11 +58,19 @@ public class SingleManageEquipEditHandleImpl implements IBizDataChangeHandleStra
         if (!allChangeColumns.isEmpty()) {
             // 更新历史的JSON的数据
             this.buildLogData(allChangeColumns);
-            // 异步记录日志
-            publisher.publish(new ChangeDataEvent(this, allChangeColumns, RequestContext.cloneRequestContext()));
+            // 异步记录变更流水
+            publishEvent2Logger(record, allChangeColumns);
         }
     }
 
+    private void publishEvent2Logger(String record, List<ChangeDataDto> allChangeColumns) {
+        BizRelationDataDto relationDataDto = new BizRelationDataDto();
+        relationDataDto.setBizId(record);
+        relationDataDto.setBizType(canHandleBizType());
+        // 异步记录日志
+        publisher.publish(new ChangeDataEvent(this, relationDataDto, allChangeColumns, RequestContext.cloneRequestContext()));
+    }
+
     private List<ChangeDataDto> update(String record, Map<String, Object> changeData) {
         List<ChangeDataDto> allChangeColumns = new ArrayList<>();
         // 新数据解析

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/UseRegisterDataChangeHandleImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.jg.api.dto.BizRelationDataDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.ChangeDataDto;
 import com.yeejoin.amos.boot.module.jg.api.service.IBizDataChangeHandleStrategy;
 import com.yeejoin.amos.boot.module.jg.biz.context.DataProcessStrategyContext;
@@ -51,11 +52,18 @@ public class UseRegisterDataChangeHandleImpl implements IBizDataChangeHandleStra
             // 更新历史的JSON的数据
             this.updateHistoryJson(applyNo);
             this.buildLogData(allChangeColumns);
-            // 异步记录日志
-            publisher.publish(new ChangeDataEvent(this, allChangeColumns, RequestContext.cloneRequestContext()));
+            publishEvent2Logger(applyNo, allChangeColumns);
         }
     }
 
+    private void publishEvent2Logger(String applyNo, List<ChangeDataDto> allChangeColumns) {
+        BizRelationDataDto  bizRelationDataDto = new BizRelationDataDto();
+        bizRelationDataDto.setBizId(applyNo);
+        bizRelationDataDto.setBizType(canHandleBizType());
+        // 异步记录日志
+        publisher.publish(new ChangeDataEvent(this, bizRelationDataDto, allChangeColumns, RequestContext.cloneRequestContext()));
+    }
+
     private void updateHistoryJson(String applyNo) {
         useRegisterUpdateService.updateHisData(applyNo);
     }