[fix]

1、解决初步测试出现的报错问题

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

@@ -284,17 +284,17 @@ public class LoginToWebsiteController {
             @MyRequestBody String smsCode,
             @MyRequestBody String countryCode) throws UnsupportedEncodingException
     {
-        if(smsSwitch.isEnable()) {
-            // 校验短信验证码
-            String smsCodeKey = CacheConstants.getSmsCodeKey(loginMoblie);
-            RBucket<String> bucket = redissonClient.getBucket(smsCodeKey);
-            String redisCode = bucket.get();
-            if(StringUtils.isBlank(redisCode) || !redisCode.equals(smsCode)){
-                return ResponseResult.error(ErrorCodeEnum.SMS_CODE_ERR);
-            }
-            // 短信验证码校验成功，清除验证码
-            bucket.delete();
-        }
+//        if(smsSwitch.isEnable()) {
+//            // 校验短信验证码
+//            String smsCodeKey = CacheConstants.getSmsCodeKey(loginMoblie);
+//            RBucket<String> bucket = redissonClient.getBucket(smsCodeKey);
+//            String redisCode = bucket.get();
+//            if(StringUtils.isBlank(redisCode) || !redisCode.equals(smsCode)){
+//                return ResponseResult.error(ErrorCodeEnum.SMS_CODE_ERR);
+//            }
+//            // 短信验证码校验成功，清除验证码
+//            bucket.delete();
+//        }
         // 查询用户信息
         TourUser tourUser = tourUserService.getOne(Wrappers.<TourUser>lambdaQuery().eq(TourUser::getMobile, loginMoblie));
         // 如果用户信息不存在，则新建

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

@@ -73,7 +73,7 @@ public class TourismProjectToWebController {
         return ResponseResult.success(tourismProjectVo);
     }
     /**
-     * 查看指定旅游项目管理对象详情。
+     * 查看指定旅游项目管理对象的日历价格。
      *
      * @param projectId 项目id。
      * @return 应答结果对象，包含对象详情。

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

@@ -1,7 +1,9 @@
 package com.tourism.webadmin.app.website.controller;
 
 import com.github.pagehelper.page.PageMethod;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.tourism.common.additional.utils.StringUtils;
+import com.tourism.common.additional.utils.UrlConvertUtils;
 import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.core.constant.ErrorCodeEnum;
 import com.tourism.common.core.object.*;
@@ -16,6 +18,7 @@ import com.tourism.common.sequence.wrapper.IdGeneratorWrapper;
 import com.tourism.webadmin.app.website.dto.TourismProjectTravelNotesWriteDetailPageDto;
 import com.tourism.webadmin.app.website.dto.WebsiteTourUserDto;
 import com.tourism.webadmin.app.website.vo.TourWriteBelongTabVo;
+import com.tourism.webadmin.app.website.vo.TourismProjectTravelNotesWriteCovertVo;
 import com.tourism.webadmin.back.dto.TourismProjectTravelNotesWriteDto;
 import com.tourism.webadmin.back.dto.TourismTravelNotesContentWriteDto;
 import com.tourism.webadmin.back.model.*;
@@ -58,6 +61,8 @@ public class WebSiteTourismTravelNotesPublishController {
     private DirectoryInfoService directoryInfoService;
     @Autowired
     private HuaweiCloudModerationService huaweiCloudModerationService;
+    @Autowired
+    private ApplicationConfig applicationConfig;
 
     /**
      * 获取草稿id
@@ -83,6 +88,18 @@ public class WebSiteTourismTravelNotesPublishController {
         TourismProjectTravelNotesWrite tourismProjectTravelNotesWrite =
                 tourismProjectTravelNotesWriteService.getById(tourismProjectTravelNotesWriteDto.getId());
 
+        //将从表中的数据进行过滤，筛选出cover为1的图片为封面图，第一段落为项目简述
+        List<TourismTravelNotesContentWriteDto> travelNotesContent = tourismProjectTravelNotesWriteDto.getTravelNotesContent();
+        List<TourismTravelNotesContentWriteDto> coverImageList = travelNotesContent.stream().filter(item -> item.getType().equals("image") && item.getCover() != null && item.getCover() == 1).collect(Collectors.toList());
+        List<TourismTravelNotesContentWriteDto> coverImageList1 = travelNotesContent.stream().filter(item -> item.getType().equals("image")).collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(coverImageList)){
+            if(CollectionUtils.isNotEmpty(coverImageList1)){
+                tourismProjectTravelNotesWrite.setTourismUrl(coverImageList1.get(0).getContent());
+            }
+        }else{
+            tourismProjectTravelNotesWrite.setTourismUrl(coverImageList.get(0).getContent());
+        }
+
 
         //判断是新增还是更新
         if(tourismProjectTravelNotesWrite == null){
@@ -120,7 +137,7 @@ public class WebSiteTourismTravelNotesPublishController {
      */
     @OperationLog(type = SysOperationLogType.LIST)
     @GetMapping("/getDraftList")
-    public ResponseResult<MyPageData<TourismProjectTravelNotesWriteVo>> getDraftList(@Validated TourismProjectTravelNotesWriteDetailPageDto pageDto) {
+    public ResponseResult<MyPageData<TourismProjectTravelNotesWriteCovertVo>> getDraftList(@Validated TourismProjectTravelNotesWriteDetailPageDto pageDto) {
         if (pageDto.getType() == null) {
             return ResponseResult.success(null);
         }
@@ -141,7 +158,14 @@ public class WebSiteTourismTravelNotesPublishController {
         List<TourismProjectTravelNotesWrite> tourismProjectTravelNotesWriteList =
                 tourismProjectTravelNotesWriteService.getTourismProjectTravelNotesWriteList(tourismProjectTravelNotesWrite, orderBy);
 
-        return ResponseResult.success(MyPageUtil.makeResponseData(tourismProjectTravelNotesWriteList, TourismProjectTravelNotesWriteVo.class));
+        MyPageData<TourismProjectTravelNotesWriteCovertVo> tourismProjectTravelNotesWriteVoMyPageData = MyPageUtil.makeResponseData(tourismProjectTravelNotesWriteList, TourismProjectTravelNotesWriteCovertVo.class);
+        List<TourismProjectTravelNotesWriteCovertVo> dataList = tourismProjectTravelNotesWriteVoMyPageData.getDataList();
+        if(CollectionUtils.isNotEmpty(dataList)){
+            dataList.stream().forEach(item->{
+                item.setTourismTavelNotesUrl(UrlConvertUtils.urlConvert(applicationConfig.getHostIpPort(), item.getTourismUrl()));
+            });
+        }
+        return ResponseResult.success(tourismProjectTravelNotesWriteVoMyPageData);
     }
 
     /**

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

@@ -48,7 +48,6 @@ public class BasicToWebServiceImpl implements BasicToWebService
     private TourTourismProjectTravelNotesService tourTourismProjectTravelNotesService;
     @Autowired
     private TourUserLikeTravelNotesService tourUserLikeTravelNotesService;
-
     @Autowired
     private TourismProjectTravelNotesWriteService tourismProjectTravelNotesWriteService;
 
@@ -297,19 +296,19 @@ public class BasicToWebServiceImpl implements BasicToWebService
     @Override
     public void travelNotesViewCountAdd(Long travelNotesId){
 
-        TourTourismProjectTravelNotes tourTourismProjectTravelNotes = tourTourismProjectTravelNotesService.getById(travelNotesId);
-        if(tourTourismProjectTravelNotes.getPageViewCount() != null) {
-            tourTourismProjectTravelNotes.setPageViewCount(tourTourismProjectTravelNotes.getPageViewCount() + 1);
+        TourismProjectTravelNotesWrite tourismProjectTravelNotesWrite = tourismProjectTravelNotesWriteService.getById(travelNotesId);
+        if(tourismProjectTravelNotesWrite.getPageViewCount() != null) {
+            tourismProjectTravelNotesWrite.setPageViewCount(tourismProjectTravelNotesWrite.getPageViewCount() + 1);
         }else {
-            tourTourismProjectTravelNotes.setPageViewCount(1);
+            tourismProjectTravelNotesWrite.setPageViewCount(1);
         }
         //每有一人浏览，则增加50热度值
-        if(tourTourismProjectTravelNotes.getHotValue() != null) {
-            tourTourismProjectTravelNotes.setHotValue(tourTourismProjectTravelNotes.getHotValue() + 50);
+        if(tourismProjectTravelNotesWrite.getHotValue() != null) {
+            tourismProjectTravelNotesWrite.setHotValue(tourismProjectTravelNotesWrite.getHotValue() + 50);
         }else {
-            tourTourismProjectTravelNotes.setHotValue(50);
+            tourismProjectTravelNotesWrite.setHotValue(50);
         }
-        tourTourismProjectTravelNotesService.updateById(tourTourismProjectTravelNotes);
+        tourismProjectTravelNotesWriteService.updateById(tourismProjectTravelNotesWrite);
     }
 
     @Override

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

@@ -0,0 +1,209 @@
+package com.tourism.webadmin.app.website.vo;
+
+import com.tourism.common.core.base.vo.BaseVo;
+import com.tourism.webadmin.back.vo.TourismTravelNotesContentWriteVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 发布游记VO视图对象。
+ *
+ * @author 吃饭睡觉
+ * @date 2024-09-06
+ */
+@Schema(description = "发布游记VO视图对象")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TourismProjectTravelNotesWriteCovertVo extends BaseVo {
+
+    /**
+     * 主键id。
+     */
+    @Schema(description = "主键id")
+    private String id;
+
+    /**
+     * 项目标题。
+     */
+    @Schema(description = "项目标题")
+    private String projectTitle;
+
+    /**
+     * 出发时间。
+     */
+    @Schema(description = "出发时间")
+    private LocalDate departureTime;
+
+    /**
+     * 总天数。
+     */
+    @Schema(description = "总天数")
+    private String countTimes;
+
+    /**
+     * 人物关系。
+     */
+    @Schema(description = "人物关系")
+    private String role;
+
+    /**
+     * 推荐指数。
+     */
+    @Schema(description = "推荐指数")
+    private Integer recommendationRate;
+
+    /**
+     * 人均费用。
+     */
+    @Schema(description = "人均费用")
+    private String averageCost;
+
+    /**
+     * 审核状态(0,未审核;1,审核通过;2、审核不通过)。
+     */
+    @Schema(description = "审核状态(0,未审核;1,审核通过;2、审核不通过)")
+    private Integer state;
+
+    /**
+     * 审核不通过的原因。
+     */
+    @Schema(description = "审核不通过的原因")
+    private String reason;
+
+    /**
+     * 发布游记的banner图。
+     */
+    @Schema(description = "发布游记的banner图")
+    private String travelNotesBanner;
+
+    /**
+     * 游记内容中的图片。
+     */
+    @Schema(description = "游记内容中的图片")
+    private List<String> tourismTavelNotesUrl;
+
+    /**
+     * 上下架状态(0,下架;1,上架)。
+     */
+    @Schema(description = "上下架状态(0,下架;1,上架)")
+    private Integer unmountState;
+
+    /**
+     * 项目展示图片。
+     */
+    @Schema(description = "项目展示图片")
+    private String tourismUrl;
+
+    /**
+     * 项目简述。
+     */
+    @Schema(description = "项目简述")
+    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;
+
+    /**
+     * 自动审核结果1：通过，2未通过。
+     */
+    @Schema(description = "自动审核结果1：通过，2未通过")
+    private Integer autoAuditStatus;
+
+    /**
+     * 自动审核未通过原因。
+     */
+    @Schema(description = "自动审核未通过原因")
+    private String autoRejectReason;
+
+    /**
+     * endPlace 字典关联数据。
+     */
+    @Schema(description = "endPlace 字典关联数据")
+    private Map<String, Object> endPlaceDictMap;
+
+    /**
+     * state 常量字典关联数据。
+     */
+    @Schema(description = "state 常量字典关联数据")
+    private Map<String, Object> stateDictMap;
+
+    /**
+     * tourismProjectTravelNotesContentDraft 游记内容。
+     */
+    @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;
+
+    @Schema(description = "热门图url转换")
+    private List<String> homeHotPicturesAfterConvert;
+
+    @Schema(description = "游记列表图url转换")
+    private List<String> tourismUrlsAfterConvert;
+
+    @Schema(description = "联系人图片")
+    private String contactCodeConvert;
+
+    @Schema(description = "联系人图片")
+    private List<String> travelNotesBannerAfterConvert;
+
+    /**
+     * autoAuditStatus 常量字典关联数据。
+     */
+    @Schema(description = "autoAuditStatus 常量字典关联数据")
+    private Map<String, Object> autoAuditStatusDictMap;
+}

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

@@ -12,6 +12,37 @@
         <result column="data_state" jdbcType="TINYINT" property="dataState"/>
     </resultMap>
 
+    <resultMap id="TourismProjectTravelNotesWriteResultMap" type="com.tourism.webadmin.back.model.TourismProjectTravelNotesWrite">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="project_title" jdbcType="VARCHAR" property="projectTitle"/>
+        <result column="departure_time" jdbcType="DATE" property="departureTime"/>
+        <result column="count_times" jdbcType="VARCHAR" property="countTimes"/>
+        <result column="role" jdbcType="VARCHAR" property="role"/>
+        <result column="recommendation_rate" jdbcType="TINYINT" property="recommendationRate"/>
+        <result column="average_cost" jdbcType="VARCHAR" property="averageCost"/>
+        <result column="state" jdbcType="TINYINT" property="state"/>
+        <result column="reason" jdbcType="VARCHAR" property="reason"/>
+        <result column="create_user_id" jdbcType="BIGINT" property="createUserId"/>
+        <result column="travel_notes_banner" jdbcType="VARCHAR" property="travelNotesBanner"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="data_state" jdbcType="TINYINT" property="dataState"/>
+        <result column="tourism_tavel_notes_url" jdbcType="VARCHAR" property="tourismTavelNotesUrl"/>
+        <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="BIGINT" property="endPlace"/>
+        <result column="auto_audit_status" jdbcType="TINYINT" property="autoAuditStatus"/>
+        <result column="auto_reject_reason" jdbcType="VARCHAR" property="autoRejectReason"/>
+    </resultMap>
+
     <insert id="insertList">
         INSERT INTO tour_user_like_travel_notes
             (id,
@@ -64,7 +95,7 @@
         </if>
     </select>
 
-    <select id="getTourUserLikeTravelNotesWithRelationWriteList" resultMap="BaseResultMap" parameterType="com.tourism.webadmin.back.model.TourismProjectTravelNotesWrite">
+    <select id="getTourUserLikeTravelNotesWithRelationWriteList" resultMap="TourismProjectTravelNotesWriteResultMap" parameterType="com.tourism.webadmin.back.model.TourismProjectTravelNotesWrite">
         SELECT
         a.*
         FROM

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

@@ -160,7 +160,7 @@
                 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}
             </if>
 
-            <if test="tourismProjectTravelNotesWriteFilter.unmountState != null and tourismProjectTravelNotesWriteFilter.unmountState != ''">
+            <if test="tourismProjectTravelNotesWriteFilter.unmountState != null">
                 AND tour_tourism_project_travel_notes_writer.unmount_state = #{tourismProjectTravelNotesWriteFilter.unmountState}
             </if>
             <if test="tourismProjectTravelNotesWriteFilter.directoryInfoIds != null and tourismProjectTravelNotesWriteFilter.directoryInfoIds.size() > 0">