From 46108e67037d599b3f99585ad0da4408c5d3651e Mon Sep 17 00:00:00 2001
From: YXY <932687738@qq.com>
Date: Sun, 20 Aug 2023 18:17:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=B4=E6=97=B6=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LarkActiveController.java      | 14 ++++++++++---
 ...rkUserActiveInviteRelatoinServiceImpl.java |  2 +-
 .../LarkUserActiveRelatoinServiceImpl.java    | 20 ++++++++++---------
 .../framework/config/SecurityConfig.java      |  1 +
 4 files changed, 24 insertions(+), 13 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 8fac5be..96124d9 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
@@ -104,7 +104,7 @@ public class LarkActiveController extends BaseController {
      * 上传活动图片
      */
     @PostMapping("/uploadActiveFile")
-        public ResponseVo<LarkUserActiveRelatoin> uploadActiveFile(@RequestParam("file") MultipartFile file,@RequestParam("userName")String userName,@RequestParam("larkActiveName") String larkActiveName,@RequestParam("companyName") String companyName) {
+    public ResponseVo<LarkUserActiveRelatoin> uploadActiveFile(@RequestParam("file") MultipartFile file, @RequestParam("userName") String userName, @RequestParam("larkActiveName") String larkActiveName, @RequestParam("companyName") String companyName) {
         LarkActiveUserRelationRequest request = new LarkActiveUserRelationRequest();
         request.setFile(file);
         request.setUserName(userName);
@@ -113,6 +113,14 @@ public class LarkActiveController extends BaseController {
         return larkUserActiveRelatoinService.commitFile(request);
     }
 
+    /**
+     * 上传活动图片
+     */
+    @PostMapping("/uploadActiveFile2")
+    public ResponseVo<LarkUserActiveRelatoin> uploadActiveFile2(@RequestBody LarkActiveUserRelationRequest request) {
+        return larkUserActiveRelatoinService.commitFile(request);
+    }
+
     /**
      * 查询已经完成所有活动的人的名称
      */
@@ -167,8 +175,8 @@ public class LarkActiveController extends BaseController {
                     .autoCloseStream(Boolean.TRUE)
                     .sheet("sheetName")
                     .doWrite(Arrays.asList(larkActiveCountVo));
-        }catch (Exception e){
-            log.info("导出信息错误",e);
+        } catch (Exception e) {
+            log.info("导出信息错误", e);
         }
     }
 
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 ce44585..4dde794 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
@@ -60,7 +60,7 @@ public class LarkUserActiveInviteRelatoinServiceImpl implements ILarkUserActiveI
         List<LarkInviteVo> result = larkUserActiveInviteRelatoins.stream().map(r -> {
             LarkInviteVo larkInviteVo = new LarkInviteVo();
             larkInviteVo.setUrl(r.getInviteUserName());
-            larkInviteVo.setUrl(r.getInviteUserName());
+            larkInviteVo.setText(r.getUserName());
             LarkActiveInviteStageEnum inviteStageEnum = LarkActiveInviteStageEnum.getByCode(r.getInviteStage());
 
             larkInviteVo.setType(inviteStageEnum != null ? inviteStageEnum.getType() : "primary");
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 c540b4c..3d44d5e 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
@@ -152,13 +152,6 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi
 
     @Override
     public ResponseVo<LarkUserActiveRelatoin> commitFile(LarkActiveUserRelationRequest request) {
-        MultipartFile multipartFile = request.getFile();
-        File file = FileUtils.multipartFile2File(multipartFile);
-        String name = file.getName();
-        String[] split = name.split("\\.");
-        String key = String.format("%s_%s", split[0], System.currentTimeMillis());
-        split[0] = key;
-        key = String.join(".", split);
         List<LarkActive> larkActives = larkActiveMapper.selectLarkActiveByName(request.getLarkActiveName(), FlagStatus.OK.getCode());
         if (CollectionUtils.isEmpty(larkActives)){
             return new ResponseVo();
@@ -170,8 +163,17 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi
         }
         Integer totalCount = userActiveCount(relatoin) + 1;
         LarkActive larkActive = larkActiveMapper.selectLarkActiveById(relatoin.getActiveId());
-        cosHelper.upload(BUCKET_NAME, key, file);
-        buildUserActiveImage(relatoin, key);
+        MultipartFile multipartFile = request.getFile();
+        if (multipartFile != null) {
+            File file = FileUtils.multipartFile2File(multipartFile);
+            String name = file.getName();
+            String[] split = name.split("\\.");
+            String key = String.format("%s_%s", split[0], System.currentTimeMillis());
+            split[0] = key;
+            key = String.join(".", split);
+            cosHelper.upload(BUCKET_NAME, key, file);
+            buildUserActiveImage(relatoin, key);
+        }
         if (totalCount >= larkActive.getActiveImageCount()) {
             relatoin.setActiveStage(LarkActiveStageEnum.ADJUST.getCode());
             larkUserActiveRelatoinMapper.updateLarkUserActiveRelatoin(relatoin);
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 30ec148..eb95d2b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -103,6 +103,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                         , "/lark/active/queryActive"
                         , "/lark/active/getAcitveByName"
                         , "/lark/active/uploadActiveFile"
+                        , "/lark/active/uploadActiveFile2"
                         , "/lark/active/queryCompleteActiveList"
                         , "/lark/active/queryMyCompleteActiveList"
                         , "/lark/active/queryInviteUserList"