From dd37247e65374dd4ef7e8e8b9212d8f29023e301 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 十二月 2021 09:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-generator/src/main/resources/vm/java/service.java.vm | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index 6a5ce97..f93053c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -1,11 +1,13 @@
package ${packageName}.service;
import ${packageName}.domain.${ClassName};
-import ${packageName}.vo.${ClassName}Vo;
-import ${packageName}.bo.${ClassName}QueryBo;
-import ${packageName}.bo.${ClassName}AddBo;
-import ${packageName}.bo.${ClassName}EditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import ${packageName}.domain.vo.${ClassName}Vo;
+import ${packageName}.domain.bo.${ClassName}Bo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+#end
import java.util.Collection;
import java.util.List;
@@ -16,31 +18,38 @@
* @author ${author}
* @date ${datetime}
*/
-public interface I${ClassName}Service extends IService<${ClassName}> {
+public interface I${ClassName}Service extends IServicePlus<${ClassName}, ${ClassName}Vo> {
/**
* 鏌ヨ鍗曚釜
* @return
*/
${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
+#if($table.crud || $table.sub)
/**
* 鏌ヨ鍒楄〃
*/
- List<${ClassName}Vo> queryList(${ClassName}QueryBo bo);
+ TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
+#end
+
+ /**
+ * 鏌ヨ鍒楄〃
+ */
+ List<${ClassName}Vo> queryList(${ClassName}Bo bo);
/**
* 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆${functionName}
* @param bo ${functionName}鏂板涓氬姟瀵硅薄
* @return
*/
- Boolean insertByAddBo(${ClassName}AddBo bo);
+ Boolean insertByBo(${ClassName}Bo bo);
/**
* 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼${functionName}
* @param bo ${functionName}缂栬緫涓氬姟瀵硅薄
* @return
*/
- Boolean updateByEditBo(${ClassName}EditBo bo);
+ Boolean updateByBo(${ClassName}Bo bo);
/**
* 鏍￠獙骞跺垹闄ゆ暟鎹�
@@ -48,5 +57,5 @@
* @param isValid 鏄惁鏍￠獙,true-鍒犻櫎鍓嶆牎楠�,false-涓嶆牎楠�
* @return
*/
- Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+ Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
}
--
Gitblit v1.9.3