bookshelfplus/bookshelfplus
1
0
Fork 0
mirror of https://gitee.com/bookshelfplus/bookshelfplus synced 2025-09-12 11:41:39 +08:00
Code Issues Projects Releases Wiki Activity GitHub Gitee

升级 MyBatis Generator 依赖版本，更新一些文件，同时修了一个小Bug

Browse Source
This commit is contained in:
小墨
2022-04-10 23:58:00 +08:00
parent 63d8192372
commit c9723573da
17 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/FileController.java
View File

@@ -143,7 +143,8 @@ public class FileController extends BaseController {
case PUT:
if (isExist) throw new BusinessException(BusinessErrorCode.PARAMETER_VALIDATION_ERROR, "文件已存在");
// 添加一个scheduleTask，用于检测用户是否上传了文件，然后更新数据库中信息
fileService.addScheduleTask(expireMinute, bookSaveFolder, urlGUID, userModel.getId());
// TODO
// fileService.addScheduleTask(expireMinute, bookSaveFolder, urlGUID, userModel.getId());
break;
case GET:
if (!isExist) throw new BusinessException(BusinessErrorCode.PARAMETER_VALIDATION_ERROR, "文件不存在");

5
bookshelfplus/src/main/java/plus/bookshelf/Dao/DO/BookDOExample.java
View File

@@ -35,7 +35,7 @@ public class BookDOExample {
* @mbg.generated
*/
public BookDOExample() {
oredCriteria = new ArrayList<Criteria>();
oredCriteria = new ArrayList<>();
}
/**
@@ -158,7 +158,7 @@ public class BookDOExample {
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -802,7 +802,6 @@ public class BookDOExample {
* @mbg.generated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}

10
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/BookDOMapper.java
View File

@@ -22,7 +22,7 @@ public interface BookDOMapper {
*
* @mbg.generated
*/
int insert(BookDO record);
int insert(BookDO row);
/**
* This method was generated by MyBatis Generator.
@@ -30,7 +30,7 @@ public interface BookDOMapper {
*
* @mbg.generated
*/
int insertSelective(BookDO record);
int insertSelective(BookDO row);
/**
* This method was generated by MyBatis Generator.
@@ -62,7 +62,7 @@ public interface BookDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(BookDO record);
int updateByPrimaryKeySelective(BookDO row);
/**
* This method was generated by MyBatis Generator.
@@ -70,7 +70,7 @@ public interface BookDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeyWithBLOBs(BookDO record);
int updateByPrimaryKeyWithBLOBs(BookDO row);
/**
* This method was generated by MyBatis Generator.
@@ -78,7 +78,7 @@ public interface BookDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(BookDO record);
int updateByPrimaryKey(BookDO row);
/**
* 通过用户id获取用户收藏书籍列表

10
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/CategoryDOMapper.java
View File

@@ -19,7 +19,7 @@ public interface CategoryDOMapper {
*
* @mbg.generated
*/
int insert(CategoryDO record);
int insert(CategoryDO row);
/**
* This method was generated by MyBatis Generator.
@@ -27,7 +27,7 @@ public interface CategoryDOMapper {
*
* @mbg.generated
*/
int insertSelective(CategoryDO record);
int insertSelective(CategoryDO row);
/**
* This method was generated by MyBatis Generator.
@@ -43,7 +43,7 @@ public interface CategoryDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(CategoryDO record);
int updateByPrimaryKeySelective(CategoryDO row);
/**
* This method was generated by MyBatis Generator.
@@ -51,7 +51,7 @@ public interface CategoryDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeyWithBLOBs(CategoryDO record);
int updateByPrimaryKeyWithBLOBs(CategoryDO row);
/**
* This method was generated by MyBatis Generator.
@@ -59,7 +59,7 @@ public interface CategoryDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(CategoryDO record);
int updateByPrimaryKey(CategoryDO row);
CategoryDO[] selectChildrenByCategoryId(Integer id);

8
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/CosPresignedUrlGenerateLogDOMapper.java
View File

@@ -19,7 +19,7 @@ public interface CosPresignedUrlGenerateLogDOMapper {
*
* @mbg.generated
*/
int insert(CosPresignedUrlGenerateLogDO record);
int insert(CosPresignedUrlGenerateLogDO row);
/**
* This method was generated by MyBatis Generator.
@@ -27,7 +27,7 @@ public interface CosPresignedUrlGenerateLogDOMapper {
*
* @mbg.generated
*/
int insertSelective(CosPresignedUrlGenerateLogDO record);
int insertSelective(CosPresignedUrlGenerateLogDO row);
/**
* This method was generated by MyBatis Generator.
@@ -43,7 +43,7 @@ public interface CosPresignedUrlGenerateLogDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(CosPresignedUrlGenerateLogDO record);
int updateByPrimaryKeySelective(CosPresignedUrlGenerateLogDO row);
/**
* This method was generated by MyBatis Generator.
@@ -51,5 +51,5 @@ public interface CosPresignedUrlGenerateLogDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(CosPresignedUrlGenerateLogDO record);
int updateByPrimaryKey(CosPresignedUrlGenerateLogDO row);
}

8
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/FileDOMapper.java
View File

@@ -19,7 +19,7 @@ public interface FileDOMapper {
*
* @mbg.generated
*/
int insert(FileDO record);
int insert(FileDO row);
/**
* This method was generated by MyBatis Generator.
@@ -27,7 +27,7 @@ public interface FileDOMapper {
*
* @mbg.generated
*/
int insertSelective(FileDO record);
int insertSelective(FileDO row);
/**
* This method was generated by MyBatis Generator.
@@ -43,7 +43,7 @@ public interface FileDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(FileDO record);
int updateByPrimaryKeySelective(FileDO row);
/**
* This method was generated by MyBatis Generator.
@@ -51,7 +51,7 @@ public interface FileDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(FileDO record);
int updateByPrimaryKey(FileDO row);
/**
* 查询系统中的所有文件

8
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/FileObjectDOMapper.java
View File

@@ -20,7 +20,7 @@ public interface FileObjectDOMapper {
*
* @mbg.generated
*/
int insert(FileObjectDO record);
int insert(FileObjectDO row);
/**
* This method was generated by MyBatis Generator.
@@ -28,7 +28,7 @@ public interface FileObjectDOMapper {
*
* @mbg.generated
*/
int insertSelective(FileObjectDO record);
int insertSelective(FileObjectDO row);
/**
* This method was generated by MyBatis Generator.
@@ -44,7 +44,7 @@ public interface FileObjectDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(FileObjectDO record);
int updateByPrimaryKeySelective(FileObjectDO row);
/**
* This method was generated by MyBatis Generator.
@@ -52,7 +52,7 @@ public interface FileObjectDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(FileObjectDO record);
int updateByPrimaryKey(FileObjectDO row);
/**
* 查询系统中的所有文件对象

8
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/ScheduleTaskDOMapper.java
View File

@@ -19,7 +19,7 @@ public interface ScheduleTaskDOMapper {
*
* @mbg.generated
*/
int insert(ScheduleTaskDO record);
int insert(ScheduleTaskDO row);
/**
* This method was generated by MyBatis Generator.
@@ -27,7 +27,7 @@ public interface ScheduleTaskDOMapper {
*
* @mbg.generated
*/
int insertSelective(ScheduleTaskDO record);
int insertSelective(ScheduleTaskDO row);
/**
* This method was generated by MyBatis Generator.
@@ -43,7 +43,7 @@ public interface ScheduleTaskDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(ScheduleTaskDO record);
int updateByPrimaryKeySelective(ScheduleTaskDO row);
/**
* This method was generated by MyBatis Generator.
@@ -51,7 +51,7 @@ public interface ScheduleTaskDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(ScheduleTaskDO record);
int updateByPrimaryKey(ScheduleTaskDO row);
/**
* 从数据库中取出需要处理的任务

8
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/ThirdPartyUserAuthDOMapper.java
View File

@@ -19,7 +19,7 @@ public interface ThirdPartyUserAuthDOMapper {
*
* @mbg.generated
*/
int insert(ThirdPartyUserAuthDO record);
int insert(ThirdPartyUserAuthDO row);
/**
* This method was generated by MyBatis Generator.
@@ -27,7 +27,7 @@ public interface ThirdPartyUserAuthDOMapper {
*
* @mbg.generated
*/
int insertSelective(ThirdPartyUserAuthDO record);
int insertSelective(ThirdPartyUserAuthDO row);
/**
* This method was generated by MyBatis Generator.
@@ -43,7 +43,7 @@ public interface ThirdPartyUserAuthDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(ThirdPartyUserAuthDO record);
int updateByPrimaryKeySelective(ThirdPartyUserAuthDO row);
/**
* This method was generated by MyBatis Generator.
@@ -51,7 +51,7 @@ public interface ThirdPartyUserAuthDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(ThirdPartyUserAuthDO record);
int updateByPrimaryKey(ThirdPartyUserAuthDO row);
ThirdPartyUserAuthDO selectByThirdPartyUserId(Integer id);

9
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/ThirdPartyUserDOMapper.java
View File

@@ -1,7 +1,6 @@
package plus.bookshelf.Dao.Mapper;
import org.springframework.stereotype.Repository;
import plus.bookshelf.Dao.DO.ThirdPartyUserAuthDO;
import plus.bookshelf.Dao.DO.ThirdPartyUserDO;
@Repository // 添加这个注解，Autowired的时候idea就不会报错了
@@ -20,7 +19,7 @@ public interface ThirdPartyUserDOMapper {
*
* @mbg.generated
*/
int insert(ThirdPartyUserDO record);
int insert(ThirdPartyUserDO row);
/**
* This method was generated by MyBatis Generator.
@@ -28,7 +27,7 @@ public interface ThirdPartyUserDOMapper {
*
* @mbg.generated
*/
int insertSelective(ThirdPartyUserDO record);
int insertSelective(ThirdPartyUserDO row);
/**
* This method was generated by MyBatis Generator.
@@ -44,7 +43,7 @@ public interface ThirdPartyUserDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(ThirdPartyUserDO record);
int updateByPrimaryKeySelective(ThirdPartyUserDO row);
/**
* This method was generated by MyBatis Generator.
@@ -52,7 +51,7 @@ public interface ThirdPartyUserDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(ThirdPartyUserDO record);
int updateByPrimaryKey(ThirdPartyUserDO row);
/**
* 通过 uuid + source 查询第三方登录的用户信息

8
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/UserDOMapper.java
View File

@@ -19,7 +19,7 @@ public interface UserDOMapper {
*
* @mbg.generated
*/
int insert(UserDO record);
int insert(UserDO row);
/**
* This method was generated by MyBatis Generator.
@@ -27,7 +27,7 @@ public interface UserDOMapper {
*
* @mbg.generated
*/
int insertSelective(UserDO record);
int insertSelective(UserDO row);
/**
* This method was generated by MyBatis Generator.
@@ -43,7 +43,7 @@ public interface UserDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(UserDO record);
int updateByPrimaryKeySelective(UserDO row);
/**
* This method was generated by MyBatis Generator.
@@ -51,7 +51,7 @@ public interface UserDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(UserDO record);
int updateByPrimaryKey(UserDO row);
UserDO selectByUsernameAndEncryptpwd(String username, String encryptPwd);

10
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/UserFavoritesDOMapper.java
View File

@@ -1,7 +1,9 @@
package plus.bookshelf.Dao.Mapper;
import org.springframework.stereotype.Repository;
import plus.bookshelf.Dao.DO.UserFavoritesDO;
@Repository // 添加这个注解，Autowired的时候idea就不会报错了
public interface UserFavoritesDOMapper {
/**
* This method was generated by MyBatis Generator.
@@ -17,7 +19,7 @@ public interface UserFavoritesDOMapper {
*
* @mbg.generated
*/
int insert(UserFavoritesDO record);
int insert(UserFavoritesDO row);
/**
* This method was generated by MyBatis Generator.
@@ -25,7 +27,7 @@ public interface UserFavoritesDOMapper {
*
* @mbg.generated
*/
int insertSelective(UserFavoritesDO record);
int insertSelective(UserFavoritesDO row);
/**
* This method was generated by MyBatis Generator.
@@ -41,7 +43,7 @@ public interface UserFavoritesDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(UserFavoritesDO record);
int updateByPrimaryKeySelective(UserFavoritesDO row);
/**
* This method was generated by MyBatis Generator.
@@ -49,7 +51,7 @@ public interface UserFavoritesDOMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(UserFavoritesDO record);
int updateByPrimaryKey(UserFavoritesDO row);
/**
* 通过用户id和书籍id删除用户收藏状态

3
bookshelfplus/src/main/java/plus/bookshelf/Service/Impl/ScheduleTaskServiceImpl.java
View File

@@ -60,7 +60,8 @@ public class ScheduleTaskServiceImpl {
ScheduleTaskModel scheduleTaskModel = convertToModel(task);
switch (scheduleTaskModel.getAction()) {
case CHECK_FILE_IS_UPLOADED:
fileService.doScheduleTask(scheduleTaskModel);
// TODO
// fileService.doScheduleTask(scheduleTaskModel);
break;
default:
throw new BusinessException(BusinessErrorCode.UNKNOWN_ERROR, "未知的定时任务类型");

10
bookshelfplus/src/main/resources/mapping/FileObjectDOMapper.xml
View File

@@ -26,7 +26,7 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
select
<include refid="Base_Column_List" />
from file_object_info
where id = #{id,jdbcType=INTEGER}
@@ -44,11 +44,11 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into file_object_info (id, file_id, storage_medium_type,
file_path, file_pwd, file_share_code,
insert into file_object_info (id, file_id, storage_medium_type,
file_path, file_pwd, file_share_code,
additional_fields)
values (#{id,jdbcType=INTEGER}, #{fileId,jdbcType=INTEGER}, #{storageMediumType,jdbcType=VARCHAR},
#{filePath,jdbcType=VARCHAR}, #{filePwd,jdbcType=VARCHAR}, #{fileShareCode,jdbcType=VARCHAR},
values (#{id,jdbcType=INTEGER}, #{fileId,jdbcType=INTEGER}, #{storageMediumType,jdbcType=VARCHAR},
#{filePath,jdbcType=VARCHAR}, #{filePwd,jdbcType=VARCHAR}, #{fileShareCode,jdbcType=VARCHAR},
#{additionalFields,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="plus.bookshelf.Dao.DO.FileObjectDO">

4
bookshelfplus/src/main/resources/mapping/ScheduleTaskDOMapper.xml
View File

@@ -158,14 +158,14 @@
fail_time = #{failTime,jdbcType=TINYINT}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectTodoTask" parameterType="plus.bookshelf.Dao.DO.BookDOExample" resultMap="ResultMap">
<select id="selectTodoTask" parameterType="plus.bookshelf.Dao.DO.BookDOExample" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from schedule_task
where <![CDATA[ schedule_time <= CURRENT_TIMESTAMP ]]>
order by schedule_time asc
</select>
<select id="selectByGuid" parameterType="plus.bookshelf.Dao.DO.BookDOExample" resultMap="ResultMap">
<select id="selectByGuid" parameterType="plus.bookshelf.Dao.DO.BookDOExample" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from schedule_task

14
bookshelfplus/src/main/resources/mybatis-generator.xml
View File

@@ -28,13 +28,13 @@
<!--<property name="addRemarkComments" value="true"/>-->
</commentGenerator>
<!-- 数据库链接配置 -->
<!--<jdbcConnection driverClass="com.mysql.jdbc.Driver"-->
<!-- connectionURL="jdbc:mysql://127.0.0.1:3306/bookshelfplus?serverTimezone=Asia/Shanghai&amp;useSSL=false"-->
<!-- userId="root"-->
<!-- password="111111">-->
<!--</jdbcConnection>-->
<jdbcConnection driverClass="com.mysql.jdbc.Driver" connectionURL="${spring.datasource.url}"
<!-- 数据库连接配置 -->
<!--
升级依赖后 driverClass 由 com.mysql.jdbc.Driver 改为 com.mysql.cj.jdbc.Driver
Loading class `com.mysql.jdbc.Driver'. This is deprecated. The new driver class is `com.mysql.cj.jdbc.Driver'.
The driver is automatically registered via the SPI and manual loading of the driver class is generally unnecessary.
-->
<jdbcConnection driverClass="com.mysql.cj.jdbc.Driver" connectionURL="${spring.datasource.url}"
userId="${spring.datasource.username}" password="${spring.datasource.password}">
<!--
禁止MyBatis使用其他数据库中的同名数据表