Merge remote-tracking branch 'origin/dev' into dev

nightFragrance-framework/src/main/java/com/ylx/framework/config/SecurityConfig.java

@@ -120,7 +120,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/technician/technician/getTechnician", "/technician/technician/getTechnicianInfo", "/technician/technician/getTechnicianList",
                         "/technician/technician/apply", "/technician/technician/resetPassword",
                         "/customer/banner/page", "/customer/service/category/**", "/technician/technician/profile",
-                        "/customer/city/**","/home/hot/recommend","/home/search/**").permitAll()
+                        "/customer/city/**","/home/hot/recommend","/home/search/**","/discover/moment/**").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.txt", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

nightFragrance-massage/src/main/java/com/ylx/discover/moment/controller/CustomerMomentController.java

@@ -0,0 +1,40 @@
+package com.ylx.discover.moment.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.common.core.domain.R;
+import com.ylx.discover.moment.domain.dto.MomentPageDTO;
+import com.ylx.discover.moment.domain.vo.MomentPageVO;
+import com.ylx.moment.domain.vo.MomentDetailVO;
+import com.ylx.moment.service.ITechnicianMomentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/discover/moment")
+@Api(tags = {"用户端发现商户动态"})
+@Slf4j
+public class CustomerMomentController {
+
+    @Resource
+    private ITechnicianMomentService momentService;
+
+    @PostMapping("/page")
+    @ApiOperation("获取发现页动态列表")
+    public R<Page<MomentPageVO>> getMomentPage(@Validated @RequestBody MomentPageDTO dto) {
+        Page<MomentPageVO> result = this.momentService.getMomentPage(dto);
+        return R.ok(result);
+    }
+
+    @ApiOperation("根据动态ID查询动态详情")
+    @GetMapping("/detail/{id}")
+    public R<MomentDetailVO> getMomentDetailById(@PathVariable("id") Long id) {
+        MomentDetailVO momentDetail = this.momentService.getMomentDetail(id, null, null);
+        return R.ok(momentDetail);
+    }
+
+}

nightFragrance-massage/src/main/java/com/ylx/discover/moment/domain/dto/MomentPageDTO.java

@@ -0,0 +1,20 @@
+package com.ylx.discover.moment.domain.dto;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("发现页商户动态DTO")
+public class MomentPageDTO extends Page<MomentPageDTO> {
+
+    @ApiModelProperty("城市编码")
+    @NotNull(message = "城市编码不能为空")
+    private String cityCode;
+
+}

nightFragrance-massage/src/main/java/com/ylx/discover/moment/domain/vo/MomentPageVO.java

@@ -0,0 +1,35 @@
+package com.ylx.discover.moment.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("发现页商户动态分页VO")
+public class MomentPageVO {
+
+    @ApiModelProperty("动态ID")
+    private String id;
+
+    @ApiModelProperty("动态标题")
+    private String title;
+
+    @ApiModelProperty("动态内容")
+    private String content;
+
+    @ApiModelProperty("封面图URL")
+    private String coverUrl;
+
+    @ApiModelProperty("商户昵称")
+    private String technicianNickName;
+
+    @ApiModelProperty("收藏量")
+    private Integer saveCount;
+
+    @ApiModelProperty("浏览量")
+    private Integer viewCount;
+
+    @ApiModelProperty("媒体类型:1=图片,2=视频")
+    private Integer mediaType;
+
+}

nightFragrance-massage/src/main/java/com/ylx/merchant/domain/vo/MomentVO.java

