CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-04-01 16:39:03 +08:00
parent 921c8a2374
commit 9ae74c999e
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/dto/WeComChatSession.java
View File

@@ -35,7 +35,10 @@ public class WeComChatSession {
this.lastInteractionTime = LocalDateTime.now().format(FMT); this.lastInteractionTime = LocalDateTime.now().format(FMT);
} }
public boolean isLogisticsWaitRemark() { /**
* 是否处于「已收物流链、待备注」步骤。方法名避免使用 isXxx，防止 Fastjson 序列化 Redis JSON 时混入多余布尔字段。
*/
public boolean matchLogisticsWaitRemark() {
return SCENE_JD_LOGISTICS_SHARE.equals(scene) && STEP_WAIT_REMARK.equals(step) return SCENE_JD_LOGISTICS_SHARE.equals(scene) && STEP_WAIT_REMARK.equals(step)
&& logisticsUrl != null && !logisticsUrl.isEmpty(); && logisticsUrl != null && !logisticsUrl.isEmpty();
} }

19
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/WeComChatSessionServiceImpl.java
View File

@@ -40,23 +40,29 @@ public class WeComChatSessionServiceImpl implements IWeComChatSessionService {
if (!StringUtils.hasText(wecomUserId)) { if (!StringUtils.hasText(wecomUserId)) {
return null; return null;
} }
String json = stringRedisTemplate.opsForValue().get(WeComConvention.sessionRedisKey(wecomUserId.trim())); String key = WeComConvention.sessionRedisKey(wecomUserId.trim());
String json = stringRedisTemplate.opsForValue().get(key);
if (!StringUtils.hasText(json)) { if (!StringUtils.hasText(json)) {
log.debug("企微会话 Redis 未命中 key={}", key);
return null; return null;
} }
try { try {
WeComChatSession s = JSON.parseObject(json, WeComChatSession.class); WeComChatSession s = JSON.parseObject(json, WeComChatSession.class);
if (s == null || !StringUtils.hasText(s.getLastInteractionTime())) { if (s == null || !StringUtils.hasText(s.getLastInteractionTime())) {
log.info("企微会话 Redis 命中但缺字段 userId={} key={}", wecomUserId, WeComConvention.sessionRedisKey(wecomUserId.trim()));
return null; return null;
} }
LocalDateTime last = LocalDateTime.parse(s.getLastInteractionTime(), FMT); LocalDateTime last = LocalDateTime.parse(s.getLastInteractionTime(), FMT);
if (ChronoUnit.MINUTES.between(last, LocalDateTime.now()) > idleTimeoutMinutes) { if (ChronoUnit.MINUTES.between(last, LocalDateTime.now()) > idleTimeoutMinutes) {
stringRedisTemplate.delete(WeComConvention.sessionRedisKey(wecomUserId.trim())); stringRedisTemplate.delete(WeComConvention.sessionRedisKey(wecomUserId.trim()));
log.info("企微会话空闲超时已删 userId={} key={}", wecomUserId, WeComConvention.sessionRedisKey(wecomUserId.trim()));
return null; return null;
} }
log.debug("企微会话读取成功 userId={} scene={} step={}", wecomUserId, s.getScene(), s.getStep());
return s; return s;
} catch (Exception e) { } catch (Exception e) {
log.warn("解析企微会话失败 userId={}", wecomUserId, e); log.warn("解析企微会话失败 userId={} key={} jsonSnippet={}", wecomUserId, WeComConvention.sessionRedisKey(wecomUserId.trim()),
json != null && json.length() > 120 ? json.substring(0, 120) + "..." : json, e);
return null; return null;
} }
} }
@@ -67,11 +73,10 @@ public class WeComChatSessionServiceImpl implements IWeComChatSessionService {
return; return;
} }
session.touch(); session.touch();
stringRedisTemplate.opsForValue().set( String key = WeComConvention.sessionRedisKey(wecomUserId.trim());
WeComConvention.sessionRedisKey(wecomUserId.trim()), String payload = JSON.toJSONString(session);
JSON.toJSONString(session), stringRedisTemplate.opsForValue().set(key, payload, sessionTtlMinutes, TimeUnit.MINUTES);
sessionTtlMinutes, log.info("企微会话已写入 Redis key={} ttlMin={} bytes={}", key, sessionTtlMinutes, payload.length());
TimeUnit.MINUTES);
} }
@Override @Override

5
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/WeComInboundServiceImpl.java
View File

@@ -56,12 +56,12 @@ public class WeComInboundServiceImpl implements IWeComInboundService {
} }
WeComChatSession session = weComChatSessionService.get(from); WeComChatSession session = weComChatSessionService.get(from);
if (session != null && !session.isLogisticsWaitRemark()) { if (session != null && !session.matchLogisticsWaitRemark()) {
weComChatSessionService.delete(from); weComChatSessionService.delete(from);
session = null; session = null;
} }
if (session != null && session.isLogisticsWaitRemark()) { if (session != null && session.matchLogisticsWaitRemark()) {
String t = content.trim(); String t = content.trim();
if ("取消".equals(t) || "取消录入".equals(t)) { if ("取消".equals(t) || "取消录入".equals(t)) {
weComChatSessionService.delete(from); weComChatSessionService.delete(from);
@@ -91,6 +91,7 @@ public class WeComInboundServiceImpl implements IWeComInboundService {
String url = extractJd3cnUrl(content); String url = extractJd3cnUrl(content);
if (url != null) { if (url != null) {
weComChatSessionService.put(from, WeComChatSession.startLogisticsWaitRemark(url)); weComChatSessionService.put(from, WeComChatSession.startLogisticsWaitRemark(url));
log.info("企微物流多轮会话已创建 user={} url={}", from, url);
return "收到物流链接 " + url + " ，请输入备注信息"; return "收到物流链接 " + url + " ，请输入备注信息";
} }
} }