From 5577a546848723907409537ee8c0553fea75cafe Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Mon, 9 Oct 2023 16:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0list=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/vm/java/controller.java.vm |  4 +--
 .../src/main/resources/vm/java/domain.java.vm |  6 +++-
 .../src/main/resources/vm/java/mapper.java.vm |  7 ----
 .../main/resources/vm/java/service.java.vm    |  2 +-
 .../resources/vm/java/serviceImpl.java.vm     |  9 +++---
 .../src/main/resources/vm/xml/mapper.xml.vm   | 32 -------------------
 .../book/controller/BookInfoController.java   |  4 +--
 .../java/com/ruoyi/book/domain/BookInfo.java  |  2 ++
 .../ruoyi/book/service/BookInfoService.java   |  2 +-
 .../service/impl/BookInfoServiceImpl.java     | 10 +++---
 .../resources/mapper/book/BookInfoMapper.xml  |  7 ----
 11 files changed, 22 insertions(+), 63 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 0016124..17d28c5 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -44,12 +44,12 @@ public class ${ClassName}Controller extends BaseController {
 #if($table.crud || $table.sub)
     public Result<TableDataInfo> list(${ClassName} ${className}) {
         startPage();
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        List<${ClassName}> list = ${className}Service.list(${className});
         return getDataTable(list);
     }
 #elseif($table.tree)
     public Result list(${ClassName} ${className}) {
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        List<${ClassName}> list = ${className}Service.list(${className});
         return success(list);
     }
 #end
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index 59c35a3..4996d6a 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -3,9 +3,11 @@ package ${packageName}.domain;
 #foreach ($import in $importList)
 import ${import};
 #end
-import lombok.AllArgsConstructor;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -31,6 +33,8 @@ import com.ruoyi.common.core.domain.TreeEntity;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName("${tableName}")
 public class ${ClassName} extends ${Entity} {
     private static final long serialVersionUID = 1L;
 
diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
index 5924fb1..5c1df73 100644
--- a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
@@ -15,11 +15,4 @@ import ${packageName}.domain.${subClassName};
  */
 public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
 
-    /**
-     * 查询${functionName}列表
-     *
-     * @param ${className} ${functionName}
-     * @return ${functionName}集合
-     */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
 }
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 d4a8640..89bbdf4 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -17,6 +17,6 @@ public interface ${ClassName}Service extends IService<${ClassName}> {
      * @param ${className} ${functionName}
      * @return ${functionName}集合
      */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+    public List<${ClassName}> list(${ClassName} ${className});
 
 }
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 1a943be..fc158a2 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -1,12 +1,12 @@
 package ${packageName}.service.impl;
 
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.${ClassName}Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 /**
  * ${functionName}Service业务层处理
@@ -16,8 +16,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}>  implements ${ClassName}Service {
-    @Autowired
-    private ${ClassName}Mapper ${className}Mapper;
 
     /**
      * 查询${functionName}列表
@@ -26,7 +24,8 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
      * @return ${functionName}
      */
     @Override
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) {
-        return ${className}Mapper.select${ClassName}List(${className});
+    public List<${ClassName}> list(${ClassName} ${className}) {
+        LambdaQueryWrapper<${ClassName}> queryWrapper = new LambdaQueryWrapper<>();
+        return list(queryWrapper);
     }
 }
diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
index 3942ec1..6b49aba 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -13,36 +13,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="select${ClassName}Vo">
         select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
     </sql>
-
-    <select id="select${ClassName}List" parameterType="${packageName}.domain.${ClassName}" resultMap="${ClassName}Result">
-        <include refid="select${ClassName}Vo"/>
-        <where>
-#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 test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName = #{$javaField}</if>
-#elseif($queryType == "NE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName != #{$javaField}</if>
-#elseif($queryType == "GT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt; #{$javaField}</if>
-#elseif($queryType == "GTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt;= #{$javaField}</if>
-#elseif($queryType == "LT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt; #{$javaField}</if>
-#elseif($queryType == "LTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt;= #{$javaField}</if>
-#elseif($queryType == "LIKE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName like concat('%', #{$javaField}, '%')</if>
-#elseif($queryType == "BETWEEN")
-            <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
-#end
-#end
-#end
-        </where>
-    </select>
 </mapper>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/book/controller/BookInfoController.java b/ruoyi-system/src/main/java/com/ruoyi/book/controller/BookInfoController.java
