[fix]

1、完善tour_tourism_project_travel_notes_writer表的字段

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

@@ -364,6 +364,17 @@ public class WebSiteTourismTravelNotesPublishController {
         return ResponseResult.success();
     }
 
+    /**
+     * 用户发布游记选择所属分类---->目的地
+     *
+     * @return 应答结果对象，包含查询结果集。
+     */
+//    @OperationLog(type = SysOperationLogType.LIST)
+//    @GetMapping("/getWriteBelongTab")
+//    public ResponseResult<Integer> getWriteBelongTab() {
+//
+//    }
+
 
 
 }

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

@@ -1,13 +1,21 @@
 package com.tourism.webadmin.app.website.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.github.pagehelper.page.PageMethod;
+import com.tourism.common.additional.utils.StringUtils;
 import com.tourism.common.additional.utils.UrlConvertUtils;
+import com.tourism.common.core.constant.ErrorCodeEnum;
 import com.tourism.common.core.object.MyOrderParam;
 import com.tourism.common.core.object.MyPageData;
 import com.tourism.common.core.object.ResponseResult;
+import com.tourism.common.core.object.TokenData;
+import com.tourism.common.core.util.MyCommonUtil;
 import com.tourism.common.core.util.MyModelUtil;
+import com.tourism.common.core.validator.UpdateGroup;
 import com.tourism.common.log.annotation.OperationLog;
 import com.tourism.common.log.model.constant.SysOperationLogType;
+import com.tourism.webadmin.app.website.dto.PageDto;
+import com.tourism.webadmin.app.website.dto.TourismCollectDto;
 import com.tourism.webadmin.app.website.dto.TourismProjectTravelNotesToWebDto;
 import com.tourism.webadmin.app.website.service.BasicToWebService;
 import com.tourism.webadmin.app.website.vo.TourTravelNotesDirectoryCountryVo;
