From 0e88dfb5773b1fecb9dfb54572747d16698f7f50 Mon Sep 17 00:00:00 2001
From: Hsy <32729842@qq.com>
Date: Mon, 28 Jul 2025 11:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/vm/java/controller.java.vm | 24 +++++---------
 .../src/main/resources/vm/java/domain.java.vm | 15 +++------
 .../src/main/resources/vm/java/mapper.java.vm |  4 +--
 .../main/resources/vm/java/service.java.vm    |  4 +--
 .../resources/vm/java/serviceImpl.java.vm     | 31 +++++++------------
 .../main/resources/vm/java/sub-domain.java.vm |  9 ++----
 6 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/devttl-generator/src/main/resources/vm/java/controller.java.vm b/devttl-generator/src/main/resources/vm/java/controller.java.vm
index 65c3285..8b9e113 100644
--- a/devttl-generator/src/main/resources/vm/java/controller.java.vm
+++ b/devttl-generator/src/main/resources/vm/java/controller.java.vm
@@ -32,8 +32,7 @@ import com.devttl.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
+public class ${ClassName}Controller extends BaseController {
     @Autowired
     private I${ClassName}Service ${className}Service;
 
@@ -43,15 +42,13 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
     @GetMapping("/list")
 #if($table.crud || $table.sub)
-    public TableDataInfo list(${ClassName} ${className})
-    {
+    public TableDataInfo list(${ClassName} ${className}) {
         startPage();
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         return getDataTable(list);
     }
 #elseif($table.tree)
-    public AjaxResult list(${ClassName} ${className})
-    {
+    public AjaxResult list(${ClassName} ${className}) {
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         return success(list);
     }
@@ -63,8 +60,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ${ClassName} ${className})
-    {
+    public void export(HttpServletResponse response, ${ClassName} ${className}) {
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
         util.exportExcel(response, list, "${functionName}数据");
@@ -75,8 +71,7 @@ public class ${ClassName}Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
     @GetMapping(value = "/{${pkColumn.javaField}}")
-    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
         return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
     }
 
@@ -86,8 +81,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ${ClassName} ${className})
-    {
+    public AjaxResult add(@RequestBody ${ClassName} ${className}) {
         return toAjax(${className}Service.insert${ClassName}(${className}));
     }
 
@@ -97,8 +91,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ${ClassName} ${className})
-    {
+    public AjaxResult edit(@RequestBody ${ClassName} ${className}) {
         return toAjax(${className}Service.update${ClassName}(${className}));
     }
 
@@ -108,8 +101,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{${pkColumn.javaField}s}")
-    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${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));
     }
 }
diff --git a/devttl-generator/src/main/resources/vm/java/domain.java.vm b/devttl-generator/src/main/resources/vm/java/domain.java.vm
index efc2f67..6b08bc1 100644
--- a/devttl-generator/src/main/resources/vm/java/domain.java.vm
+++ b/devttl-generator/src/main/resources/vm/java/domain.java.vm
@@ -21,8 +21,7 @@ import com.devttl.common.annotation.Excel;
 #elseif($table.tree)
 #set($Entity="TreeEntity")
 #end