index dd13e4f..51316d9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/book/controller/BookInfoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/book/controller/BookInfoController.java
@@ -40,7 +40,7 @@ public class BookInfoController extends BaseController {
     @GetMapping("/list")
     public Result<TableDataInfo> list(BookInfo bookInfo) {
         startPage();
-        List<BookInfo> list = bookInfoService.selectBookInfoList(bookInfo);
+        List<BookInfo> list = bookInfoService.list(bookInfo);
         return getDataTable(list);
     }
 
@@ -51,7 +51,7 @@ public class BookInfoController extends BaseController {
     @Log(title = "书籍信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BookInfo bookInfo) {
-        List<BookInfo> list = bookInfoService.selectBookInfoList(bookInfo);
+        List<BookInfo> list = bookInfoService.list(bookInfo);
         ExcelUtil<BookInfo> util = new ExcelUtil<BookInfo>(BookInfo.class);
         util.exportExcel(response, list, "书籍信息数据");
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java b/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java
index 5bc6ff9..4a2ae45 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -25,6 +26,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("book_info")
+@EqualsAndHashCode(callSuper = true)
 public class BookInfo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/book/service/BookInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/book/service/BookInfoService.java
index c3c0f1d..07eb45a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/book/service/BookInfoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/book/service/BookInfoService.java
@@ -17,6 +17,6 @@ public interface BookInfoService extends IService<BookInfo> {
      * @param bookInfo 书籍信息
      * @return 书籍信息集合
      */
-    public List<BookInfo> selectBookInfoList(BookInfo bookInfo);
+    public List<BookInfo> list(BookInfo bookInfo);
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/book/service/impl/BookInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/book/service/impl/BookInfoServiceImpl.java
index 346f143..748fbe8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/book/service/impl/BookInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/book/service/impl/BookInfoServiceImpl.java
@@ -1,7 +1,8 @@
 package com.ruoyi.book.service.impl;
 
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 import com.ruoyi.book.mapper.BookInfoMapper;
 import com.ruoyi.book.domain.BookInfo;
@@ -16,8 +17,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class BookInfoServiceImpl extends ServiceImpl<BookInfoMapper, BookInfo>  implements BookInfoService {
-    @Autowired
-    private BookInfoMapper bookInfoMapper;
 
     /**
      * 查询书籍信息列表
@@ -26,7 +25,8 @@ public class BookInfoServiceImpl extends ServiceImpl<BookInfoMapper, BookInfo>
      * @return 书籍信息
      */
     @Override
-    public List<BookInfo> selectBookInfoList(BookInfo bookInfo) {
-        return bookInfoMapper.selectBookInfoList(bookInfo);
+    public List<BookInfo> list(BookInfo bookInfo) {
+        LambdaQueryWrapper<BookInfo> queryWrapper = new LambdaQueryWrapper<>();
+        return list(queryWrapper);
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml
index a1f4962..83103aa 100644
--- a/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml
@@ -16,11 +16,4 @@
         select id, name, price, create_by, create_time from book_info
     </sql>
 
-    <select id="selectBookInfoList" parameterType="com.ruoyi.book.domain.BookInfo" resultMap="BookInfoResult">
-        <include refid="selectBookInfoVo"/>
-        <where>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="params.beginPrice != null and params.beginPrice != '' and params.endPrice != null and params.endPrice != ''"> and price between #{params.beginPrice} and #{params.endPrice}</if>
-        </where>
-    </select>
 </mapper>