BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 2aec7d6cf879ec459bd4bf251ca5ca5b44fe815b

Authored by xingyu
2 parents aaf62982 e6774407

Merge remote-tracking branch 'origin/master' into dev

Inline Side-by-side
Showing 3 changed files with 21 additions and 14 deletions
... ... @@ -35,9 +35,10 @@
35 35 <maven.compiler.source>${java.version}</maven.compiler.source>
36 36 <maven.compiler.target>${java.version}</maven.compiler.target>
37 37 <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
38   - <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
  38 + <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
39 39 <!-- 看看咋放到 bom 里 -->
40 40 <lombok.version>1.18.24</lombok.version>
  41 + <spring.boot.version>2.7.7</spring.boot.version>
41 42 <mapstruct.version>1.5.3.Final</mapstruct.version>
42 43 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
43 44 </properties>
... ... @@ -64,7 +65,8 @@
64 65 <artifactId>maven-surefire-plugin</artifactId>
65 66 <version>${maven-surefire-plugin.version}</version>
66 67 </plugin>
67   - <!-- maven-compiler-plugin 插件，解决 Lombok + MapStruct 组合 -->
  68 + <!-- maven-compiler-plugin 插件，解决 spring-boot-configuration-processor + Lombok + MapStruct 组合 -->
  69 + <!-- https://stackoverflow.com/questions/33483697/re-run-spring-boot-configuration-annotation-processor-to-update-generated-metada -->
68 70 <plugin>
69 71 <groupId>org.apache.maven.plugins</groupId>
70 72 <artifactId>maven-compiler-plugin</artifactId>
... ... @@ -72,6 +74,11 @@
72 74 <configuration>
73 75 <annotationProcessorPaths>
74 76 <path>
  77 + <groupId>org.springframework.boot</groupId>
  78 + <artifactId>spring-boot-configuration-processor</artifactId>
  79 + <version>${spring.boot.version}</version>
  80 + </path>
  81 + <path>
75 82 <groupId>org.projectlombok</groupId>
76 83 <artifactId>lombok</artifactId>
77 84 <version>${lombok.version}</version>
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java
  View file @2aec7d6
... ... @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
11 11 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
12 12 import com.baomidou.mybatisplus.generator.config.po.TableField;
13 13 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
14   -import com.baomidou.mybatisplus.generator.config.rules.IColumnType;
  14 +import org.apache.ibatis.type.JdbcType;
15 15 import org.mapstruct.Mapper;
16 16 import org.mapstruct.Mapping;
17 17 import org.mapstruct.Mappings;
... ... @@ -39,7 +39,7 @@ public interface CodegenConvert {
39 39  
40 40 @Mappings({
41 41 @Mapping(source = "name", target = "columnName"),
42   - @Mapping(source = "columnType", target = "dataType", qualifiedByName = "getType"),
  42 + @Mapping(source = "metaInfo.jdbcType", target = "dataType", qualifiedByName = "getDataType"),
43 43 @Mapping(source = "comment", target = "columnComment"),
44 44 @Mapping(source = "metaInfo.nullable", target = "nullable"),
45 45 @Mapping(source = "keyFlag", target = "primaryKey"),
... ... @@ -49,9 +49,9 @@ public interface CodegenConvert {
49 49 })
50 50 CodegenColumnDO convert(TableField bean);
51 51  
52   - @Named("getType")
53   - default String getType(IColumnType jdbcType) {
54   - return jdbcType.getType();
  52 + @Named("getDataType")
  53 + default String getDataType(JdbcType jdbcType) {
  54 + return jdbcType.name();
55 55 }
56 56  
57 57 // ========== CodegenTableDO 相关 ==========
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
  View file @2aec7d6
... ... @@ -30,7 +30,7 @@ public class CodegenColumnDO extends BaseDO {
30 30 private Long id;
31 31 /**
32 32 * 表编号
33   - *
  33 + * <p>
34 34 * 关联 {@link CodegenTableDO#getId()}
35 35 */
36 36 private Long tableId;
... ... @@ -42,8 +42,8 @@ public class CodegenColumnDO extends BaseDO {
42 42 */
43 43 private String columnName;
44 44 /**
45   - * 字段类型
46   - * 关联 {@link TableField#getColumnType()}}
  45 + * 数据库字段类型
  46 + * 关联 {@link TableField.MetaInfo#getJdbcType()}
47 47 */
48 48 private String dataType;
49 49 /**
... ... @@ -71,7 +71,7 @@ public class CodegenColumnDO extends BaseDO {
71 71  
72 72 /**
73 73 * Java 属性类型
74   - *
  74 + * <p>
75 75 * 例如说 String、Boolean 等等
76 76 */
77 77 private String javaType;
... ... @@ -81,7 +81,7 @@ public class CodegenColumnDO extends BaseDO {
81 81 private String javaField;
82 82 /**
83 83 * 字典类型
84   - *
  84 + * <p>
85 85 * 关联 DictTypeDO 的 type 属性
86 86 */
87 87 private String dictType;
... ... @@ -106,7 +106,7 @@ public class CodegenColumnDO extends BaseDO {
106 106 private Boolean listOperation;
107 107 /**
108 108 * List 查询操作的条件类型
109   - *
  109 + * <p>
110 110 * 枚举 {@link CodegenColumnListConditionEnum}
111 111 */
112 112 private String listOperationCondition;
... ... @@ -119,7 +119,7 @@ public class CodegenColumnDO extends BaseDO {
119 119  
120 120 /**
121 121 * 显示类型
122   - *
  122 + * <p>
123 123 * 枚举 {@link CodegenColumnHtmlTypeEnum}
124 124 */
125 125 private String htmlType;
... ...