From 4290841df510502388f5749867ab4838d4301536 Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@aliyun.com>
Date: 星期二, 06 八月 2024 16:53:40 +0800
Subject: [PATCH] 生成代码逻辑修改
---
src/test/java/com/lunhan/xxx/host/GenCodeGauss.java | 1324 +++++++++++++++++++++++++++-----------------------------
1 files changed, 635 insertions(+), 689 deletions(-)
diff --git a/src/test/java/com/lunhan/xxx/host/GenCodeGauss.java b/src/test/java/com/lunhan/xxx/host/GenCodeGauss.java
index 17f2c45..42de15a 100644
--- a/src/test/java/com/lunhan/xxx/host/GenCodeGauss.java
+++ b/src/test/java/com/lunhan/xxx/host/GenCodeGauss.java
@@ -1,10 +1,7 @@
package com.lunhan.xxx.host;
import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.util.ListUtil;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.lunhan.xxx.common.util.*;
import org.apache.commons.lang3.BooleanUtils;
import java.io.File;
@@ -12,34 +9,36 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
import java.util.*;
+import java.util.stream.Collectors;
public class GenCodeGauss {
private static final String HOST = "113.250.189.120";
private static final String PORT = "57654";
private static final String USER = "lunhan";
private static final String PASSWORD = "lunhan.20240330";
- private static final String DB_NAME = "water_trade_center";
+ private static final String DB_NAME = "water_basic";
private static final String AUTHOR = "lin.liu";
- private static Connection CONN = null;
+ public static Connection CONN = null;
private static final String DRIVER = "org.postgresql.Driver";
private static final String CONNECTION_STR = "jdbc:postgresql://" + HOST + ":" + PORT + "/" + DB_NAME;
//region 输出文件路径设置
class OutSet {
- public static final String PO = "./src/main/java/com/lunhan/water/repository/po/";
- public static final String VO = "./src/main/java/com/lunhan/water/repository/vo/";
- public static final String COMVERT_MAPPER = "./src/main/java/com/lunhan/water/service/convert/";
- public static final String COLUMNS_ENUM = "./src/main/java/com/lunhan/water/repository/columns/";
- public static final String DAO = "./src/main/java/com/lunhan/water/repository/dao/";
- public static final String MAPPER = "./src/main/java/com/lunhan/water/repository/";
- public static final String MAPPERXML = "./src/main/resources/mapper/";
- public static final String SERVICE = "./src/main/java/com/lunhan/water/service/";
- public static final String Controller = "./src/main/java/com/lunhan/water/host/controller/";
- public static final String SEARCH = "./src/main/java/com/lunhan/water/entity/dto/search/";
- public static final String RequestDTO = "./src/main/java/com/lunhan/water/entity/request/";
- public static final String ResponseDTO = "./src/main/java/com/lunhan/water/entity/response/";
+ public static final String PO = "./src/main/java/com/lunhan/xxx/repository/po/";
+ public static final String VO = "./src/main/java/com/lunhan/xxx/repository/vo/";
+ public static final String CONVERT_MAPPER = "./src/main/java/com/lunhan/xxx/service/convert/";
+ public static final String MAPPER_IMPL = "./src/main/java/com/lunhan/xxx/repository/impl/";
+ public static final String MAPPER = "./src/main/java/com/lunhan/xxx/repository/mapper/";
+ public static final String SERVICE = "./src/main/java/com/lunhan/xxx/service/";
+ public static final String Controller = "./src/main/java/com/lunhan/xxx/host/controller/";
+ public static final String SEARCH = "./src/main/java/com/lunhan/xxx/entity/dto/search/";
+ public static final String RequestDTO = "./src/main/java/com/lunhan/xxx/entity/request/";
+ public static final String ResponseDTO = "./src/main/java/com/lunhan/xxx/entity/response/";
}
//endregion
@@ -48,9 +47,8 @@
public static final String PO = "com.lunhan.xxx.repository.po";
public static final String VO = "com.lunhan.xxx.repository.vo";
public static final String CONVERT_MAPPER = "com.lunhan.xxx.service.convert";
- public static final String DAO = "com.lunhan.xxx.repository.dao";
- public static final String COLUMNS_ENUM = "com.lunhan.xxx.repository.columns";
- public static final String MAPPER = "com.lunhan.xxx.repository";
+ public static final String MAPPER_IMPL = "com.lunhan.xxx.repository.impl";
+ public static final String MAPPER = "com.lunhan.xxx.repository.mapper";
public static final String SERVICE = "com.lunhan.xxx.service";
public static final String Controller = "com.lunhan.xxx.host.controller";
public static final String SEARCH = "com.lunhan.xxx.entity.dto.search";
@@ -63,8 +61,8 @@
class SuffixSet {
public static final String PO = "PO";
public static final String VO = "VO";
- public static final String COLUMNS_ENUM = "";//POColumns
- public static final String DAO = "Dao";
+ public static final String CONVERT_MAPPER = "Convert";
+ public static final String MAPPER_IMPL = "MapperImpl";
public static final String MAPPER = "Mapper";
public static final String SERVICE = "Service";
public static final String Controller = "Controller";
@@ -82,7 +80,7 @@
private static final Integer SET_PO_Getter = 1;
//endregion
- //region po类头部文字设置
+ //region 类头部文字设置
private static final String SET_BEFORE_TEXT =
"/**\n" +
"# __----~~~~~~~~~~~------___\n" +
@@ -108,9 +106,12 @@
"*/";
//endregion
+ //region import依赖架包
+
//region po类 import 内容设置
private static final String[] SET_PO_IMPORT = new String[]{
- "import javax.persistence.*;",
+ "import com.baomidou.mybatisplus.annotation.*;",
+ "",
"import java.io.Serializable;",
"import java.sql.Timestamp;"
};
@@ -124,7 +125,7 @@
};
//endregion
- //region 实体映射类 import 内容设置
+ //region 实体属性映射类 import 内容设置
private static final String[] SET_CONVERT_IMPORT = new String[]{
"import org.mapstruct.Mapper;" +
"import org.mapstruct.factory.Mappers;" +
@@ -133,40 +134,33 @@
};
//endregion
- //region 字段名枚举类 import 内容设置
- private static final String[] SET_COLUMNS_ENUM_IMPORT = new String[]{
- "import com.lunhan.xxx.common.orm2.enums.ColumnBasic;",
- "import java.util.Arrays;",
- "import java.util.Objects;"
- };
- //endregion
-
- //region dao类 import 内容设置
- private static final String[] SET_DAO_IMPORT = new String[]{
- "import com.lunhan.xxx.common.ConstantFactory;",
+ //region mapper实现类 import 内容设置
+ private static final String[] SET_MAPPER_IMPL_IMPORT = new String[]{
+ "import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;",
+ "import com.baomidou.mybatisplus.extension.plugins.pagination.Page;",
"import com.lunhan.xxx.common.PagerResult;",
- "import com.lunhan.xxx.common.orm2.SqlBuilder;",
+ "import com.lunhan.xxx.common.enums.EYesOrNo;",
"import com.lunhan.xxx.common.util.*;",
- "import com.lunhan.xxx.entity.dto.OrderByDTO;",
+ "import com.lunhan.xxx.entity.dto.*;",
"import com.lunhan.xxx.entity.enums.*;",
- "import com.lunhan.xxx.repository.BasicDao;",
+ "import com.lunhan.xxx.repository.BasicMapperImpl;",
"import org.springframework.stereotype.Repository;",
- "import java.util.*;",
- "import org.springframework.transaction.annotation.Transactional;"
+ "",
+ "import java.util.List;"
};
//endregion
//region service类 import 内容设置
private static final String[] SET_Service_IMPORT = new String[]{
"import com.lunhan.xxx.common.*;",
+ "import com.lunhan.xxx.common.enums.*;",
"import com.lunhan.xxx.common.model.Tuple;",
"import com.lunhan.xxx.common.util.*;",
"import org.apache.commons.lang3.BooleanUtils;",
"import org.springframework.beans.factory.annotation.Autowired;",
"import org.springframework.stereotype.Service;",
- "import java.util.ArrayList;",
- "import java.util.List;",
- "import java.util.Objects;"
+ "import java.util.*;",
+ "import java.util.stream.Collectors;"
};
//endregion
@@ -189,6 +183,8 @@
private static final String[] SET_SEARCH_IMPORT = new String[]{
"import " + GenCodeGauss.PackageSet.SEARCH.replaceAll("\\.search", "") + ".SearchBasicDTO;",
};
+ //endregion
+
//endregion
//region 类注释模版
@@ -220,12 +216,12 @@
//#endregion
//#region 编辑接口忽略字段配置
- private static final List<String> NO_UPDATE_COLUMNS = Arrays.asList(
+ private static final List<String> NO_UPDATE_COLUMNS = Arrays.asList(
"create_time", "create_user", "create_user_id", "create_user_name",
"update_time", "update_user", "update_user_id", "update_user_name",
"datachange_lasttime", "data_change_last_time", "is_delete"
);
- private static final List<String> UPDATE_TIME_COLUMNS = Arrays.asList(
+ private static final List<String> UPDATE_TIME_COLUMNS = Arrays.asList(
"update_time", "datachange_lasttime", "data_change_last_time"
);
//#endregion
@@ -249,7 +245,7 @@
* 只生成以下配置的表
*/
private static final List<String> ONLY_TABLES = Arrays.asList(
- "water_meter_apply"
+
);
public static void main(String[] args) {
@@ -257,7 +253,7 @@
System.out.println("conn is null.");
return;
}
- Map<String, String> tables = getTables(DB_NAME);
+ Map<String, String> tables = getTables(CONN, DB_NAME);
for (Map.Entry<String, String> table : tables.entrySet()) {
String tableName = table.getKey();
String tableDesc = table.getValue();
@@ -265,20 +261,18 @@
if (ONLY_TABLES.size() > 0 && BooleanUtils.isFalse(ONLY_TABLES.contains(tableName))) {
continue;
}
- List<Map<String, Object>> columns = getColumns(tableName, DB_NAME);
+ List<Map<String, Object>> columns = getColumns(CONN, tableName);
genPO(columns, tableDesc);
genVO(columns, tableDesc);
- genColumnsEnum(columns, tableDesc);
genCreateDto(columns, tableName, tableDesc);
- genModifyDto(columns, tableName, tableDesc);
- genDao(tableName, tableDesc);
+
genSearch(columns, tableDesc);
+ genMapper(columns, tableDesc);
+ genModifyDto(columns, tableName, tableDesc);
+ genMapperImpl(tableName, tableDesc);
genConvertMapper(tableName, tableDesc);
genService(tableName, tableDesc);
genController(tableName, tableDesc);
-
- //genMapperXml(columns, tableDesc);
- //genMapper(columns, tableDesc);
}
}
@@ -333,21 +327,25 @@
listColumn.add(SET_PRO_DESC_TPL.replaceAll("\\{\\#\\=desc\\}", desc));
if (Objects.equals(isPK, 1)) {
- listColumn.add("\t@Id");
+ listColumn.add("\t@TableId");
+ if (Objects.equals(isIdentity, 1)) {
+ listColumn.add("(type = IdType.AUTO)");
+ } else {
+ listColumn.add("(type = IdType.ASSIGN_ID)");
+ }
}
- if (Objects.equals(isIdentity, 1)) {
- listColumn.add("\t@GeneratedValue(strategy = GenerationType.AUTO)");
- }
- String columnAnnotation = "\t@Column(name = \"" + name + "\"";
- //忽略最后修改时间这一列的新增和编辑
- if (UPDATE_TIME_COLUMNS.stream().anyMatch(c -> c.equalsIgnoreCase(name))) {
- columnAnnotation += ", insertable = false, updatable = false";
+ if (!"id".equals(name)) {
+ String columnAnnotation = "\t@TableField(\"" + 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));
@@ -365,7 +363,7 @@
}
content.append(ConstantFactory.STR_NEWLINE);
content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc)
+ .replaceAll("\\{\\#\\=desc\\}", tableDesc == null ? modelName : tableDesc)
.replaceAll("\\{\\#\\=author\\}", AUTHOR)
.replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
);
@@ -374,9 +372,7 @@
content.append("@Data");
content.append(ConstantFactory.STR_NEWLINE);
}
- content.append("@Entity");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("@Table(name = \"" + tableName);
+ content.append("@TableName(\"" + tableName);
content.append("\")");
content.append(ConstantFactory.STR_NEWLINE);
content.append("public class ");
@@ -385,8 +381,10 @@
content.append(ConstantFactory.STR_NEWLINE);
content.append(StringUtil.join(listColumn, ConstantFactory.STR_NEWLINE));
content.append(ConstantFactory.STR_NEWLINE);
- content.append(StringUtil.join(listGetterSetter, ConstantFactory.STR_NEWLINE));
- content.append(ConstantFactory.STR_NEWLINE);
+ if (!isData) {
+ content.append(StringUtil.join(listGetterSetter, ConstantFactory.STR_NEWLINE));
+ content.append(ConstantFactory.STR_NEWLINE);
+ }
content.append("}");
writeFile(GenCodeGauss.OutSet.PO, modelName + GenCodeGauss.SuffixSet.PO + ".java", content.toString());
@@ -428,14 +426,13 @@
content.append(ConstantFactory.STR_NEWLINE);
content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc)
+ .replaceAll("\\{\\#\\=desc\\}", tableDesc == null ? modelName : tableDesc)
.replaceAll("\\{\\#\\=author\\}", AUTHOR)
.replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
);
content.append(ConstantFactory.STR_NEWLINE);
if (isData) {
content.append("@Data");
- content.append(ConstantFactory.STR_NEWLINE);
}
content.append(ConstantFactory.STR_NEWLINE);
content.append("public class ");
@@ -474,11 +471,17 @@
String modelName = underline2Camel(tableName, true);
String searchName = "Search" + modelName;
String tableNamePackage = tableName.toLowerCase().replaceAll("_", "");
+ boolean isData = Objects.equals(SET_PO_Getter, 2);
StringBuilder content = new StringBuilder();
content.append("package ");
content.append(GenCodeGauss.PackageSet.SEARCH + ConstantFactory.STR_SEMICOLON);
content.append(ConstantFactory.STR_NEWLINE);
+ if (isData) {
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("import lombok.Data;");
+ content.append(ConstantFactory.STR_NEWLINE);
+ }
if (SET_SEARCH_IMPORT.length > 0) {
content.append(ConstantFactory.STR_NEWLINE);
for (String s : SET_SEARCH_IMPORT) {
@@ -488,40 +491,46 @@
}
content.append(ConstantFactory.STR_NEWLINE);
content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc)
+ .replaceAll("\\{\\#\\=desc\\}", tableDesc == null ? modelName : tableDesc)
.replaceAll("\\{\\#\\=author\\}", AUTHOR)
.replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
);
+ if (isData) {
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("@Data");
+ }
content.append(ConstantFactory.STR_NEWLINE);
content.append("public class " + searchName + " extends SearchBasicDTO {");
content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t@Override");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\tpublic String toString() {");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\treturn \"" + searchName + "{\" + \"'\" +");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\t\t\"keywords='\" + getKeywords() +");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\t\t\", listId =\" + getListId() +");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\t\t\", status =\" + getStatus() +");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\t\t\", listStatus =\" + getListStatus() +");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\t\t\", createTimeRange='\" + getCreateTimeRange() + \"'\" +");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\t\t\", createTimeStart =\" + getCreateTimeEnd() +");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\t\t\", createTimeEnd =\" + getCreateTimeEnd() +");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\t\t\", lastId =\" + getListId() +");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\t\t\", orderBy='\" + getOrderBy() + \"'\" +");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t\t'}';");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t}");
+ if (!isData) {
+ content.append("\t@Override");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\tpublic String toString() {");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\treturn \"" + searchName + "{\" + \"'\" +");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\t\t\"keywords='\" + getKeywords() +");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\t\t\", listId =\" + getListId() +");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\t\t\", status =\" + getStatus() +");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\t\t\", listStatus =\" + getListStatus() +");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\t\t\", createTimeRange='\" + getCreateTimeRange() + \"'\" +");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\t\t\", createTimeStart =\" + getCreateTimeEnd() +");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\t\t\", createTimeEnd =\" + getCreateTimeEnd() +");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\t\t\", lastId =\" + getListId() +");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\t\t\", orderBy='\" + getOrderBy() + \"'\" +");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t\t'}';");
+ content.append(ConstantFactory.STR_NEWLINE);
+ content.append("\t}");
+ }
content.append(ConstantFactory.STR_NEWLINE);
content.append("}");
@@ -531,107 +540,10 @@
writeFile(GenCodeGauss.OutSet.SEARCH + "/", searchName + ".java", content.toString());
}
- private static void genColumnsEnum(List<Map<String, Object>> columns, String tableDesc) {
- if (ListUtil.isNullOrEmpty(columns)) {
- return;
- }
- String tableName = columns.get(0).get("objname").toString();
+ private static void genMapperImpl(String tableName, String tableDesc) {
String modelName = underline2Camel(tableName, true);
- String enumName = "E" + modelName + GenCodeGauss.SuffixSet.COLUMNS_ENUM;
-
- StringBuilder content = new StringBuilder();
- content.append(SET_BEFORE_TEXT);
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("package ");
- content.append(GenCodeGauss.PackageSet.COLUMNS_ENUM);
- content.append(ConstantFactory.STR_SEMICOLON);
- content.append(ConstantFactory.STR_NEWLINE);
- if (SET_COLUMNS_ENUM_IMPORT.length > 0) {
- content.append(ConstantFactory.STR_NEWLINE);
- for (String s : SET_COLUMNS_ENUM_IMPORT) {
- content.append(s);
- content.append(ConstantFactory.STR_NEWLINE);
- }
- }
- content.append(ConstantFactory.STR_NEWLINE);
- content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc)
- .replaceAll("\\{\\#\\=author\\}", AUTHOR)
- .replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
- );
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("public enum ");
- content.append(enumName);
- content.append(" implements ColumnBasic {");
-
- List<String> listColumn = new ArrayList<>();
- String lastStr = "";
- int idx = 0;
- for (Map<String, Object> column : columns) {
- idx++;
- String name = column.get("name").toString();
- String desc = String.valueOf(column.get("description"));
- String type = column.get("type").toString();
- int length = NumericUtil.tryParseInt(column.get("length"), 0);
- String defValue = String.valueOf(column.get("default"));
- int isPK = NumericUtil.tryParseInt(column.get("isPK"), 0);
- int isIdentity = NumericUtil.tryParseInt(column.get("isIdentity"), 0);
- int isNullable = NumericUtil.tryParseInt(column.get("isNullable"), 0);
-
- String propName = underline2Camel(name);
-
- listColumn.add(SET_PRO_DESC_TPL.replaceAll("\\{\\#\\=desc\\}", desc));
- String str = String.format("\t%s(\"%s\", %s),", name.toUpperCase(), name, idx);
- //追加列
- listColumn.add(str);
- lastStr = str;
- }
- content.append(ConstantFactory.STR_NEWLINE);
- content.append(StringUtil.join(listColumn, ConstantFactory.STR_NEWLINE).replace(lastStr, lastStr.replace("),", ");")));
- content.append(ConstantFactory.STR_NEWLINE);
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\tprivate String columnName;\n");
- content.append("\tprivate Integer value;\n");
- content.append("\tpublic Integer getValue() {\n");
- content.append("\t\treturn value;\n");
- content.append("\t}\n");
- content.append("\tpublic String getColumnName() {\n");
- content.append("\t\treturn columnName;\n");
- content.append("\t}\n");
- content.append("\tstatic final String TABLE_NAME = \"" + tableName + "\";\n");
- content.append("\tpublic String getTableName() {\n");
- content.append("\t\treturn TABLE_NAME;\n");
- content.append("\t}\n");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t");
- content.append(enumName);
- content.append("(String columnName, Integer value) {\n");
- content.append("\t\tthis.columnName = columnName;\n");
- content.append("\t\tthis.value = value;\n");
- content.append("\t}\n");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\tpublic static " + enumName + " getByValue(Integer value) {\n");
- content.append("\t\treturn Arrays.stream(" + enumName + ".values())\n");
- content.append("\t\t\t\t.filter(e -> Objects.equals(e.getValue(), value))\n");
- content.append("\t\t\t\t.findAny()\n");
- content.append("\t\t\t\t.orElse(null);\n");
- content.append("\t}\n");
- content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t@Override\n");
- content.append("\tpublic String toString() {\n");
- content.append("\t\treturn \"" + enumName + "{\" +\n");
- content.append("\t\t\t\t\"columnName='\" + columnName + '\\'' +\n");
- content.append("\t\t\t\t\", value=\" + value +\n");
- content.append("\t\t\t\t'}';\n");
- content.append("\t}\n");
- content.append("}");
-
- writeFile(GenCodeGauss.OutSet.COLUMNS_ENUM, enumName + ".java", content.toString());
- }
-
- private static void genDao(String tableName, String tableDesc) {
- String modelName = underline2Camel(tableName, true);
- String daoName = modelName + GenCodeGauss.SuffixSet.DAO;
+ String mapperName = modelName + SuffixSet.MAPPER;
+ String daoName = modelName + GenCodeGauss.SuffixSet.MAPPER_IMPL;
String poName = modelName + GenCodeGauss.SuffixSet.PO;
String enumName = "E" + modelName;
String searchName = "Search" + modelName;
@@ -641,30 +553,30 @@
content.append(SET_BEFORE_TEXT);
content.append(ConstantFactory.STR_NEWLINE);
content.append("package ");
- content.append(GenCodeGauss.PackageSet.DAO);
+ content.append(GenCodeGauss.PackageSet.MAPPER_IMPL);
content.append(ConstantFactory.STR_SEMICOLON);
content.append(ConstantFactory.STR_NEWLINE);
- if (SET_DAO_IMPORT.length > 0) {
+ if (SET_MAPPER_IMPL_IMPORT.length > 0) {
content.append(ConstantFactory.STR_NEWLINE);
- for (String s : SET_DAO_IMPORT) {
+ for (String s : SET_MAPPER_IMPL_IMPORT) {
content.append(s);
content.append(ConstantFactory.STR_NEWLINE);
}
}
content.append("import ");
- content.append(GenCodeGauss.PackageSet.COLUMNS_ENUM);
+ content.append(GenCodeGauss.PackageSet.SEARCH + ".");
+ content.append(searchName + ";\n");
+ content.append("import ");
+ content.append(PackageSet.MAPPER);
content.append(".");
- content.append("E" + modelName + GenCodeGauss.SuffixSet.COLUMNS_ENUM + ";\n");
+ content.append(mapperName + ";\n");
content.append("import ");
content.append(GenCodeGauss.PackageSet.PO);
content.append(".");
content.append(poName + ";\n");
- content.append("import ");
- content.append(GenCodeGauss.PackageSet.SEARCH + ".");
- content.append(searchName + ";\n");
content.append(ConstantFactory.STR_NEWLINE);
content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc)
+ .replaceAll("\\{\\#\\=desc\\}", tableDesc == null ? modelName : tableDesc)
.replaceAll("\\{\\#\\=author\\}", AUTHOR)
.replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
);
@@ -672,98 +584,108 @@
content.append("@Repository\n");
content.append("public class ");
content.append(daoName);
- content.append(" extends BasicDao<");
+ content.append(" extends BasicMapperImpl<");
content.append(modelName + GenCodeGauss.SuffixSet.PO);
- content.append("> {");
+ content.append(", " + mapperName + "> {");
content.append(ConstantFactory.STR_NEWLINE);
- content.append("\t" + daoName + "() {\n");
- content.append("\t\tsuper(E" + modelName + GenCodeGauss.SuffixSet.COLUMNS_ENUM + ".values());\n");
+ content.append("\t" + daoName + "(" + mapperName + " mapper) {\n");
+ content.append("\t\tsuper(mapper);\n");
content.append("\t}\n");
content.append(ConstantFactory.STR_NEWLINE);
- content.append(" /**\n" +
- " * 批量删除数据\n" +
- " * @param listId 主键id列表\n" +
- " * @return 是否成功\n" +
- " */\n" +
- " public Boolean removeByListId(List<Long> listId) {\n" +
- " return super.remove(new SqlBuilder().where(" + enumName + ".ID.in(listId)));\n" +
- " }\n\n");
- content.append(" /**\n" +
- " * 根据主键获取数据列表\n" +
- " * @param listId 主键id列表\n" +
- " * @return 数据实体\n" +
- " */\n" +
- " @Transactional(readOnly = true)\n" +
- " public List<" + poName + "> getListById(List<Long> listId) {\n" +
- " return super.getList(new SqlBuilder()\n" +
- " .where(" + enumName + ".ID.in(listId))\n" +
- " );\n" +
- " }\n\n");
- content.append("\tpublic PagerResult<" + poName + "> search(" + searchName + " search) {\n" +
- "\t\tSqlBuilder builder = new SqlBuilder()\n" +
- "\t\t\t\t// 分页参数\n" +
- "\t\t\t\t.page(NumericUtil.tryParseInt(search.getPage(), 1), NumericUtil.tryParseInt(search.getLimit(), 1))\n" +
+ content.append("\t@Override\n" +
+ "\tpublic PagerResult<" + poName + "> search(SearchBasicDTO request) {\n" +
+ "\t\t// 还原查询条件真实类型\n" +
+ "\t\t" + searchName + " search = (" + searchName + ")request;\n" +
+ "\t\t// 查询条件\n" +
+ "\t\tLambdaQueryWrapper<" + poName + "> queryWrapper = this.query();\n" +
+ "\t\t// 非逻辑删除\n" +
+ "\t\tqueryWrapper.eq(" + poName + "::getIsDelete, EYesOrNo.NO.getValue());\n" +
+ "\t\t// 状态\n" +
+ "\t\t//queryWrapper.eq(NumericUtil.tryParseInt(search.getStatus()).compareTo(0) > 0, " + poName + "::getStatus, search.getStatus());\n" +
+ "\t\t// 状态列表\n" +
+ "\t\t//queryWrapper.in(ListUtil.isNotNullOrEmpty(search.getListStatus()), " + poName + "::getStatus, search.getListStatus());\n" +
"\n" +
- "\t\t\t\t// 数据非逻辑删除\n" +
- "\t\t\t\t//.and(" + enumName + ".IS_DELETE.equal(EYesOrNo.NO.getValue()))\n" +
- "\t\t\t\t// 状态非删除状态\n" +
- "\t\t\t\t//.and(" + enumName + ".STATUS.notEqual(EState.DELETED.getValue()))\n" +
+ "\t\t// 数据创建时间-起始\n" +
+ "\t\tqueryWrapper.ge(NumericUtil.tryParseLong(search.getCreateTimeStart()).compareTo(0L) > 0, " + poName + "::getCreateTime, search.getCreateTimeStart());\n" +
+ "\t\t// 数据创建时间-截止\n" +
+ "\t\tqueryWrapper.le(NumericUtil.tryParseLong(search.getCreateTimeEnd()).compareTo(0L) > 0, " + poName + "::getCreateTime, search.getCreateTimeEnd());\n" +
+ "\t\t// 关键字\n" +
+ "\t\t//if (StringUtil.isNotNullOrEmpty(search.getKeywords())) {\n" +
+ "\t\t//\tqueryWrapper.and(q ->\n" +
+ "\t\t//\t\tq.like(" + poName + "::getName, search.getKeywords())\n" +
+ "\t\t//\t\t.or().like(" + poName + "::getPhone, search.getKeywords())\n" +
+ "\t\t//\t);\n" +
+ "\t\t//}\n" +
"\n" +
- "\t\t\t\t// 状态\n" +
- "\t\t\t\t//.andIf(NumericUtil.tryParseInt(search.getStatus()).compareTo(0) > 0, " + enumName + ".STATUS.equal(search.getStatus()))\n" +
- "\t\t\t\t// 状态列表\n" +
- "\t\t\t\t//.andIf(ListUtil.isNotNullOrEmpty(search.getListStatus()), " + enumName + ".STATUS.in(search.getListStatus()))\n" +
- "\t\t\t\t// id列表\n" +
- "\t\t\t\t.andIf(ListUtil.isNotNullOrEmpty(search.getListId()), " + enumName + ".ID.in(search.getListId()))\n" +
- "\t\t\t\t// 关键字\n" +
- "\t\t\t\t//.andIf(StringUtil.isNotNullOrEmpty(search.getKeywords()), " + enumName + ".NAME.like(search.getKeywords()))\n" +
- "\t\t\t\t// 创建时间-起始\n" +
- "\t\t\t\t.andIf(NumericUtil.tryParseLong(search.getCreateTimeStart()).compareTo(0L) > 0, " + enumName + ".CREATE_TIME.greaterOrEqual(search.getCreateTimeStart()))\n" +
- "\t\t\t\t// 创建时间-截止\n" +
- "\t\t\t\t.andIf(NumericUtil.tryParseLong(search.getCreateTimeEnd()).compareTo(0L) > 0, " + enumName + ".CREATE_TIME.lessOrEqual(search.getCreateTimeEnd()))\n" +
- "\t\t\t\t;\n" +
+ "\t\t// 排序处理\n" +
"\t\tif (ListUtil.isNotNullOrEmpty(search.getOrderBy())) {\n" +
- "\t\t\tList<String> listOrderBy = new ArrayList<>();\n" +
"\t\t\tfor (OrderByDTO item : search.getOrderBy()) {\n" +
- "\t\t\t\tEOrderBy orderBy = EOrderBy.getByValue(NumericUtil.tryParseInt(item.getOrderBy(), 1));\n" +
- "\t\t\t\tif (Objects.isNull(orderBy)) {\n" +
- "\t\t\t\t\tcontinue;\n" +
- "\t\t\t\t}\n" +
- "\t\t\t\tswitch (orderBy) {\n" +
- "\t\t\t\t\tcase ID:\n" +
- "\t\t\t\t\t\tlistOrderBy.add(" + enumName + ".ID.getColumnName() +\n" +
- "\t\t\t\t\t\t\t\t(item.getIsAsc() ? ConstantFactory.SQL_ASC : ConstantFactory.SQL_DESC)\n" +
- "\t\t\t\t\t\t);\n" +
- "\t\t\t\t\t\tbreak;\n" +
- "\n" +
- "\t\t\t\t\tcase CREATE_TIME:\n" +
- "\t\t\t\t\t\tlistOrderBy.add(" + enumName + ".CREATE_TIME.getColumnName() +\n" +
- "\t\t\t\t\t\t\t\t(item.getIsAsc() ? ConstantFactory.SQL_ASC : ConstantFactory.SQL_DESC)\n" +
- "\t\t\t\t\t\t);\n" +
- "\t\t\t\t\t\tbreak;\n" +
- "\n" +
- "\t\t\t\t\tcase UPDATE_TIME:\n" +
- "\t\t\t\t\t\tlistOrderBy.add(" + enumName + ".UPDATE_TIME.getColumnName() +\n" +
- "\t\t\t\t\t\t\t\t(item.getIsAsc() ? ConstantFactory.SQL_ASC : ConstantFactory.SQL_DESC)\n" +
- "\t\t\t\t\t\t);\n" +
- "\t\t\t\t\t\tbreak;\n" +
- "\n" +
- "\t\t\t\t\tdefault:\n" +
- "\t\t\t\t\t\tbreak;\n" +
+ "\t\t\t\tEOrderBy orderBy = EOrderBy.getByValue(item.getOrderBy());\n" +
+ "\t\t\t\t// 顺序排序\n" +
+ "\t\t\t\tif (item.getIsAsc()) {\n" +
+ "\t\t\t\t\tswitch (orderBy) {\n" +
+ "\t\t\t\t\t\t// 主键\n" +
+ "\t\t\t\t\t\tcase ID:\n" +
+ "\t\t\t\t\t\t\tqueryWrapper.orderByAsc(" + poName + "::getId);\n" +
+ "\t\t\t\t\t\t\tbreak;\n" +
+ "\t\t\t\t\t\t// 数据创建时间\n" +
+ "\t\t\t\t\t\tcase CREATE_TIME:\n" +
+ "\t\t\t\t\t\t\tqueryWrapper.orderByAsc(" + poName + "::getCreateTime);\n" +
+ "\t\t\t\t\t\t\tbreak;\n" +
+ "\t\t\t\t\t\t// 最后更新时间\n" +
+ "\t\t\t\t\t\tcase UPDATE_TIME:\n" +
+ "\t\t\t\t\t\t\tqueryWrapper.orderByAsc(" + poName + "::getUpdateTime);\n" +
+ "\t\t\t\t\t\t\tbreak;\n" +
+ "\t\t\t\t\t}\n" +
+ "\t\t\t\t} else {\n" +
+ "\t\t\t\t\t// 倒叙排序\n" +
+ "\t\t\t\t\tswitch (orderBy) {\n" +
+ "\t\t\t\t\t\t// 主键\n" +
+ "\t\t\t\t\t\tcase ID:\n" +
+ "\t\t\t\t\t\t\tqueryWrapper.orderByDesc(" + poName + "::getId);\n" +
+ "\t\t\t\t\t\t\tbreak;\n" +
+ "\t\t\t\t\t\t// 数据创建时间\n" +
+ "\t\t\t\t\t\tcase CREATE_TIME:\n" +
+ "\t\t\t\t\t\t\tqueryWrapper.orderByDesc(" + poName + "::getCreateTime);\n" +
+ "\t\t\t\t\t\t\tbreak;\n" +
+ "\t\t\t\t\t\t// 最后更新时间\n" +
+ "\t\t\t\t\t\tcase UPDATE_TIME:\n" +
+ "\t\t\t\t\t\t\tqueryWrapper.orderByDesc(" + poName + "::getUpdateTime);\n" +
+ "\t\t\t\t\t\t\tbreak;\n" +
+ "\t\t\t\t\t}\n" +
"\t\t\t\t}\n" +
"\t\t\t}\n" +
- "\t\t\tbuilder.orderBy(ListUtil.toArray(listOrderBy));\n" +
- "\t\t}else {\n" +
- "\t\t\tbuilder.orderBy(" + enumName + ".ID.getColumnName() + ConstantFactory.SQL_DESC);\n" +
- "\t\t}\n"+
- "\t\treturn super.getPageList(builder);\n" +
- "\t\t}");
+ "\t\t} else {\n" +
+ "\t\t\tqueryWrapper.orderByDesc(" + poName + "::getId);\n" +
+ "\t\t}\n" +
+ "\t\tPage<" + poName + "> pageResult = super.selectPage(new Page<>(search.getPage(), search.getLimit()), queryWrapper);\n" +
+ "\t\treturn new PagerResult<>(pageResult.getSize(), pageResult.getPages(), pageResult.getTotal(), pageResult.getRecords());\n" +
+ "\t}\n" +
+ "\n" +
+ "\tpublic Boolean add(" + poName + " item) {\n" +
+ "\t\tint rowCount = super.insert(item);\n" +
+ "\t\treturn rowCount == 1;\n" +
+ "\t}\n" +
+ "\n" +
+ "\tpublic Boolean addNotIncrement(" + poName + " item) {\n" +
+ "\t\tint rowCount = super.insert(item);\n" +
+ "\t\treturn rowCount == 1;\n" +
+ "\t}\n" +
+ "\n" +
+ "\tpublic " + poName + " getById(Long id) {\n" +
+ "\t\treturn super.get(id);\n" +
+ "\t}\n" +
+ "\n" +
+ "\tpublic List<" + poName + "> getListById(List<Long> listId) {\n" +
+ "\t\treturn super.getList(listId);\n" +
+ "\t}\n"
+ );
content.append("}");
- if (new File(GenCodeGauss.OutSet.DAO + daoName + ".java").exists()) {
+ if (new File(GenCodeGauss.OutSet.MAPPER_IMPL + daoName + ".java").exists()) {
return;
}
- writeFile(GenCodeGauss.OutSet.DAO, daoName + ".java", content.toString());
+ writeFile(GenCodeGauss.OutSet.MAPPER_IMPL, daoName + ".java", content.toString());
}
private static Boolean IsNoCreate(String name, Integer isPK, Integer isIdentity) {
@@ -846,14 +768,13 @@
}
content.append(ConstantFactory.STR_NEWLINE);
content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc)
+ .replaceAll("\\{\\#\\=desc\\}", tableDesc == null ? modelName : tableDesc)
.replaceAll("\\{\\#\\=author\\}", AUTHOR)
.replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
);
content.append(ConstantFactory.STR_NEWLINE);
if (isData) {
content.append("@Data");
- content.append(ConstantFactory.STR_NEWLINE);
}
content.append(ConstantFactory.STR_NEWLINE);
content.append("public class ");
@@ -862,8 +783,10 @@
content.append(ConstantFactory.STR_NEWLINE);
content.append(StringUtil.join(listColumn, ConstantFactory.STR_NEWLINE));
content.append(ConstantFactory.STR_NEWLINE);
- content.append(StringUtil.join(listGetterSetter, ConstantFactory.STR_NEWLINE));
- content.append(ConstantFactory.STR_NEWLINE);
+ if (!isData) {
+ content.append(StringUtil.join(listGetterSetter, ConstantFactory.STR_NEWLINE));
+ content.append(ConstantFactory.STR_NEWLINE);
+ }
content.append("}");
if (new File(GenCodeGauss.OutSet.RequestDTO + tableNamePackage + "/" + createDTOName + ".java").exists()) {
@@ -938,14 +861,13 @@
}
content.append(ConstantFactory.STR_NEWLINE);
content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc)
+ .replaceAll("\\{\\#\\=desc\\}", tableDesc == null ? modelName : tableDesc)
.replaceAll("\\{\\#\\=author\\}", AUTHOR)
.replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
);
content.append(ConstantFactory.STR_NEWLINE);
if (isData) {
content.append("@Data");
- content.append(ConstantFactory.STR_NEWLINE);
}
content.append(ConstantFactory.STR_NEWLINE);
content.append("public class ");
@@ -954,8 +876,10 @@
content.append(ConstantFactory.STR_NEWLINE);
content.append(StringUtil.join(listColumn, ConstantFactory.STR_NEWLINE));
content.append(ConstantFactory.STR_NEWLINE);
- content.append(StringUtil.join(listGetterSetter, ConstantFactory.STR_NEWLINE));
- content.append(ConstantFactory.STR_NEWLINE);
+ if (!isData) {
+ content.append(StringUtil.join(listGetterSetter, ConstantFactory.STR_NEWLINE));
+ content.append(ConstantFactory.STR_NEWLINE);
+ }
content.append("}");
if (new File(GenCodeGauss.OutSet.RequestDTO + tableNamePackage + "/" + modifyDTOName + ".java").exists()) {
@@ -970,7 +894,7 @@
String voName = modelName + GenCodeGauss.SuffixSet.VO;
String createDTOName = GenCodeGauss.SuffixSet.Create + modelName;
String modifyDTOName = GenCodeGauss.SuffixSet.Modify + modelName;
- String convertMapperName = modelName + "Mapper";
+ String convertMapperName = modelName + SuffixSet.CONVERT_MAPPER;
String tableNamePackage = tableName.toLowerCase().replaceAll("_", "");
StringBuilder content = new StringBuilder();
@@ -1011,7 +935,7 @@
content.append(ConstantFactory.STR_NEWLINE);
content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc)
+ .replaceAll("\\{\\#\\=desc\\}", tableDesc == null ? modelName : tableDesc)
);
content.append(ConstantFactory.STR_NEWLINE);
content.append("@Mapper");
@@ -1030,17 +954,17 @@
content.append(ConstantFactory.STR_NEWLINE);
content.append("}");
- if (new File(GenCodeGauss.OutSet.COMVERT_MAPPER + convertMapperName + ".java").exists()) {
+ if (new File(GenCodeGauss.OutSet.CONVERT_MAPPER + convertMapperName + ".java").exists()) {
return;
}
- writeFile(GenCodeGauss.OutSet.COMVERT_MAPPER, convertMapperName + ".java", content.toString());
+ writeFile(GenCodeGauss.OutSet.CONVERT_MAPPER, convertMapperName + ".java", content.toString());
}
private static void genService(String tableName, String tableDesc) {
String modelName = underline2Camel(tableName, true);
String poName = modelName + GenCodeGauss.SuffixSet.PO;
String serviceName = modelName + GenCodeGauss.SuffixSet.SERVICE;
- String daoName = modelName + GenCodeGauss.SuffixSet.DAO;
+ String daoName = modelName + GenCodeGauss.SuffixSet.MAPPER_IMPL;
String createDTOName = GenCodeGauss.SuffixSet.Create + modelName;
String modifyDTOName = GenCodeGauss.SuffixSet.Modify + modelName;
String responseDTOName = modelName + "VO";
@@ -1062,7 +986,7 @@
}
}
content.append("import ");
- content.append(GenCodeGauss.PackageSet.DAO);
+ content.append(GenCodeGauss.PackageSet.MAPPER_IMPL);
content.append(".");
content.append(daoName + ";\n");
content.append("import ");
@@ -1086,7 +1010,7 @@
content.append(responseDTOName + ";\n");
content.append(ConstantFactory.STR_NEWLINE);
content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc)
+ .replaceAll("\\{\\#\\=desc\\}", tableDesc == null ? modelName : tableDesc)
.replaceAll("\\{\\#\\=author\\}", AUTHOR)
.replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
);
@@ -1096,22 +1020,20 @@
content.append(serviceName);
content.append(" extends BaseService {\n");
content.append(" @Autowired\n" +
- " private " + daoName + " dao;\n");
+ " private " + daoName + " mapper;\n");
content.append(ConstantFactory.STR_NEWLINE);
content.append(" public ExecutedResult<Long> create(" + createDTOName + " request) {\n" +
" // 转换po\n" +
" " + poName + " item = CopierUtil.mapTo(request, " + poName + ".class);\n" +
- " // 设置主键id\n" +
- " //item.setId(SnowFlakeUtil.getId());\n" +
" // 设置状态\n" +
" //item.setStatus(EState.NORMAL.getValue());\n" +
" // 设置记录创建时间\n" +
" item.setCreateTime(LocalDateTimeUtil.nowTimeStamp());\n" +
" // 是否删除(逻辑删除)初始值\n" +
- " //item.setIsDelete(EYesOrNo.NO.getValue());\n" +
+ " item.setIsDelete(EYesOrNo.NO.getValue());\n" +
"\n" +
- " Boolean result = this.dao.add(item);\n" +
- " if (BooleanUtils.isFalse(result)) {\n" +
+ " int rowCount = mapper.insert(item);\n" +
+ " if (rowCount != 1) {\n" +
" return ExecutedResult.failed(\"创建[" + tableDesc + "]失败。\");\n" +
" }\n" +
" return ExecutedResult.success(item.getId());\n" +
@@ -1126,8 +1048,8 @@
" // 转换po\n" +
" " + poName + " item = CopierUtil.mapTo(request, " + poName + ".class);\n" +
"\n" +
- " Boolean result = this.dao.modify(item);\n" +
- " if (BooleanUtils.isFalse(result)) {\n" +
+ " int rowCount = mapper.updateById(item);\n" +
+ " if (rowCount != 1) {\n" +
" return ExecutedResult.failed(\"编辑[" + tableDesc + "]失败。\");\n" +
" }\n" +
" return ExecutedResult.success();\n" +
@@ -1136,7 +1058,7 @@
" public ExecutedResult<" + responseDTOName + "> get(Long id) {\n" +
" " + responseDTOName + " result = new " + responseDTOName + "();\n" +
"\n" +
- " " + poName + " find = dao.getById(id);\n" +
+ " " + poName + " find = mapper.get(id);\n" +
" if (null != find) {\n" +
" result = CopierUtil.mapTo(find, " + responseDTOName + ".class);\n" +
" }\n" +
@@ -1153,8 +1075,8 @@
"// item.setId(id);\n" +
"// item.setStatus(EState.DISABLED.getValue());\n" +
"//\n" +
- "// Boolean result = this.dao.modify(item);\n" +
- "// if (BooleanUtils.isFalse(result)) {\n" +
+ "// int rowCount = mapper.updateById(item);\n" +
+ "// if (rowCount != 1) {\n" +
"// return ExecutedResult.failed(\"停用[" + tableDesc + "]失败。\");\n" +
"// }\n" +
"// return ExecutedResult.success();\n" +
@@ -1170,8 +1092,8 @@
"// item.setId(id);\n" +
"// item.setStatus(EState.NORMAL.getValue());\n" +
"//\n" +
- "// Boolean result = this.dao.modify(item);\n" +
- "// if (BooleanUtils.isFalse(result)) {\n" +
+ "// int rowCount = mapper.updateById(item);\\n\" +\n" +
+ "// if (rowCount != 1) {\n" +
"// return ExecutedResult.failed(\"启用[" + tableDesc + "]失败。\");\n" +
"// }\n" +
"// return ExecutedResult.success();\n" +
@@ -1187,15 +1109,39 @@
"// item.setId(request.getId());\n" +
"// item.setSort(request.getSort());\n" +
"//\n" +
- "// Boolean result = this.dao.modify(item);\n" +
- "// if (BooleanUtils.isFalse(result)) {\n" +
+ "// int rowCount = mapper.updateById(item);\\n\" +\n" +
+ "// if (rowCount != 1) {\n" +
"// return ExecutedResult.failed(\"设置[" + tableDesc + "]排序值失败。\");\n" +
"// }\n" +
"// return ExecutedResult.success();\n" +
"// }\n" +
"//\n" +
+ "// public ExecutedResult<String> listSetSort(ReqListSetSort request) {\n" +
+ "// // id列表\n" +
+ "// List<Long> listId = request.getList().stream().map(ReqSetSort::getId).collect(Collectors.toList());\n" +
+ "// // 验证记录是否存在\n" +
+ "// ExecutedResult<List<" + poName + ">> checkExists = this.check4Id(listId);\n" +
+ "// if (checkExists.isFailed()) {\n" +
+ "// return ExecutedResult.failed(checkExists.getMsg());\n" +
+ "// }\n" +
+ "//\n" +
+ "// List<" + poName + "> listUpdate = request.getList().stream()\n" +
+ "// .map(c -> {\n" +
+ "// " + poName + " item = new " + poName + "();\n" +
+ "// item.setId(c.getId());\n" +
+ "// item.setSort(c.getSort());\n" +
+ "// return item;\n" +
+ "// })\n" +
+ "// .collect(Collectors.toList());\n" +
+ "// Boolean result = mapper.modifyList(listUpdate);\n" +
+ "// if (result) {\n" +
+ "// return ExecutedResult.success();\n" +
+ "// }\n" +
+ "// return ExecutedResult.failed(\"[" + tableDesc + "]设置排序值失败\");\n" +
+ "// }\n" +
+ "//\n" +
"// public ExecutedResult<String> remove(Long id) {\n" +
- "// Boolean result = this.dao.remove(id);\n" +
+ "// Boolean result = mapper.deleteLogic(id);\n" +
"// if (BooleanUtils.isFalse(result)) {\n" +
"// return ExecutedResult.failed(\"删除[" + tableDesc + "]失败。\");\n" +
"// }\n" +
@@ -1203,7 +1149,7 @@
"// }\n" +
"//\n" +
"// public ExecutedResult<String> removeList(List<Long> ids) {\n" +
- "// Boolean result = this.dao.removeByListId(ids);\n" +
+ "// Boolean result = mapper.deleteLogic(ids);\n" +
"// if (BooleanUtils.isFalse(result)) {\n" +
"// return ExecutedResult.failed(\"删除[" + tableDesc + "]失败。\");\n" +
"// }\n" +
@@ -1213,7 +1159,7 @@
" public ExecutedResult<List<" + responseDTOName + ">> getList(List<Long> listId) {\n" +
" List<" + responseDTOName + "> result = new ArrayList<>();\n" +
"\n" +
- " List<" + poName + "> list = this.dao.getListById(listId);\n" +
+ " List<" + poName + "> list = mapper.getList(listId);\n" +
" if (ListUtil.isNotNullOrEmpty(list)) {\n" +
" result = CopierUtil.mapTo(list, " + responseDTOName + ".class);\n" +
" }\n" +
@@ -1230,7 +1176,7 @@
" search.setCreateTimeEnd(LocalDateTimeUtil.getTimeStamp(createTimeRange.getItem2()).getTime());\n" +
" }\n" +
"\n" +
- " PagerResult<" + poName + "> pageList = dao.search(search);\n" +
+ " PagerResult<" + poName + "> pageList = mapper.search(search);\n" +
" List<" + responseDTOName + "> listVo = new ArrayList<>();\n" +
" List<" + poName + "> list = pageList.getList();\n" +
" if (ListUtil.isNotNullOrEmpty(list)) {\n" +
@@ -1244,12 +1190,30 @@
" }\n" +
"\n" +
" protected ExecutedResult<" + poName + "> check4Id(Long id) {\n" +
- " " + poName + " exists = dao.getById(id);\n" +
+ " " + poName + " exists = mapper.get(id);\n" +
" if (Objects.isNull(exists)) {\n" +
" return ExecutedResult.failed(\"[" + tableDesc + "]不存在：\" + id);\n" +
" }\n" +
" return ExecutedResult.success(exists);\n" +
- " }\n");
+ " }\n" +
+ " protected ExecutedResult<List<" + poName + ">> check4Id(List<Long> listId) {\n" +
+ " // 从数据库查找" + tableDesc + "\n" +
+ " List<" + poName + "> list = mapper.getList(listId);\n" +
+ " if (ListUtil.isNullOrEmpty(list)) {\n" +
+ " return ExecutedResult.failed(\"[" + tableDesc + "]不存在.\" + listId);\n" +
+ " }\n" +
+ " // 数据库找到的id列表\n" +
+ " List<Long> listIdFind = list.stream().map(" + poName + "::getId).collect(Collectors.toList());\n" +
+ " // 数量不一致\n" +
+ " if (listId.size() != listIdFind.size()) {\n" +
+ " // 筛选数据库不存在的" + tableDesc + "\n" +
+ " List<Long> listIdNotFound = listId.stream().filter(c -> !listIdFind.contains(c)).collect(Collectors.toList());\n" +
+ " if (ListUtil.isNullOrEmpty(list)) {\n" +
+ " return ExecutedResult.failed(\"[" + tableDesc + "]不存在.\" + listIdNotFound);\n" +
+ " }\n" +
+ " }\n" +
+ " return ExecutedResult.success(list);\n" +
+ " }");
content.append("}");
if (new File(GenCodeGauss.OutSet.SERVICE + serviceName + ".java").exists()) {
@@ -1306,7 +1270,7 @@
content.append(responseDTOName + ";\n");
content.append(ConstantFactory.STR_NEWLINE);
content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc)
+ .replaceAll("\\{\\#\\=desc\\}", tableDesc == null ? modelName : tableDesc)
.replaceAll("\\{\\#\\=author\\}", AUTHOR)
.replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
);
@@ -1382,16 +1346,6 @@
.replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
);
content.append(ConstantFactory.STR_NEWLINE);
- content.append(" @PostMapping(value = \"getList\")\n" +
- " public ExecutedResult<List<" + voName + ">> getList(@RequestBody ReqListId request) {\n" +
- " return this.service.getList(request.getListId());\n" +
- " }\n\n");
- content.append(SET_METHOD_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", "查询[" + tableDesc + "]")
- .replaceAll("\\{\\#\\=author\\}", AUTHOR)
- .replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
- );
- content.append(ConstantFactory.STR_NEWLINE);
content.append(" @PostMapping(value = \"search\")\n" +
" public ExecutedResult<PagerResult<" + voName + ">> search(@RequestBody " + searchName + " request) {\n" +
" return this.service.search(request);\n" +
@@ -1417,110 +1371,6 @@
//#region gen MyBatis mapper
- private static void genMapperXml(List<Map<String, Object>> columns, String tableDesc) {
- if (ListUtil.isNullOrEmpty(columns)) {
- return;
- }
- String tableName = columns.get(0).get("objname").toString();
- String modelName = underline2Camel(tableName, true);
-
- StringBuilder content = new StringBuilder();
- content.append("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" +
- "<!DOCTYPE mapper\n" +
- " PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\"\n" +
- " \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\">\n");
- content.append("<!-- ");
- content.append(tableDesc);
- content.append(" mapper -->\n");
- content.append(String.format("<mapper namespace=\"%s.%s%s\">\n", GenCodeGauss.PackageSet.MAPPER, modelName, GenCodeGauss.SuffixSet.MAPPER));
-
- Map<String, String> mapResultMap = new HashMap<>();
- Map<String, String> mapResultMapDesc = new HashMap<>();
- for (Map<String, Object> column : columns) {
- String name = column.get("name").toString();
- String desc = String.valueOf(column.get("description"));
-
- String propName = underline2Camel(name);
- //忽略最后修改时间这一列的新增和编辑
- if ("datachange_lasttime".equalsIgnoreCase(name)) {
- propName = "dataChangeLastTime";
- }
-
- mapResultMap.put(name, propName);
- mapResultMapDesc.put(name, desc);
- }
-
- //追加 resultMap
- content.append(String.format("\t<resultMap type=\"%s.%s%s\" id=\"resultMap\">\n", GenCodeGauss.PackageSet.PO, modelName, GenCodeGauss.SuffixSet.PO));
- content.append(genResultMap(mapResultMap, mapResultMapDesc));
- content.append("\n\t</resultMap>\n\n");
-
- //追加 add 的方法
- content.append(String.format("\t<insert id=\"add\" parameterType=\"%s.%s%s\" keyProperty=\"id\" useGeneratedKeys=\"true\">\n", GenCodeGauss.PackageSet.PO, modelName, GenCodeGauss.SuffixSet.PO));
- content.append(genInsert(tableName, mapResultMap, mapResultMapDesc));
- content.append("\n\t</insert>\n\n");
-
- //追加 addBatch 的方法
- content.append(String.format("\t<insert id=\"addBatch\" parameterType=\"%s.%s%s\" useGeneratedKeys=\"true\" keyProperty=\"id\">\n", GenCodeGauss.PackageSet.PO, modelName, GenCodeGauss.SuffixSet.PO));
- content.append(genInsertBath(tableName, mapResultMap, mapResultMapDesc));
- content.append("\n\t</insert>\n\n");
-
- //追加 update 的方法
- content.append(String.format("\t<update id=\"update\" parameterType=\"%s.%s%s\" keyProperty=\"id\">\n", GenCodeGauss.PackageSet.PO, modelName, GenCodeGauss.SuffixSet.PO));
- content.append(genUpdate(tableName, mapResultMap, mapResultMapDesc));
- content.append("\n\t</update>\n\n");
-
- //追加 updateBatch 的方法
- content.append("\t<update id=\"updateBatch\" parameterType=\"java.util.List\">\n");
- content.append(genUpdateBatch(tableName, mapResultMap, mapResultMapDesc));
- content.append("\n\t</update>\n\n");
-
- //追加 delete 的方法
- content.append("\t<delete id=\"delete\">\n");
- content.append("\t\tDELETE FROM `");
- content.append(tableName);
- content.append("` WHERE `id` = #{value}\n");
- content.append("\t</delete>\n\n");
-
- //追加 deleteBatch 的方法
- content.append("\t<delete id=\"deleteBatch\" parameterType=\"java.util.List\">\n");
- content.append("\t\tDELETE FROM `");
- content.append(tableName);
- content.append("` WHERE `id` IN");
- content.append("\t\t<!-- “collection”固定值为list，“item”为循环变量取的别名 -->\n");
- content.append("\t\t<foreach collection=\"list\" item=\"id\" open=\"(\" separator=\",\" close=\")\">\n");
- content.append("\t\t\t#{id}\n");
- content.append("\t\t</foreach>\n");
- content.append("\t</delete>\n\n");
-
- //追加 get 的方法
- content.append("\t<select id=\"get\" resultMap=\"resultMap\">\n");
- content.append(genGet(tableName, mapResultMap, mapResultMapDesc));
- content.append("\n\t</select>\n\n");
-
- //追加 getCount 的方法
- content.append(String.format("\t<select id=\"getCount\" resultType=\"Long\" parameterType=\"%s.Search%s\">\n", GenCodeGauss.PackageSet.SEARCH, modelName));
- content.append(genGetCount(tableName));
- content.append("\n\t</select>\n\n");
-
- //追加 getList 的方法
- content.append(String.format("\t<select id=\"getList\" resultMap=\"resultMap\" parameterType=\"%s.Search%s\">\n", GenCodeGauss.PackageSet.SEARCH, modelName));
- content.append(genGetList(tableName, mapResultMap, mapResultMapDesc));
- content.append("\n\t</select>\n\n");
-
- //追加 getListBySql 的方法
- content.append("\t<select id=\"getListBySql\" parameterType=\"java.util.Map\" resultType=\"HashMap\">\n");
- content.append("\t\t${sql}\n");
- content.append("\t</select>\n");
-
- content.append("</mapper>");
-
- if (new File(GenCodeGauss.OutSet.MAPPERXML + modelName + GenCodeGauss.SuffixSet.MAPPER + ".xml").exists()) {
- return;
- }
- writeFile(GenCodeGauss.OutSet.MAPPERXML, modelName + GenCodeGauss.SuffixSet.MAPPER + ".xml", content.toString());
- }
-
private static void genMapper(List<Map<String, Object>> columns, String tableDesc) {
if (ListUtil.isNullOrEmpty(columns)) {
return;
@@ -1534,11 +1384,12 @@
content.append(ConstantFactory.STR_SEMICOLON);
content.append(ConstantFactory.STR_NEWLINE);
content.append(ConstantFactory.STR_NEWLINE);
+ content.append(String.format("import %s.BasicMapper;", PackageSet.MAPPER.replace(".mapper", "")));
content.append(String.format("import %s.%s%s;", GenCodeGauss.PackageSet.PO, modelName, GenCodeGauss.SuffixSet.PO));
content.append(ConstantFactory.STR_NEWLINE);
content.append(ConstantFactory.STR_NEWLINE);
content.append(SET_CLASS_DESC_TPL
- .replaceAll("\\{\\#\\=desc\\}", tableDesc + " mapper")
+ .replaceAll("\\{\\#\\=desc\\}", tableDesc == null ? modelName : tableDesc + " mapper")
.replaceAll("\\{\\#\\=author\\}", AUTHOR)
.replaceAll("\\{\\#\\=date\\}", LocalDateTimeUtil.todayStr().replaceAll("\\-", "/"))
);
@@ -1553,234 +1404,10 @@
writeFile(GenCodeGauss.OutSet.MAPPER, modelName + GenCodeGauss.SuffixSet.MAPPER + ".java", content.toString());
}
- private static String genInsert(String tableName, Map<String, String> mapResultMap, Map<String, String> mapResultMapDesc) {
- List<String> result = new ArrayList<>();
- result.add("\t\tINSERT INTO `" + tableName + "`(");
-
- List<String> listColumn = new ArrayList<>();
- List<String> listValue = new ArrayList<>();
- for (Map.Entry<String, String> entry : mapResultMap.entrySet()) {
- String name = entry.getKey();
- if (NO_CREATE_COLUMNS.stream().anyMatch(c -> c.equalsIgnoreCase(name))) {
- continue;
- }
- listColumn.add("\t\t<!-- " + mapResultMapDesc.get(entry.getKey()) + " -->\n\t\t`" + name + "`");
-
- listValue.add("\t\t#{" + entry.getValue() + "}");
- }
- result.add(StringUtil.join(listColumn, ",\r\n"));
- result.add("\t\t) VALUES(");
- result.add(StringUtil.join(listValue, ",\r\n"));
- result.add("\t);");
- return StringUtil.join(result, ConstantFactory.STR_NEWLINE);
- }
-
- private static String genInsertBath(String tableName, Map<String, String> mapResultMap, Map<String, String> mapResultMapDesc) {
- List<String> result = new ArrayList<>();
- result.add("\t\tINSERT INTO `" + tableName + "`(");
-
- List<String> listColumn = new ArrayList<>();
- List<String> listValue = new ArrayList<>();
- for (Map.Entry<String, String> entry : mapResultMap.entrySet()) {
- String name = entry.getKey();
- if (NO_CREATE_COLUMNS.stream().anyMatch(c -> c.equalsIgnoreCase(name))) {
- continue;
- }
- listColumn.add("\t\t<!-- " + mapResultMapDesc.get(entry.getKey()) + " -->\n\t\t`" + name + "`");
-
- listValue.add("\t\t\t#{item." + entry.getValue() + "}");
- }
- result.add(StringUtil.join(listColumn, ",\r\n"));
- result.add("\t\t) VALUES(");
- result.add("\t\t<!-- “collection”固定值为list，“item”为循环变量取的别名 -->");
- result.add("\t\t<foreach collection=\"list\" item=\"item\" separator=\",\">");
- result.add("\t\t\t(");
- result.add(StringUtil.join(listValue, ",\r\n"));
- result.add("\t\t\t)");
- result.add("\t\t</foreach>");
- result.add("\t\t);");
- return StringUtil.join(result, ConstantFactory.STR_NEWLINE);
- }
-
- private static String genUpdate(String tableName, Map<String, String> mapResultMap, Map<String, String> mapResultMapDesc) {
- List<String> result = new ArrayList<>();
- result.add("\t\tUPDATE `" + tableName + "`");
- result.add("\t\t<trim prefix=\"SET\" suffixOverrides=\",\">");
- for (Map.Entry<String, String> entry : mapResultMap.entrySet()) {
- String name = entry.getKey();
- String propName = entry.getValue();
- if (NO_UPDATE_COLUMNS.stream().anyMatch(c -> c.equalsIgnoreCase(name))) {
- continue;
- }
- result.add("\t\t\t<!-- " + mapResultMapDesc.get(entry.getKey()) + " -->");
- result.add("\t\t\t<if test=\"null != " + propName + "\">`" + name + "` = #{" + propName + "},</if>");
- }
- result.add("\t\t</trim>");
- result.add("\t\tWHERE `id` = #{id}");
- return StringUtil.join(result, ConstantFactory.STR_NEWLINE);
- }
-
- private static String genUpdateBatch(String tableName, Map<String, String> mapResultMap, Map<String, String> mapResultMapDesc) {
- List<String> result = new ArrayList<>();
- result.add("\t\t<!-- “collection”固定值为list，“item”为循环变量取的别名 -->");
- result.add("\t\t<foreach collection=\"list\" item=\"item\" index=\"index\" open=\"\" close=\"\" separator=\";\">");
- result.add("\t\t\tUPDATE `" + tableName + "`");
- result.add("\t\t\t<trim prefix=\"SET\" suffixOverrides=\",\">");
- for (Map.Entry<String, String> entry : mapResultMap.entrySet()) {
- String name = entry.getKey();
- String propName = entry.getValue();
- if (NO_UPDATE_COLUMNS.stream().anyMatch(c -> c.equalsIgnoreCase(name))) {
- continue;
- }
- result.add("\t\t\t\t<!-- " + mapResultMapDesc.get(entry.getKey()) + " -->");
- result.add("\t\t\t\t<if test=\"null != item." + propName + "\">`" + name + "` = #{item." + propName + "},</if>");
- }
- result.add("\t\t\t</trim>");
- result.add("\t\t\tWHERE `id` = #{id}");
- result.add("\t\t</foreach>");
- return StringUtil.join(result, ConstantFactory.STR_NEWLINE);
- }
-
- private static String genGet(String tableName, Map<String, String> mapResultMap, Map<String, String> mapResultMapDesc) {
- List<String> result = new ArrayList<>();
- result.add("\t\t<![CDATA[SELECT");
-
- List<String> listColumn = new ArrayList<>();
- for (Map.Entry<String, String> entry : mapResultMap.entrySet()) {
- String name = entry.getKey();
- listColumn.add("\t\t\t`" + name + "`");
- }
- result.add(StringUtil.join(listColumn, ",\r\n"));
- result.add("\t\tFROM `" + tableName + "`]]>");
- result.add("\t\tWHERE `id` = #{id}");
- return StringUtil.join(result, ConstantFactory.STR_NEWLINE);
- }
-
- private static String genGetCount(String tableName) {
- List<String> result = new ArrayList<>();
- result.add("\t\t<![CDATA[SELECT COUNT(*) FROM `" + tableName + "`]]>");
- result.add("\t\t<!-- 加上“WHERE”前缀，去掉第一个“AND” -->");
- result.add("\t\t<trim prefix=\"WHERE\" prefixOverrides=\"AND \">");
-
- result.add("\t\t\t<!-- 自增id -->");
- result.add("\t\t\t<if test=\"null != id and id > 0\">");
- result.add("\t\t\t\tAND `id` = #{id}");
- result.add("\t\t\t</if>");
-
- result.add("\t\t\t<!-- 自增id列表 -->");
- result.add("\t\t\t<if test=\"null != listId and listId.size() > 0\">");
- result.add("\t\t\t\tAND `id` IN");
- result.add("\t\t\t\t<foreach collection=\"listId\" item=\"item\" open=\"(\" separator=\",\" close=\")\">");
- result.add("\t\t\t\t\t#{item}");
- result.add("\t\t\t\t</foreach>");
- result.add("\t\t\t</if>");
-
- result.add("\t\t\t<!-- 数据状态 -->");
- result.add("\t\t\t<if test=\"null != status and status > 0\">");
- result.add("\t\t\t\tAND `status` = #{status}");
- result.add("\t\t\t</if>");
-
- result.add("\t\t\t<!-- 数据状态列表 -->");
- result.add("\t\t\t<if test=\"null != listStatus and listStatus.size() > 0\">");
- result.add("\t\t\t\tAND `status` IN");
- result.add("\t\t\t\t<foreach collection=\"listStatus\" item=\"item\" open=\"(\" separator=\",\" close=\")\">");
- result.add("\t\t\t\t\t#{item}");
- result.add("\t\t\t\t</foreach>");
- result.add("\t\t\t</if>");
-
- result.add("\t\t\t<!-- 关键字模糊搜索 -->");
- result.add("\t\t\t<!-- <if test=\"null != keywords and '' != keywords.trim()\">");
- result.add("\t\t\t\tAND (`user_name` LIKE #{keywords} OR `nick_name` LIKE #{keywords})");
- result.add("\t\t\t</if> -->");
-
- result.add("\t\t\t<!-- 数据创建时间-起始 -->");
- result.add("\t\t\t<if test=\"null != createTimeStart and createTimeStart > 0\">");
- result.add("\t\t\t\tAND `create_time` >= #{createTimeStart}");
- result.add("\t\t\t</if>");
-
- result.add("\t\t\t<!-- 数据创建时间-截止 -->");
- result.add("\t\t\t<if test=\"null != createTimeEnd and createTimeEnd > 0\">");
- result.add("\t\t\t\tAND `create_time` <= #{createTimeEnd}");
- result.add("\t\t\t</if>");
-
- result.add("\t\t</trim>");
- return StringUtil.join(result, ConstantFactory.STR_NEWLINE);
- }
-
- private static String genGetList(String tableName, Map<String, String> mapResultMap, Map<String, String> mapResultMapDesc) {
- List<String> result = new ArrayList<>();
- result.add("\t\t<![CDATA[SELECT");
-
- List<String> listColumn = new ArrayList<>();
- for (Map.Entry<String, String> entry : mapResultMap.entrySet()) {
- String name = entry.getKey();
- listColumn.add("\t\t`" + name + "`");
- }
- result.add(StringUtil.join(listColumn, ",\r\n"));
- result.add("\t\tFROM `" + tableName + "`]]>");
- result.add("\t\t<!-- 加上“WHERE”前缀，去掉第一个“AND” -->");
- result.add("\t\t<trim prefix=\"WHERE\" prefixOverrides=\"AND \">");
-
- result.add("\t\t\t<!-- 自增id -->");
- result.add("\t\t\t<if test=\"null != id and id > 0\">");
- result.add("\t\t\t\tAND `id` = #{id}");
- result.add("\t\t\t</if>");
-
- result.add("\t\t\t<!-- 自增id列表 -->");
- result.add("\t\t\t<if test=\"null != listId and listId.size() > 0\">");
- result.add("\t\t\t\tAND `id` IN");
- result.add("\t\t\t\t<foreach collection=\"listId\" item=\"item\" open=\"(\" separator=\",\" close=\")\">");
- result.add("\t\t\t\t\t#{item}");
- result.add("\t\t\t\t</foreach>");
- result.add("\t\t\t</if>");
-
- result.add("\t\t\t<!-- 数据状态 -->");
- result.add("\t\t\t<if test=\"null != status and status > 0\">");
- result.add("\t\t\t\tAND `status` = #{status}");
- result.add("\t\t\t</if>");
-
- result.add("\t\t\t<!-- 数据状态列表 -->");
- result.add("\t\t\t<if test=\"null != listStatus and listStatus.size() > 0\">");
- result.add("\t\t\t\tAND `status` IN");
- result.add("\t\t\t\t<foreach collection=\"listStatus\" item=\"item\" open=\"(\" separator=\",\" close=\")\">");
- result.add("\t\t\t\t\t#{item}");
- result.add("\t\t\t\t</foreach>");
- result.add("\t\t\t</if>");
-
- result.add("\t\t\t<!-- 关键字模糊搜索 -->");
- result.add("\t\t\t<!-- <if test=\"null != keywords and '' != keywords.trim()\">");
- result.add("\t\t\t\tAND (`user_name` LIKE #{keywords} OR `nick_name` LIKE #{keywords})");
- result.add("\t\t\t</if> -->");
-
- result.add("\t\t\t<!-- 数据创建时间-起始 -->");
- result.add("\t\t\t<if test=\"null != createTimeStart and createTimeStart > 0\">");
- result.add("\t\t\t\tAND `create_time` >= #{createTimeStart}");
- result.add("\t\t\t</if>");
-
- result.add("\t\t\t<!-- 数据创建时间-截止 -->");
- result.add("\t\t\t<if test=\"null != createTimeEnd and createTimeEnd > 0\">");
- result.add("\t\t\t\tAND `create_time` <= #{createTimeEnd}");
- result.add("\t\t\t</if>");
-
- result.add("\t\t</trim>");
- result.add("\t\t<choose>");
- result.add("\t\t\t<when test=\"null!=orderBy and orderBy.trim()!=''\">");
- result.add("\t\t\t\tORDER BY ${orderBy}");
- result.add("\t\t\t</when>");
- result.add("\t\t\t<otherwise>");
- result.add("\t\t\t\tORDER BY id DESC");
- result.add("\t\t\t</otherwise>");
- result.add("\t\t</choose>");
- result.add("\t\t<if test=\"null!=pageSize and pageSize>0 and null!=lastRowNo and lastRowNo>=0\">");
- result.add("\t\t\tLIMIT ${lastRowNo}, ${pageSize}");
- result.add("\t\t</if>");
- return StringUtil.join(result, ConstantFactory.STR_NEWLINE);
- }
-
//#endregion
- private static Map<String, String> getTables(String dbSchema) {
+ public static Map<String, String> getTables(Connection connect, String dbSchema) {
// dbSchema="public";
Map<String, String> result = new LinkedHashMap<>();
String sql = "SELECT tb.table_name, d.description AS TABLE_COMMENT" +
@@ -1788,7 +1415,7 @@
" JOIN pg_class c ON c.relname = tb.table_name" +
" LEFT JOIN pg_description d ON d.objoid = c.oid AND d.objsubid = '0'" +
" WHERE tb.table_schema = 'public' ";
- try (PreparedStatement pStmt = CONN.prepareStatement(sql)) {
+ try (PreparedStatement pStmt = connect.prepareStatement(sql)) {
//pStmt.setString(1, dbSchema);
try (ResultSet rs = pStmt.executeQuery()) {
while (rs.next()) {
@@ -1803,29 +1430,22 @@
return result;
}
- private static List<Map<String, Object>> getColumns(String tableName, String dbSchema) {
+ public static List<Map<String, Object>> getColumns(Connection connect, String tableName) {
List<Map<String, Object>> result = new ArrayList<>();
- String sql = "select " +
- "col.table_name AS objName, " +
- "col.column_name AS name, " +
- "col.data_type AS type, " +
- "col.character_maximum_length AS LENGTH, " +
- "des.description, " +
- "col.numeric_precision, " +
- "col.numeric_scale," +
- "CASE is_identity WHEN 'YES' THEN 1 ELSE 0 END AS isIdentity, " +
- "CASE col.IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS isNullable, " +
- "col.column_default AS default " +
- "from " +
- "information_schema.columns col left join pg_description des on " +
- "col.table_name::regclass = des.objoid " +
- "and col.ordinal_position = des.objsubid " +
- "where " +
- "table_name = ? " +
- "and table_schema = 'public' " +
- "order by " +
+ String sql = "SELECT col.table_name AS objName, col.column_name AS name, col.udt_name AS type, col.character_maximum_length AS LENGTH, des.description,\n" +
+ "col.numeric_precision, \n" +
+ "col.numeric_scale,\n" +
+ "col.datetime_precision,\n" +
+ "CASE is_identity WHEN 'YES' THEN 1 ELSE 0 END AS isIdentity,\n" +
+ "CASE col.IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS isNullable,\n" +
+ "col.column_default AS default\n" +
+ "FROM information_schema.columns col \n" +
+ "LEFT JOIN pg_description des ON col.table_name::regclass = des.objoid AND col.ordinal_position = des.objsubid\n" +
+ "WHERE table_name = ? " +
+ "AND table_schema = 'public' " +
+ "ORDER BY " +
"ordinal_position;";
- try (PreparedStatement pStmt = CONN.prepareStatement(sql)) {
+ try (PreparedStatement pStmt = connect.prepareStatement(sql)) {
pStmt.setString(1, tableName);
// pStmt.setString(2, "public");
try (ResultSet rs = pStmt.executeQuery()) {
@@ -1849,9 +1469,11 @@
return result;
}
- private static String getJavaType(String typeName) {
+ public static String getJavaType(String typeName) {
String result = "String";
switch (typeName) {
+ case "int2":
+ case "int4":
case "integer":
case "tinyint":
result = "Integer";
@@ -1874,6 +1496,7 @@
case "decimal":
result = "BigDecimal";
break;
+ case "int8":
case "bigint":
result = "Long";
break;
@@ -1887,7 +1510,7 @@
return result;
}
- private static String underline2Camel(String line, boolean... firstIsUpperCase) {
+ public static String underline2Camel(String line, boolean... firstIsUpperCase) {
String str = "";
if (StringUtil.isNullOrEmpty(line)) {
return str;
@@ -1947,4 +1570,327 @@
e.printStackTrace();
}
}
+
+ public static String toDBValue(Object value) {
+ String result;
+ if (null == value) {
+ return "";
+ }
+ if (value instanceof Number || value instanceof Boolean) {
+ result = value.toString();
+ } else if (value instanceof Timestamp) {
+ result = String.valueOf(((Timestamp) value).getTime());
+ } else if (value instanceof LocalDateTime) {
+ result = "'" + LocalDateTimeUtil.toFormatFullString((LocalDateTime) value) + "'";
+ } else if (value instanceof LocalDate) {
+ result = "'" + LocalDateTimeUtil.toFormatString((LocalDate) value) + "'";
+ } else if (value instanceof Date) {
+ result = "'" + LocalDateTimeUtil.toFormatFullString(((Date) value).getTime()) + "'";
+ } else if (value instanceof Calendar) {
+ result = "'" + CalendarUtil.toDateTimeMSStr((Calendar) value) + "'";
+ } else {
+ result = "'" + value.toString() + "'";
+ }
+ return result;
+ }
+
+ public static boolean genTable(Connection connect, String tableName, String tableDesc, List<Map<String, Object>> listColumn, Map<String, String> mapPK, Map<String, String> mapIndex) throws SQLException {
+ String sql = "CREATE TABLE \"public\".\"" + tableName + "\" (\n";
+
+ Map<String, String> mapColumnDesc = new HashMap<>();
+ int idx = 0;
+ boolean result = Boolean.FALSE;
+
+ result = GenCodeGauss.execSql(connect, "DROP TABLE IF EXISTS \"public\".\"" + tableName + "\";\n");
+
+ // 遍历列，构建sql
+ for (Map<String, Object> column : listColumn) {
+ idx++;
+ String name = column.get("name").toString();
+ String type = column.get("type").toString();
+ String desc = column.get("description").toString();
+ String isNullable = column.get("isNullable").toString();
+
+ mapColumnDesc.put(name, desc);
+
+ sql += "\t\"" + name + "\" " + GenCodeGauss.mysqlType2Gauss(type);
+ switch (type) {
+ case "char":
+ case "varchar":
+ case "nvarchar":
+ String length = column.get("length").toString();
+ sql += "(" + length + ")";
+ if ("1".equals(isNullable)) {
+ sql += " NULL DEFAULT NULL";
+ } else {
+ sql += " NOT NULL DEFAULT NULL::character varying";
+ }
+ break;
+ case "numeric":
+ case "decimal":
+ String numeric_precision = column.get("numeric_precision").toString();
+ String numeric_scale = column.get("numeric_scale").toString();
+ sql += "(" + numeric_precision + "," + numeric_scale + ")";
+ if ("1".equals(isNullable)) {
+ sql += " NULL DEFAULT NULL";
+ } else {
+ sql += " NOT NULL DEFAULT 0";
+ }
+ break;
+ case "datetime":
+ case "timestamp":
+ String datetime_precision = column.get("datetime_precision").toString();
+ sql += "(" + datetime_precision + ")";
+ if ("1".equals(isNullable)) {
+ sql += " NULL DEFAULT NULL";
+ } else {
+ sql += " NOT NULL DEFAULT pg_systimestamp()";
+ }
+ break;
+ case "int":
+ case "tinyint":
+ case "bit":
+ case "int2":
+ case "int4":
+ case "int8":
+ case "bigint":
+ if ("1".equals(isNullable)) {
+ sql += " NULL DEFAULT NULL";
+ } else {
+ sql += " NOT NULL DEFAULT 0";
+ }
+ break;
+
+ default:
+ sql += " NULL DEFAULT NULL";
+ break;
+ }
+ if (idx < listColumn.size()) {
+ sql += ",";
+ }
+ sql += "\n";
+ }
+ sql += ")\n" +
+ ";\n";
+ result = GenCodeGauss.execSql(connect, sql);
+ sql = "";
+
+ sql += "COMMENT ON TABLE \"public\".\"" + tableName + "\" IS '" + tableDesc + "';\n";
+ // 构建字段描述sql
+ for (Map.Entry<String, String> desc : mapColumnDesc.entrySet()) {
+ sql += "COMMENT ON COLUMN \"public\".\"" + tableName + "\".\"" + desc.getKey() + "\" IS '" + desc.getValue().replace("\r\n", " ").replace("\n", " ") + "';\n";
+ }
+ result = GenCodeGauss.execSql(connect, sql);
+ sql = "";
+
+ // 设置主键
+ if (!mapPK.isEmpty()) {
+ for (Map.Entry<String, String> key : mapPK.entrySet()) {
+ sql += "ALTER TABLE \"public\".\"" + tableName + "\" ADD CONSTRAINT \"PK_" + tableName + "\" PRIMARY KEY (\"" + key.getValue() + "\");\n";
+ }
+ }
+ sql += "ALTER TABLE \"public\".\"" + tableName + "\" ADD CONSTRAINT \"PK_" + tableName + "\" PRIMARY KEY (\"id\");\n";
+ result = GenCodeGauss.execSql(connect, sql);
+ sql = "";
+
+ // 触发器：自动赋值最后更新时间
+ sql += "CREATE TRIGGER \"TG_" + tableName + "\" BEFORE INSERT OR UPDATE ON \"public\".\"" + tableName + "\"\n" +
+ "FOR EACH ROW\n" +
+ "EXECUTE PROCEDURE \"public\".\"update_timestamp_column\"();";
+ result = GenCodeGauss.execSql(connect, sql);
+ sql = "";
+
+ // 遍历索引，构建sql
+ for (Map.Entry<String, String> index : mapIndex.entrySet()) {
+ if (!mapPK.containsKey(index.getKey())) {
+ sql += "CREATE INDEX \"" + index.getKey() + "\" ON \"public\".\"test_info\"(\"" + index.getValue() + "\");\n";
+ result = GenCodeGauss.execSql(connect, sql);
+ sql = "";
+ }
+ }
+ return result;
+ }
+
+ private static String mysqlType2Gauss(String type) {
+ String result = "";
+ switch (type) {
+ case "char":
+ case "nvarchar":
+ result = "varchar";
+ break;
+
+ case "longtext":
+ result = "text";
+ break;
+
+ case "decimal":
+ result = "numeric";
+ break;
+ case "datetime":
+ result = "timestamp";
+ break;
+
+ case "bit":
+ case "tinyint":
+ result = "int2";
+ break;
+
+ case "int":
+ result = "int4";
+ break;
+
+ default:
+ result = type;
+ break;
+ }
+ return result;
+ }
+
+ public static boolean execSql(Connection connect, String sql) {
+ try(PreparedStatement pst = connect.prepareStatement(sql)) {
+ int rowCount = pst.executeUpdate();
+ return rowCount > 0;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ public static Map<String, String> getPK(Connection connect, String tableName) {
+ Map<String, String> mapPK = new HashMap<>();
+ // 查询主键
+ String pkSq = "select pg_attribute.attname as col_name,pg_constraint.conname as pk_name\n" +
+ "from pg_constraint\n" +
+ "inner join pg_class on pg_constraint.conrelid=pg_class.oid\n" +
+ "inner join pg_attribute on pg_attribute.attrelid=pg_class.oid and pg_attribute.attnum=pg_constraint.conkey[1]\n" +
+ "where pg_class.relname='" + tableName + "'\n" +
+ "and pg_constraint.contype='p'";
+ try (PreparedStatement pStmt = connect.prepareStatement(pkSq)) {
+ try (ResultSet rs = pStmt.executeQuery()) {
+ //获取键名
+ ResultSetMetaData md = rs.getMetaData();
+ //获取列的数量
+ int columnCount = md.getColumnCount();
+ while (rs.next()) {
+ String pk_name = rs.getString("pk_name");
+ String col_name = rs.getString("col_name");
+ mapPK.put(pk_name, col_name);
+ }
+ }
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ return mapPK;
+ }
+
+ public static Map<String, String> getIndex(Connection connect, String tableName) {
+ Map<String, String> mapPK = new HashMap<>();
+ // 查询主键
+ String pkSq = "SELECT * FROM pg_indexes WHERE tablename = '" + tableName + "';";
+ try (PreparedStatement pStmt = connect.prepareStatement(pkSq)) {
+ try (ResultSet rs = pStmt.executeQuery()) {
+ //获取键名
+ ResultSetMetaData md = rs.getMetaData();
+ while (rs.next()) {
+ String indexname = rs.getString("indexname");
+ String indexdef = rs.getString("indexdef");
+ mapPK.put(indexname, indexdef);
+ }
+ }
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ return mapPK;
+ }
+
+ public static List<Map<String, Object>> getListAll(Connection connect, String tableName, String dbSchema) {
+ List<Map<String, Object>> result = new ArrayList<>();
+ String sql = "SELECT * FROM " + dbSchema + "." + tableName;
+ try (PreparedStatement pStmt = connect.prepareStatement(sql)) {
+ try (ResultSet rs = pStmt.executeQuery()) {
+ //获取键名
+ ResultSetMetaData md = rs.getMetaData();
+ //获取列的数量
+ int columnCount = md.getColumnCount();
+ while (rs.next()) {
+ Map<String, Object> column = new HashMap<>();
+ for (int i = 1; i <= columnCount; i++) {
+ String keyName = md.getColumnLabel(i);
+ Object value = rs.getObject(i);
+ column.put(keyName, value);
+ }
+ result.add(column);
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ return result;
+ }
+
+ public static List<Boolean> insertAll(Connection connect, List<Map<String, Object>> list, String tableName, Integer onceCount) {
+ List<Boolean> result = new ArrayList<>();
+ String insertSql = "INSERT INTO public." + tableName + "(\"";
+ List<String> listColumn = new ArrayList<>();
+ for (String column : list.get(0).keySet()) {
+ if ("update_time".equalsIgnoreCase(column)) {
+ continue;
+ }
+ listColumn.add(column);
+ }
+ insertSql += StringUtil.join(listColumn, "\",\"") + "\") VALUES";
+
+ String sql = "";
+ List<Object> listValue = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ if (StringUtil.isNullOrEmpty(sql)) {
+ sql = insertSql;
+ }
+ Map<String, Object> row = list.get(i);
+
+ List<Object> listColValue = new ArrayList<>();
+ for (Map.Entry<String, Object> item : row.entrySet()) {
+ if ("update_time".equalsIgnoreCase(item.getKey())) {
+ continue;
+ }
+ listColValue.add(item.getValue());
+ }
+ sql += "\n(" + StringUtil.join(listColValue.stream().map(c -> "?").collect(Collectors.toList())) + "),";
+ listValue.addAll(listColValue);
+ if (i > 0 && i % onceCount == 0) {
+ sql = sql.substring(0, sql.length() - 1);
+ try (PreparedStatement pStmt = connect.prepareStatement(sql)) {
+ for (int j = 0; j < listValue.size(); j++) {
+ pStmt.setObject(j + 1, listValue.get(j));
+ }
+ listValue = new ArrayList<>();
+ boolean insertList = pStmt.execute();
+ result.add(insertList);
+ System.out.println("插入数据" + Math.max(i - onceCount, 0) + " - " + i + "，结果：" + insertList);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ sql = "";
+ }
+ }
+ if (StringUtil.isNotNullOrEmpty(sql)) {
+ sql = sql.substring(0, sql.length() - 1);
+ try (PreparedStatement pStmt = connect.prepareStatement(sql)) {
+ for (int j = 0; j < listValue.size(); j++) {
+ Object value = listValue.get(j);
+ if (Objects.equals("", value)) {
+ // TODO 神奇的gauss，''会判定为null，如果有非空约束，会插入失败
+ value = " ";
+ }
+ pStmt.setObject(j + 1, value);
+ }
+ listValue = new ArrayList<>();
+ boolean insertList = pStmt.execute();
+ result.add(insertList);
+ System.out.println("插入数据" + (list.size() - list.size() % onceCount) + " - " + list.size() + "，结果：" + insertList);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ return result;
+ }
}
--
Gitblit v1.9.3