From 5034ebd1f709fbc57928185a466db0c4b8384007 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 28 Jul 2026 18:56:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IMsOperationLogService.java | 16 +++++ .../impl/MsOperationLogServiceImpl.java | 59 +++++++++++++++++++ .../service/impl/SdDwBHServiceImpl.java | 2 +- .../service/impl/SdWeBHServiceImpl.java | 4 +- 4 files changed, 79 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java index f22e59c7..b22736f0 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java @@ -6,6 +6,7 @@ import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.qgc_base.domain.MsOperationLog; import com.yfd.platform.qgc_base.domain.MsOperationLogDetail; import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.utils.CodeToNameMetadataBo; import java.util.List; @@ -53,6 +54,21 @@ public interface IMsOperationLogService extends IService { */ void recordAddDetailLog(String recordId,String tableName, T entity, String source); + /** + * 通用新增操作详情日志（含字段级详情，支持代码-名称映射） + *

+ * 与 {@link #recordAddDetailLog(String, String, Object, String)} 功能相同， + * 额外支持将实体中 code 字段对应的 name 字段值填充到 newValueName。 + *

+ * @param recordId 记录ID（stcd） + * @param tableName 表名 + * @param entity 新增的实体 + * @param source 操作来源 + * @param codeToNameMetaList 代码-名称映射元数据列表（可为null） + * @param 实体类型 + */ + void recordAddDetailLog(String recordId, String tableName, T entity, String source, List codeToNameMetaList); + /** * 通用删除操作详情日志（含字段级详情） *

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java index 3ed63af0..daa36dfb 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java @@ -15,6 +15,7 @@ import com.yfd.platform.qgc_base.domain.SdEngInfoBH; import com.yfd.platform.qgc_base.mapper.MsOperationLogDetailMapper; import com.yfd.platform.qgc_base.mapper.MsOperationLogMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; @@ -471,6 +472,64 @@ public class MsOperationLogServiceImpl extends ServiceImpl void recordAddDetailLog(String recordId, String tableName, T entity, String source, List codeToNameMetaList) { + if (entity == null) { + return; + } + // 构建 codeFieldName -> nameFieldName 映射 + Map codeToNameFieldMap = new HashMap<>(); + if (codeToNameMetaList != null) { + for (CodeToNameMetadataBo meta : codeToNameMetaList) { + if (StrUtil.isNotBlank(meta.getCodeProperty()) && StrUtil.isNotBlank(meta.getModifyProperty())) { + codeToNameFieldMap.put(meta.getCodeProperty(), meta.getModifyProperty()); + } + } + } + + MsOperationLog mainLog = buildMainLog(tableName, recordId, "新增", source); + msOperationLogMapper.insert(mainLog); + + List details = new ArrayList<>(); + Set processedColumns = new HashSet<>(); + Class entityClass = entity.getClass(); + + for (Field field : entityClass.getDeclaredFields()) { + if (shouldSkipField(field)) { + continue; + } + field.setAccessible(true); + String columnName = resolveColumnName(field); + if (processedColumns.contains(columnName)) { + continue; + } + String fieldMeaning = resolveFieldChinese(field); + Object newValue = getFieldValue(field, entity); + + MsOperationLogDetail detail = buildGenericDetail(mainLog.getId(), tableName, recordId, columnName, + fieldMeaning, null, newValue, "新增字段值"); + + // 如果当前字段是 code 字段，且存在对应的 name 字段映射，则填充 newValueName + String nameFieldName = codeToNameFieldMap.get(field.getName()); + if (nameFieldName != null) { + try { + Field nameField = entityClass.getDeclaredField(nameFieldName); + nameField.setAccessible(true); + Object nameValue = nameField.get(entity); + if (nameValue != null) { + detail.setNewValueName(formatValue(nameValue)); + } + } catch (NoSuchFieldException | IllegalAccessException e) { + // 忽略找不到 name 字段的情况 + } + } + + details.add(detail); + processedColumns.add(columnName); + } + batchInsertDetails(details); + } + @Override public void recordDeleteDetailLog(String recordId,String tableName, T entity, String source) { if (entity == null) { diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java index 32bf57be..e52ae145 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java @@ -68,7 +68,7 @@ public class SdDwBHServiceImpl extends ServiceImpl impleme public boolean add(SdDwBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); + msOperationLogService.recordAddDetailLog(entity.getStcd(), TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java index e5936adf..3ed4c0bd 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java @@ -68,7 +68,8 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme public boolean add(SdWeBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); } + msOperationLogService.recordAddDetailLog(entity.getStcd(), TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); + } return result; } @@ -76,6 +77,7 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme @Transactional(rollbackFor = Exception.class) public boolean update(SdWeBH entity, String source) { SdWeBH before = this.getById(entity.getStcd()); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); boolean result = this.updateById(entity); if (result && before != null) { msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); From 28e7ca55296f580a01fd1a4400947c7f637789e0 Mon Sep 17 00:00:00 2001 From: tangwei Date: Wed, 29 Jul 2026 08:44:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E6=97=A5=E5=BF=97=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IMsOperationLogService.java | 29 +++ .../impl/MsOperationLogServiceImpl.java | 212 +++++++++++++++--- .../service/impl/SdAiboxBHServiceImpl.java | 10 +- .../impl/SdAimonitorBHServiceImpl.java | 10 +- .../service/impl/SdArtsgBHServiceImpl.java | 10 +- .../service/impl/SdDwBHServiceImpl.java | 9 +- .../service/impl/SdEqBHServiceImpl.java | 10 +- .../service/impl/SdFbrdBHServiceImpl.java | 10 +- .../service/impl/SdFhbtBHServiceImpl.java | 10 +- .../impl/SdFishDictoryBServiceImpl.java | 14 +- .../service/impl/SdFpssBHServiceImpl.java | 10 +- .../service/impl/SdOpinfoBHServiceImpl.java | 10 +- .../service/impl/SdOtteBHServiceImpl.java | 10 +- .../service/impl/SdOtweBHServiceImpl.java | 10 +- .../service/impl/SdSonarBHServiceImpl.java | 10 +- .../service/impl/SdTeBHServiceImpl.java | 9 +- .../service/impl/SdVaBHServiceImpl.java | 10 +- .../service/impl/SdVdinfoBServiceImpl.java | 11 +- .../service/impl/SdVpBHServiceImpl.java | 10 +- .../service/impl/SdWeBHServiceImpl.java | 10 +- .../service/impl/SdWqBHServiceImpl.java | 10 +- .../service/impl/SdWtBHServiceImpl.java | 10 +- 22 files changed, 358 insertions(+), 86 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java index b22736f0..756ea8a3 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java @@ -41,6 +41,21 @@ public interface IMsOperationLogService extends IService { */ void recordModifyDetailLog(String recordId,String tableName, T before, T after, String source); + /** + * 通用修改操作详情日志（含字段级变更详情，支持代码-名称映射） + *

+ * 额外支持将实体中 code 字段对应的 name 字段值填充到 oldValueName 和 newValueName。 + *

+ * @param recordId 记录ID（stcd） + * @param tableName 表名 + * @param before 修改前的实体 + * @param after 修改后的实体 + * @param source 操作来源 + * @param codeToNameMetaList 代码-名称映射元数据列表（可为null） + * @param 实体类型 + */ + void recordModifyDetailLog(String recordId, String tableName, T before, T after, String source, List codeToNameMetaList); + /** * 通用新增操作详情日志（含字段级详情） *

@@ -82,6 +97,20 @@ public interface IMsOperationLogService extends IService { */ void recordDeleteDetailLog(String recordId,String tableName, T entity, String source); + /** + * 通用删除操作详情日志（含字段级详情，支持代码-名称映射） + *

+ * 额外支持将实体中 code 字段对应的 name 字段值填充到 oldValueName。 + *

+ * @param recordId 记录ID（stcd） + * @param tableName 表名 + * @param entity 被删除的实体 + * @param source 操作来源 + * @param codeToNameMetaList 代码-名称映射元数据列表（可为null） + * @param 实体类型 + */ + void recordDeleteDetailLog(String recordId, String tableName, T entity, String source, List codeToNameMetaList); + /** * 分页查询操作日志 * diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java index daa36dfb..52b84801 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java @@ -1,6 +1,7 @@ package com.yfd.platform.qgc_base.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -24,6 +25,11 @@ import org.springframework.stereotype.Service; import java.lang.reflect.Field; import java.lang.reflect.Modifier; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; @Service @@ -32,7 +38,11 @@ public class MsOperationLogServiceImpl extends ServiceImpl ENG_FIELD_MEANING_MAP = new LinkedHashMap<>(); - + // 标准日期时间格式器 + private static final DateTimeFormatter DATETIME_FORMATTER = + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + private static final DateTimeFormatter DATE_FORMATTER = + DateTimeFormatter.ofPattern("yyyy-MM-dd"); static { ENG_FIELD_MEANING_MAP.put("STCD", "电站编码"); ENG_FIELD_MEANING_MAP.put("TM", "数据时间"); @@ -477,15 +487,7 @@ public class MsOperationLogServiceImpl extends ServiceImpl nameFieldName 映射 - Map codeToNameFieldMap = new HashMap<>(); - if (codeToNameMetaList != null) { - for (CodeToNameMetadataBo meta : codeToNameMetaList) { - if (StrUtil.isNotBlank(meta.getCodeProperty()) && StrUtil.isNotBlank(meta.getModifyProperty())) { - codeToNameFieldMap.put(meta.getCodeProperty(), meta.getModifyProperty()); - } - } - } + Map codeToNameFieldMap = buildCodeToNameFieldMap(codeToNameMetaList); MsOperationLog mainLog = buildMainLog(tableName, recordId, "新增", source); msOperationLogMapper.insert(mainLog); @@ -509,20 +511,7 @@ public class MsOperationLogServiceImpl extends ServiceImpl void recordModifyDetailLog(String recordId, String tableName, T before, T after, String source, List codeToNameMetaList) { + if (before == null || after == null) { + return; + } + Map codeToNameFieldMap = buildCodeToNameFieldMap(codeToNameMetaList); + + MsOperationLog mainLog = buildMainLog(tableName, recordId, "修改", source); + msOperationLogMapper.insert(mainLog); + + List details = new ArrayList<>(); + Set processedColumns = new HashSet<>(); + Class entityClass = before.getClass(); + + for (Field field : entityClass.getDeclaredFields()) { + if (shouldSkipField(field)) { + continue; + } + field.setAccessible(true); + String columnName = resolveColumnName(field); + if (processedColumns.contains(columnName)) { + continue; + } + String fieldMeaning = resolveFieldChinese(field); + Object oldValue = getFieldValue(field, before); + Object newValue = getFieldValue(field, after); + + if (newValue == null) { + continue; + } + if (equalsValue(oldValue, newValue)) { + continue; + } + MsOperationLogDetail detail = buildGenericDetail(mainLog.getId(), tableName, recordId, columnName, + fieldMeaning, oldValue, newValue, "修改字段值"); + + fillCodeNameValues(detail, entityClass, field.getName(), codeToNameFieldMap, before, after); + + details.add(detail); + processedColumns.add(columnName); + } + batchInsertDetails(details); + } + + @Override + public void recordDeleteDetailLog(String recordId, String tableName, T entity, String source, List codeToNameMetaList) { + if (entity == null) { + return; + } + Map codeToNameFieldMap = buildCodeToNameFieldMap(codeToNameMetaList); + + MsOperationLog mainLog = buildMainLog(tableName, recordId, "删除", source); + msOperationLogMapper.insert(mainLog); + + List details = new ArrayList<>(); + Set processedColumns = new HashSet<>(); + Class entityClass = entity.getClass(); + + for (Field field : entityClass.getDeclaredFields()) { + if (shouldSkipField(field)) { + continue; + } + field.setAccessible(true); + String columnName = resolveColumnName(field); + if (processedColumns.contains(columnName)) { + continue; + } + String fieldMeaning = resolveFieldChinese(field); + Object oldValue = getFieldValue(field, entity); + + MsOperationLogDetail detail = buildGenericDetail(mainLog.getId(), tableName, recordId, columnName, + fieldMeaning, oldValue, null, "删除字段值"); + + fillCodeNameValues(detail, entityClass, field.getName(), codeToNameFieldMap, entity, null); + + details.add(detail); + processedColumns.add(columnName); + } + batchInsertDetails(details); + } + + /** + * 根据 codeToNameMetaList 构建 codeFieldName -> nameFieldName 映射 + */ + private Map buildCodeToNameFieldMap(List codeToNameMetaList) { + Map map = new HashMap<>(); + if (codeToNameMetaList != null) { + for (CodeToNameMetadataBo meta : codeToNameMetaList) { + if (StrUtil.isNotBlank(meta.getCodeProperty()) && StrUtil.isNotBlank(meta.getModifyProperty())) { + map.put(meta.getCodeProperty(), meta.getModifyProperty()); + } + } + } + return map; + } + + /** + * 填充日志明细的 oldValueName 和 newValueName + */ + private void fillCodeNameValues(MsOperationLogDetail detail, Class entityClass, String codeFieldName, + Map codeToNameFieldMap, Object beforeEntity, Object afterEntity) { + String nameFieldName = codeToNameFieldMap.get(codeFieldName); + if (nameFieldName == null) { + return; + } + try { + Field nameField = entityClass.getDeclaredField(nameFieldName); + nameField.setAccessible(true); + if (beforeEntity != null) { + Object oldNameValue = nameField.get(beforeEntity); + if (oldNameValue != null) { + detail.setOldValueName(formatValue(oldNameValue)); + } + } + if (afterEntity != null) { + Object newNameValue = nameField.get(afterEntity); + if (newNameValue != null) { + detail.setNewValueName(formatValue(newNameValue)); + } + } + } catch (NoSuchFieldException | IllegalAccessException e) { + // 忽略找不到 name 字段的情况 + } + } + private MsOperationLogDetail buildDetail(String mainId, String stationCode, String fieldCode, @@ -729,16 +843,64 @@ public class MsOperationLogServiceImpl extends ServiceImpl 去除末尾多余的 0 -> 避免科学计数法 + BigDecimal bd = new BigDecimal(value.toString()); + return bd.stripTrailingZeros().toPlainString(); + } + + // ========== 3. 扩展：对字符串类型的数字做同样处理 ========== + // 场景：数据库字段是 varchar 但存了 '12.000000'，或者前端传来字符串 '12.0' +// if (value instanceof String str) { +// if (StrUtil.isNotBlank(str) && NumberUtil.isNumber(str)) { +// try { +// BigDecimal bd = new BigDecimal(str); +// // 注意：这里不去除前导零（如版本号 1.0.0 不会被识别为数字），只处理纯数值 +// return bd.stripTrailingZeros().toPlainString(); +// } catch (Exception ignore) { +// // 转换失败则按普通字符串处理 +// } +// } +// return str; +// } + // 其他未知类型（如数组、Map 等）保持原样，但建议视具体业务补充 return String.valueOf(value); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java index a68f1bc5..4ab0272d 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java @@ -71,7 +71,8 @@ public class SdAiboxBHServiceImpl extends ServiceImpl 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAimonitorBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAimonitorBHServiceImpl.java index 6da771b6..b86e1f5b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAimonitorBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAimonitorBHServiceImpl.java @@ -59,7 +59,8 @@ public class SdAimonitorBHServiceImpl extends ServiceImpl 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java index e52ae145..5a46e814 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java @@ -68,6 +68,7 @@ public class SdDwBHServiceImpl extends ServiceImpl impleme public boolean add(SdDwBH entity, String source) { boolean result = this.save(entity); if (result) { + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); msOperationLogService.recordAddDetailLog(entity.getStcd(), TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; @@ -79,7 +80,9 @@ public class SdDwBHServiceImpl extends ServiceImpl impleme SdDwBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(), TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -97,7 +100,9 @@ public class SdDwBHServiceImpl extends ServiceImpl impleme wrapper.set(SdDwBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdDwBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); count++; + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd, TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); + count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java index bc2810f7..e2bbad6e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java @@ -68,7 +68,8 @@ public class SdEqBHServiceImpl extends ServiceImpl impleme public boolean add(SdEqBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -79,7 +80,9 @@ public class SdEqBHServiceImpl extends ServiceImpl impleme SdEqBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -97,7 +100,8 @@ public class SdEqBHServiceImpl extends ServiceImpl impleme wrapper.set(SdEqBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdEqBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); count++; + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java index 3c2b4fa6..ba5ee0e4 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java @@ -65,7 +65,8 @@ public class SdFbrdBHServiceImpl extends ServiceImpl i public boolean add(SdFbrdBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -76,7 +77,9 @@ public class SdFbrdBHServiceImpl extends ServiceImpl i SdFbrdBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -89,7 +92,8 @@ public class SdFbrdBHServiceImpl extends ServiceImpl i for (String stcd : stcds) { SdFbrdBH entity = this.getById(stcd); if (this.removeById(stcd)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java index f30de316..5ef06658 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java @@ -69,7 +69,8 @@ public class SdFhbtBHServiceImpl extends ServiceImpl i public boolean add(SdFhbtBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -80,7 +81,9 @@ public class SdFhbtBHServiceImpl extends ServiceImpl i SdFhbtBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -98,7 +101,8 @@ public class SdFhbtBHServiceImpl extends ServiceImpl i wrapper.set(SdFhbtBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdFhbtBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); count++; + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFishDictoryBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFishDictoryBServiceImpl.java index 638f9f89..ffe6a682 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFishDictoryBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFishDictoryBServiceImpl.java @@ -76,7 +76,8 @@ public class SdFishDictoryBServiceImpl extends ServiceImpl i public boolean add(SdFpssBH entity, String source) { boolean result = save(entity); if (result) { + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); // msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -226,7 +227,9 @@ public class SdFpssBHServiceImpl extends ServiceImpl i SdFpssBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -266,7 +269,8 @@ public class SdFpssBHServiceImpl extends ServiceImpl i wrapper.set(SdFpssBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdFpssBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); count++; + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java index 3b26ccdc..82382aca 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java @@ -69,7 +69,8 @@ public class SdOpinfoBHServiceImpl extends ServiceImpl i public boolean add(SdOtteBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -79,7 +80,9 @@ public class SdOtteBHServiceImpl extends ServiceImpl i SdOtteBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -92,7 +95,8 @@ public class SdOtteBHServiceImpl extends ServiceImpl i for (String stcd : stcds) { SdOtteBH entity = this.getById(stcd); if (this.removeById(stcd)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java index 08c90eef..8589aeb4 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java @@ -66,7 +66,8 @@ public class SdOtweBHServiceImpl extends ServiceImpl i public boolean add(SdOtweBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -77,7 +78,9 @@ public class SdOtweBHServiceImpl extends ServiceImpl i SdOtweBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -90,7 +93,8 @@ public class SdOtweBHServiceImpl extends ServiceImpl i for (String stcd : stcds) { SdOtweBH entity = this.getById(stcd); if (this.removeById(stcd)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java index 33a929c7..0e1d337b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java @@ -71,7 +71,8 @@ public class SdSonarBHServiceImpl extends ServiceImpl impleme public boolean add(SdTeBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -77,7 +78,9 @@ public class SdTeBHServiceImpl extends ServiceImpl impleme SdTeBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -90,7 +93,7 @@ public class SdTeBHServiceImpl extends ServiceImpl impleme for (String stcd : stcds) { SdTeBH entity = this.getById(stcd); if (this.removeById(stcd)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java index 4e950072..d90388ba 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java @@ -67,7 +67,8 @@ public class SdVaBHServiceImpl extends ServiceImpl impleme public boolean add(SdVaBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -78,7 +79,9 @@ public class SdVaBHServiceImpl extends ServiceImpl impleme SdVaBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -96,7 +99,8 @@ public class SdVaBHServiceImpl extends ServiceImpl impleme wrapper.set(SdVaBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdVaBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java index 117af726..01b739d0 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java @@ -12,6 +12,7 @@ import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; +import org.checkerframework.checker.units.qual.C; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -72,7 +73,8 @@ public class SdVdinfoBServiceImpl extends ServiceImpl 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java index c89dc3cc..ad1bdd63 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java @@ -67,7 +67,8 @@ public class SdVpBHServiceImpl extends ServiceImpl impleme public boolean add(SdVpBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); } + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -77,7 +78,9 @@ public class SdVpBHServiceImpl extends ServiceImpl impleme SdVpBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -95,7 +98,8 @@ public class SdVpBHServiceImpl extends ServiceImpl impleme wrapper.set(SdVpBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdVpBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); count++; + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source,CODE_TO_NAME_META_LIST); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java index 3ed4c0bd..c71d4c39 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java @@ -68,6 +68,7 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme public boolean add(SdWeBH entity, String source) { boolean result = this.save(entity); if (result) { + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); msOperationLogService.recordAddDetailLog(entity.getStcd(), TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; @@ -77,10 +78,11 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme @Transactional(rollbackFor = Exception.class) public boolean update(SdWeBH entity, String source) { SdWeBH before = this.getById(entity.getStcd()); - dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(), TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -92,8 +94,10 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme int count = 0; for (String stcd : stcds) { SdWeBH entity = this.getById(stcd); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); if (this.removeById(stcd)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); count++; + msOperationLogService.recordDeleteDetailLog(stcd, TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); + count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java index 20eb8bd2..c474ddd0 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java @@ -70,7 +70,8 @@ public class SdWqBHServiceImpl extends ServiceImpl impleme public boolean add(SdWqBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); } + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -80,7 +81,9 @@ public class SdWqBHServiceImpl extends ServiceImpl impleme SdWqBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -98,7 +101,8 @@ public class SdWqBHServiceImpl extends ServiceImpl impleme wrapper.set(SdWqBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdWqBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); count++; + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java index c82548fe..751f99aa 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java @@ -72,7 +72,8 @@ public class SdWtBHServiceImpl extends ServiceImpl impleme public boolean add(SdWtBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordAddDetailLog(entity.getStcd(),TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -83,7 +84,9 @@ public class SdWtBHServiceImpl extends ServiceImpl impleme SdWtBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source); + dictCodeToNameConverter.convertCodeToName(before, CODE_TO_NAME_META_LIST); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordModifyDetailLog(entity.getStcd(),TABLE_NAME, before, entity, source, CODE_TO_NAME_META_LIST); } return result; } @@ -101,7 +104,8 @@ public class SdWtBHServiceImpl extends ServiceImpl impleme wrapper.set(SdWtBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdWtBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source); + dictCodeToNameConverter.convertCodeToName(entity, CODE_TO_NAME_META_LIST); + msOperationLogService.recordDeleteDetailLog(stcd,TABLE_NAME, entity, source, CODE_TO_NAME_META_LIST); count++; } }