更新文件 articleTweetAction.java

mhotel/src/com/happy/action/articleTweetAction.java

@@ -186,8 +186,10 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
             List<String> fileStr = new ArrayList<>();
             if (articleTweetDto.getImages() != null && articleTweetDto.getImages().size() > 0) {
                 fileStr = articleTweetDto.getImages();
-            } else {
-                fileStr.add(articleTweetDto.getVideo());
+            }
+            List<String> fileStrVideo = new ArrayList<>();
+            if (articleTweetDto.getVideo() != null && articleTweetDto.getVideo().length() > 0) {
+                fileStrVideo.add(articleTweetDto.getVideo());
             }
             List<ArticleFileInfo> afis = new ArrayList<>();
             for (String f : fileStr) {
@@ -199,6 +201,19 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
                 afi.setType(1);
                 afi.setUrl(f);
                 afi.setCreateDate(now);
+                afi.setFileType(1);
+                afis.add(afi);
+            }
+            for (String f : fileStrVideo) {
+                String[] split = f.split("/");
+                String fileName = split[split.length - 1];
+                ArticleFileInfo afi = new ArticleFileInfo();
+                afi.setLinkId(aId);
+                afi.setName(fileName);
+                afi.setType(1);
+                afi.setUrl(f);
+                afi.setCreateDate(now);
+                afi.setFileType(2);
                 afis.add(afi);
             }
             int length = articleTweetService.insertArticleFileBatch(afis);
@@ -328,8 +343,10 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
             List<String> fileStr = new ArrayList<>();
             if (articleTweetDto.getImages() != null && articleTweetDto.getImages().size() > 0) {
                 fileStr = articleTweetDto.getImages();
-            } else {
-                fileStr.add(articleTweetDto.getVideo());
+            }
+            List<String> fileStrVideo = new ArrayList<>();
+            if (articleTweetDto.getVideo() != null && articleTweetDto.getVideo().length() > 0) {
+                fileStrVideo.add(articleTweetDto.getVideo());
             }
             List<ArticleFileInfo> afis = new ArrayList<>();
             for (String f : fileStr) {
@@ -341,6 +358,19 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
                 afi.setType(1);
                 afi.setUrl(f);
                 afi.setCreateDate(now);
+                afi.setFileType(1);
+                afis.add(afi);
+            }
+            for (String f : fileStrVideo) {
+                String[] split = f.split("/");
+                String fileName = split[split.length - 1];
+                ArticleFileInfo afi = new ArticleFileInfo();
+                afi.setLinkId(aId);
+                afi.setName(fileName);
+                afi.setType(1);
+                afi.setUrl(f);
+                afi.setCreateDate(now);
+                afi.setFileType(2);
                 afis.add(afi);
             }
             int length = articleTweetService.insertArticleFileBatch(afis);
