diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index 1e0fa50..9fcb46b 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/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")) { 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 85a6583..8bdaccf 100644 --- a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm +++ b/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}; 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 c3a965d..cf41c0a 100644 --- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/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} * 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 ab6e38c..bdc5243 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/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) 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 c09f8cd..1bd3c74 100644 --- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm +++ b/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"> - + #foreach ($column in $columns) #end #if($table.sub) - + @@ -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} - #foreach($column in $columns) @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #end - + update ${tableName} #foreach($column in $columns) diff --git a/ruoyi-system/src/main/java/com/ruoyi/book/mapper/BookInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/book/mapper/BookInfoMapper.java index e80d779..70279f7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/book/mapper/BookInfoMapper.java +++ b/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 { /** @@ -28,14 +27,6 @@ public interface BookInfoMapper extends BaseMapper { */ public List selectBookInfoList(BookInfo bookInfo); - /** - * 新增书籍信息 - * - * @param bookInfo 书籍信息 - * @return 结果 - */ - public int insertBookInfo(BookInfo bookInfo); - /** * 修改书籍信息 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/book/service/IBookInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/book/service/BookInfoService.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/book/service/IBookInfoService.java rename to ruoyi-system/src/main/java/com/ruoyi/book/service/BookInfoService.java index 27b17e3..7cb251b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/book/service/IBookInfoService.java +++ b/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 { /** * 查询书籍信息 * 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 217a6a7..5e7d36c 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 @@ -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; diff --git a/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml index 228b7d6..3c40f13 100644 --- a/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> @@ -29,22 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - insert into book_info - - name, - price, - create_by, - create_time, - - - #{name}, - #{price}, - #{createBy}, - #{createTime}, - - - update book_info