From 6a014a19d03708491653864d0ac97993eaaeb3c2 Mon Sep 17 00:00:00 2001 From: YXY <932687738@qq.com> Date: Sun, 20 Aug 2023 09:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=88=91=E7=9A=84=E9=82=80?= =?UTF-8?q?=E8=AF=B7=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/LarkActiveInviteStageEnum.java | 21 ++++++++++++++++--- .../controller/LarkActiveController.java | 15 +++++++++++-- .../domain/larkactive/LarkInviteVo.java | 18 ++++++++++++++++ .../ILarkUserActiveInviteRelatoinService.java | 4 ++++ ...rkUserActiveInviteRelatoinServiceImpl.java | 18 ++++++++++++++++ 5 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkInviteVo.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LarkActiveInviteStageEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/LarkActiveInviteStageEnum.java index f355a0b..8e0f6d8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LarkActiveInviteStageEnum.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/LarkActiveInviteStageEnum.java @@ -10,15 +10,17 @@ public enum LarkActiveInviteStageEnum { /** * */ - INVITE("INVITE", "邀请"), - ACTIVE("ACTIVE", "参加活动"); + INVITE("INVITE", "邀请","primary"), + ACTIVE("ACTIVE", "参加活动","success"); private final String code; private final String info; + private final String type; - LarkActiveInviteStageEnum(String code, String info) { + LarkActiveInviteStageEnum(String code, String info, String type) { this.code = code; this.info = info; + this.type = type; } public String getCode() { @@ -28,4 +30,17 @@ public enum LarkActiveInviteStageEnum { public String getInfo() { return info; } + + public String getType() { + return type; + } + + public static LarkActiveInviteStageEnum getByCode(String code){ + for (LarkActiveInviteStageEnum value : LarkActiveInviteStageEnum.values()) { + if (value.getCode().equals(code)){ + return value; + } + } + return null; + } } diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java index 36c6c17..b0bcb40 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java @@ -1,5 +1,6 @@ package com.ruoyi.flyingbook.controller; +import com.lark.oapi.service.authen.v1.model.CreateAccessTokenRespBody; import com.ruoyi.flyingbook.CosHelper.CosHelper; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.FlagStatus; @@ -50,9 +51,10 @@ public class LarkActiveController extends BaseController { * 分页查询活动 */ @PostMapping("/getSession") - public ResponseVo getSession(@RequestBody LarkSessionRequest request) { + public ResponseVo getSession(@RequestBody LarkSessionRequest request) { LarkSessionResponse larkSessionResponse = larkUserHelper.tokenLoginValidate(new LarkUserRequest(APP_ID, APP_SECRET, null, request.getCode())); - return new ResponseVo<>(larkSessionResponse.getData()); + CreateAccessTokenRespBody userToken = larkUserHelper.getUserToken(new LarkUserRequest(APP_ID, APP_SECRET, larkSessionResponse.getData().getOpen_id())); + return new ResponseVo<>(userToken); } /** @@ -102,6 +104,15 @@ public class LarkActiveController extends BaseController { return new ResponseVo(larkActives); } + /** + * 查询当前登陆人已经完成所有活动 + */ + @PostMapping("/queryInviteUserList") + public ResponseVo queryInviteUserList(@RequestBody LarkUserActiveInviteRelatoin request) { + List larkInviteVos = larkUserActiveInviteRelatoinService.queryMyInviteList(request); + return new ResponseVo(larkInviteVos); + } + /** * 查询邀请的top 10的人的信息 diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkInviteVo.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkInviteVo.java new file mode 100644 index 0000000..47c8297 --- /dev/null +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkInviteVo.java @@ -0,0 +1,18 @@ +package com.ruoyi.flyingbook.domain.larkactive; + +import lombok.Data; + +/** + * 【请填写功能名称】对象 lark_active + * + * @author ruoyi + * @date 2023-08-16 + */ +@Data +public class LarkInviteVo { + + private String url; + private String text; + private String type; + private String badge = "0"; +} diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveInviteRelatoinService.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveInviteRelatoinService.java index f3cbc5e..32d786a 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveInviteRelatoinService.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveInviteRelatoinService.java @@ -1,6 +1,7 @@ package com.ruoyi.flyingbook.service; import com.ruoyi.flyingbook.domain.LarkUserActiveInviteRelatoin; +import com.ruoyi.flyingbook.domain.larkactive.LarkInviteVo; import java.util.List; @@ -29,6 +30,9 @@ public interface ILarkUserActiveInviteRelatoinService { public List queryTopTen(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin); + public List queryMyInviteList(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin); + + /** * 新增【请填写功能名称】 * diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java index a2bbd9d..ce44585 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java @@ -4,12 +4,14 @@ import com.ruoyi.common.enums.FlagStatus; import com.ruoyi.common.enums.LarkActiveInviteStageEnum; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.flyingbook.domain.LarkUserActiveInviteRelatoin; +import com.ruoyi.flyingbook.domain.larkactive.LarkInviteVo; import com.ruoyi.flyingbook.mapper.LarkUserActiveInviteRelatoinMapper; import com.ruoyi.flyingbook.service.ILarkUserActiveInviteRelatoinService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; /** * 【请填写功能名称】Service业务层处理 @@ -51,6 +53,22 @@ public class LarkUserActiveInviteRelatoinServiceImpl implements ILarkUserActiveI return larkUserActiveInviteRelatoinMapper.queryTopTen(larkUserActiveInviteRelatoin); } + @Override + public List queryMyInviteList(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin) { + larkUserActiveInviteRelatoin.setFlag(FlagStatus.OK.getCode()); + List larkUserActiveInviteRelatoins = larkUserActiveInviteRelatoinMapper.selectLarkUserActiveInviteRelatoinList(larkUserActiveInviteRelatoin); + List result = larkUserActiveInviteRelatoins.stream().map(r -> { + LarkInviteVo larkInviteVo = new LarkInviteVo(); + larkInviteVo.setUrl(r.getInviteUserName()); + larkInviteVo.setUrl(r.getInviteUserName()); + LarkActiveInviteStageEnum inviteStageEnum = LarkActiveInviteStageEnum.getByCode(r.getInviteStage()); + + larkInviteVo.setType(inviteStageEnum != null ? inviteStageEnum.getType() : "primary"); + return larkInviteVo; + }).collect(Collectors.toList()); + return result; + } + /** * 新增【请填写功能名称】 *