代码生成器及其结构更改

ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -172,7 +172,7 @@ public class VelocityUtils {
         } else if (template.contains("mapper.java.vm")) {
             fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
         } else if (template.contains("service.java.vm")) {
-            fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
+            fileName = StringUtils.format("{}/service/{}Service.java", javaPath, className);
         } else if (template.contains("serviceImpl.java.vm")) {
             fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
         } else if (template.contains("controller.java.vm")) {

ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

@@ -1,6 +1,7 @@
 package ${packageName}.mapper;
 
 import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import ${packageName}.domain.${ClassName};
 #if($table.sub)
 import ${packageName}.domain.${subClassName};

ruoyi-generator/src/main/resources/vm/java/service.java.vm

@@ -9,7 +9,7 @@ import ${packageName}.domain.${ClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service {
+public interface ${ClassName}Service {
     /**
      * 查询${functionName}
      *

ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -7,6 +7,7 @@ import com.ruoyi.common.utils.DateUtils;
 #break
 #end
 #end
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 #if($table.sub)
@@ -17,7 +18,7 @@ import ${packageName}.domain.${subClassName};
 #end
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
-import ${packageName}.service.I${ClassName}Service;
+import ${packageName}.service.${ClassName}Service;
 
 /**
  * ${functionName}Service业务层处理
@@ -26,7 +27,7 @@ import ${packageName}.service.I${ClassName}Service;
  * @date ${datetime}
  */
 @Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service {
+public class ${ClassName}ServiceImpl implements ${ClassName}Service {
     @Autowired
     private ${ClassName}Mapper ${className}Mapper;
 
@@ -68,7 +69,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
         ${className}.setCreateTime(DateUtils.getNowDate());
 #end
 #if($column.javaField == 'createBy')
-        ${className}.setCreateBy(DateUtils.getNowDate());
+        ${className}.setCreateBy(SecurityUtils.getUserId());
 #end
 #end
 #if($table.sub)

ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -4,14 +4,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
 
-    <resultMap type="${ClassName}" id="${ClassName}Result">
+    <resultMap type="${packageName}.domain.${ClassName}" id="${ClassName}Result">
 #foreach ($column in $columns)
         <result property="${column.javaField}"    column="${column.columnName}"    />
 #end
     </resultMap>
 #if($table.sub)
 
-    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
+    <resultMap id="${ClassName}${subClassName}Result" type="${packageName}.domain.${ClassName}" extends="${ClassName}Result">
         <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
     </resultMap>
 
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
     </sql>
 
-    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
+    <select id="select${ClassName}List" parameterType="${packageName}.domain.${ClassName}" resultMap="${ClassName}Result">
         <include refid="select${ClassName}Vo"/>
         <where>
 #foreach($column in $columns)
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
     </select>
 
-    <update id="update${ClassName}" parameterType="${ClassName}">
+    <update id="update${ClassName}" parameterType="${packageName}.domain.${ClassName}">
         update ${tableName}
         <trim prefix="SET" suffixOverrides=",">
 #foreach($column in $columns)

ruoyi-system/src/main/java/com/ruoyi/book/mapper/BookInfoMapper.java

@@ -1,7 +1,6 @@
 package com.ruoyi.book.mapper;
 
 import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.book.domain.BookInfo;
 
@@ -9,7 +8,7 @@ import com.ruoyi.book.domain.BookInfo;
  * 书籍信息Mapper接口
  *
  * @author DongZeLiang
- * @date 2023-10-08
+ * @date 2023-10-09
  */
 public interface BookInfoMapper extends BaseMapper<BookInfo> {
     /**
@@ -28,14 +27,6 @@ public interface BookInfoMapper extends BaseMapper<BookInfo> {
      */
     public List<BookInfo> selectBookInfoList(BookInfo bookInfo);
 
-    /**
-     * 新增书籍信息
-     *
-     * @param bookInfo 书籍信息
-     * @return 结果
-     */
-    public int insertBookInfo(BookInfo bookInfo);
-
     /**
      * 修改书籍信息
      *

ruoyi-system/src/main/java/com/ruoyi/book/service/BookInfoService.java

@@ -7,9 +7,9 @@ import com.ruoyi.book.domain.BookInfo;
  * 书籍信息Service接口
  *
  * @author DongZeLiang
- * @date 2023-10-08
+ * @date 2023-10-09
  */
-public interface IBookInfoService {
+public interface BookInfoService {
     /**
      * 查询书籍信息
      *

ruoyi-system/src/main/java/com/ruoyi/book/service/impl/BookInfoServiceImpl.java

@@ -7,16 +7,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.book.mapper.BookInfoMapper;
 import com.ruoyi.book.domain.BookInfo;
-import com.ruoyi.book.service.IBookInfoService;
+import com.ruoyi.book.service.BookInfoService;
 
 /**
  * 书籍信息Service业务层处理
  *
  * @author DongZeLiang
- * @date 2023-10-08
+ * @date 2023-10-09
  */
 @Service
-public class BookInfoServiceImpl implements IBookInfoService {
+public class BookInfoServiceImpl implements BookInfoService {
     @Autowired
     private BookInfoMapper bookInfoMapper;
 

ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.book.mapper.BookInfoMapper">
 
     <resultMap type="com.ruoyi.book.domain.BookInfo" id="BookInfoResult">
@@ -29,22 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <insert id="insertBookInfo" parameterType="com.ruoyi.book.domain.BookInfo" useGeneratedKeys="true" keyProperty="id">
-        insert into book_info
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null and name != ''">name,</if>
-            <if test="price != null">price,</if>
-            <if test="createBy != null and createBy != ''">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null and name != ''">#{name},</if>
-            <if test="price != null">#{price},</if>
-            <if test="createBy != null and createBy != ''">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-         </trim>
-    </insert>
-
     <update id="updateBookInfo" parameterType="com.ruoyi.book.domain.BookInfo">
         update book_info
         <trim prefix="SET" suffixOverrides=",">