BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 42b7946685bdfb89f94c613e70f890425a94aaf1

Authored by YunaiV
1 parent e630cea3

【功能修复】代码生成：代同步数据库结构之后字段顺序混乱的问题

Inline Side-by-side
Showing 4 changed files with 32 additions and 17 deletions
yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java
  View file @42b7946
... ... @@ -134,6 +134,11 @@ public class RandomUtils {
134 134 @SafeVarargs
135 135 public static <T> List<T> randomPojoList(Class<T> clazz, Consumer<T>... consumers) {
136 136 int size = RandomUtil.randomInt(1, RANDOM_COLLECTION_LENGTH);
  137 + return randomPojoList(clazz, size, consumers);
  138 + }
  139 +
  140 + @SafeVarargs
  141 + public static <T> List<T> randomPojoList(Class<T> clazz, int size, Consumer<T>... consumers) {
137 142 return Stream.iterate(0, i -> i).limit(size).map(o -> randomPojo(clazz, consumers))
138 143 .collect(Collectors.toList());
139 144 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/codegen/CodegenColumnMapper.java
  View file @42b7946
... ... @@ -13,7 +13,7 @@ public interface CodegenColumnMapper extends BaseMapperX&lt;CodegenColumnDO&gt; {
13 13 default List<CodegenColumnDO> selectListByTableId(Long tableId) {
14 14 return selectList(new LambdaQueryWrapperX<CodegenColumnDO>()
15 15 .eq(CodegenColumnDO::getTableId, tableId)
16   - .orderByAsc(CodegenColumnDO::getId));
  16 + .orderByAsc(CodegenColumnDO::getOrdinalPosition));
17 17 }
18 18  
19 19 default void deleteListByTableId(Long tableId) {
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
  View file @42b7946
... ... @@ -22,13 +22,14 @@ import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
22 22 import com.baomidou.mybatisplus.generator.config.po.TableField;
23 23 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
24 24 import com.google.common.annotations.VisibleForTesting;
  25 +import jakarta.annotation.Resource;
25 26 import org.springframework.stereotype.Service;
26 27 import org.springframework.transaction.annotation.Transactional;
27 28  
28   -import jakarta.annotation.Resource;
29 29 import java.util.*;
30 30 import java.util.function.BiPredicate;
31 31 import java.util.stream.Collectors;
  32 +import java.util.stream.IntStream;
32 33  
33 34 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
34 35 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
... ... @@ -179,11 +180,18 @@ public class CodegenServiceImpl implements CodegenService {
179 180 && tableField.getMetaInfo().isNullable() == codegenColumn.getNullable()
180 181 && tableField.isKeyFlag() == codegenColumn.getPrimaryKey()
181 182 && tableField.getComment().equals(codegenColumn.getColumnComment());
182   - Set<String> modifyFieldNames = tableFields.stream()
183   - .filter(tableField -> codegenColumnDOMap.get(tableField.getColumnName()) != null
184   - && !primaryKeyPredicate.test(tableField, codegenColumnDOMap.get(tableField.getColumnName())))
185   - .map(TableField::getColumnName)
186   - .collect(Collectors.toSet());
  183 + Set<String> modifyFieldNames = IntStream.range(0, tableFields.size()).mapToObj(index -> {
  184 + TableField tableField = tableFields.get(index);
  185 + String columnName = tableField.getColumnName();
  186 + CodegenColumnDO codegenColumn = codegenColumnDOMap.get(columnName);
  187 + if (codegenColumn == null) {
  188 + return null;
  189 + }
  190 + if (!primaryKeyPredicate.test(tableField, codegenColumn) || codegenColumn.getOrdinalPosition() != index) {
  191 + return columnName;
  192 + }
  193 + return null;
  194 + }).filter(Objects::nonNull).collect(Collectors.toSet());
187 195 // 3.2 计算需要【删除】的字段
188 196 Set<String> tableFieldNames = convertSet(tableFields, TableField::getName);
189 197 Set<Long> deleteColumnIds = codegenColumns.stream()
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
  View file @42b7946
... ... @@ -24,12 +24,11 @@ import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
24 24 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
25 25 import com.baomidou.mybatisplus.generator.config.po.TableField;
26 26 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
27   -import org.junit.jupiter.api.Disabled;
  27 +import jakarta.annotation.Resource;
28 28 import org.junit.jupiter.api.Test;
29 29 import org.springframework.boot.test.mock.mockito.MockBean;
30 30 import org.springframework.context.annotation.Import;
31 31  
32   -import jakarta.annotation.Resource;
33 32 import java.util.Arrays;
34 33 import java.util.Collections;
35 34 import java.util.List;
... ... @@ -234,17 +233,16 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
234 233 }
235 234  
236 235 @Test
237   - @Disabled // TODO @芋艿：这个单测会随机性失败，需要定位下；
238 236 public void testSyncCodegenFromDB() {
239 237 // mock 数据（CodegenTableDO）
240 238 CodegenTableDO table = randomPojo(CodegenTableDO.class, o -> o.setTableName("t_yunai")
241 239 .setDataSourceConfigId(1L).setScene(CodegenSceneEnum.ADMIN.getScene()));
242 240 codegenTableMapper.insert(table);
243 241 CodegenColumnDO column01 = randomPojo(CodegenColumnDO.class, o -> o.setTableId(table.getId())
244   - .setColumnName("id"));
  242 + .setColumnName("id").setPrimaryKey(true).setOrdinalPosition(0));
245 243 codegenColumnMapper.insert(column01);
246 244 CodegenColumnDO column02 = randomPojo(CodegenColumnDO.class, o -> o.setTableId(table.getId())
247   - .setColumnName("name"));
  245 + .setColumnName("name").setOrdinalPosition(1));
248 246 codegenColumnMapper.insert(column02);
249 247 // 准备参数
250 248 Long tableId = table.getId();
... ... @@ -263,7 +261,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
263 261 when(databaseTableService.getTable(eq(1L), eq("t_yunai")))
264 262 .thenReturn(tableInfo);
265 263 // mock 方法（CodegenTableDO）
266   - List<CodegenColumnDO> newColumns = randomPojoList(CodegenColumnDO.class);
  264 + List<CodegenColumnDO> newColumns = randomPojoList(CodegenColumnDO.class, 2);
267 265 when(codegenBuilder.buildColumns(eq(table.getId()), argThat(tableFields -> {
268 266 assertEquals(2, tableFields.size());
269 267 assertSame(tableInfo.getFields(), tableFields);
... ... @@ -457,9 +455,11 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
457 455 .setTemplateType(CodegenTemplateTypeEnum.ONE.getType()));
458 456 codegenTableMapper.insert(table);
459 457 // mock 数据（CodegenColumnDO）
460   - CodegenColumnDO column01 = randomPojo(CodegenColumnDO.class, o -> o.setTableId(table.getId()));
  458 + CodegenColumnDO column01 = randomPojo(CodegenColumnDO.class, o -> o.setTableId(table.getId())
  459 + .setOrdinalPosition(1));
461 460 codegenColumnMapper.insert(column01);
462   - CodegenColumnDO column02 = randomPojo(CodegenColumnDO.class, o -> o.setTableId(table.getId()));
  461 + CodegenColumnDO column02 = randomPojo(CodegenColumnDO.class, o -> o.setTableId(table.getId())
  462 + .setOrdinalPosition(2));
463 463 codegenColumnMapper.insert(column02);
464 464 // mock 执行生成
465 465 Map<String, String> codes = MapUtil.of(randomString(), randomString());
... ... @@ -486,9 +486,11 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
486 486 .setTemplateType(CodegenTemplateTypeEnum.MASTER_NORMAL.getType()));
487 487 codegenTableMapper.insert(table);
488 488 // mock 数据（CodegenColumnDO）
489   - CodegenColumnDO column01 = randomPojo(CodegenColumnDO.class, o -> o.setTableId(table.getId()));
  489 + CodegenColumnDO column01 = randomPojo(CodegenColumnDO.class, o -> o.setTableId(table.getId())
  490 + .setOrdinalPosition(1));
490 491 codegenColumnMapper.insert(column01);
491   - CodegenColumnDO column02 = randomPojo(CodegenColumnDO.class, o -> o.setTableId(table.getId()));
  492 + CodegenColumnDO column02 = randomPojo(CodegenColumnDO.class, o -> o.setTableId(table.getId())
  493 + .setOrdinalPosition(2));
492 494 codegenColumnMapper.insert(column02);
493 495 // mock 数据（sub CodegenTableDO）
494 496 CodegenTableDO subTable = randomPojo(CodegenTableDO.class,
... ...