From 8bf5f6f38e6ad9320a304b0cd3deb4c2836b01eb Mon Sep 17 00:00:00 2001 From: YXY <932687738@qq.com> Date: Sat, 19 Aug 2023 20:58:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LarkActiveController.java | 16 +- .../domain/larkactive/LarkActiveRequest.java | 4 +- .../LarkActiveUserRelationRequest.java | 2 +- .../flyingbook/mapper/LarkActiveMapper.java | 3 + .../service/ILarkActiveService.java | 2 +- .../service/impl/LarkActiveServiceImpl.java | 19 +- .../LarkUserActiveRelatoinServiceImpl.java | 9 +- .../resources/mapper/LarkActiveMapper.xml | 201 +++++++++++------- .../mapper/LarkUserActiveRelatoinMapper.xml | 2 +- 9 files changed, 163 insertions(+), 95 deletions(-) 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 3327f6a..36c6c17 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 @@ -21,8 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.io.File; import java.util.Date; +import java.util.Enumeration; import java.util.List; @Slf4j @@ -64,8 +66,8 @@ public class LarkActiveController extends BaseController { /** * 通过活动id查询 活动明细 */ - @PostMapping("/getAcitveById") - public ResponseVo getAcitveById(@RequestBody LarkActiveRequest request) { + @PostMapping("/getAcitveByName") + public ResponseVo getAcitveByName(@RequestBody LarkActiveRequest request) { LarkActive larkActive = larkActiveService.getActiveInfo(request); return new ResponseVo(larkActive); } @@ -74,11 +76,11 @@ public class LarkActiveController extends BaseController { * 上传活动图片 */ @PostMapping("/uploadActiveFile") - public ResponseVo uploadActiveFile(@RequestParam("file") MultipartFile file,@RequestParam("userName")String userName,@RequestParam("larkActiveId") Long larkActiveId) { + public ResponseVo uploadActiveFile(@RequestParam("file") MultipartFile file,@RequestParam("userName")String userName,@RequestParam("larkActiveName") String larkActiveName) { LarkActiveUserRelationRequest request = new LarkActiveUserRelationRequest(); request.setFile(file); request.setUserName(userName); - request.setLarkActiveId(larkActiveId); + request.setLarkActiveName(larkActiveName); return larkUserActiveRelatoinService.commitFile(request); } @@ -87,8 +89,8 @@ public class LarkActiveController extends BaseController { */ @PostMapping("/queryCompleteActiveList") public ResponseVo queryCompleteActiveList(@RequestBody LarkActiveRequest request) { - List list = larkActiveService.queryCompleteActiveUserName(request.getCompanyName()); - return new ResponseVo(list); + String nameList = larkActiveService.queryCompleteActiveUserName(request.getCompanyName()); + return new ResponseVo(nameList); } /** @@ -105,7 +107,7 @@ public class LarkActiveController extends BaseController { * 查询邀请的top 10的人的信息 */ @PostMapping("/queryInviteTopTen") - public ResponseVo queryInviteTopTen(LarkUserActiveInviteRelatoin request) { + public ResponseVo queryInviteTopTen(@RequestBody LarkUserActiveInviteRelatoin request) { List larkUserActiveInviteRelatoins = larkUserActiveInviteRelatoinService.queryTopTen(request); return new ResponseVo(larkUserActiveInviteRelatoins); } diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveRequest.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveRequest.java index f09f226..583fa8f 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveRequest.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveRequest.java @@ -2,6 +2,7 @@ package com.ruoyi.flyingbook.domain.larkactive; import com.ruoyi.common.core.domain.LarkActiveBaseRequestVo; import lombok.Data; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -13,8 +14,9 @@ import java.util.List; public class LarkActiveRequest extends LarkActiveBaseRequestVo { private String companyName; + private MultipartFile file; - private Long larkActiveId; + private String larkActiveName; private List larkActiveIdList; private String userName; diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveUserRelationRequest.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveUserRelationRequest.java index 7648276..b63c4f2 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveUserRelationRequest.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveUserRelationRequest.java @@ -15,7 +15,7 @@ public class LarkActiveUserRelationRequest extends LarkActiveBaseRequestVo { private String companyName; - private Long larkActiveId; + private String larkActiveName; private String userName; diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkActiveMapper.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkActiveMapper.java index 043ffe3..a4f7f91 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkActiveMapper.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkActiveMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.flyingbook.mapper; import com.ruoyi.flyingbook.domain.LarkActive; import com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -19,6 +20,7 @@ public interface LarkActiveMapper { * @return 【请填写功能名称】 */ public LarkActive selectLarkActiveById(Long id); + public List selectLarkActiveByName(@RequestParam("activeName") String activeName,@RequestParam("flag") Long flag); /** * 查询【请填写功能名称】列表 @@ -29,6 +31,7 @@ public interface LarkActiveMapper { public List selectLarkActiveList(LarkActive larkActive); public Integer count(LarkActive larkActive); public List queryPage(LarkActiveRequest request); + public List queryActive(LarkActiveRequest larkActive); public List queryCompleteActive(LarkActiveRequest larkActive); /** * 新增【请填写功能名称】 diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkActiveService.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkActiveService.java index 9b897cf..cefcd3f 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkActiveService.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkActiveService.java @@ -33,7 +33,7 @@ public interface ILarkActiveService { public List selectLarkActiveList(LarkActive larkActive); ResponseVo queryPage(LarkActiveRequest request); - public List queryCompleteActiveUserName(String companyName); + public String queryCompleteActiveUserName(String companyName); public List queryCompleteActiveByUserName(LarkActiveRequest larkActive); /** diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java index 6185517..3ef29d7 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java @@ -47,18 +47,21 @@ public class LarkActiveServiceImpl implements ILarkActiveService { @Override public LarkActiveVo getActiveInfo(LarkActiveRequest request) { LarkActiveVo result = new LarkActiveVo(); - if (request == null || request.getLarkActiveId() == null){ + if (request == null || StringUtils.isBlank(request.getLarkActiveName()) || StringUtils.isBlank(request.getUserName())){ return result; } - LarkActive larkActive = larkActiveMapper.selectLarkActiveById(request.getLarkActiveId()); - if (larkActive != null){ - BeanUtils.copyProperties(larkActive,result); + List larkActiveList = larkActiveMapper.selectLarkActiveByName(request.getLarkActiveName(),FlagStatus.OK.getCode()); + + if (CollectionUtils.isEmpty(larkActiveList)){ + return result; } + LarkActive active = larkActiveList.get(0); + BeanUtils.copyProperties(active,result); if (StringUtils.isNotBlank(request.getUserName())){ LarkUserActiveRelatoin relatoin = new LarkUserActiveRelatoin(); relatoin.setFlag(FlagStatus.OK.getCode()); - relatoin.setActiveId(request.getLarkActiveId()); + relatoin.setActiveId(active.getId()); relatoin.setUserName(request.getUserName()); List larkUserActiveRelatoins = larkUserActiveRelatoinMapper.selectLarkUserActiveRelatoinList(relatoin); result.setComplete(CollectionUtils.isNotEmpty(larkUserActiveRelatoins)); @@ -94,15 +97,17 @@ public class LarkActiveServiceImpl implements ILarkActiveService { } @Override - public List queryCompleteActiveUserName(String companyName) { + public String queryCompleteActiveUserName(String companyName) { LarkActive larkActive = new LarkActive(); larkActive.setFlag(FlagStatus.OK.getCode()); Integer count = larkActiveMapper.count(larkActive); - return larkUserActiveRelatoinMapper.queryCompleteActiveUserName(count,companyName); + List nameList = larkUserActiveRelatoinMapper.queryCompleteActiveUserName(count, companyName); + return String.join(",",nameList); } @Override public List queryCompleteActiveByUserName(LarkActiveRequest larkActive) { + larkActive.setFlag(FlagStatus.OK.getCode()); return larkActiveMapper.queryCompleteActive(larkActive); } diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java index 04b1ffa..e5be6fc 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java @@ -79,7 +79,7 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi LarkActiveRequest query = new LarkActiveRequest(); query.setFlag(FlagStatus.OK.getCode()); query.setLarkActiveIdList(activeIdList); - Map activeMap = larkActiveMapper.queryCompleteActive(query).stream().collect(Collectors.toMap(LarkActive::getId, Function.identity(), (k1, k2) -> k1)); + Map activeMap = larkActiveMapper.queryActive(query).stream().collect(Collectors.toMap(LarkActive::getId, Function.identity(), (k1, k2) -> k1)); for (LarkActiveVo activeCountVo : larkActiveCountVos) { LarkActive larkActive = activeMap.get(activeCountVo.getId()); if (larkActive != null) { @@ -128,7 +128,12 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi String key = String.format("%s_%s", split[0], System.currentTimeMillis()); split[0] = key; key = String.join(".", split); - LarkUserActiveRelatoin relatoin = queryUserActiveRelation(request.getUserName(), request.getLarkActiveId()); + List larkActives = larkActiveMapper.selectLarkActiveByName(request.getLarkActiveName(), FlagStatus.OK.getCode()); + if (CollectionUtils.isEmpty(larkActives)){ + return new ResponseVo(); + } + LarkActive active = larkActives.get(0); + LarkUserActiveRelatoin relatoin = queryUserActiveRelation(request.getUserName(), active.getId()); if (relatoin == null) { return new ResponseVo(); } diff --git a/ruoyi-flyingbook/src/main/resources/mapper/LarkActiveMapper.xml b/ruoyi-flyingbook/src/main/resources/mapper/LarkActiveMapper.xml index da09b8f..1f4fd9a 100644 --- a/ruoyi-flyingbook/src/main/resources/mapper/LarkActiveMapper.xml +++ b/ruoyi-flyingbook/src/main/resources/mapper/LarkActiveMapper.xml @@ -1,108 +1,157 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - select id, company_id, company_name, active_name, active_desc, active_content, active_image_url, active_type, active_score,active_image_count, create_by, create_time, update_by, update_time, flag, remark from lark_active + select id, + company_id, + company_name, + active_name, + active_desc, + active_content, + active_image_url, + active_type, + active_score, + active_image_count, + create_by, + create_time, + update_by, + update_time, + flag, + remark + from lark_active - - - and company_id = #{companyId} - and company_name like concat('%', #{companyName}, '%') - and active_name like concat('%', #{activeName}, '%') - and active_desc = #{activeDesc} - and active_content = #{activeContent} - and active_image_url = #{activeImageUrl} - and active_type = #{activeType} - and active_score = #{activeScore} - and active_image_count = #{activeImageCount} - and flag = #{flag} + + and company_id = #{companyId} + and company_name like concat('%', #{companyName}, + '%') + + and active_name like concat('%', #{activeName}, '%') + + and active_desc = #{activeDesc} + and active_content = #{activeContent} + and active_image_url = #{activeImageUrl} + and active_type = #{activeType} + and active_score = #{activeScore} + and active_image_count = #{activeImageCount} + and flag = #{flag} - - and company_id = #{companyId} - and company_name like concat('%', #{companyName}, '%') - and active_name like concat('%', #{activeName}, '%') - and active_desc = #{activeDesc} - and active_content = #{activeContent} - and active_image_url = #{activeImageUrl} - and active_type = #{activeType} - and active_score = #{activeScore} - and active_image_count = #{activeImageCount} - and flag = #{flag} + and company_id = #{companyId} + and company_name like concat('%', #{companyName}, + '%') + + and active_name like concat('%', #{activeName}, '%') + + and active_desc = #{activeDesc} + and active_content = #{activeContent} + and active_image_url = #{activeImageUrl} + and active_type = #{activeType} + and active_score = #{activeScore} + and active_image_count = #{activeImageCount} + and flag = #{flag} limit #{offset},{pageSize} - - and company_id = #{companyId} - and company_name like concat('%', #{companyName}, '%') - and active_name like concat('%', #{activeName}, '%') - and active_desc = #{activeDesc} - and active_content = #{activeContent} - and active_image_url = #{activeImageUrl} - and active_type = #{activeType} - and active_score = #{activeScore} - and active_image_count = #{activeImageCount} - and flag = #{flag} + and company_id = #{companyId} + and company_name like concat('%', #{companyName}, + '%') + + and active_name like concat('%', #{activeName}, '%') + + and active_desc = #{activeDesc} + and active_content = #{activeContent} + and active_image_url = #{activeImageUrl} + and active_type = #{activeType} + and active_score = #{activeScore} + and active_image_count = #{activeImageCount} + and flag = #{flag} - and id in - #{item} - - + and id in + + #{item} + + - + + + - - + + + + insert into lark_active company_id, @@ -120,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, flag, remark, - + #{companyId}, #{companyName}, @@ -137,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{flag}, #{remark}, - + @@ -163,11 +212,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from lark_active where id = #{id} + delete + from lark_active + where id = #{id} - delete from lark_active where id in + delete from lark_active where id in #{id} diff --git a/ruoyi-flyingbook/src/main/resources/mapper/LarkUserActiveRelatoinMapper.xml b/ruoyi-flyingbook/src/main/resources/mapper/LarkUserActiveRelatoinMapper.xml index a863afa..062a363 100644 --- a/ruoyi-flyingbook/src/main/resources/mapper/LarkUserActiveRelatoinMapper.xml +++ b/ruoyi-flyingbook/src/main/resources/mapper/LarkUserActiveRelatoinMapper.xml @@ -123,7 +123,7 @@ from lark_user_active_relatoin where company_name = #{companyName} GROUP BY user_name - HAVING total > #{count} + HAVING total >= #{count}