From 7c25fa6fb6a457852cbf1daae297a330396d21b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Thu, 22 Aug 2024 21:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E4=BF=AE=E6=94=B9,=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=91=BD=E5=90=8Dservice=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/vm/java/controller.java.vm |  4 +-
 src/main/resources/vm/java/service.java.vm    |  2 +-
 .../resources/vm/java/serviceImpl.java.vm     | 80 +++++++++----------
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/main/resources/vm/java/controller.java.vm b/src/main/resources/vm/java/controller.java.vm
index a1443ae..04f73a4 100644
--- a/src/main/resources/vm/java/controller.java.vm
+++ b/src/main/resources/vm/java/controller.java.vm
@@ -16,7 +16,7 @@ import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import ${packageName}.domain.${ClassName};
-import ${packageName}.service.${ClassName}Service;
+import ${packageName}.service.I${ClassName}Service;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
@@ -36,7 +36,7 @@ import com.muyu.common.core.web.page.TableDataInfo;
 public class ${ClassName}Controller extends BaseController
 {
     @Resource
-    private ${ClassName}Service ${className}Service;
+    private I${ClassName}Service ${className}Service;
 
     /**
      * 查询${functionName}列表
diff --git a/src/main/resources/vm/java/service.java.vm b/src/main/resources/vm/java/service.java.vm
index 8faf7e2..2a905a2 100644
--- a/src/main/resources/vm/java/service.java.vm
+++ b/src/main/resources/vm/java/service.java.vm
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Service extends IService<${ClassName}> {
+public interface I${ClassName}Service extends IService<${ClassName}> {
     /**
      * 精确查询${functionName}
      *
diff --git a/src/main/resources/vm/java/serviceImpl.java.vm b/src/main/resources/vm/java/serviceImpl.java.vm
index 43b466f..fa9da03 100644
--- a/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/src/main/resources/vm/java/serviceImpl.java.vm
@@ -17,7 +17,7 @@ import ${packageName}.domain.${subClassName};
 #end
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
-import ${packageName}.service.${ClassName}Service;
+import ${packageName}.service.I${ClassName}Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.utils.StringUtils;
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
 @Service
 public class ${ClassName}ServiceImpl
         extends ServiceImpl<${ClassName}Mapper, ${ClassName}>
-        implements ${ClassName}Service {
+        implements I${ClassName}Service {
 
     /**
      * 精确查询${functionName}
@@ -45,7 +45,7 @@ public class ${ClassName}ServiceImpl
     {
         LambdaQueryWrapper<${ClassName}> queryWrapper = new LambdaQueryWrapper<>();
         Assert.notNull(${pkColumn.javaField}, "${pkColumn.javaField}不可为空");
-        queryWrapper.eq(${ClassName}::get${pkColumn.capJavaField}, ${className}.get${pkColumn.capJavaField}());
+        queryWrapper.eq(${ClassName}::get${pkColumn.capJavaField}, ${pkColumn.javaField});
         return this.getOne(queryWrapper);
     }
 
@@ -60,44 +60,44 @@ public class ${ClassName}ServiceImpl
     public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
     {
         LambdaQueryWrapper<${ClassName}> queryWrapper = new LambdaQueryWrapper<>();
-        #foreach($column in $columns)
-            #set($queryType=$column.queryType)
-            #set($javaField=$column.javaField)
-            #set($javaType=$column.javaType)
-            #set($columnName=$column.columnName)
-            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-            #if($column.query)
-                #if($column.queryType == "EQ")
-                    if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
-                        queryWrapper.eq(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
-                    }
+#foreach($column in $columns)
+    #set($queryType=$column.queryType)
+    #set($javaField=$column.javaField)
+    #set($javaType=$column.javaType)
+    #set($columnName=$column.columnName)
+    #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+    #if($column.query)
+    #if($column.queryType == "EQ")
+        if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
+            queryWrapper.eq(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
+        }
                 #elseif($queryType == "NE")
-                    if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
-                        queryWrapper.ne(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
-                    }
-                #elseif($queryType == "GT")
-                    if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
-                        queryWrapper.gt(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
-                    }
-                #elseif($queryType == "GTE")
-                    if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
-                        queryWrapper.ge(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
-                    }
-                #elseif($queryType == "LT")
-                    if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
-                        queryWrapper.lt(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
-                    }
-                #elseif($queryType == "LTE")
-                    if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
-                        queryWrapper.le(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
-                    }
-                #elseif($queryType == "LIKE")
-                    if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
-                        queryWrapper.like(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
-                    }
-                #end
-            #end
-        #end
+        if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
+            queryWrapper.ne(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
+        }
+    #elseif($queryType == "GT")
+        if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
+            queryWrapper.gt(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
+        }
+    #elseif($queryType == "GTE")
+        if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
+            queryWrapper.ge(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
+        }
+    #elseif($queryType == "LT")
+        if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
+            queryWrapper.lt(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
+        }
+    #elseif($queryType == "LTE")
+        if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
+            queryWrapper.le(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
+        }
+    #elseif($queryType == "LIKE")
+        if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
+            queryWrapper.like(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
+        }
+    #end
+    #end
+#end
         return this.list(queryWrapper);
     }