@@ -614,15 +644,13 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
             for (ArticleListVo data : result.getPageList()) {
                 if (fileInfos != null) {
                     List<FileInfo> fileInfoList = fileInfos.stream().filter(e -> e.getLinkId().equals(data.getId().toString())).collect(Collectors.toList());
-                    if (fileInfoList != null) {
-                        if (fileInfoList.size() > 1) {
-                            data.setImage(fileInfoList.get(0).getUrl());
-                        } else if (fileInfoList.size() == 1) {
-                            String url = fileInfoList.get(0).getUrl();
-                            if (!url.endsWith("jpg") && !url.endsWith("png")) {
-                                data.setVideo(fileInfoList.get(0).getUrl());
+                    if (fileInfoList.size()>0) {
+                        for (int i = 0; i < fileInfoList.size(); i++) {
+                            FileInfo fileInfo = fileInfoList.get(i);
+                            if (fileInfo.getFileType()==1){
+                                data.setImage(fileInfo.getUrl());
                             } else {
-                                data.setImage(url);
+                                data.setVideo(fileInfo.getUrl());
                             }
                         }
                     }
@@ -679,21 +707,18 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
         result.setIsCollect(data.getIsCollect());
         result.setId(data.getId());
         List<FileInfo> fileInfoList = articleTweetService.queryList("and link_id = '" + articleTweetDto.getId() + "'");
-        if (fileInfoList != null) {
-            if (fileInfoList.size() > 1) {
-                result.setImages(fileInfoList.stream().map(FileInfo::getUrl).collect(Collectors.toList()));
-            } else if (fileInfoList.size() == 1) {
-                String url = fileInfoList.get(0).getUrl();
-                if (!url.endsWith("jpg") && !url.endsWith("png")) {
-                    result.setVideo(fileInfoList.get(0).getUrl());
+        if (fileInfoList != null && fileInfoList.size()>0) {
+            List<String> fileUrl = new ArrayList<>();
+            for (int i = 0; i < fileInfoList.size(); i++) {
+                FileInfo fileInfo = fileInfoList.get(i);
+                if (fileInfo.getFileType()==1){
+                    fileUrl.add(fileInfo.getUrl());
+                    result.setImages(fileUrl);
                 } else {
-                    List<String> images = new ArrayList<>();
-                    images.add(url);
-                    result.setImages(images);
+                    result.setVideo(fileInfo.getUrl());
                 }
             }
         }
-
         result.setUserId(data.getUserId());
         result.setUserName(data.getUserName());
         result.setUserPhoto(data.getUserPhoto() == null ? ConstDefault.DefaultHeadPhoto : data.getUserPhoto());
@@ -1114,17 +1139,15 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
 
             for (OwnerArticleVo data : result.getPageList()) {
                 List<FileInfo> fileInfoList = fileInfos == null ? null : fileInfos.stream().filter(e -> e.getLinkId().equals(data.getId().toString())).collect(Collectors.toList());
-                if (fileInfoList != null) {
-                    if (fileInfoList.size() > 1) {
-                        data.setImages(fileInfoList.stream().map(FileInfo::getUrl).collect(Collectors.toList()));
-                    } else if (fileInfoList.size() == 1) {
-                        String url = fileInfoList.get(0).getUrl();
-                        if (!url.endsWith("jpg") && !url.endsWith("png")) {
-                            data.setVideo(fileInfoList.get(0).getUrl());
-                        } else {
-                            List<String> images = new ArrayList<>();
-                            images.add(url);
-                            data.setImages(images);
+                if (fileInfoList != null && fileInfoList.size()>0) {
+                    for (int i = 0; i < fileInfoList.size(); i++) {
+                        FileInfo fileInfo = fileInfoList.get(i);
+                        List<String> fileUrl = new ArrayList<>();
+                        if (fileInfo.getFileType()==1){
+                            fileUrl.add(fileInfo.getUrl());
+                            data.setImages(fileUrl);
+                        }else {
+                            data.setVideo(fileInfo.getUrl());
                         }
                     }
                 }
@@ -1179,15 +1202,13 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
             for (ArticleListVo data : result.getPageList()) {
                 if (fileInfos != null) {
                     List<FileInfo> fileInfoList = fileInfos.stream().filter(e -> e.getLinkId().equals(data.getId().toString())).collect(Collectors.toList());
-                    if (fileInfoList != null) {
-                        if (fileInfoList.size() > 1) {
-                            data.setImage(fileInfoList.get(0).getUrl());
-                        } else if (fileInfoList.size() == 1) {
-                            String url = fileInfoList.get(0).getUrl();
-                            if (!url.endsWith("jpg") && !url.endsWith("png")) {
-                                data.setVideo(fileInfoList.get(0).getUrl());
+                    if (fileInfoList.size() > 0) {
+                        for (int i = 0; i < fileInfoList.size(); i++) {
+                            FileInfo fileInfo = fileInfoList.get(i);
+                            if (fileInfo.getFileType()==1){
+                                data.setImage(fileInfo.getUrl());
                             } else {
-                                data.setImage(url);
+                                data.setVideo(fileInfo.getUrl());
                             }
                         }
                     }
@@ -1213,14 +1234,12 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
         if (result != null) {
             List<FileInfo> fileInfos = articleTweetService.queryList("and link_id = " + result.getId() + "");
             if (fileInfos != null) {
-                if (fileInfos.size() > 1) {
-                    result.setImage(fileInfos.get(0).getUrl());
-                } else if (fileInfos.size() == 1) {
-                    String url = fileInfos.get(0).getUrl();
-                    if (!url.endsWith("jpg") && !url.endsWith("png")) {
-                        result.setVideo(fileInfos.get(0).getUrl());
+                for (int i = 0; i < fileInfos.size(); i++) {
+                    FileInfo fileInfo = fileInfos.get(i);
+                    if (fileInfo.getFileType()==1){
+                        result.setImage(fileInfo.getUrl());
                     } else {
-                        result.setImage(url);
+                        result.setVideo(fileInfo.getUrl());
                     }
                 }
             }
@@ -1255,15 +1274,13 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
 
             for (ArticleListVo data : result.getPageList()) {
                 List<FileInfo> fileInfoList = fileInfos.stream().filter(e -> e.getLinkId().equals(data.getId().toString())).collect(Collectors.toList());
-                if (fileInfoList != null) {
-                    if (fileInfoList.size() > 1) {
-                        data.setImage(fileInfoList.get(0).getUrl());
-                    } else if (fileInfoList.size() == 1) {
-                        String url = fileInfoList.get(0).getUrl();
-                        if (!url.endsWith("jpg") && !url.endsWith("png")) {
-                            data.setVideo(fileInfoList.get(0).getUrl());
+                if (fileInfoList.size() > 0) {
+                    for (int i = 0; i < fileInfoList.size(); i++) {
+                        FileInfo fileInfo = fileInfoList.get(i);
+                        if (fileInfo.getFileType()==1){
+                            data.setImage(fileInfo.getUrl());
                         } else {
-                            data.setImage(url);
+                            data.setVideo(fileInfo.getUrl());
                         }
                     }
                 }
@@ -1691,14 +1708,12 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
             for (int i = 0; i < result.size(); i++) {
                 List<FileInfo> fileInfos = articleTweetService.queryList("and link_id = " + result.get(i).getId() + "");
                 if (fileInfos != null) {
-                    if (fileInfos.size() > 1) {
-                        result.get(i).setImage(fileInfos.get(0).getUrl());
-                    } else if (fileInfos.size() == 1) {
-                        String url = fileInfos.get(0).getUrl();
-                        if (!url.endsWith("jpg") && !url.endsWith("png")) {
-                            result.get(i).setVideo(fileInfos.get(0).getUrl());
+                    for (int j = 0; j < fileInfos.size(); j++) {
+                        FileInfo fileInfo = fileInfos.get(i);
+                        if (fileInfo.getFileType()==1){
+                            result.get(i).setImage(fileInfo.getUrl());
                         } else {
-                            result.get(i).setImage(url);
+                            result.get(i).setVideo(fileInfo.getUrl());
                         }
                     }
                 }