完善接口

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/WebsiteTourismProjectTravelNotesController.java

@@ -222,7 +222,7 @@ public class WebsiteTourismProjectTravelNotesController {
     public ResponseResult<Integer> getLikeCount(@RequestParam(required = true) Long travelNotesId) {
 
         TourTourismProjectTravelNotes tourTourismProjectTravelNotes = tourTourismProjectTravelNotesService.getById(travelNotesId);
-        Integer hotValue = tourTourismProjectTravelNotes.getHotValue();
-        return ResponseResult.success(hotValue);
+        Integer likeCount = tourTourismProjectTravelNotes.getLikeCount();
+        return ResponseResult.success(likeCount);
     }
 }

application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/impl/BasicToWebServiceImpl.java

@@ -25,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -66,23 +68,23 @@ public class BasicToWebServiceImpl implements BasicToWebService
         MyPageData<BannerInfoVo> bannerInfoVoMyPageData = MyPageUtil.makeResponseData(bannerInfoList, BannerInfoVo.class);
 
         List<BannerInfoVo> dataList = bannerInfoVoMyPageData.getDataList();
-        //先把imgUrl由jaon转换为List<FileUrlObject>
-        dataList.stream().forEach(item ->
-        {
-            if (StringUtils.isNotEmpty(item.getImgUrl())) {
-                List<FileUrlObject> fileUrlObjectList = JsonUtils.parseFileUrlArray(item.getImgUrl(), FileUrlObject.class);
-                if (!CollectionUtils.isEmpty(fileUrlObjectList)) {
-                    ArrayList<String> arrayList = new ArrayList<>();
-                    //遍历每个元素的数组对象,对元素的url对象进行拼接
-                    for (FileUrlObject y : fileUrlObjectList) {
-                        String imgUrlAfterConvert =
-                                applicationConfig.getHostIpPort() + y.getDownloadUri() + "?id=" + item.getId() + "&fieldName=imgUrl&asImage=true&filename=" + y.getFilename();
-                        arrayList.add(imgUrlAfterConvert);
+            //先把imgUrl由jaon转换为List<FileUrlObject>
+            dataList.stream().forEach(item ->
+            {
+                if (StringUtils.isNotEmpty(item.getImgUrl())) {
+                    List<FileUrlObject> fileUrlObjectList = JsonUtils.parseFileUrlArray(item.getImgUrl(), FileUrlObject.class);
+                    if (!CollectionUtils.isEmpty(fileUrlObjectList)) {
+                        ArrayList<String> arrayList = new ArrayList<>();
+                        //遍历每个元素的数组对象,对元素的url对象进行拼接
+                        for (FileUrlObject y : fileUrlObjectList) {
+                            String imgUrlAfterConvert =
+                                    applicationConfig.getHostIpPort() + y.getDownloadUri() + "?id=" + item.getId() + "&fieldName=imgUrl&asImage=true&filename=" + y.getFilename();
+                            arrayList.add(imgUrlAfterConvert);
+                        }
+                        item.setImgUrlsAfterConvert(arrayList);
                     }
-                    item.setImgUrlsAfterConvert(arrayList);
                 }
-            }
-        });
+            });
 
         return bannerInfoVoMyPageData;
     }
@@ -140,7 +142,6 @@ public class BasicToWebServiceImpl implements BasicToWebService
                 }
             }
         });
-
         return directoryInfoVoMyPageData;
     }
 
@@ -247,48 +248,50 @@ public class BasicToWebServiceImpl implements BasicToWebService
         TourTourismProjectTravelNotesVo tourTourismProjectTravelNotesVo =
                 MyModelUtil.copyTo(tourTourismProjectTravelNotes, TourTourismProjectTravelNotesVo.class);
 
