From 9509af69aff71aeb1f3b62f766e124d291c3f374 Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@aliyun.com>
Date: 星期二, 30 七月 2024 00:07:04 +0800
Subject: [PATCH] 适配mybatis-plus
---
src/test/java/com/lunhan/xxx/host/GenCodeGauss.java | 655 ++++++++++-------------------------------------------------
1 files changed, 110 insertions(+), 545 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..bcc7534 100644
--- a/src/test/java/com/lunhan/xxx/host/GenCodeGauss.java
+++ b/src/test/java/com/lunhan/xxx/host/GenCodeGauss.java
@@ -28,18 +28,16 @@
//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/mapper/";
+ public static final String MAPPER = "./src/main/java/com/lunhan/xxx/repository/imapper/";
+ 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 +46,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.mapper";
+ public static final String MAPPER = "com.lunhan.xxx.repository.imapper";
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 +60,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";
@@ -110,6 +107,8 @@
//region po类 import 内容设置
private static final String[] SET_PO_IMPORT = new String[]{
+ "import com.lunhan.xxx.repository.BasicPO;",
+ "",
"import javax.persistence.*;",
"import java.io.Serializable;",
"import java.sql.Timestamp;"
@@ -143,16 +142,18 @@
//region dao类 import 内容设置
private static final String[] SET_DAO_IMPORT = new String[]{
- "import com.lunhan.xxx.common.ConstantFactory;",
+ "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.util.*;",
+ "import com.lunhan.xxx.common.enums.EYesOrNo;",
+ "import com.lunhan.xxx.common.util.ListUtil;",
+ "import com.lunhan.xxx.common.util.NumericUtil;",
+ "import com.lunhan.xxx.common.util.StringUtil;",
"import com.lunhan.xxx.entity.dto.OrderByDTO;",
- "import com.lunhan.xxx.entity.enums.*;",
- "import com.lunhan.xxx.repository.BasicDao;",
- "import org.springframework.stereotype.Repository;",
- "import java.util.*;",
- "import org.springframework.transaction.annotation.Transactional;"
+ "import com.lunhan.xxx.entity.dto.SearchBasicDTO;",
+ "import com.lunhan.xxx.entity.enums.EOrderBy;",
+ "import com.lunhan.xxx.repository.BasicMapperImpl;",
+ "import org.springframework.stereotype.Repository;"
};
//endregion
@@ -268,17 +269,15 @@
List<Map<String, Object>> columns = getColumns(tableName, DB_NAME);
genPO(columns, tableDesc);
genVO(columns, tableDesc);
- genColumnsEnum(columns, tableDesc);
genCreateDto(columns, tableName, tableDesc);
+
+ genSearch(columns, tableDesc);
+ genMapper(columns, tableDesc);
genModifyDto(columns, tableName, tableDesc);
genDao(tableName, tableDesc);
- genSearch(columns, tableDesc);
genConvertMapper(tableName, tableDesc);
genService(tableName, tableDesc);
genController(tableName, tableDesc);
-
- //genMapperXml(columns, tableDesc);
- //genMapper(columns, tableDesc);
}
}
@@ -531,107 +530,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();
- 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,7 +543,7 @@
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) {
@@ -652,16 +554,16 @@
}
}
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)
@@ -672,98 +574,89 @@
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(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(" + searchName + " 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\tif (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.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}\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 = DB.selectPage(new Page<>(search.getPage(), search.getLimit()), queryWrapper);\n" +
+ "\t\treturn new PagerResult<>(pageResult.getSize(), pageResult.getPages(), pageResult.getTotal(), pageResult.getRecords());\n" +
+ "\t}");
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) {
@@ -970,7 +863,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();
@@ -1030,17 +923,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 +955,7 @@
}
}
content.append("import ");
- content.append(GenCodeGauss.PackageSet.DAO);
+ content.append(GenCodeGauss.PackageSet.MAPPER_IMPL);
content.append(".");
content.append(daoName + ";\n");
content.append("import ");
@@ -1417,110 +1310,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;
@@ -1551,230 +1340,6 @@
return;
}
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
--
Gitblit v1.9.3