From 3fd322b355d53103d62740772f5f76a140aa7345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 3 Jan 2025 15:21:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=89=87=E9=94=AE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/config/ShardingConfig.java | 38 +++++++++---------- .../modules/course/entity/CourseCollect.java | 8 ++-- .../sqx/modules/course/entity/CourseUser.java | 6 +-- .../impl/CourseCollectServiceImpl.java | 1 + .../impl/CourseDetailsServiceImpl.java | 3 +- .../service/impl/CourseServiceImpl.java | 4 +- .../com/sqx/modules/orders/entity/Orders.java | 6 +-- 7 files changed, 32 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/sqx/config/ShardingConfig.java b/src/main/java/com/sqx/config/ShardingConfig.java index d5a490d6..2ca52aa0 100644 --- a/src/main/java/com/sqx/config/ShardingConfig.java +++ b/src/main/java/com/sqx/config/ShardingConfig.java @@ -148,24 +148,24 @@ public class ShardingConfig { for (String regionTable : regionTables) { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(regionTable, String.format(regionTablesDataNode, regionTable)); tableRuleConfig.setDatabaseShardingStrategyConfig(databaseShardingStrategyConfig); - // 设置区域表使用雪花算法生成主键 - switch (regionTable){ - case "orders": - tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "orders_id")); - break; - case "course_collect": - tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "course_collect_id")); - break; - case "course_user": - tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "course_user_id")); - break; - case "tb_user": - tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "user_id")); - break; - default: - tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "id")); - break; - } +// // 设置区域表使用雪花算法生成主键 +// switch (regionTable){ +// case "orders": +// tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "orders_id")); +// break; +//// case "course_collect": +//// tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "course_collect_id")); +//// break; +// case "course_user": +// tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "course_user_id")); +// break; +// case "tb_user": +// tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "user_id")); +// break; +// default: +// tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "id")); +// break; +// } sets.add(tableRuleConfig); } @@ -254,4 +254,4 @@ public class ShardingConfig { } return tableNames.toString(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/sqx/modules/course/entity/CourseCollect.java b/src/main/java/com/sqx/modules/course/entity/CourseCollect.java index 17b6e034..717a4902 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseCollect.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseCollect.java @@ -1,11 +1,10 @@ package com.sqx.modules.course.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.experimental.Accessors; +import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.UpdateProvider; import java.io.Serializable; @@ -41,6 +40,7 @@ public class CourseCollect implements Serializable { /** * 用户id */ + @TableField(updateStrategy = FieldStrategy.NEVER) private Long userId; /** diff --git a/src/main/java/com/sqx/modules/course/entity/CourseUser.java b/src/main/java/com/sqx/modules/course/entity/CourseUser.java index fe28e60b..4fc9606c 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseUser.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseUser.java @@ -1,9 +1,6 @@ package com.sqx.modules.course.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; @@ -49,6 +46,7 @@ public class CourseUser implements Serializable { /** * 用户id */ + @TableField(updateStrategy = FieldStrategy.NEVER) private Long userId; /** diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 8672b6a2..b5a59480 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -1,5 +1,6 @@ package com.sqx.modules.course.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java index e76e61df..f8616d64 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java @@ -225,7 +225,8 @@ public class CourseDetailsServiceImpl extends ServiceImpl().eq(CourseDetails::getCourseId, courseCollect.getCourseId()) + .eq(CourseDetails::getCourseDetailsId, courseCollect.getCourseDetailsId())); if (courseDetails != null) { bean.setCourseDetailsId(courseDetails.getCourseDetailsId()); bean.setCourseDetailsName(courseDetails.getCourseDetailsName()); diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java index d65631f0..10fea223 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java @@ -201,7 +201,7 @@ public class CourseServiceImpl extends ServiceImpl implements m.put("dyEpisodeId", ""); m.put("wxCourseDetailsId", ""); } - PageUtils pageUtils = PageUtils.page(pageInfo, true); + PageUtils pageUtils = PageUtils.page(pageInfo); setCache(cacheKey, JSONUtil.toJsonStr(pageUtils)); return Result.success().put("data", pageUtils); } @@ -222,7 +222,7 @@ public class CourseServiceImpl extends ServiceImpl implements map.put("wxCourseDetailsId", ""); map.putAll(countMap); } - PageUtils pageUtils = PageUtils.page(pageInfo, true); + PageUtils pageUtils = PageUtils.page(pageInfo); setCache(cacheKey, JSONUtil.toJsonStr(pageUtils)); return Result.success().put("data", pageUtils); } diff --git a/src/main/java/com/sqx/modules/orders/entity/Orders.java b/src/main/java/com/sqx/modules/orders/entity/Orders.java index c11801c8..57e65829 100644 --- a/src/main/java/com/sqx/modules/orders/entity/Orders.java +++ b/src/main/java/com/sqx/modules/orders/entity/Orders.java @@ -1,9 +1,6 @@ package com.sqx.modules.orders.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.sqx.modules.course.entity.Course; import lombok.Data; @@ -40,6 +37,7 @@ public class Orders implements Serializable { /** * 用户id */ + @TableField(updateStrategy = FieldStrategy.NEVER) private Long userId; /**