-public class ${ClassName} extends ${Entity}
-{
+public class ${ClassName} extends ${Entity} {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
@@ -60,26 +59,22 @@ public class ${ClassName} extends ${Entity}
 #else
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 #end
-    public void set${AttrName}($column.javaType $column.javaField) 
-    {
+    public void set${AttrName}($column.javaType $column.javaField) {
         this.$column.javaField = $column.javaField;
     }
 
-    public $column.javaType get${AttrName}() 
-    {
+    public $column.javaType get${AttrName}() {
         return $column.javaField;
     }
 
 #end
 #end
 #if($table.sub)
-    public List<${subClassName}> get${subClassName}List()
-    {
+    public List<${subClassName}> get${subClassName}List() {
         return ${subclassName}List;
     }
 
-    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
-    {
+    public void set${subClassName}List(List<${subClassName}> ${subclassName}List) {
         this.${subclassName}List = ${subclassName}List;
     }
 
diff --git a/devttl-generator/src/main/resources/vm/java/mapper.java.vm b/devttl-generator/src/main/resources/vm/java/mapper.java.vm
index 7e7d7c2..861886a 100644
--- a/devttl-generator/src/main/resources/vm/java/mapper.java.vm
+++ b/devttl-generator/src/main/resources/vm/java/mapper.java.vm
@@ -1,6 +1,7 @@
 package ${packageName}.mapper;
 
 import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import ${packageName}.domain.${ClassName};
 #if($table.sub)
 import ${packageName}.domain.${subClassName};
@@ -12,8 +13,7 @@ import ${packageName}.domain.${subClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
-{
+public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
     /**
      * 查询${functionName}
      * 
diff --git a/devttl-generator/src/main/resources/vm/java/service.java.vm b/devttl-generator/src/main/resources/vm/java/service.java.vm
index 264882b..84fe078 100644
--- a/devttl-generator/src/main/resources/vm/java/service.java.vm
+++ b/devttl-generator/src/main/resources/vm/java/service.java.vm
@@ -1,6 +1,7 @@
 package ${packageName}.service;
 
 import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import ${packageName}.domain.${ClassName};
 
 /**
@@ -9,8 +10,7 @@ import ${packageName}.domain.${ClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service 
-{
+public interface I${ClassName}Service extends IService<${ClassName}> {
     /**
      * 查询${functionName}
      * 
diff --git a/devttl-generator/src/main/resources/vm/java/serviceImpl.java.vm b/devttl-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 35fd4b5..65eea19 100644
--- a/devttl-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/devttl-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -15,6 +15,7 @@ import com.devttl.common.utils.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import ${packageName}.domain.${subClassName};
 #end
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
@@ -26,8 +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;
 
@@ -38,8 +38,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return ${functionName}
      */
     @Override
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
         return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
     }
 
@@ -50,8 +49,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return ${functionName}
      */
     @Override
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
-    {
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) {
         return ${className}Mapper.select${ClassName}List(${className});
     }
 
@@ -65,8 +63,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int insert${ClassName}(${ClassName} ${className})
-    {
+    public int insert${ClassName}(${ClassName} ${className}) {
 #foreach ($column in $columns)
 #if($column.javaField == 'createTime')
         ${className}.setCreateTime(DateUtils.getNowDate());
@@ -91,8 +88,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int update${ClassName}(${ClassName} ${className})
-    {
+    public int update${ClassName}(${ClassName} ${className}) {
 #foreach ($column in $columns)
 #if($column.javaField == 'updateTime')
         ${className}.setUpdateTime(DateUtils.getNowDate());
@@ -115,8 +111,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
+    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) {
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
 #end
@@ -133,8 +128,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
 #end
@@ -147,20 +141,17 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * 
      * @param ${className} ${functionName}对象
      */
-    public void insert${subClassName}(${ClassName} ${className})
-    {
+    public void insert${subClassName}(${ClassName} ${className}) {
         List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
         ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
-        if (StringUtils.isNotNull(${subclassName}List))
-        {
+        if (StringUtils.isNotNull(${subclassName}List)) {
             List<${subClassName}> list = new ArrayList<${subClassName}>();
             for (${subClassName} ${subclassName} : ${subclassName}List)
             {
                 ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
                 list.add(${subclassName});
             }
-            if (list.size() > 0)
-            {
+            if (list != null && !list.isEmpty()) {
                 ${className}Mapper.batch${subClassName}(list);
             }
         }
diff --git a/devttl-generator/src/main/resources/vm/java/sub-domain.java.vm b/devttl-generator/src/main/resources/vm/java/sub-domain.java.vm
index 1d2b609..a41eeba 100644
--- a/devttl-generator/src/main/resources/vm/java/sub-domain.java.vm
+++ b/devttl-generator/src/main/resources/vm/java/sub-domain.java.vm
@@ -13,8 +13,7 @@ import com.devttl.common.annotation.Excel;
  * @author ${author}
  * @date ${datetime}
  */
-public class ${subClassName} extends BaseEntity
-{
+public class ${subClassName} extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $subTable.columns)
@@ -47,13 +46,11 @@ public class ${subClassName} extends BaseEntity
 #else
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 #end
-    public void set${AttrName}($column.javaType $column.javaField) 
-    {
+    public void set${AttrName}($column.javaType $column.javaField) {
         this.$column.javaField = $column.javaField;
     }
 
-    public $column.javaType get${AttrName}() 
-    {
+    public $column.javaType get${AttrName}() {
         return $column.javaField;
     }
 #end