分页打包接口参数修改，数据源字段key名称更改

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceFiledReqVO.java

@@ -24,7 +24,7 @@ public class DataSourceFiledReqVO {
     private String name;
 
     @Schema(description = "字段key")
-    private String key;
+    private String keyName;
 
     @Schema(description = "下一层级结构")
     private List<DataSourceFiledReqVO> children;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceSaveReqVO.java

@@ -24,7 +24,7 @@ public class DataSourceSaveReqVO {
     private String name;
 
     @Schema(description = "数据源的字段key", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String  key;
+    private String  keyName;
 
     @Schema(description = "数据源的父ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long  parentId;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/datasource/DataSourceFiledDO.java

@@ -37,6 +37,5 @@ public class DataSourceFiledDO {
     /**
      * 字段key
      */
-    @TableField("`key`")
-    private String key;
+    private String keyName;
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java

@@ -46,14 +46,14 @@ public class DataSourceServiceImpl implements DataSourceService {
 
         // 提取 SourceField 中的 key 列表
         List<String> keyList = createReqVO.stream()
-                .map(DataSourceSaveReqVO::getKey)
+                .map(DataSourceSaveReqVO::getKeyName)
                 .collect(Collectors.toList());
 
         // 根据 key 列表查询对应的 DataSourceFiledDO 列表并转换为 Map
         Map<String, List<DataSourceFiledDO>> dataSourceFiledDoMap = dataSourceFiledMapper
                 .selectFiledListByKey(keyList)
                 .stream()
-                .collect(Collectors.groupingBy(DataSourceFiledDO::getKey));
+                .collect(Collectors.groupingBy(DataSourceFiledDO::getKeyName));
 
         List<DataSourceFiledDO> insertFiledDoS = new ArrayList<>();
 
@@ -62,7 +62,7 @@ public class DataSourceServiceImpl implements DataSourceService {
         // 遍历 SourceFields 进行插入或更新操作
         for (DataSourceSaveReqVO sourceField : createReqVO) {
 
-            List<DataSourceFiledDO> existingFiledDoS = dataSourceFiledDoMap.get(sourceField.getKey());
+            List<DataSourceFiledDO> existingFiledDoS = dataSourceFiledDoMap.get(sourceField.getKeyName());
 
             if (existingFiledDoS != null) {
                 DataSourceFiledDO dataSourceFiledDO = existingFiledDoS.get(0);
@@ -75,7 +75,7 @@ public class DataSourceServiceImpl implements DataSourceService {
             } else {
 
                 insertFiledDoS.add(DataSourceFiledDO.builder()
-                        .key(sourceField.getKey())
+                        .keyName(sourceField.getKeyName())
                         .sourceId(String.valueOf(sourceField.getParentId()))
                         .name(sourceField.getName())
                         .build());
@@ -422,7 +422,7 @@ public class DataSourceServiceImpl implements DataSourceService {
 
         // 获取没有key的节点ID
         List<Long> ids = parentList.stream()
-                .filter(f -> f.getKey() == null)
+                .filter(f -> f.getKeyName() == null)
                 .map(DataSourceFiledReqVO::getId)
                 .distinct()
                 .toList();

cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml

@@ -11,12 +11,12 @@
             <result property="name" column="field_name"/>
             <result property="sourceId" column="field_source_id"/>
             <result property="id" column="field_id"/>
-            <result property="key" column="field_key"/>
+            <result property="keyName" column="field_key"/>
         </collection>
     </resultMap>
 
     <select id="selectListVO" resultMap="map">
-        select a.*, b.id field_id, b.name field_name, b.source_id field_source_id, b.key field_key
+        select a.*, b.id field_id, b.name field_name, b.source_id field_source_id, b.keyName field_key
         from system_data_source a
         left join system_data_source_field b on a.id = b.source_id
         where a.type in (1,2)