From ba4cecf87e80fb01aeb69377b7e978399c4d60e6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 12:09:38 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
index 70aa04e..3fd7867 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -15,13 +15,16 @@
import com.ruoyi.other.mapper.TechnicianSubscribeMapper;
import com.ruoyi.other.service.TechnicianSubscribeService;
import com.ruoyi.other.vo.TechnicianSubscribeVO;
+import org.springframework.data.redis.connection.RedisZSetCommands;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.ZoneId;
+import java.time.ZoneOffset;
import java.util.List;
+import java.util.Set;
/**
* <p>
@@ -38,8 +41,7 @@
@Resource
private RemoteOrderGoodsClient orderGoodsClient;
@Resource
- private RedisTemplate<String, String> redisTemplate;
-
+ private RedisTemplate redisTemplate;
@Resource
private AppUserClient appUserClient;
@@ -89,22 +91,33 @@
if (subscribe.getOrderId() != null){
orderGoodsClient.subscribe(subscribe.getOrderId(), subscribe.getTechnicianId());
}
- LocalDateTime subscribeTime = subscribe.getSubscribeTime();
- long deadlineTimestamp = subscribeTime.atZone(ZoneId.systemDefault()).toEpochSecond();
- redisTemplate.opsForZSet().add("delay_queue:subscribe", subscribe.getId().toString(), deadlineTimestamp);
+ //添加到redis有序队列中用于定时处理状态
+ redisTemplate.opsForZSet().add("technician_subscribe", subscribe.getId().toString(), subscribe.getSubscribeTime().toEpochSecond(ZoneOffset.UTC));
}
+
+ @Override
+ public void switchingTechnician(TechnicianSubscribe technicianSubscribe) {
+ TechnicianSubscribe subscribe = this.getById(technicianSubscribe.getId());
+ if(subscribe.getTechnicianId().equals(technicianSubscribe.getTechnicianId())){
+ throw new RuntimeException("不能切换相同的技师");
+ }
+ subscribe.setTechnicianId(technicianSubscribe.getTechnicianId());
+ this.updateById(subscribe);
+ }
/**
* 定时修改到期状态
*/
@Override
public void taskEditStstus() {
- List<TechnicianSubscribe> list = this.list(new LambdaQueryWrapper<TechnicianSubscribe>().eq(TechnicianSubscribe::getStatus, 0).eq(TechnicianSubscribe::getDelFlag, 0)
- .lt(TechnicianSubscribe::getSubscribeTime, LocalDateTime.now()));
- list.forEach(s->s.setStatus(3));
- if(list.size() > 0){
+ long second = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
+ Set<String> technician_subscribe = redisTemplate.opsForZSet().rangeByScore("technician_subscribe", 0, second);
+ if(technician_subscribe.size() > 0){
+ List<TechnicianSubscribe> list = this.listByIds(technician_subscribe);
+ list.forEach(s->s.setStatus(3));
this.updateBatchById(list);
+ redisTemplate.opsForZSet().remove("technician_subscribe", technician_subscribe.toArray());
}
}
}
--
Gitblit v1.7.1