fields) {
- this.fields = fields;
- }
-
- /**
- * 转换filed实体为xmlmapper中的basecolumn字符串信息
- *
- * @return
- */
- public String getFieldNames() {
- if (StringUtils.isBlank(fieldNames)) {
- StringBuilder names = new StringBuilder();
- for (int i = 0; i < fields.size(); i++) {
- TableField fd = fields.get(i);
- if (i == fields.size() - 1) {
- names.append(cov2col(fd));
- } else {
- names.append(cov2col(fd)).append(", ");
- }
- }
- fieldNames = names.toString();
- }
- return fieldNames;
- }
-
- /**
- * 判断字段中是否包含日期类型
- *
- * @return 是否
- */
- public boolean isHasDate() {
- for (TableField fieldInfo : fields) {
- if (fieldInfo.getPropertyType().equals("Date")) {
- hasDate = true;
- break;
- }
- }
- return hasDate;
- }
-
- /**
- * mapper xml中的字字段添加as
- *
- * @param field 字段实体
- * @return 转换后的信息
- */
- private String cov2col(TableField field) {
- if (null != field) {
- return field.isConvert() ? field.getName() + " AS " + field.getPropertyName() : field.getName();
- }
- return StringUtils.EMPTY;
- }
-}
diff --git a/src/main/java/com/baomidou/config/rules/DbType.java b/src/main/java/com/baomidou/config/rules/DbType.java
deleted file mode 100644
index dcccc70e62351c9c49dd6fac7896c784cba7d545..0000000000000000000000000000000000000000
--- a/src/main/java/com/baomidou/config/rules/DbType.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.baomidou.config.rules;
-
-/**
- * 数据库类型定义
- *
- * @author YangHu
- * @since 2016/8/30
- */
-public enum DbType {
-
- MYSQL("myslq"), ORACLE("oracle");
-
- private String value;
-
- DbType(String value) {
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
-}
diff --git a/src/main/java/com/baomidou/config/rules/IdStrategy.java b/src/main/java/com/baomidou/config/rules/IdStrategy.java
deleted file mode 100644
index 27d8e4c8e46a6cd95bed3a16a0d54554738dd6e8..0000000000000000000000000000000000000000
--- a/src/main/java/com/baomidou/config/rules/IdStrategy.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.baomidou.config.rules;
-
-/**
- * ID生成策略
- *
- * @author YangHu
- * @since 2016/8/30
- */
-public enum IdStrategy {
- auto("AUTO"), none("NONE"), assign_id("ASSIGN_ID"), assign_uuid("ASSIGN_UUID"),id_worker("ID_WORKER"), uuid("UUID"), input("INPUT");
-
- private String value;
-
- IdStrategy(String value) {
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
-}
diff --git a/src/main/java/com/baomidou/config/rules/NamingStrategy.java b/src/main/java/com/baomidou/config/rules/NamingStrategy.java
deleted file mode 100644
index a9bae0c901fa9a139215c8e98fb2564d1a10649d..0000000000000000000000000000000000000000
--- a/src/main/java/com/baomidou/config/rules/NamingStrategy.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.baomidou.config.rules;
-
-import com.baomidou.config.ConstVal;
-import org.apache.commons.lang.StringUtils;
-
-/**
- * 从数据库表到文件的命名策略
- *
- * @author YangHu, tangguo
- * @since 2016/8/30
- */
-public enum NamingStrategy {
- /**
- * 不做任何改变，原样输出
- */
- nochange,
- /**
- * 下划线转驼峰命名
- */
- underline_to_camel,
- /**
- * 仅去掉前缀
- */
- remove_prefix,
- /**
- * 去掉前缀并且转驼峰
- */
- remove_prefix_and_camel,
- /**
- * 去掉第一个下划线之前内容，后面原样输出
- */
- remove_underline,
- /**
- * 去掉第一个下划线之前内容，后面转驼峰
- */
- remove_underline_and_camel;
-
- public static String underlineToCamel(String name) {
- // 快速检查
- if (StringUtils.isBlank(name)) {
- // 没必要转换
- return "";
- }
- StringBuilder result = new StringBuilder();
- // 用下划线将原始字符串分割
- String camels[] = name.toLowerCase().split(ConstVal.UNDERLINE);
- for (String camel : camels) {
- // 跳过原始字符串中开头、结尾的下换线或双重下划线
- if (StringUtils.isBlank(camel)) {
- continue;
- }
- // 处理真正的驼峰片段
- if (result.length() == 0) {
- // 第一个驼峰片段，全部字母都小写
- result.append(camel);
- } else {
- // 其他的驼峰片段，首字母大写
- result.append(capitalFirst(camel));
- }
- }
- return result.toString();
- }
-
- /**
- * 去掉第一个下划线之前内容，后面原样输出
- *
- * @param name
- * @return
- */
- public static String removeUnderline(String name) {
- if (StringUtils.isBlank(name)) {
- return "";
- }
- int idx = name.indexOf(ConstVal.UNDERLINE);
- if (idx == -1) {
- return name;
- }
- return name.substring(idx + 1);
- }
-
- /**
- * 去掉第一个下划线之前内容，后面转驼峰
- *
- * @param name
- * @return
- */
- public static String removeUnderlineAndCamel(String name) {
- return underlineToCamel(removeUnderline(name));
- }
-
- /**
- * 去掉指定的前缀
- * @param name
- * @param prefix
- * @return
- */
- public static String removePrefix(String name, String prefix) {
- if (StringUtils.isBlank(name)) {
- return "";
- }
- int idx = -1;
- if (prefix != null && !"".equals(prefix.trim())) {
- idx = name.indexOf(ConstVal.UNDERLINE);
- if (name.toLowerCase().matches("^" + prefix.toLowerCase() + ".*")) { // 判断是否有匹配的前缀，然后截取前缀
- idx = prefix.length() - 1;
- }
- }
- if (idx == -1) {
- return name;
- }
- return name.substring(idx + 1);
- }
-
- /**
- * 去掉下划线前缀且将后半部分转成驼峰格式
- *
- * @param name
- * @param tablePrefix
- * @return
- */
- public static String removePrefixAndCamel(String name, String tablePrefix) {
- return underlineToCamel(removePrefix(name, tablePrefix));
- }
-
- /**
- * 实体首字母大写
- *
- * @param name 待转换的字符串
- * @return 转换后的字符串
- */
- public static String capitalFirst(String name) {
- if (StringUtils.isNotBlank(name)) {
- //return name.substring(0, 1).toUpperCase() + name.substring(1);
- char[] array = name.toCharArray();
- array[0] -= 32;
- return String.valueOf(array);
- }
- return "";
- }
-
-}
diff --git a/src/main/java/com/baomidou/config/rules/QuerySQL.java b/src/main/java/com/baomidou/config/rules/QuerySQL.java
deleted file mode 100644
index 83b7f5d3a17b2acbf3e513df51cc555ba27ba6d1..0000000000000000000000000000000000000000
--- a/src/main/java/com/baomidou/config/rules/QuerySQL.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.baomidou.config.rules;
-
-/**
- *
- * 表数据查询
- *
- *
- * @author hubin, tangguo
- * @since 2016-04-25
- */
-public enum QuerySQL {
- MYSQL("mysql", "show tables", "show table status",
- "show full fields from %s",
- "NAME", "COMMENT", "FIELD", "TYPE", "COMMENT", "KEY"),
-
- ORACLE("oracle", "SELECT * FROM USER_TABLES", "SELECT * FROM USER_TAB_COMMENTS",
- "SELECT A.COLUMN_NAME, CASE WHEN A.DATA_TYPE='NUMBER' THEN " +
- "(CASE WHEN A.DATA_PRECISION IS NULL THEN A.DATA_TYPE " +
- "WHEN NVL(A.DATA_SCALE, 0) > 0 THEN A.DATA_TYPE||'('||A.DATA_PRECISION||','||A.DATA_SCALE||')' " +
- "ELSE A.DATA_TYPE||'('||A.DATA_PRECISION||')' END) " +
- "ELSE A.DATA_TYPE END DATA_TYPE, B.COMMENTS,DECODE(C.POSITION, '1', 'PRI') KEY " +
- "FROM USER_TAB_COLUMNS A INNER JOIN USER_COL_COMMENTS B ON A.TABLE_NAME = B.TABLE_NAME" +
- " AND A.COLUMN_NAME = B.COLUMN_NAME LEFT JOIN USER_CONSTRAINTS D " +
- "ON D.TABLE_NAME = A.TABLE_NAME AND D.CONSTRAINT_TYPE = 'P' " +
- "LEFT JOIN USER_CONS_COLUMNS C ON C.CONSTRAINT_NAME = D.CONSTRAINT_NAME " +
- "AND C.COLUMN_NAME=A.COLUMN_NAME WHERE A.TABLE_NAME = '%s' ",
- "TABLE_NAME", "COMMENTS", "COLUMN_NAME", "DATA_TYPE", "COMMENTS", "KEY");
-
- private final String dbType;
- private final String tablesSql;
- private final String tableCommentsSql;
- private final String tableFieldsSql;
- private final String tableName;
- private final String tableComment;
- private final String fieldName;
- private final String fieldType;
- private final String fieldComment;
- private final String fieldKey;
-
-
- QuerySQL(final String dbType, final String tablesSql, final String tableCommentsSql,
- final String tableFieldsSql, final String tableName, final String tableComment, final String fieldName,
- final String fieldType, final String fieldComment, final String fieldKey) {
- this.dbType = dbType;
- this.tablesSql = tablesSql;
- this.tableCommentsSql = tableCommentsSql;
- this.tableFieldsSql = tableFieldsSql;
- this.tableName = tableName;
- this.tableComment = tableComment;
- this.fieldName = fieldName;
- this.fieldType = fieldType;
- this.fieldComment = fieldComment;
- this.fieldKey = fieldKey;
- }
-
- public String getDbType() {
- return dbType;
- }
-
- public String getTablesSql() {
- return tablesSql;
- }
-
- public String getTableCommentsSql() {
- return tableCommentsSql;
- }
-
- public String getTableFieldsSql() {
- return tableFieldsSql;
- }
-
- public String getTableName() {
- return tableName;
- }
-
- public String getTableComment() {
- return tableComment;
- }
-
- public String getFieldName() {
- return fieldName;
- }
-
- public String getFieldType() {
- return fieldType;
- }
-
- public String getFieldComment() {
- return fieldComment;
- }
-
- public String getFieldKey() {
- return fieldKey;
- }
-
-}
diff --git a/src/main/resources/template/controller.java.vm b/src/main/resources/template/controller.java.vm
index e709a01cf5d57377817e314301cfddc343a019c0..da07d89a1fcdc279a70ceaf77afcf34ecea915cc 100644
--- a/src/main/resources/template/controller.java.vm
+++ b/src/main/resources/template/controller.java.vm
@@ -1,26 +1,46 @@
-package ${package.Controller};
-
-#if(${enableSwagger})
-
-import io.swagger.annotations.Api;
-#end
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- *
- * ${table.comment} 前端控制器
- *
- *
- * @author ${author}
- * @since ${date}
- */
-#if(${enableSwagger})
-
-@Api(tags = "${table.comment}")
-#end
-@RestController
-@RequestMapping("#if(${package.ModuleName})/${package.ModuleName}#end/${table.entityName.toLowerCase()}")
-public class ${table.controllerName} {
-
-}
+package ${package.Controller};
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import $!{package.Entity}.$!{entity};
+import $!{package.Service}.$!{table.serviceName};
+import io.swagger.annotations.Api;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 业务表$!{table.name}前端控制器
+ *
+ * @author ${author}
+ */
+@Api(tags = "业务表$!{table.name}接口")
+@RestController
+@RequestMapping("/outward/${table.name}")
+#if(${superControllerClass})
+public class ${table.controllerName} extends ${superControllerClass} {
+#else
+public class ${table.controllerName} {
+#end
+ @Resource
+ private $!{table.serviceName} $!{table.entityPath}Service;
+
+ @PostMapping("/save")
+ public ResponseEntity save(@RequestBody $!{entity} $!{table.entityPath}) {
+ return ResponseEntity.ok($!{table.entityPath}Service.save($!{table.entityPath}));
+ }
+
+ @PostMapping("/update")
+ public ResponseEntity update(@RequestBody $!{entity} $!{table.entityPath}) {
+ return ResponseEntity.ok($!{table.entityPath}Service.updateById($!{table.entityPath}));
+ }
+
+ @PostMapping("/selectByPage")
+ public ResponseEntity> selectByPage(@RequestParam(value = "current",defaultValue = "0") Integer current,
+ @RequestParam(value = "size",defaultValue = "20") Integer size,
+ @RequestBody(required = false) $!{entity} $!{table.entityPath}) {
+ return ResponseEntity.ok($!{table.entityPath}Service.page(new Page<>(current, size), new QueryWrapper<>($!{table.entityPath})));
+ }
+}
diff --git a/src/main/resources/template/entity.java.vm b/src/main/resources/template/entity.java.vm
deleted file mode 100644
index fed314df03aa08410e218a67cb1edafa28406873..0000000000000000000000000000000000000000
--- a/src/main/resources/template/entity.java.vm
+++ /dev/null
@@ -1,70 +0,0 @@
-package ${package.Entity};
-
-#if(${activeRecord})
-import com.baomidou.mybatisplus.activerecord.Model;
-#end
-#if(${idGenType}!="ID_WORKER")
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-#end
-import com.baomidou.mybatisplus.annotation.TableField;
-#if(${addTabeName})
-import com.baomidou.mybatisplus.annotation.TableName;
-#end
-#if(${enableSwagger})
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-#end
-import lombok.Data;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-#if(${havBigDecimal})
-import java.math.BigDecimal;
-#end
-#if(${table.hasDate})
-import java.util.Date;
-#end
-
-/**
- *
- * ${table.comment}
- *
- *
- * @author ${author}
- * @since ${date}
- */
-@Data
-@Accessors(chain = true)
-#if(${enableSwagger})
-
-@ApiModel("${table.comment}")
-#end
-#if(${addTabeName})
-@TableName("${table.name}")
-#end
-#if(${activeRecord})
-public class ${entity} extends Model<${entity}> {
-#else
-public class ${entity} implements Serializable{
-#end
-
- private static final long serialVersionUID=1L;
-
-#foreach($field in ${table.fields})
-#if(${field.comment.equals("")})
-#else
- /** ${field.comment} */
-#end
-#if(${field.keyFlag} && ${idGenType}!="ID_WORKER")
- @TableId(type = IdType.${idGenType})
-#end
-#if(${enableSwagger})
- @ApiModelProperty("${field.comment}")
-#end
-#if($field.convert && ${field.name.toLowerCase()} != ${field.propertyName.toLowerCase()})
- @TableField(value = "${field.name}")
-#end
- private ${field.propertyType} ${field.propertyName};
-#end
-
-}
diff --git a/src/main/resources/template/mapper.java.vm b/src/main/resources/template/mapper.java.vm
deleted file mode 100644
index feed2957d628f5feb6110a87bf914d470c827a53..0000000000000000000000000000000000000000
--- a/src/main/resources/template/mapper.java.vm
+++ /dev/null
@@ -1,16 +0,0 @@
-package ${package.Mapper};
-
-import ${package.Entity}.${entity};
-import ${superMapperClassPackage};
-
-/**
- *
- * Mapper接口
- *
- *
- * @author ${author}
- * @since ${date}
- */
-public interface ${table.mapperName} extends ${superMapperClass}<${entity}> {
-
-}
\ No newline at end of file
diff --git a/src/main/resources/template/mapper.xml.vm b/src/main/resources/template/mapper.xml.vm
deleted file mode 100644
index a907ddcbf589e7e65db9620f791dd19478d7c69c..0000000000000000000000000000000000000000
--- a/src/main/resources/template/mapper.xml.vm
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-#if(${enableCache})
-
-
-#end
-
-
-#foreach($field in ${table.fields})
-#if(${field.keyFlag})
-
-#else
-
-#end
-#end
-
-
-
-
- ${table.fieldNames}
-
-
diff --git a/src/main/resources/template/service.java.vm b/src/main/resources/template/service.java.vm
deleted file mode 100644
index 343b90a58fba825dc61fde8adb0b8642078d44a3..0000000000000000000000000000000000000000
--- a/src/main/resources/template/service.java.vm
+++ /dev/null
@@ -1,16 +0,0 @@
-package ${package.Service};
-
-import ${package.Entity}.${entity};
-import ${superServiceClassPackage};
-
-/**
- *
- * 服务类
- *
- *
- * @author ${author}
- * @since ${date}
- */
-public interface ${table.serviceName} extends ${superServiceClass}<${entity}> {
-
-}
diff --git a/src/main/resources/template/serviceImpl.java.vm b/src/main/resources/template/serviceImpl.java.vm
deleted file mode 100644
index 3a92c3cbb3a0fcd00f11c95986cb792ee7925327..0000000000000000000000000000000000000000
--- a/src/main/resources/template/serviceImpl.java.vm
+++ /dev/null
@@ -1,20 +0,0 @@
-package ${package.ServiceImpl};
-
-import ${package.Entity}.${entity};
-import ${package.Mapper}.${table.mapperName};
-import ${package.Service}.${table.serviceName};
-import ${superServiceImplClassPackage};
-import org.springframework.stereotype.Service;
-
-/**
- *
- * ${table.comment} 服务实现类
- *
- *
- * @author ${author}
- * @since ${date}
- */
-@Service
-public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.mapperName}, ${entity}> implements ${table.serviceName} {
-
-}