-        if(StringUtils.isNotEmpty(tourTourismProjectTravelNotesVo.getTourismUrl())){
-            List<FileUrlObject> fileUrlObjectList = JsonUtils.parseFileUrlArray(tourTourismProjectTravelNotesVo.getTourismUrl(), FileUrlObject.class);
-            if (!CollectionUtils.isEmpty(fileUrlObjectList)) {
-                ArrayList<String> arrayList = new ArrayList<>();
-                //遍历每个元素的数组对象,对元素的url对象进行拼接
-                for (FileUrlObject y : fileUrlObjectList) {
-                    String imgUrlAfterConvert =
-                            applicationConfig.getHostIpPort() + y.getDownloadUri() + "?id=" + tourTourismProjectTravelNotesVo.getId() + "&fieldName=tourismUrl&asImage=true&filename=" + y.getFilename();
-                    arrayList.add(imgUrlAfterConvert);
+        if(tourTourismProjectTravelNotesVo != null) {
+            if (StringUtils.isNotEmpty(tourTourismProjectTravelNotesVo.getTourismUrl())) {
+                List<FileUrlObject> fileUrlObjectList = JsonUtils.parseFileUrlArray(tourTourismProjectTravelNotesVo.getTourismUrl(), FileUrlObject.class);
+                if (!CollectionUtils.isEmpty(fileUrlObjectList)) {
+                    ArrayList<String> arrayList = new ArrayList<>();
+                    //遍历每个元素的数组对象,对元素的url对象进行拼接
+                    for (FileUrlObject y : fileUrlObjectList) {
+                        String imgUrlAfterConvert =
+                                applicationConfig.getHostIpPort() + y.getDownloadUri() + "?id=" + tourTourismProjectTravelNotesVo.getId() + "&fieldName=tourismUrl&asImage=true&filename=" + y.getFilename();
+                        arrayList.add(imgUrlAfterConvert);
+                    }
+                    tourTourismProjectTravelNotesVo.setTourismUrlsAfterConvert(arrayList);
                 }
-                tourTourismProjectTravelNotesVo.setTourismUrlsAfterConvert(arrayList);
             }
-        }
 
-        if (StringUtils.isNotEmpty(tourTourismProjectTravelNotesVo.getHomeHotPicture())) {
-            List<FileUrlObject> fileUrlObjectList = JsonUtils.parseFileUrlArray(tourTourismProjectTravelNotesVo.getHomeHotPicture(), FileUrlObject.class);
-            if (!CollectionUtils.isEmpty(fileUrlObjectList)) {
-                ArrayList<String> arrayList = new ArrayList<>();
-                //遍历每个元素的数组对象,对元素的url对象进行拼接
-                for (FileUrlObject y : fileUrlObjectList) {
-                    String hotPictureUrlsAfterConvert =
-                            applicationConfig.getHostIpPort() + y.getDownloadUri() + "?id=" + tourTourismProjectTravelNotesVo.getId() + "&fieldName=homeHotPicturesAfterConvert&asImage=true&filename=" + y.getFilename();
-                    arrayList.add(hotPictureUrlsAfterConvert);
+            if (StringUtils.isNotEmpty(tourTourismProjectTravelNotesVo.getHomeHotPicture())) {
+                List<FileUrlObject> fileUrlObjectList = JsonUtils.parseFileUrlArray(tourTourismProjectTravelNotesVo.getHomeHotPicture(), FileUrlObject.class);
+                if (!CollectionUtils.isEmpty(fileUrlObjectList)) {
+                    ArrayList<String> arrayList = new ArrayList<>();
+                    //遍历每个元素的数组对象,对元素的url对象进行拼接
+                    for (FileUrlObject y : fileUrlObjectList) {
+                        String hotPictureUrlsAfterConvert =
+                                applicationConfig.getHostIpPort() + y.getDownloadUri() + "?id=" + tourTourismProjectTravelNotesVo.getId() + "&fieldName=homeHotPicturesAfterConvert&asImage=true&filename=" + y.getFilename();
+                        arrayList.add(hotPictureUrlsAfterConvert);
+                    }
+                    tourTourismProjectTravelNotesVo.setHomeHotPicturesAfterConvert(arrayList);
                 }
-                tourTourismProjectTravelNotesVo.setHomeHotPicturesAfterConvert(arrayList);
             }
-        }
 
-        if (StringUtils.isNotEmpty(tourTourismProjectTravelNotesVo.getTravelNotesBanner())) {
-            List<FileUrlObject> fileUrlObjectList = JsonUtils.parseFileUrlArray(tourTourismProjectTravelNotesVo.getTravelNotesBanner(), FileUrlObject.class);
-            if (!CollectionUtils.isEmpty(fileUrlObjectList)) {
-                ArrayList<String> arrayList = new ArrayList<>();
-                //遍历每个元素的数组对象,对元素的url对象进行拼接
-                for (FileUrlObject y : fileUrlObjectList) {
-                    String hotPictureUrlsAfterConvert =
-                            applicationConfig.getHostIpPort() + y.getDownloadUri() + "?id=" + tourTourismProjectTravelNotesVo.getId() + "&fieldName=travelNotesBanner&asImage=true&filename=" + y.getFilename();
-                    arrayList.add(hotPictureUrlsAfterConvert);
+            if (StringUtils.isNotEmpty(tourTourismProjectTravelNotesVo.getTravelNotesBanner())) {
+                List<FileUrlObject> fileUrlObjectList = JsonUtils.parseFileUrlArray(tourTourismProjectTravelNotesVo.getTravelNotesBanner(), FileUrlObject.class);
+                if (!CollectionUtils.isEmpty(fileUrlObjectList)) {
+                    ArrayList<String> arrayList = new ArrayList<>();
+                    //遍历每个元素的数组对象,对元素的url对象进行拼接
+                    for (FileUrlObject y : fileUrlObjectList) {
+                        String hotPictureUrlsAfterConvert =
+                                applicationConfig.getHostIpPort() + y.getDownloadUri() + "?id=" + tourTourismProjectTravelNotesVo.getId() + "&fieldName=travelNotesBanner&asImage=true&filename=" + y.getFilename();
+                        arrayList.add(hotPictureUrlsAfterConvert);
+                    }
+                    tourTourismProjectTravelNotesVo.setTravelNotesBannerAfterConvert(arrayList);
                 }
-                tourTourismProjectTravelNotesVo.setTravelNotesBannerAfterConvert(arrayList);
             }
-        }
 
+        }
         return tourTourismProjectTravelNotesVo;
     }
 
@@ -303,7 +306,11 @@ public class BasicToWebServiceImpl implements BasicToWebService
         tourUserLikeTravelNotes.setUserId(TokenData.takeFromRequest().getUserId());
         TourTourismProjectTravelNotes tourTourismProjectTravelNotes = tourTourismProjectTravelNotesService.getById(travelNotesId);
         if(tourTourismProjectTravelNotes.getLikeCount() != null) {
-            tourTourismProjectTravelNotes.setLikeCount(tourTourismProjectTravelNotes.getLikeCount() + 1);
+            if(type == 1) {
+                tourTourismProjectTravelNotes.setLikeCount(tourTourismProjectTravelNotes.getLikeCount() + 1);
+            }else {
+                tourTourismProjectTravelNotes.setLikeCount(tourTourismProjectTravelNotes.getLikeCount() - 1);
+            }
         }else {
             tourTourismProjectTravelNotes.setLikeCount(1);
         }