sweet接口提交

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/SweetYbEnrollParam.java

@@ -43,4 +43,7 @@ public class SweetYbEnrollParam implements Serializable {
     @NotBlank(message = "请填写常驻城市")
     private String cityName;
 
+    @ApiModelProperty(position = 19, required = false, value = "活动id", example = "0")
+    private String activityId;
+
 }

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetYbEnrollService.java

@@ -3,8 +3,11 @@ package com.liquidnet.service.sweet.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.param.SweetYbEnrollParam;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.entity.SweetYbEnroll;
 
+import java.util.List;
+
 /**
  * <p>
  * YB报名表 服务类
@@ -13,7 +16,9 @@ import com.liquidnet.service.sweet.entity.SweetYbEnroll;
  * @author jiangxiulong
  * @since 2022-07-29
  */
-public interface ISweetYbEnrollService extends IService<SweetYbEnroll> {
+public interface ISweetYbEnrollService {
 
     ResponseDto<Boolean> create(SweetYbEnrollParam param);
+
+    ResponseDto<List<SweetYbActivityVo>> list();
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetYbEnrollController.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.sweet.controller;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.param.SweetYbEnrollParam;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.service.ISweetYbEnrollService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -36,4 +38,9 @@ public class SweetYbEnrollController {
         return iSweetYbEnrollService.create(param);
     }
 
+    @PostMapping("activityList")
+    @ApiOperation("活动列表")
+    public ResponseDto<List<SweetYbActivityVo>> list() {
+        return iSweetYbEnrollService.list();
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetYbEnrollServiceImpl.java

@@ -8,14 +8,20 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.sweet.dto.param.SweetYbEnrollParam;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.entity.SweetYbEnroll;
 import com.liquidnet.service.sweet.mapper.SweetYbEnrollMapper;
 import com.liquidnet.service.sweet.service.ISweetYbEnrollService;
+import com.liquidnet.service.sweet.utils.ObjectUtil;
 import com.liquidnet.service.sweet.utils.QueueUtils;
+import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -26,13 +32,18 @@ import java.util.LinkedList;
  * @since 2022-07-29
  */
 @Service
-public class SweetYbEnrollServiceImpl extends ServiceImpl<SweetYbEnrollMapper, SweetYbEnroll> implements ISweetYbEnrollService {
+public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
 
     @Autowired
     QueueUtils queueUtils;
+    @Autowired
+    RedisDataUtils redisDataUtils;
 
     @Override
     public ResponseDto<Boolean> create(SweetYbEnrollParam param) {
+        if (param.getActivityId() == null || param.getActivityId().equals("")) {
+            param.setActivityId("0");
+        }
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
         sqls.add(SqlMapping.get("sweet_yb_enroll.insert"));
@@ -40,11 +51,24 @@ public class SweetYbEnrollServiceImpl extends ServiceImpl<SweetYbEnrollMapper, S
                 IDGenerator.nextSnowId(), StringUtil.isEmpty(param.getContactTell()) ? "" : param.getContactTell(),
                 StringUtil.isEmpty(param.getContactWechat()) ? "" : param.getContactWechat(), param.getNickname(), param.getStyle(),
                 param.getImgUrl(), param.getAudioUrl(), StringUtil.isEmpty(param.getUniversities()) ? "" : param.getUniversities(),
-                StringUtil.isEmpty(param.getCityName()) ? "" : param.getCityName()
+                StringUtil.isEmpty(param.getCityName()) ? "" : param.getCityName(), param.getActivityId()
         });
         queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_ANSWER_INSERT.getKey(),
                 SqlMapping.gets(sqls, sqlsDataA));
 
         return ResponseDto.success(true);
     }
+
+    @Override
+    public ResponseDto<List<SweetYbActivityVo>> list() {
+        List<String> list = redisDataUtils.getSweetYbActivityList();
+        List<SweetYbActivityVo> voList = ObjectUtil.sweetYbActivityVoList();
+        for (String id : list) {
+            SweetYbActivityVo vo = redisDataUtils.getSweetYbActivityVo(id);
+            voList.add(vo);
+        }
+        voList = voList.stream().sorted(Comparator.comparing(SweetYbActivityVo::getEndTime, Comparator.reverseOrder())).collect(Collectors.toList());
+        return ResponseDto.success(voList);
+    }
+
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/ObjectUtil.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.sweet.utils;
 import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.entity.SweetManualShop;
 import com.liquidnet.service.sweet.entity.SweetManualShopFive;
 import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
@@ -31,6 +32,12 @@ public class ObjectUtil {
     private static final ArrayList<SweetCItyVoteStatVo> sweetCItyVoteStatVoList = new ArrayList<>();
     private static final ArrayList<IntegralActivityVo> sweetIntegralActivityVoList = new ArrayList<>();
     private static final ArrayList<IntegralActivityDrawVo> sweetIntegralActivityDrawVoList = new ArrayList<>();
+    private static final ArrayList<SweetYbActivityVo> sweetYbActivityVo = new ArrayList<>();
+
+
+    public static ArrayList<SweetYbActivityVo> sweetYbActivityVoList() {
+        return (ArrayList<SweetYbActivityVo>) sweetYbActivityVo.clone();
+    }
 
     public static ArrayList<SweetManualAppletDto> getSweetManualAppletDtoList() {
         return (ArrayList<SweetManualAppletDto>) sweetManualAppletDtoList.clone();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -15,6 +15,7 @@ import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.dto.param.poster.SweetStrawberryParam;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.dto.vo.TempBannerVo;
 import com.liquidnet.service.sweet.entity.*;
 import com.liquidnet.service.sweet.mapper.*;
@@ -887,4 +888,27 @@ public class RedisDataUtils {
         }
     }
 
+    //yb活动vo
+    public List<String> getSweetYbActivityList() {
+        String redisKey = SweetConstant.REDIS_KEY_YB_ACTIVITY_LIST;
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return CollectionUtil.arrayListString();
+        } else {
+            return (List<String>) obj;
+        }
+    }
+
+
+    //yb活动vo
+    public SweetYbActivityVo getSweetYbActivityVo(String activityId) {
+        String redisKey = SweetConstant.REDIS_KEY_YB_ACTIVITY.concat(activityId);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return SweetYbActivityVo.getNew();
+        } else {
+            return (SweetYbActivityVo) obj;
+        }
+    }
+
 }