【feat】调整模板类，整合mybatis-plus

czsj-generator/src/main/resources/vm/java/controller.java.vm

@@ -2,6 +2,9 @@ package ${packageName}.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,9 +48,9 @@ public class ${ClassName}Controller extends BaseController
 #if($table.crud || $table.sub)
     public TableDataInfo list(${ClassName} ${className})
     {
-        startPage();
+        Page<${ClassName}> page = startPage();
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        IPage<${ClassName}> paged = ${className}Service.page(page, new QueryWrapper<>(${ClassName}));
-        return getDataTable(list);
+        return getDataTable(paged.getRecords(), paged.getTotal());
     }
 #elseif($table.tree)
     public AjaxResult list(${ClassName} ${className})
@@ -88,7 +91,7 @@ public class ${ClassName}Controller extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ${ClassName} ${className})
     {
-        return toAjax(${className}Service.insert${ClassName}(${className}));
+        return toAjax(${className}Service.save(${className}));
     }
 
     /**
@@ -99,7 +102,7 @@ public class ${ClassName}Controller extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ${ClassName} ${className})
     {
-        return toAjax(${className}Service.update${ClassName}(${className}));
+        return toAjax(${className}Service.updateById(${className}));
     }
 
     /**
@@ -110,6 +113,6 @@ public class ${ClassName}Controller extends BaseController
 	@DeleteMapping("/{${pkColumn.javaField}s}")
     public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
     {
-        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
+        return toAjax(${className}Service.removeById(${pkColumn.javaField}s));
     }
 }

czsj-generator/src/main/resources/vm/java/domain.java.vm

@@ -3,9 +3,12 @@ package ${packageName}.domain;
 #foreach ($import in $importList)
 import ${import};
 #end
+import com.baomidou.mybatisplus.annotation.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.czsj.common.annotation.Excel;
+import lombok.Data;
+
 #if($table.crud || $table.sub)
 import com.czsj.common.core.domain.BaseEntity;
 #elseif($table.tree)
@@ -28,6 +31,7 @@ public class ${ClassName} extends ${Entity}
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
+#if($column.javaField != "isDeleted" && $column.javaField != "createBy" && $column.javaField != "updateBy" && $column.javaField != "createTime" && $column.javaField != "updateTime")
 #if(!$table.isSuperColumn($column.javaField))
     /** $column.columnComment */
 #if($column.list)
@@ -37,11 +41,15 @@ public class ${ClassName} extends ${Entity}
 #else
 #set($comment=$column.columnComment)
 #end
+
 #if($parentheseIndex != -1)
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+#elseif($column.isPk)
+    @TableId(type = IdType.AUTO)
+    @Excel(name = "${comment}")
 #else
     @Excel(name = "${comment}")
 #end
@@ -50,56 +58,12 @@ public class ${ClassName} extends ${Entity}
 
 #end
 #end
+#end
+
 #if($table.sub)
     /** $table.subTable.functionName信息 */
     private List<${subClassName}> ${subclassName}List;
 
 #end
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-    public void set${AttrName}($column.javaType $column.javaField) 
-    {
-        this.$column.javaField = $column.javaField;
-    }
 
-    public $column.javaType get${AttrName}() 
-    {
-        return $column.javaField;
-    }
-#end
-#end
-
-#if($table.sub)
-    public List<${subClassName}> get${subClassName}List()
-    {
-        return ${subclassName}List;
-    }
-
-    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
-    {
-        this.${subclassName}List = ${subclassName}List;
-    }
-
-#end
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-#if($table.sub)
-            .append("${subclassName}List", get${subClassName}List())
-#end
-            .toString();
-    }
 }

czsj-generator/src/main/resources/vm/java/mapper.java.vm

@@ -2,6 +2,7 @@ package ${packageName}.mapper;
 
 import java.util.List;
 import ${packageName}.domain.${ClassName};
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 #if($table.sub)
 import ${packageName}.domain.${subClassName};
 #end
@@ -12,7 +13,7 @@ import ${packageName}.domain.${subClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
+public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
 {
     /**
      * 查询${functionName}

czsj-generator/src/main/resources/vm/java/service.java.vm

@@ -2,14 +2,14 @@ package ${packageName}.service;
 
 import java.util.List;
 import ${packageName}.domain.${ClassName};
-
+import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * ${functionName}Service接口
  * 
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service 
+public interface I${ClassName}Service extends IService<${ClassName}>
 {
     /**
      * 查询${functionName}

czsj-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -7,6 +7,7 @@ import com.czsj.common.utils.DateUtils;
 #break
 #end
 #end
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 #if($table.sub)
@@ -26,7 +27,7 @@ import ${packageName}.service.I${ClassName}Service;
  * @date ${datetime}
  */
 @Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service 
+public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service
 {
     @Autowired
     private ${ClassName}Mapper ${className}Mapper;

czsj-generator/src/main/resources/vm/java/sub-domain.java.vm

@@ -3,10 +3,12 @@ package ${packageName}.domain;
 #foreach ($import in $subImportList)
 import ${import};
 #end
+import com.baomidou.mybatisplus.annotation.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.czsj.common.annotation.Excel;
 import com.czsj.common.core.domain.BaseEntity;
+import lombok.Data;
 
 /**
  * ${subTable.functionName}对象 ${subTableName}
@@ -19,6 +21,7 @@ public class ${subClassName} extends BaseEntity
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $subTable.columns)
+#if($column.javaField != "isDeleted" && $column.javaField != "createBy" && $column.javaField != "updateBy" && $column.javaField != "createTime" && $column.javaField != "updateTime")
 #if(!$table.isSuperColumn($column.javaField))
     /** $column.columnComment */
 #if($column.list)
@@ -31,8 +34,11 @@ public class ${subClassName} extends BaseEntity
 #if($parentheseIndex != -1)
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+#elseif($column.isPk)
+@TableId(type = IdType.AUTO)
+@Excel(name = "${comment}")
 #else
     @Excel(name = "${comment}")
 #end
@@ -41,36 +47,6 @@ public class ${subClassName} extends BaseEntity
 
 #end
 #end
-#foreach ($column in $subTable.columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-    public void set${AttrName}($column.javaType $column.javaField) 
-    {
-        this.$column.javaField = $column.javaField;
-    }
-
-    public $column.javaType get${AttrName}() 
-    {
-        return $column.javaField;
-    }
-#end
 #end
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $subTable.columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-            .toString();
-    }
 }

czsj-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
         <include refid="select${ClassName}Vo"/>
-        <where>  
+        where is_delete = 0
 #foreach($column in $columns)
 #set($queryType=$column.queryType)
 #set($javaField=$column.javaField)
@@ -55,7 +55,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
 #end
 #end
-        </where>
     </select>
     
     <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
@@ -73,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="select${subClassName}List" resultMap="${subClassName}Result">
         select#foreach ($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
         from ${subTableName}
-        where ${subTableFkName} = #{${subTableFkName}}
+        where ${subTableFkName} = #{${subTableFkName}} and is_delete = 0
     </select>
 #end
 
@@ -104,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
 #end
         </trim>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+        where ${pkColumn.columnName} = #{${pkColumn.javaField}} and is_delete = 0
     </update>
 
     <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">