@@ -22,14 +30,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Tag(name = "门户网站旅游游记接口")
@@ -51,6 +57,8 @@ public class WebsiteTourismProjectTravelNotesController {
     private TourTourismProjectTravelNotesService tourTourismProjectTravelNotesService;
     @Autowired
     private ApplicationConfig applicationConfig;
+    @Autowired
+    private TourUserLikeTravelNotesService tourUserLikeTravelNotesService;
 
 
     /**
@@ -108,10 +116,13 @@ public class WebsiteTourismProjectTravelNotesController {
      */
     @SaIgnore
     @OperationLog(type = SysOperationLogType.UPDATE)
-    @GetMapping("/userCollectTravelNotesUpdate")
-    public ResponseResult<Void> userCollectTravelNotesUpdate(@RequestParam Long travelNotesId,Integer type) {
-
-        basicToWebServicel.userLikeTravelNotesUpdate(travelNotesId,type);
+    @PostMapping("/userCollectTravelNotesUpdate")
+    public ResponseResult<Void> userCollectTravelNotesUpdate(@RequestBody TourismCollectDto tourismCollectDto) {
+        String errorMessage = MyCommonUtil.getModelValidationError(tourismCollectDto, UpdateGroup.class);
+        if (errorMessage != null) {
+            return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED);
+        }
+        basicToWebServicel.userLikeTravelNotesUpdate(Long.valueOf(tourismCollectDto.getTravelNotesId()),tourismCollectDto.getType());
         return ResponseResult.success();
     }
 
@@ -122,8 +133,39 @@ public class WebsiteTourismProjectTravelNotesController {
      */
     @OperationLog(type = SysOperationLogType.LIST)
     @GetMapping("/isCollectTravelNotes")
-    public ResponseResult<Boolean> isCollectTravelNotes(@RequestParam Long travelNotesId) {
-        return ResponseResult.success(basicToWebServicel.isLikeTravelNotes(travelNotesId));
+    public ResponseResult<Boolean> isCollectTravelNotes(@RequestParam String travelNotesId) {
+        return ResponseResult.success(basicToWebServicel.isLikeTravelNotes(Long.valueOf(travelNotesId)));
+    }
+
+    /**
+     * 用户的收藏列表
+     *
+     * @return 应答结果对象，包含查询结果集。
+     */
+    @OperationLog(type = SysOperationLogType.LIST)
+    @GetMapping("/userCollectTravelNotesList")
+    public ResponseResult<List<TourTourismProjectTravelNotes>> userCollectTravelNotesList(PageDto pageDto) {
+
+        MyOrderParam myOrderParam = new MyOrderParam();
+        myOrderParam.add(new MyOrderParam.OrderInfo("updateTime",false,null));
+        String orderBy = MyOrderParam.buildOrderBy(myOrderParam, TourUserLikeTravelNotes.class);
+        Long userId = TokenData.takeFromRequest().getUserId();
+        TourUserLikeTravelNotes filter = new TourUserLikeTravelNotes();
+        filter.setUserId(userId);
+        if(pageDto.getPageSize() != null && pageDto.getPageNum() != null){
+            PageMethod.startPage(pageDto.getPageNum(), pageDto.getPageSize(), true);
+        }
+        List<TourUserLikeTravelNotes> tourUserLikeTravelNotesList = tourUserLikeTravelNotesService.getTourUserLikeTravelNotesList(filter, orderBy);
+        List<TourTourismProjectTravelNotes> tourTourismProjectTravelNotesList = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(tourUserLikeTravelNotesList)) {
+            for(TourUserLikeTravelNotes item:tourUserLikeTravelNotesList){
+                TourTourismProjectTravelNotes tourTourismProjectTravelNotes = tourTourismProjectTravelNotesService.getById(item.getId());
+                if(tourTourismProjectTravelNotes != null){
+                    tourTourismProjectTravelNotesList.add(tourTourismProjectTravelNotes);
+                }
+            }
+        }
+        return ResponseResult.success(tourTourismProjectTravelNotesList);
     }
 
 

application-webadmin/src/main/java/com/tourism/webadmin/app/website/dto/TourismCollectDto.java

@@ -0,0 +1,25 @@
+package com.tourism.webadmin.app.website.dto;
+
+import com.tourism.common.core.validator.UpdateGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class TourismCollectDto {
+
+    /**
+     * 游记id
+     */
+    @Schema(description = "游记id。")
+    @NotBlank(message = "游记id不能为空",groups = {UpdateGroup.class})
+    private String travelNotesId;
+
+    /**
+     * 类型（0取消收藏 1收藏）。
+     */
+    @Schema(description = "类型。")
+    @NotNull(message = "类型不能为空",groups = {UpdateGroup.class})
+    private Integer type;
+}

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

@@ -257,13 +257,29 @@ public class BasicToWebServiceImpl implements BasicToWebService
 //        }else {
 //            tourUserLikeTravelNotesService.saveNew(tourUserLikeTravelNotes);
 //        }
-        TourTourismProjectTravelNotes tourTourismProjectTravelNotes = tourTourismProjectTravelNotesService.getById(travelNotesId);
-        if(tourTourismProjectTravelNotes.getLikeCount() == null) {
-            tourTourismProjectTravelNotes.setLikeCount(1);
+//        TourTourismProjectTravelNotes tourTourismProjectTravelNotes = tourTourismProjectTravelNotesService.getById(travelNotesId);
+//        if(tourTourismProjectTravelNotes != null) {
+//            if (tourTourismProjectTravelNotes.getLikeCount() == null) {
+//                tourTourismProjectTravelNotes.setLikeCount(1);
+//            } else {
+//                tourTourismProjectTravelNotes.setLikeCount(tourTourismProjectTravelNotes.getLikeCount() + 1);
+//            }
+//            tourTourismProjectTravelNotesService.updateById(tourTourismProjectTravelNotes);
+//        }
+        //type为0，则进行删除;type为1，则进行新增
+        TourUserLikeTravelNotes tourUserLikeTravelNotes = new TourUserLikeTravelNotes();
+        tourUserLikeTravelNotes.setTravelNotesId(travelNotesId);
+        tourUserLikeTravelNotes.setUserId(TokenData.takeFromRequest().getUserId());
+        if(type == 0){
+            tourUserLikeTravelNotesService.removeBy(tourUserLikeTravelNotes);
         }else {
-            tourTourismProjectTravelNotes.setLikeCount(tourTourismProjectTravelNotes.getLikeCount() + 1);
+            boolean b = tourUserLikeTravelNotesService.existByFilter(tourUserLikeTravelNotes);
+            if(!b){
+                tourUserLikeTravelNotesService.saveNew(tourUserLikeTravelNotes);
+            }
+
         }
-        tourTourismProjectTravelNotesService.updateById(tourTourismProjectTravelNotes);
+
     }
 
     @Override

application-webadmin/src/main/java/com/tourism/webadmin/app/website/vo/TourWriteBelongTabVo.java

@@ -0,0 +1,21 @@
+package com.tourism.webadmin.app.website.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 门户网站中发布游记的选择所属分类(目的地)。
+ *
+ * @author 吃饭睡觉
+ * @date 2024-10-12
+ */
+//@Schema(description = "TourWriteBelongTabVo视图对象")
+//@Data
+//public class TourWriteBelongTabVo {
+//
+//    private Long id;
+//
+//    private String menuName;
+//
+//    private
+//}

application-webadmin/src/main/java/com/tourism/webadmin/back/dao/mapper/TourismProjectTravelNotesWriteMapper.xml

@@ -21,6 +21,13 @@
         <result column="unmount_state" jdbcType="TINYINT" property="unmountState"/>
         <result column="tourism_url" jdbcType="VARCHAR" property="tourismUrl"/>
         <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
+        <result column="is_hotspot" jdbcType="TINYINT" property="isHotspot"/>
+        <result column="note_label" jdbcType="VARCHAR" property="noteLabel"/>
+        <result column="like_count" jdbcType="INTEGER" property="likeCount"/>
+        <result column="page_view_count" jdbcType="INTEGER" property="pageViewCount"/>
+        <result column="hot_value" jdbcType="INTEGER" property="hotValue"/>
+        <result column="is_original" jdbcType="TINYINT" property="isOriginal"/>
+        <result column="end_place" jdbcType="VARCHAR" property="endPlace"/>
     </resultMap>
 
     <insert id="insertList">
@@ -43,7 +50,14 @@
             tourism_tavel_notes_url,
             unmount_state,
             tourism_url,
-            remarks)
+            remarks,
+            is_hotspot,
+            note_label,
+            like_count,
+            page_view_count,
+            hot_value,
+            is_original,
+            end_place)
         VALUES
         <foreach collection="list" index="index" item="item" separator="," >
             (#{item.id},
@@ -64,7 +78,14 @@
             #{item.tourismTavelNotesUrl},
             #{item.unmountState},
             #{item.tourismUrl},
-            #{item.remarks})
+            #{item.remarks},
+            #{item.isHotspot},
+            #{item.noteLabel},
+            #{item.likeCount},
+            #{item.pageViewCount},
+            #{item.hotValue},
+            #{item.isOriginal},
+            #{item.endPlace})
         </foreach>
     </insert>
 
@@ -119,6 +140,15 @@
             <if test="tourismProjectTravelNotesWriteFilter.createTimeEnd != null and tourismProjectTravelNotesWriteFilter.createTimeEnd != ''">
                 AND tour_tourism_project_travel_notes_writer.create_time &lt;= #{tourismProjectTravelNotesWriteFilter.createTimeEnd}
             </if>
+            <if test="tourismProjectTravelNotesWriteFilter.isHotspot != null">
+                AND tour_tourism_project_travel_notes_writer.is_hotspot = #{tourismProjectTravelNotesWriteFilter.isHotspot}
+            </if>
+            <if test="tourismProjectTravelNotesWriteFilter.isOriginal != null">
+                AND tour_tourism_project_travel_notes_writer.is_original = #{tourismProjectTravelNotesWriteFilter.isOriginal}
+            </if>
+            <if test="tourismProjectTravelNotesWriteFilter.endPlace != null and tourismProjectTravelNotesWriteFilter.endPlace != ''">
+                AND tour_tourism_project_travel_notes_writer.end_place = #{tourismProjectTravelNotesWriteFilter.endPlace}
+            </if>
             <if test="tourismProjectTravelNotesWriteFilter.searchString != null and tourismProjectTravelNotesWriteFilter.searchString != ''">
                 <bind name = "safeTourismProjectTravelNotesWriteSearchString" value = "'%' + tourismProjectTravelNotesWriteFilter.searchString + '%'" />
                 AND CONCAT(IFNULL(tour_tourism_project_travel_notes_writer.project_title,''), IFNULL(tour_tourism_project_travel_notes_writer.count_times,''), IFNULL(tour_tourism_project_travel_notes_writer.role,''), IFNULL(tour_tourism_project_travel_notes_writer.average_cost,''), IFNULL(tour_tourism_project_travel_notes_writer.reason,'')) LIKE #{safeTourismProjectTravelNotesWriteSearchString}

application-webadmin/src/main/java/com/tourism/webadmin/back/dto/TourismProjectTravelNotesWriteDto.java

@@ -4,6 +4,8 @@ import com.tourism.common.core.validator.UpdateGroup;
 import com.tourism.common.core.validator.ConstDictRef;
 import com.tourism.webadmin.back.model.constant.AuditState;
 
+import com.tourism.webadmin.back.model.constant.Hotspot;
+import com.tourism.webadmin.back.model.constant.IsOriginal;
 import com.tourism.webadmin.back.model.constant.UnmountState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -119,6 +121,52 @@ public class TourismProjectTravelNotesWriteDto {
     private String remarks;
 
     /**
+     * 是否热点，0非热点，1热点。
+     */
+    @Schema(description = "是否热点，0非热点，1热点。")
+    @ConstDictRef(constDictClass = Hotspot.class, message = "数据验证失败，是否热点，0非热点，1热点为无效值！")
+    private Integer isHotspot;
+
+    /**
+     * 标签。
+     */
+    @Schema(description = "标签。")
+    private String noteLabel;
+
+    /**
+     * 点赞数。
+     */
+    @Schema(description = "点赞数。")
+    private Integer likeCount;
+
+    /**
+     * 浏览量。
+     */
+    @Schema(description = "浏览量。")
+    private Integer pageViewCount;
+
+    /**
+     * 热度值。
+     */
+    @Schema(description = "热度值。")
+    private Integer hotValue;
+
+    /**
+     * 是否原创(0:非原创;1:原创)。
+     * NOTE: 可支持等于操作符的列表数据过滤。
+     */
+    @Schema(description = "是否原创(0:非原创;1:原创)。可支持等于操作符的列表数据过滤。")
+    @ConstDictRef(constDictClass = IsOriginal.class, message = "数据验证失败，是否原创(0:非原创;1:原创)为无效值！")
+    private Integer isOriginal;
+
+    /**
+     * 目的地。
+     * NOTE: 可支持等于操作符的列表数据过滤。
+     */
+    @Schema(description = "目的地。可支持等于操作符的列表数据过滤。")
+    private String endPlace;
+
+    /**
      * departureTime 范围过滤起始值(>=)。
      * NOTE: 可支持范围操作符的列表数据过滤。
      */

application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismProjectTravelNotesWrite.java

@@ -6,6 +6,8 @@ import com.tourism.common.core.util.MyCommonUtil;
 import com.tourism.common.core.upload.UploadStoreTypeEnum;
 import com.tourism.common.core.annotation.*;
 import com.tourism.common.core.base.model.BaseModel;
+import com.tourism.webadmin.back.model.constant.Hotspot;
+import com.tourism.webadmin.back.model.constant.IsOriginal;
 import com.tourism.webadmin.back.model.constant.UnmountState;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -120,6 +122,48 @@ public class TourismProjectTravelNotesWrite extends BaseModel {
     private String remarks;
 
     /**
+     * 是否热点，0非热点，1热点。
+     */
+    @TableField(value = "is_hotspot")
+    private Integer isHotspot;
+
+    /**
+     * 标签。
+     */
+    @TableField(value = "note_label")
+    private String noteLabel;
+
+    /**
+     * 点赞数。
+     */
+    @TableField(value = "like_count")
+    private Integer likeCount;
+
+    /**
+     * 浏览量。
+     */
+    @TableField(value = "page_view_count")
+    private Integer pageViewCount;
+
+    /**
+     * 热度值。
+     */
+    @TableField(value = "hot_value")
+    private Integer hotValue;
+
+    /**
+     * 是否原创(0:非原创;1:原创)。
+     */
+    @TableField(value = "is_original")
+    private Integer isOriginal;
+
+    /**
+     * 目的地。
+     */
+    @TableField(value = "end_place")
+    private String endPlace;
+
+    /**
      * departureTime 范围过滤起始值(>=)。
      */
     @TableField(exist = false)
@@ -171,4 +215,16 @@ public class TourismProjectTravelNotesWrite extends BaseModel {
             constantDictClass = UnmountState.class)
     @TableField(exist = false)
     private Map<String, Object> unmountStateDictMap;
+
+    @RelationConstDict(
+            masterIdField = "isHotspot",
+            constantDictClass = Hotspot.class)
+    @TableField(exist = false)
+    private Map<String, Object> isHotspotDictMap;
+
+    @RelationConstDict(
+            masterIdField = "isOriginal",
+            constantDictClass = IsOriginal.class)
+    @TableField(exist = false)
+    private Map<String, Object> isOriginalDictMap;
 }

application-webadmin/src/main/java/com/tourism/webadmin/back/model/constant/IsOriginal.java

@@ -0,0 +1,44 @@
+package com.tourism.webadmin.back.model.constant;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 是否原创常量字典对象。
+ *
+ * @author 吃饭睡觉
+ * @date 2024-09-06
+ */
+public final class IsOriginal {
+
+    /**
+     * 非原创。
+     */
+    public static final int NOT_ORIGINAL = 0;
+    /**
+     * 原创。
+     */
+    public static final int ORIGINAL = 1;
+
+    private static final Map<Object, String> DICT_MAP = new HashMap<>(2);
+    static {
+        DICT_MAP.put(NOT_ORIGINAL, "非原创");
+        DICT_MAP.put(ORIGINAL, "原创");
+    }
+
+    /**
+     * 判断参数是否为当前常量字典的合法值。
+     *
+     * @param value 待验证的参数值。
+     * @return 合法返回true，否则false。
+     */
+    public static boolean isValid(Integer value) {
+        return value != null && DICT_MAP.containsKey(value);
+    }
+
+    /**
+     * 私有构造函数，明确标识该常量类的作用。
+     */
+    private IsOriginal() {
+    }
+}

application-webadmin/src/main/java/com/tourism/webadmin/back/vo/TourismProjectTravelNotesWriteVo.java

@@ -106,6 +106,48 @@ public class TourismProjectTravelNotesWriteVo extends BaseVo {
     private String remarks;
 
     /**
+     * 是否热点，0非热点，1热点。
+     */
+    @Schema(description = "是否热点，0非热点，1热点")
+    private Integer isHotspot;
+
+    /**
+     * 标签。
+     */
+    @Schema(description = "标签")
+    private String noteLabel;
+
+    /**
+     * 点赞数。
+     */
+    @Schema(description = "点赞数")
+    private Integer likeCount;
+
+    /**
+     * 浏览量。
+     */
+    @Schema(description = "浏览量")
+    private Integer pageViewCount;
+
+    /**
+     * 热度值。
+     */
+    @Schema(description = "热度值")
+    private Integer hotValue;
+
+    /**
+     * 是否原创(0:非原创;1:原创)。
+     */
+    @Schema(description = "是否原创(0:非原创;1:原创)")
+    private Integer isOriginal;
+
+    /**
+     * 目的地。
+     */
+    @Schema(description = "目的地")
+    private String endPlace;
+
+    /**
      * state 常量字典关联数据。
      */
     @Schema(description = "state 常量字典关联数据")
@@ -116,4 +158,16 @@ public class TourismProjectTravelNotesWriteVo extends BaseVo {
      */
     @Schema(description = "tourismProjectTravelNotesContentDraft 游记内容")
     private List<TourismTravelNotesContentWriteVo> travelNotesContent;
+
+    /**
+     * isHotspot 常量字典关联数据。
+     */
+    @Schema(description = "isHotspot 常量字典关联数据")
+    private Map<String, Object> isHotspotDictMap;
+
+    /**
+     * isOriginal 常量字典关联数据。
+     */
+    @Schema(description = "isOriginal 常量字典关联数据")
+    private Map<String, Object> isOriginalDictMap;
 }