From ea53b3faba7222394f5bff8dbb1966ab40ec4536 Mon Sep 17 00:00:00 2001
From: xlt <xlt@xialuotang.com>
Date: 星期六, 05 三月 2022 01:27:02 +0800
Subject: [PATCH] fix 修复talbleId的单词拼写错误，应为tableId

---
 ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm |   67 +++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index b9a45c6..005c84a 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -3,14 +3,14 @@
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.utils.StringUtils;
 #if($table.crud || $table.sub)
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 #end
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
 import ${packageName}.domain.bo.${ClassName}Bo;
 import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.${ClassName};
@@ -27,25 +27,48 @@
  * @author ${author}
  * @date ${datetime}
  */
+@RequiredArgsConstructor
 @Service
-public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper, ${ClassName}, ${ClassName}Vo> implements I${ClassName}Service {
+public class ${ClassName}ServiceImpl implements I${ClassName}Service {
 
+    private final ${ClassName}Mapper baseMapper;
+
+    /**
+     * 鏌ヨ${functionName}
+     *
+     * @param ${pkColumn.javaField} ${functionName}涓婚敭
+     * @return ${functionName}
+     */
     @Override
     public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
-        return getVoById(${pkColumn.javaField});
+        return baseMapper.selectVoById(${pkColumn.javaField});
     }
 
 #if($table.crud || $table.sub)
+    /**
+     * 鏌ヨ${functionName}鍒楄〃
+     *
+     * @param bo ${functionName}
+     * @return ${functionName}
+     */
     @Override
-    public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo) {
-        PagePlus<${ClassName}, ${ClassName}Vo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
-        return PageUtils.buildDataInfo(result);
+    public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
+        Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
     }
 #end
 
+    /**
+     * 鏌ヨ${functionName}鍒楄〃
+     *
+     * @param bo ${functionName}
+     * @return ${functionName}
+     */
     @Override
     public List<${ClassName}Vo> queryList(${ClassName}Bo bo) {
-        return listVo(buildQueryWrapper(bo));
+        LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
     }
 
     private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
@@ -75,11 +98,17 @@
         return lqw;
     }
 
+    /**
+     * 鏂板${functionName}
+     *
+     * @param bo ${functionName}
+     * @return 缁撴灉
+     */
     @Override
     public Boolean insertByBo(${ClassName}Bo bo) {
         ${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class);
         validEntityBeforeSave(add);
-        boolean flag = save(add);
+        boolean flag = baseMapper.insert(add) > 0;
 #set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
         if (flag) {
             bo.set$pk(add.get$pk());
@@ -87,11 +116,17 @@
         return flag;
     }
 
+    /**
+     * 淇敼${functionName}
+     *
+     * @param bo ${functionName}
+     * @return 缁撴灉
+     */
     @Override
     public Boolean updateByBo(${ClassName}Bo bo) {
         ${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class);
         validEntityBeforeSave(update);
-        return updateById(update);
+        return baseMapper.updateById(update) > 0;
     }
 
     /**
@@ -103,11 +138,17 @@
         //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
     }
 
+    /**
+     * 鎵归噺鍒犻櫎${functionName}
+     *
+     * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}涓婚敭
+     * @return 缁撴灉
+     */
     @Override
     public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
         if(isValid){
             //TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
         }
-        return removeByIds(ids);
+        return baseMapper.deleteBatchIds(ids) > 0;
     }
 }

--
Gitblit v1.9.3