refactor(大编辑)：代码重构

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
@@ -60,4 +61,9 @@ public class FieldChangeMeta implements Serializable {
      */
     private String displayOldValue;
 
+    /**
+     * 元数据
+     */
+    private FieldDisplayDefine fieldDisplayDefine;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -280,7 +280,7 @@ public class CommonEquipDataProcessService {
     }
 
 
-    public static List<FieldChangeMeta> mergeChangeFields(List<FieldChangeMeta> changeDataNew, List<FieldChangeMeta> changeDataOld) {
+    public List<FieldChangeMeta> mergeChangeFields(List<FieldChangeMeta> changeDataNew, List<FieldChangeMeta> changeDataOld) {
         Map<String, FieldChangeMeta> oldKv = changeDataOld.stream().collect(Collectors.toMap(FieldChangeMeta::getColumnKey, Function.identity()));
         changeDataNew.forEach(o -> {
             // 正常不会出现此情况，old数据 大于等于 new 数据的key
@@ -288,7 +288,12 @@ public class CommonEquipDataProcessService {
                 o.setColumnOldValue(oldKv.get(o.getColumnKey()).getColumnOldValue());
             }
         });
-        return changeDataNew.stream().filter(n -> !StringUtils.equals(n.getColumnNewValue(), n.getColumnOldValue())).collect(Collectors.toList());
+        List<FieldChangeMeta> up = changeDataNew.stream().filter(n -> !StringUtils.equals(n.getColumnNewValue(), n.getColumnOldValue())).collect(Collectors.toList());
+        up.forEach(fieldChangeMeta->{
+            fieldChangeMeta.setDisplayOldValue(formatService.format(fieldChangeMeta.getFieldDisplayDefine(), fieldChangeMeta.getColumnOldValue()));
+            fieldChangeMeta.setDisplayNewValue(formatService.format(fieldChangeMeta.getFieldDisplayDefine(), fieldChangeMeta.getColumnNewValue()));
+        });
+        return up;
     }
 
     private static TechParamsBoilerChangeFieldDto getTechParamsBoilerChangeField(Map<String, Object> changeData) {
@@ -524,6 +529,7 @@ public class CommonEquipDataProcessService {
                     fieldChangeMeta.setColumnFamily(group.value());
                     fieldChangeMeta.setColumnLabel(fieldName);
                     fieldChangeMeta.setChangeId(changeId);
+                    fieldChangeMeta.setFieldDisplayDefine(displayDefine);
                     fieldChangeMeta.setColumnType(displayDefine.type().getSimpleName());
                     Object oV = field.get(beanData);
                     if (oV instanceof String) {
@@ -539,8 +545,6 @@ public class CommonEquipDataProcessService {
                         fieldChangeMeta.setColumnNewValue(value);
                         fieldChangeMeta.setColumnOldValue(value);
                     }
-                    fieldChangeMeta.setDisplayOldValue(formatService.format(displayDefine, fieldChangeMeta.getColumnOldValue()));
-                    fieldChangeMeta.setDisplayNewValue(formatService.format(displayDefine, fieldChangeMeta.getColumnNewValue()));
                     changeData.add(fieldChangeMeta);
                 }
             } catch (IllegalAccessException e) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java

@@ -36,7 +36,7 @@ public class PieLineDataChangeServiceImpl {
         // 新对象构造行转列
         List<FieldChangeMeta> oldProjectContraptionChangeData = commonEquipDataProcessService.convertBeanField2Column2(projectContraptionChangeDataDtoOld, projectContraptionChangeDataDtoNew.getProjectContraptionId());
         // 数据比对记录变化字段列表
-        allChangeColumns.addAll(CommonEquipDataProcessService.mergeChangeFields(newProjectContraptionChangeData, oldProjectContraptionChangeData));
+        allChangeColumns.addAll(commonEquipDataProcessService.mergeChangeFields(newProjectContraptionChangeData, oldProjectContraptionChangeData));
         // 数据入库
         LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(IdxBizJgProjectContraption::getCity, projectContraptionChangeDataDtoNew.getCity());
@@ -71,7 +71,7 @@ public class PieLineDataChangeServiceImpl {
         List<FieldChangeMeta> designInfoNew = commonEquipDataProcessService.convertBeanField2Column2(pieLineDesignChangeDataDto, record);
         // 老数据查询行转列
         List<FieldChangeMeta> designInfoOld = commonEquipDataProcessService.buildDesignInfoOld(record);
-        allChangeColumns.addAll(CommonEquipDataProcessService.mergeChangeFields(designInfoNew, designInfoOld));
+        allChangeColumns.addAll(commonEquipDataProcessService.mergeChangeFields(designInfoNew, designInfoOld));
         // 2.更新管道的设计单位名称
         equipChangeDataUpdateServiceImpl.updatePieLineDesignData(record, pieLineDesignChangeDataDto);
     }