From f6a1c27aff490f53c498776af00863801ff1942b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 20 四月 2026 12:21:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
index 840ec46..daacfe5 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
@@ -1,7 +1,8 @@
package com.xiaopeng.operation.controller;
-import com.xiaopeng.api.model.operation.XpActicity;
+import com.xiaopeng.api.model.operation.XpActivity;
+import com.xiaopeng.api.vo.operation.XpActivityVo;
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.utils.bean.BeanUtils;
@@ -61,19 +62,19 @@
*/
@PostMapping("/logan/inner/acticity/findListToIds")
@ApiOperation(value = "获取活动信息ids", tags = {"管理后台-活动首次进入情况"})
- public R<XpActicity> firstEnter(HttpServletRequest request){
+ public R<XpActivity> firstEnter(HttpServletRequest request){
String uid = request.getHeader("XP-Uid");
ValueOperations<String, String> ops = redisTemplate.opsForValue();
- XpActicity acticity = xpActicityService.activiting();
- XpActicity ret = new XpActicity();
- if (acticity !=null) {
- BeanUtils.copyBeanProp(ret, acticity);
- Duration duration = Duration.between(LocalDateTime.now(), acticity.getEndTime());
- Boolean isFirst = ops.setIfAbsent(CacheConstants.firstEnterActivity(String.valueOf(acticity.getId()), uid),"1", duration);
+ XpActivity activity = xpActicityService.activiting();
+ XpActivityVo ret = new XpActivityVo();
+ if (activity !=null) {
+ BeanUtils.copyBeanProp(ret, activity);
+ Duration duration = Duration.between(LocalDateTime.now(), activity.getEndTime());
+ Boolean isFirst = ops.setIfAbsent(CacheConstants.firstEnterActivity(String.valueOf(activity.getId()), uid),"1", duration);
ret.setIsFirst(isFirst);
}
- return R.ok(acticity);
+ return R.ok(activity);
}
--
Gitblit v1.7.1