Merge remote-tracking branch 'refs/remotes/origin/dev'
This commit is contained in:
@@ -13,12 +13,10 @@ import com.schisandra.share.common.utils.CaffeineUtil;
|
|||||||
import com.schisandra.share.domain.bo.SchisandraShareDetailBO;
|
import com.schisandra.share.domain.bo.SchisandraShareDetailBO;
|
||||||
import com.schisandra.share.domain.bo.SchisandraUserLikesDetailBO;
|
import com.schisandra.share.domain.bo.SchisandraUserLikesDetailBO;
|
||||||
import com.schisandra.share.domain.service.SchisandraShareDetailDomainService;
|
import com.schisandra.share.domain.service.SchisandraShareDetailDomainService;
|
||||||
import feign.form.FormData;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.rocketmq.client.producer.SendCallback;
|
import org.apache.rocketmq.client.producer.SendCallback;
|
||||||
import org.apache.rocketmq.client.producer.SendResult;
|
import org.apache.rocketmq.client.producer.SendResult;
|
||||||
import org.apache.rocketmq.spring.core.RocketMQTemplate;
|
import org.apache.rocketmq.spring.core.RocketMQTemplate;
|
||||||
import org.springframework.cache.annotation.Cacheable;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
@@ -49,6 +47,13 @@ public class SchisandraShareDetailController {
|
|||||||
@Resource
|
@Resource
|
||||||
private RocketMQTemplate rocketMQTemplate;
|
private RocketMQTemplate rocketMQTemplate;
|
||||||
|
|
||||||
|
@GetMapping("getRecentShare")
|
||||||
|
public Result getRecentShare(String userId) {
|
||||||
|
String key = redisUtil.buildKey(SHARE_USER_RECENT, userId, "*");
|
||||||
|
List<HashMap<Object, Object>> list = redisUtil.getDataFromShare(key);
|
||||||
|
return Result.ok(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description: 点赞
|
* @description: 点赞
|
||||||
|
@@ -53,6 +53,17 @@ public class RedisUtil {
|
|||||||
});
|
});
|
||||||
return keysList;
|
return keysList;
|
||||||
}
|
}
|
||||||
|
public List<HashMap<Object,Object>> getDataFromShare(String directory) {
|
||||||
|
Set<String>keys=redisTemplate.keys(directory);
|
||||||
|
List<HashMap<Object,Object>> keysList=new ArrayList<>();
|
||||||
|
keys.forEach(key->{
|
||||||
|
HashMap<Object,Object> map=new HashMap<>();
|
||||||
|
String value= (String) redisTemplate.opsForValue().get(key);
|
||||||
|
map.put(key,value);
|
||||||
|
keysList.add(map);
|
||||||
|
});
|
||||||
|
return keysList;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user