|
@@ -378,22 +378,31 @@ public class GenCodeRun {
|
|
|
|
|
|
listColumn.add(SET_PRO_DESC_TPL.replaceAll("\\{\\#\\=desc\\}", desc));
|
|
|
|
|
|
-// if (Objects.equals(isPK, 1)) {
|
|
|
-// listColumn.add("\t@Id");
|
|
|
-// }
|
|
|
-// if (Objects.equals(isIdentity, 1)) {
|
|
|
-// listColumn.add("\t@GeneratedValue(strategy = GenerationType.AUTO)");
|
|
|
-// }
|
|
|
-// String columnAnnotation = "\t@Column(name = \"" + name + "\"";
|
|
|
-// //忽略最后修改时间这一列的新增和编辑
|
|
|
+ if (Objects.equals(isPK, 1)) {
|
|
|
+ listColumn.add("\t@TableId");
|
|
|
+ if (Objects.equals(isIdentity, 1)) {
|
|
|
+ listColumn.add("(type = IdType.AUTO)");
|
|
|
+ } else {
|
|
|
+ listColumn.add("(type = IdType.ASSIGN_ID)");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if ("is_delete".equalsIgnoreCase(name)) {
|
|
|
+ String columnAnnotation = "\t@TableLogic";
|
|
|
+ listColumn.add(columnAnnotation);
|
|
|
+ }
|
|
|
+ if (!"id".equalsIgnoreCase(name)) {
|
|
|
+ String columnAnnotation = "\t@TableField(value = \"" + name + "\"";
|
|
|
+ //忽略最后修改时间这一列的新增和编辑
|
|
|
// if (UPDATE_TIME_COLUMNS.stream().anyMatch(c -> c.equalsIgnoreCase(name))) {
|
|
|
// columnAnnotation += ", insertable = false, updatable = false";
|
|
|
// }
|
|
|
+ listColumn.add(columnAnnotation + ")");
|
|
|
+ }
|
|
|
+ // 矫正错误的驼峰命名字段
|
|
|
// if ("datachange_lasttime".equalsIgnoreCase(name)) {
|
|
|
// propName = "dataChangeLastTime";
|
|
|
// columnNameUpper = "DataChangeLastTime";
|
|
|
// }
|
|
|
-// listColumn.add(columnAnnotation + ")");
|
|
|
|
|
|
//追加列
|
|
|
listColumn.add(String.format("\tprivate %s %s;", javaType, propName));
|