@@ -30,6 +30,9 @@ public class MomentVO implements Serializable {
     @ApiModelProperty("浏览量")
     private Integer viewCount;
 
+    @ApiModelProperty("地址名称")
+    private String location;
+
     @ApiModelProperty("发布时间")
     private LocalDateTime publishTime;
 

nightFragrance-massage/src/main/java/com/ylx/message/domain/MessageContent.java

@@ -28,6 +28,9 @@ public class MessageContent extends BaseEntity {
     @ApiModelProperty("跳转路由/链接")
     private String jumpPage;
 
+    @ApiModelProperty("标题")
+    private String title;
+
     @TableLogic
     @ApiModelProperty("是否删除 0=否，1=是")
     private Integer isDelete;

nightFragrance-massage/src/main/java/com/ylx/message/domain/UserMessage.java

@@ -35,4 +35,7 @@ public class UserMessage extends BaseEntity {
     @ApiModelProperty("是否删除 0=否，1=是")
     private Integer isDelete;
 
+    @ApiModelProperty("标题")
+    private String title;
+
 }

nightFragrance-massage/src/main/java/com/ylx/message/domain/vo/MessageDetailVO.java

@@ -1,5 +1,6 @@
 package com.ylx.message.domain.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -7,6 +8,9 @@ public class MessageDetailVO {
     /** 消息ID */
     private Long id;
 
+    @ApiModelProperty("标题")
+    private String title;
+
     /** 消息具体内容 (来自 user_message.personalized_content) */
     private String content;
 

nightFragrance-massage/src/main/java/com/ylx/message/service/impl/MessageServiceImpl.java

@@ -77,6 +77,7 @@ public class MessageServiceImpl implements IMessageService {
         userMsg.setUserId(userId);
         userMsg.setMessageContentId(config.getId());
         userMsg.setIsRead(READ_STATUS_UNREAD);
+        userMsg.setTitle(config.getTitle());
         userMsg.setPersonalizedContent(content);
         userMsg.setPersonalizedJumpPage(jumpPage);
         userMessageMapper.insert(userMsg);

nightFragrance-massage/src/main/java/com/ylx/moment/controller/TechnicianMomentController.java

@@ -5,18 +5,18 @@ import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.core.domain.model.WxLoginUser;
 import com.ylx.common.exception.ServiceException;
-import com.ylx.massage.domain.dto.MomentAuditDTO;
-import com.ylx.massage.domain.dto.MomentManageQueryDTO;
-import com.ylx.massage.domain.dto.MomentRecommendDTO;
+import com.ylx.moment.domain.dto.MomentAuditDTO;
+import com.ylx.moment.domain.dto.MomentManageQueryDTO;
+import com.ylx.moment.domain.dto.MomentRecommendDTO;
 import com.ylx.massage.domain.dto.PublishMomentDTO;
 import com.ylx.massage.domain.dto.EditMomentDTO;
-import com.ylx.massage.domain.dto.MomentListStatusDTO;
-import com.ylx.massage.domain.vo.MomentAuditStatusCountVO;
-import com.ylx.massage.domain.vo.MomentDetailVO;
-import com.ylx.massage.domain.vo.MomentListVO;
-import com.ylx.massage.domain.vo.MomentManageVO;
-import com.ylx.massage.domain.vo.MomentSimpleDetailVO;
-import com.ylx.massage.domain.vo.MyMomentVO;
+import com.ylx.moment.domain.dto.MomentListStatusDTO;
+import com.ylx.moment.domain.vo.MomentAuditStatusCountVO;
+import com.ylx.moment.domain.vo.MomentDetailVO;
+import com.ylx.moment.domain.vo.MomentListVO;
+import com.ylx.moment.domain.vo.MomentManageVO;
+import com.ylx.moment.domain.vo.MomentSimpleDetailVO;
+import com.ylx.moment.domain.vo.MyMomentVO;
 import com.ylx.moment.service.ITechnicianMomentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/MomentAuditDTO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/dto/MomentAuditDTO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.dto;
+package com.ylx.moment.domain.dto;
 
 import lombok.Data;
 

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/MomentListStatusDTO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/dto/MomentListStatusDTO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.dto;
+package com.ylx.moment.domain.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/MomentManageQueryDTO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/dto/MomentManageQueryDTO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.dto;
+package com.ylx.moment.domain.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/MomentQueryDTO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/dto/MomentQueryDTO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.dto;
+package com.ylx.moment.domain.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/MomentRecommendDTO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/dto/MomentRecommendDTO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.dto;
+package com.ylx.moment.domain.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MomentAuditStatusCountVO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/vo/MomentAuditStatusCountVO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.vo;
+package com.ylx.moment.domain.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MomentDetailVO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/vo/MomentDetailVO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.vo;
+package com.ylx.moment.domain.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MomentListVO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/vo/MomentListVO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.vo;
+package com.ylx.moment.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MomentManageVO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/vo/MomentManageVO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.vo;
+package com.ylx.moment.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MomentMediaVO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/vo/MomentMediaVO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.vo;
+package com.ylx.moment.domain.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MomentSimpleDetailVO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/vo/MomentSimpleDetailVO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.vo;
+package com.ylx.moment.domain.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MyMomentVO.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/vo/MyMomentVO.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain.vo;
+package com.ylx.moment.domain.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/moment/mapper/TechnicianMomentMapper.java

@@ -1,8 +1,11 @@
 package com.ylx.moment.mapper;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.discover.moment.domain.dto.MomentPageDTO;
+import com.ylx.discover.moment.domain.vo.MomentPageVO;
 import com.ylx.moment.domain.TechnicianMoment;
-import com.ylx.massage.domain.vo.MomentAuditStatusCountVO;
+import com.ylx.moment.domain.vo.MomentAuditStatusCountVO;
 import com.ylx.merchant.domain.dto.MerchantMomentDTO;
 import com.ylx.merchant.domain.vo.MomentVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -31,7 +34,7 @@ public interface TechnicianMomentMapper extends BaseMapper<TechnicianMoment> {
     /**
      * 查询附近动态（10km内，按日期倒序，同一天按距离排序）
      */
-    List<TechnicianMoment> selectNearbyMoments(Page<TechnicianMoment> page, @Param("longitude") BigDecimal longitude,@Param("latitude") BigDecimal latitude);
+    List<TechnicianMoment> selectNearbyMoments(Page<TechnicianMoment> page, @Param("longitude") BigDecimal longitude, @Param("latitude") BigDecimal latitude);
 
     /**
      * 增加浏览量
@@ -62,4 +65,6 @@ public interface TechnicianMomentMapper extends BaseMapper<TechnicianMoment> {
     Map<String, Object> selectMomentSimpleDetail(@Param("momentId") Long momentId);
 
     Page<MomentVO> getMerchantProject(Page<MomentVO> page, @Param("dto") MerchantMomentDTO dto);
+
+    Page<MomentPageVO> getMomentPage(Page<MomentPageVO> page, @Param("dto") MomentPageDTO dto);
 }

nightFragrance-massage/src/main/java/com/ylx/moment/service/ITechnicianMomentService.java

@@ -1,18 +1,17 @@
 package com.ylx.moment.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ylx.moment.domain.TechnicianMoment;
+import com.ylx.discover.moment.domain.dto.MomentPageDTO;
+import com.ylx.discover.moment.domain.vo.MomentPageVO;
+import com.ylx.moment.domain.*;
 import com.ylx.massage.domain.dto.EditMomentDTO;
-import com.ylx.massage.domain.dto.MomentAuditDTO;
-import com.ylx.massage.domain.dto.MomentManageQueryDTO;
+import com.ylx.moment.domain.dto.MomentAuditDTO;
+import com.ylx.moment.domain.dto.MomentManageQueryDTO;
 import com.ylx.massage.domain.dto.PublishMomentDTO;
-import com.ylx.massage.domain.vo.MomentAuditStatusCountVO;
-import com.ylx.massage.domain.vo.MomentDetailVO;
-import com.ylx.massage.domain.vo.MomentListVO;
-import com.ylx.massage.domain.vo.MomentManageVO;
-import com.ylx.massage.domain.vo.MomentSimpleDetailVO;
 import com.ylx.merchant.domain.dto.MerchantMomentDTO;
 import com.ylx.merchant.domain.vo.MomentVO;
+import com.ylx.moment.domain.vo.*;
+
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -95,7 +94,7 @@ public interface ITechnicianMomentService extends IService<TechnicianMoment> {
      * @param pageSize 每页数量
      * @return 我的动态列表
      */
-    Page<com.ylx.massage.domain.vo.MyMomentVO> getMyMoments(String openId, Integer pageNum, Integer pageSize);
+    Page<MyMomentVO> getMyMoments(String openId, Integer pageNum, Integer pageSize);
 
     /**
      * 删除我的动态。
@@ -166,4 +165,6 @@ public interface ITechnicianMomentService extends IService<TechnicianMoment> {
     MomentSimpleDetailVO getMomentSimpleDetail(Long momentId);
 
     Page<MomentVO> getByMerchantMoment(MerchantMomentDTO dto);
+
+    Page<MomentPageVO> getMomentPage(MomentPageDTO dto);
 }

nightFragrance-massage/src/main/java/com/ylx/moment/service/impl/TechnicianMomentServiceImpl.java

@@ -6,15 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.exception.ServiceException;
+import com.ylx.discover.moment.domain.dto.MomentPageDTO;
+import com.ylx.discover.moment.domain.vo.MomentPageVO;
 import com.ylx.massage.domain.MaTechnician;
-import com.ylx.moment.domain.MomentMedia;
-import com.ylx.moment.domain.TechnicianMoment;
+import com.ylx.moment.domain.*;
 import com.ylx.massage.domain.dto.EditMomentDTO;
-import com.ylx.massage.domain.dto.MomentAuditDTO;
-import com.ylx.massage.domain.dto.MomentManageQueryDTO;
+import com.ylx.moment.domain.dto.MomentAuditDTO;
+import com.ylx.moment.domain.dto.MomentManageQueryDTO;
 import com.ylx.massage.domain.dto.PublishMomentDTO;
-import com.ylx.massage.domain.vo.*;
 import com.ylx.massage.mapper.MaTechnicianMapper;
+import com.ylx.moment.domain.vo.*;
 import com.ylx.moment.mapper.MomentMediaMapper;
 import com.ylx.massage.mapper.TJsMapper;
 import com.ylx.moment.mapper.TechnicianMomentMapper;
@@ -1067,4 +1068,11 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
         Page<MomentVO> page = new Page<>(dto.getCurrent(), dto.getSize());
         return this.baseMapper.getMerchantProject(page, dto);
     }
+
+    @Override
+    public Page<MomentPageVO> getMomentPage(MomentPageDTO dto) {
+        Page<MomentPageVO> page = new Page<>(dto.getCurrent(), dto.getSize());
+        return this.baseMapper.getMomentPage(page, dto);
+    }
+
 }

nightFragrance-massage/src/main/resources/mapper/message/UserMessageMapper.xml

@@ -50,6 +50,7 @@
             um.personalized_content AS content, <!-- 渲染后的内容 -->
             DATE_FORMAT(um.create_time, '%H:%i') AS create_time,
             um.is_read AS isRead,
+            um.title,
             um.personalized_jump_page AS jumpUrl      <!-- 点击跳转地址 -->
         FROM user_message um
         INNER JOIN message_content mc ON um.message_content_id = mc.id

nightFragrance-massage/src/main/resources/mapper/moment/TechnicianMomentMapper.xml

@@ -118,7 +118,7 @@
     </update>
 
     <!-- 查询后台动态管理审核状态统计 -->
-    <select id="selectManageAuditStatusCount" resultType="com.ylx.massage.domain.vo.MomentAuditStatusCountVO">
+    <select id="selectManageAuditStatusCount" resultType="com.ylx.moment.domain.vo.MomentAuditStatusCountVO">
         SELECT
             COALESCE(SUM(CASE WHEN audit_status = 1 THEN 1 ELSE 0 END), 0) AS pendingCount,
             COALESCE(SUM(CASE WHEN audit_status = 2 THEN 1 ELSE 0 END), 0) AS approvedCount,
@@ -167,4 +167,31 @@
         ORDER BY publish_time DESC
     </select>
 
+    <select id="getMomentPage" resultType="com.ylx.discover.moment.domain.vo.MomentPageVO">
+        SELECT
+            m.id,
+            m.title,
+            m.content,
+            m.cover_url,
+            t.te_nick_name AS technicianNickName,
+            IFNULL(m.save_count, 0) AS saveCount,
+            IFNULL(m.view_count, 0) AS viewCount,
+            m.media_type,
+            m.publish_time
+        FROM
+            t_technician_moment m
+        LEFT JOIN ma_technician t ON m.technician_id = t.id AND t.is_delete = 0
+        <where>
+            m.is_delete = 0
+        AND m.is_list = 1
+        AND m.audit_status = 2
+            <if test="dto.cityCode != null and dto.cityCode != ''">
+                AND m.city_code = #{dto.cityCode}
+            </if>
+        </where>
+        ORDER BY
+            m.audit_time DESC,
+            m.id DESC
+    </select>
+
 </mapper>

nightFragrance-massage/src/test/java/com/ylx/massage/service/impl/TechnicianMomentServiceImplTest.java

@@ -5,7 +5,7 @@ import com.ylx.common.exception.ServiceException;
 import com.ylx.massage.domain.MaTechnician;
 import com.ylx.moment.domain.MomentMedia;
 import com.ylx.moment.domain.TechnicianMoment;
-import com.ylx.massage.domain.vo.MomentAuditStatusCountVO;
+import com.ylx.moment.domain.vo.MomentAuditStatusCountVO;
 import com.ylx.massage.mapper.MaTechnicianMapper;
 import com.ylx.moment.mapper.MomentMediaMapper;
 import com.ylx.moment.mapper.TechnicianMomentMapper;