From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-generator/src/main/resources/vm/java/service.java.vm | 74 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 38 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 9ae8620..4a3eb56 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -1,13 +1,11 @@
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.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import ${packageName}.domain.vo.${ClassName}Vo;
+import ${packageName}.domain.bo.${ClassName}Bo;
#if($table.crud || $table.sub)
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
#end
import java.util.Collection;
@@ -19,44 +17,44 @@
* @author ${author}
* @date ${datetime}
*/
-public interface I${ClassName}Service extends IServicePlus<${ClassName}> {
- /**
- * 鏌ヨ鍗曚釜
- * @return
- */
- ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
+public interface I${ClassName}Service {
+ /**
+ * 鏌ヨ鍗曚釜
+ * @return
+ */
+ ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
#if($table.crud || $table.sub)
- /**
- * 鏌ヨ鍒楄〃
- */
- TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}QueryBo bo);
+ /**
+ * 鏌ヨ鍒楄〃
+ */
+ TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
#end
- /**
- * 鏌ヨ鍒楄〃
- */
- List<${ClassName}Vo> queryList(${ClassName}QueryBo bo);
+ /**
+ * 鏌ヨ鍒楄〃
+ */
+ List<${ClassName}Vo> queryList(${ClassName}Bo bo);
- /**
- * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆${functionName}
- * @param bo ${functionName}鏂板涓氬姟瀵硅薄
- * @return
- */
- Boolean insertByAddBo(${ClassName}AddBo bo);
+ /**
+ * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆${functionName}
+ * @param bo ${functionName}鏂板涓氬姟瀵硅薄
+ * @return
+ */
+ Boolean insertByBo(${ClassName}Bo bo);
- /**
- * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼${functionName}
- * @param bo ${functionName}缂栬緫涓氬姟瀵硅薄
- * @return
- */
- Boolean updateByEditBo(${ClassName}EditBo bo);
+ /**
+ * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼${functionName}
+ * @param bo ${functionName}缂栬緫涓氬姟瀵硅薄
+ * @return
+ */
+ Boolean updateByBo(${ClassName}Bo bo);
- /**
- * 鏍￠獙骞跺垹闄ゆ暟鎹�
- * @param ids 涓婚敭闆嗗悎
- * @param isValid 鏄惁鏍￠獙,true-鍒犻櫎鍓嶆牎楠�,false-涓嶆牎楠�
- * @return
- */
- Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
+ /**
+ * 鏍￠獙骞跺垹闄ゆ暟鎹�
+ * @param ids 涓婚敭闆嗗悎
+ * @param isValid 鏄惁鏍￠獙,true-鍒犻櫎鍓嶆牎楠�,false-涓嶆牎楠�
+ * @return
+ */
+ Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
}
--
Gitblit v1.9.3