Browse Source

操盘手业务,调试

zhaoxian 3 years ago
parent
commit
4c7ca32126

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/live/controller/KuaishouLiveBroadcastController.java

@@ -125,7 +125,7 @@ public class KuaishouLiveBroadcastController extends BaseController {
     public ResultResponse replay(
             @ApiParam("直播id") @RequestParam(value = "id", required = true) String id,
             @ApiParam("图片") @RequestParam(value = "replayPictureUrls", required = false) String replayPictureUrls,
-            @ApiParam("复盘数据") @RequestParam(value = "replayFile", required = false) MultipartFile replayFile) {
+            @ApiParam("复盘数据") @RequestParam(value = "replayFile", required = false) String replayFile) {
 
         try {
             if ( Check.isNull(replayPictureUrls) && Check.isNull(replayFile)) {

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/live/service/IKuaishouLiveBroadcastService.java

@@ -65,5 +65,5 @@ public interface IKuaishouLiveBroadcastService {
 
     ResultResponse dataUpload(String id, Long actualGmv, String dapanUrls, String portraitUrls, MultipartFile[] files) throws Exception;
 
-    ResultResponse replay(String id, String replayPictureUrls, MultipartFile replayFile);
+    ResultResponse replay(String id, String replayPictureUrls, String replayFile);
 }

+ 58 - 81
ruixuan-live/src/main/java/com/ruixuan/live/service/impl/KuaishouLiveBroadcastServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruixuan.live.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruixuan.common.core.domain.ResultResponse;
 import com.ruixuan.common.cos.CosUpload;
@@ -178,90 +179,74 @@ public class KuaishouLiveBroadcastServiceImpl implements IKuaishouLiveBroadcastS
         String msg = "";
         //记录上传文件
         int count = 0;
-        for (MultipartFile file : files) {
-            String fileName = file.getOriginalFilename();
-            if (!(fileName.endsWith(".xls") || fileName.endsWith(".xlsx") || fileName.endsWith(".csv"))) {
-                msg += fileName + "、";
-                continue;
-            }
-            List<JSONObject> list = LiveDataExcelUtils.analysisFile(file, fileName);
-            if (Check.isNotNull(list)) {
-                if (fileName.contains("看板")) {
-                    count += kanbanService.inserExcelInfo(broadcast, list);
-                } else if (fileName.contains("概览")) {
-                    count += overviewService.inserExcelInfo(broadcast, list);
-                } else if (fileName.contains("漏斗")) {
-                    count += funnelService.inserExcelInfo(broadcast, list);
-                } else if (fileName.contains("分析")) {
-                    count += analysisService.inserExcelInfo(broadcast, list);
+        if (!(Check.isNull(files) || "".equals(files[0].getOriginalFilename()))) {
+            for (MultipartFile file : files) {
+                String fileName = file.getOriginalFilename();
+                if (!(fileName.endsWith(".xls") || fileName.endsWith(".xlsx") || fileName.endsWith(".csv"))) {
+                    msg += fileName + "、";
+                    continue;
+                }
+                List<JSONObject> list = LiveDataExcelUtils.analysisFile(file, fileName);
+                if (Check.isNotNull(list)) {
+                    if (fileName.contains("看板")) {
+                        count += kanbanService.inserExcelInfo(broadcast, list);
+                    } else if (fileName.contains("概览")) {
+                        count += overviewService.inserExcelInfo(broadcast, list);
+                    } else if (fileName.contains("漏斗")) {
+                        count += funnelService.inserExcelInfo(broadcast, list);
+                    } else if (fileName.contains("分析")) {
+                        count += analysisService.inserExcelInfo(broadcast, list);
+                    }
                 }
             }
         }
-
         //上传到cos的文件夹名称 (操盘手)
         String upFileName = "CaoPanShou";
         KuaishouLiveBroadcastFiles file = new KuaishouLiveBroadcastFiles();
         //上传数据大盘
         if (Check.isNotNull(dapanUrls)) {
-            List<String> urls = Arrays.asList(dapanUrls.split(","));
+            List<String> urls = JSONArray.parseArray(dapanUrls, String.class);
             HashSet<String> set = new HashSet<>(urls);
             String urlFix = "";
             String names = "";
-            int dapanCount = 0;
+            int dapanCount = set.size();
             for (String url : set) {
-                String pictureName = "dapan_000" + (dapanCount + 1);
-                String cosUrl = CosUpload.getJPGCosUrl(url, upFileName, pictureName);
-                if (Check.isNotNull(cosUrl)) {
-                    dapanCount++;
-                    int lastNo = cosUrl.lastIndexOf("/") + 1;
-                    urlFix = cosUrl.substring(0, lastNo);
-                    String name = cosUrl.substring(lastNo);
-                    if (dapanCount > 1) {
-                        names += "," + name;
-                    } else {
-                        names = name;
-                    }
+//                String pictureName = "dapan_000" + (dapanCount + 1);
+//                String cosUrl = CosUpload.getJPGCosUrl(url, upFileName, pictureName);
+                if (Check.isNotNull(url)) {
+                    int lastNo = url.lastIndexOf("/") + 1;
+                    urlFix = url.substring(0, lastNo);
+                    String name = url.substring(lastNo);
+                    names += "," + name;
                 }
             }
             file.setUpCommonUrl(urlFix);
             file.setDapanCount(dapanCount);
-            file.setDapanNames(names);
-            if (set.size() == dapanCount) {
-                file.setDapanMsg("success");
-            } else {
-                file.setDapanMsg("共上传" + set.size() + "张,成功" + dapanCount + "张");
-            }
+            file.setDapanNames(names.substring(1));
+            file.setDapanMsg("success");
         }
 
         //画像分析上传
         if (Check.isNotNull(portraitUrls)) {
-            List<String> urls = Arrays.asList(portraitUrls.split(","));
+            List<String> urls = JSONArray.parseArray(portraitUrls, String.class);
             HashSet<String> set = new HashSet<>(urls);
             String urlFix = "";
             String names = "";
-            int portraitCount = 0;
+            int portraitCount = set.size();
             for (String url : set) {
-                String pictureName = "portrait_000" + (portraitCount + 1);
-                String cosUrl = CosUpload.getJPGCosUrl(url, upFileName, pictureName);
-                if (Check.isNotNull(cosUrl)) {
-                    portraitCount++;
-                    int lastNo = cosUrl.lastIndexOf("/") + 1;
-                    urlFix = cosUrl.substring(0, lastNo);
-                    String name = cosUrl.substring(lastNo);
-                    if (portraitCount > 1) {
-                        names += "," + name;
-                    } else {
-                        names = name;
-                    }
+//                String pictureName = "portrait_000" + (portraitCount + 1);
+//                String cosUrl = CosUpload.getJPGCosUrl(url, upFileName, pictureName);
+                if (Check.isNotNull(url)) {
+                    int lastNo = url.lastIndexOf("/") + 1;
+                    urlFix = url.substring(0, lastNo);
+                    String name = url.substring(lastNo);
+                    names += "," + name;
                 }
             }
+            file.setUpCommonUrl(urlFix);
             file.setPortraitCount(portraitCount);
-            file.setPortraitNames(names);
-            if (set.size() == portraitCount) {
-                file.setPortraitMsg("success");
-            } else {
-                file.setPortraitMsg("共上传" + set.size() + "张,成功" + portraitCount + "张");
-            }
+            file.setPortraitNames(names.substring(1));
+            file.setPortraitMsg("success");
         }
         KuaishouLiveBroadcastFiles one = filesMapper.selectKuaishouLiveBroadcastFilesById(id);
         file.setId(id);
@@ -275,11 +260,12 @@ public class KuaishouLiveBroadcastServiceImpl implements IKuaishouLiveBroadcastS
         KuaishouLiveBroadcast updateEntity = new KuaishouLiveBroadcast();
         updateEntity.setId(id);
         updateEntity.setUploadFileCount(count);
-        updateEntity.setUploadPictureCount(file.getDapanCount() + file.getPortraitCount());
+        int dapanCount = Check.isNotNull(file.getDapanCount()) ? file.getDapanCount() : 0;
+        int portraitCount = Check.isNotNull(file.getPortraitCount()) ? file.getPortraitCount() : 0;
+        updateEntity.setUploadPictureCount(dapanCount + portraitCount);
         updateEntity.setActualGmv(actualGmv);
         kuaishouLiveBroadcastMapper.updateKuaishouLiveBroadcast(updateEntity);
 
-
         if (msg.length() > 0) {
             msg = msg.substring(0, msg.length() - 1) + "不支持文件格式";
         } else {
@@ -290,43 +276,34 @@ public class KuaishouLiveBroadcastServiceImpl implements IKuaishouLiveBroadcastS
     }
 
     @Override
-    public ResultResponse replay(String id, String replayPictureUrls, MultipartFile replayFile) {
+    public ResultResponse replay(String id, String replayPictureUrls, String replayFile) {
         //上传到cos的文件夹名称 (操盘手)
         String upFileName = "CaoPanShou";
         KuaishouLiveBroadcastFiles file = new KuaishouLiveBroadcastFiles();
         //上传复盘图片
         if (Check.isNotNull(replayPictureUrls)) {
-            List<String> urls = Arrays.asList(replayPictureUrls.split(","));
+            List<String> urls = JSONArray.parseArray(replayPictureUrls, String.class);
             HashSet<String> set = new HashSet<>(urls);
             String urlFix = "";
             String names = "";
-            int replayPictureCount = 0;
+            int replayPictureCount = set.size();
             for (String url : set) {
-                String pictureName = "replayPicture_000" + (replayPictureCount + 1);
-                String cosUrl = CosUpload.getJPGCosUrl(url, upFileName, pictureName);
-                if (Check.isNotNull(cosUrl)) {
-                    replayPictureCount++;
-                    int lastNo = cosUrl.lastIndexOf("/") + 1;
-                    urlFix = cosUrl.substring(0, lastNo);
-                    String name = cosUrl.substring(lastNo);
-                    if (replayPictureCount > 1) {
-                        names += "," + name;
-                    } else {
-                        names = name;
-                    }
+//                String pictureName = "replayPicture_000" + (replayPictureCount + 1);
+//                String cosUrl = CosUpload.getJPGCosUrl(url, upFileName, pictureName);
+                if (Check.isNotNull(url)) {
+                    int lastNo = url.lastIndexOf("/") + 1;
+                    urlFix = url.substring(0, lastNo);
+                    String name = url.substring(lastNo);
+                    names += "," + name;
                 }
             }
             file.setReplayCommonUrl(urlFix);
             file.setReplayPictureCount(replayPictureCount);
-            file.setReplayPictureNames(names);
-            if (set.size() == replayPictureCount) {
-                file.setReplayPictureMsg("success");
-            } else {
-                file.setReplayPictureMsg("共上传" + set.size() + "张,成功" + replayPictureCount + "张");
-            }
+            file.setReplayPictureNames(names.substring(1));
+            file.setReplayPictureMsg("success");
         }
         if (Check.isNotNull(replayFile)) {
-            file.setReplayFileUrl(CosUpload.getFileCosUrl(replayFile, upFileName));
+            file.setReplayFileUrl(replayFile);
         }
         KuaishouLiveBroadcastFiles one = filesMapper.selectKuaishouLiveBroadcastFilesById(id);
         file.setId(id);

+ 2 - 1
ruixuan-live/src/main/java/com/ruixuan/live/service/impl/KuaishouLiveUserAccountServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruixuan.common.core.domain.ResultResponse;
+import com.ruixuan.common.utils.Check;
 import com.ruixuan.live.entity.KuaishouLiveUserAccount;
 import com.ruixuan.live.entity.KuaishouLiveUserAccountPart;
 import com.ruixuan.live.mapper.KuaishouLiveUserAccountMapper;
@@ -82,7 +83,7 @@ public class KuaishouLiveUserAccountServiceImpl implements IKuaishouLiveUserAcco
                 obj.put("accountName", account.getAccountName());
                 obj.put("createrId", account.getCreaterId());
             }
-            if (collaborators != null) {
+            if (Check.isNotNull(collaborators)) {
                 accountPartMapper.replaceBatch(collaborators);
             }
         }