修改代码生成模板

slibra-generator/src/main/resources/generator.yml

@@ -3,7 +3,7 @@ gen:
   # 作者
   author: slibra
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.slibra.system
+  packageName: com.slibra.business
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）

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

@@ -88,6 +88,7 @@ public class ${ClassName}Controller extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ${ClassName} ${className})
     {
+        ${className}.setCreateBy(getUsername());
         return toAjax(${className}Service.insert${ClassName}(${className}));
     }
 
@@ -99,6 +100,7 @@ public class ${ClassName}Controller extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ${ClassName} ${className})
     {
+        ${className}.setUpdateBy(getUsername());
         return toAjax(${className}Service.update${ClassName}(${className}));
     }
 

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

@@ -3,7 +3,10 @@ package ${packageName}.domain;
 #foreach ($import in $importList)
 import ${import};
 #end
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import com.slibra.common.annotation.Excel;
+import com.slibra.common.core.domain.BaseEntity;
 #if($table.crud || $table.sub)
 #elseif($table.tree)
 #end

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

@@ -28,7 +28,8 @@ 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>
+            1 = 1
 #foreach($column in $columns)
 #set($queryType=$column.queryType)
 #set($javaField=$column.javaField)
@@ -56,19 +57,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
 #end
         </where>
+        and del_flag = 0
     </select>
     
     <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
 #if($table.crud || $table.tree)
         <include refid="select${ClassName}Vo"/>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+        where ${pkColumn.columnName} = #{${pkColumn.javaField}} and del_flag = 0
 #elseif($table.sub)
         select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
            #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
 
         from ${tableName} a
         left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
-        where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
+        where a.${pkColumn.columnName} = #{${pkColumn.javaField}} and a.del_flag = 0 and b.del_flag = 0
 #end
     </select>
         
@@ -99,10 +101,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
 #end
         </trim>
+        ,revision = revision + 1
         where ${pkColumn.columnName} = #{${pkColumn.javaField}}
     </update>
 
-    <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
+    #*<delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
         delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
     </delete>
 
@@ -123,7 +126,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
         delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
+    </delete>*#
+
+    <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
+        update ${tableName} set del_flag = 2,revision = revision + 1 where del_flag = 0 and ${pkColumn.columnName} = #{${pkColumn.javaField}}
+    </delete>
+
+    <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
+        update ${tableName} set del_flag = 2,revision = revision + 1 where del_flag = 0 and ${pkColumn.columnName} in
+        <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
+            #{${pkColumn.javaField}}
+        </foreach>
     </delete>
+    #if($table.sub)
+
+        <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
+            update ${tableName} set del_flag = 2,revision = revision + 1 where del_flag = 0 and ${subTableFkName} in
+            <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
+                #{${subTableFkclassName}}
+            </foreach>
+        </delete>
+
+        <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
+            update ${tableName} set del_flag = 2,revision = revision + 1 where del_flag = 0 and ${subTableFkName} = #{${subTableFkclassName}}
+        </delete>
 
     <insert id="batch${subClassName}">
         insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values