From 1238837d6248cee0075458d604a6e007ca8544be Mon Sep 17 00:00:00 2001 From: wangqx Date: Wed, 24 Sep 2025 10:35:32 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/app/AppSearchController.java | 1 + .../common/mq/enums/MessageActionEnum.java | 4 +- .../impl/MQMessageHandleServiceImpl.java | 4 +- .../controller/ImCallbackController.java | 1 + .../wzj/soopin/member/domain/bo/MemberBO.java | 1 + script/sql/syncVlog.sql | 63 +++++++++++++++++++ 6 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 script/sql/syncVlog.sql diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java index 5a73ead20..243361e3c 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java @@ -64,6 +64,7 @@ public class AppSearchController { } else if (Objects.nonNull(searchBO) && Objects.nonNull(searchBO.getType()) && (SearchTypeEnum.MEMBER.type.intValue() == searchBO.getType().intValue())) { MemberBO memberBO = new MemberBO(); memberBO.setNickname(searchBO.getTitle()); + memberBO.setPhone(searchBO.getTitle()); pages = memberService.getMemberPageList(memberBO, page); } return R.ok(pages); diff --git a/ruoyi-common/ruoyi-common-mq/src/main/java/org/dromara/common/mq/enums/MessageActionEnum.java b/ruoyi-common/ruoyi-common-mq/src/main/java/org/dromara/common/mq/enums/MessageActionEnum.java index 73bbfe6fa..13afc53ee 100644 --- a/ruoyi-common/ruoyi-common-mq/src/main/java/org/dromara/common/mq/enums/MessageActionEnum.java +++ b/ruoyi-common/ruoyi-common-mq/src/main/java/org/dromara/common/mq/enums/MessageActionEnum.java @@ -5,7 +5,9 @@ public enum MessageActionEnum { SYSTEM_NOTIFY(10, "system"), // 系统->通知 SYSTEM_REPORT(13, "system"), // 系统->举报下架（视频，视频评论） 视频评论 - SYSTEM_CHECK(14, "system"), // 系统->审核结果（复审，驳回 ，通过） + SYSTEM_CHECK(14, "system"), // 系统->审核结果（通过） + SYSTEM_VLOG_REFUSE(17, "system"), // 系统->审核结果（驳回） + SYSTEM_VLOG_RECHECK(18, "system"), // 系统->审核结果（复审） SYSTEM_PUSH(15, "system"), //系统->推广类的 INTERACTION_COMMENT(21, "interaction"), //互动->评论 INTERACTION_AT(27, "interaction"), //互动->视频评论中的@ diff --git a/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/service/impl/MQMessageHandleServiceImpl.java b/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/service/impl/MQMessageHandleServiceImpl.java index 22f765b77..c7c713636 100644 --- a/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/service/impl/MQMessageHandleServiceImpl.java +++ b/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/service/impl/MQMessageHandleServiceImpl.java @@ -157,7 +157,9 @@ public class MQMessageHandleServiceImpl implements IMQMessageHandleService { return content; } for (String key : variables.keySet()) { - content = content.replaceAll("\\$\\{" + key + "\\}", variables.get(key).toString()); + if(variables.get(key)!=null){ + content = content.replaceAll("\\$\\{" + key + "\\}", variables.get(key).toString()); + } } return content; } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ImCallbackController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ImCallbackController.java index da1edf115..c0f114f06 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ImCallbackController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ImCallbackController.java @@ -24,6 +24,7 @@ public class ImCallbackController { @PostMapping public R handleCallback( @RequestParam(value = "Sign", required = false) String sign, + @RequestParam(value = "RequestTime", required = false) String requestTime, @RequestParam(value = "CallbackCommand", required = false) String callbackCommand, @RequestBody Map requestBody) { diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberBO.java index 53a3450aa..85b1c4288 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberBO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberBO.java @@ -86,6 +86,7 @@ public class MemberBO extends BaseBO { QueryWrapper qw = new QueryWrapper<>(); qw.lambda() .like(StringUtils.isNotEmpty(this.getNickname()), Member::getNickname, this.getNickname()) +// .and(wq->wq.like(StringUtils.isNotEmpty(this.getPhone()), Member::getPhoneHidden, this.getPhone()).or()) .eq(getId() != null, Member::getId, this.getId()) .eq(status != null, Member::getStatus, status) .eq(spreadUid != null, Member::getSpreadUid, spreadUid) diff --git a/script/sql/syncVlog.sql b/script/sql/syncVlog.sql new file mode 100644 index 000000000..1a22e2cb4 --- /dev/null +++ b/script/sql/syncVlog.sql @@ -0,0 +1,63 @@ +INSERT INTO cont_vlog ( + id, + member_id, + url, + cover, + title, + width, + height, + like_counts, + comments_counts, + is_private, + create_time, + update_time, + status, + reason, + city_code, + file_id, + first_frame_img, + create_by, + update_by, + del_flag +) +SELECT + -- 核心字段映射（t_vlog -> cont_vlog） + id, + vloger_id, -- 视频发布者ID映射为会员ID + url, + cover, + title, + width, + height, + like_counts, + comments_counts, + is_private, + created_time, -- 创建时间字段名转换 + updated_time, -- 更新时间字段名转换 + status, + reason, + city_code, + file_id, + first_frame_img, + vloger_id, -- 假设创建者为视频发布者 + vloger_id, -- 假设更新者为视频发布者（可根据实际业务调整） + 0 -- 删除标志默认为0（未删除） +FROM t_vlog +-- 处理重复数据：若id已存在则更新指定字段 + ON DUPLICATE KEY UPDATE + member_id = VALUES(member_id), + url = VALUES(url), + cover = VALUES(cover), + title = VALUES(title), + width = VALUES(width), + height = VALUES(height), + like_counts = VALUES(like_counts), + comments_counts = VALUES(comments_counts), + is_private = VALUES(is_private), + update_time = VALUES(update_time), + status = VALUES(status), + reason = VALUES(reason), + city_code = VALUES(city_code), + file_id = VALUES(file_id), + first_frame_img = VALUES(first_frame_img), + update_by = VALUES(update_by);