客户端服务类目接口

nightFragrance-massage/src/main/java/com/ylx/banner/controller/ClientBannerController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 
 @RestController
-@RequestMapping("/banner")
+@RequestMapping("/client/banner")
 @Api(tags = {"客户端轮播图"})
 @Slf4j
 public class ClientBannerController {

nightFragrance-massage/src/main/java/com/ylx/servicecategory/controller/ClientServiceCategoryController.java

@@ -0,0 +1,34 @@
+package com.ylx.servicecategory.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.common.core.domain.R;
+import com.ylx.servicecategory.domain.ServiceCategory;
+import com.ylx.servicecategory.domain.vo.ClientServiceCategoryVO;
+import com.ylx.servicecategory.service.ServiceCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@Api(tags = {"服务类目管理"})
+@RequestMapping("/client/service/category")
+public class ClientServiceCategoryController {
+
+    @Resource
+    private ServiceCategoryService serviceCategoryService;
+
+    @PreAuthorize("@customerAuth.isCustomer()")
+    @PostMapping("page")
+    @ApiOperation("客户端首页分页查询服务类目数据")
+    public R<Page<ClientServiceCategoryVO>> page(Page<ServiceCategory> page) {
+        Page<ClientServiceCategoryVO> pageData = this.serviceCategoryService.page(page);
+        return R.ok(pageData);
+    }
+}

nightFragrance-massage/src/main/java/com/ylx/servicecategory/domain/vo/ClientServiceCategoryVO.java

@@ -0,0 +1,31 @@
+package com.ylx.servicecategory.domain.vo;
+
+import com.ylx.servicecategory.domain.ServiceCategory;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("客户端服务类目VO")
+@Data
+public class ClientServiceCategoryVO {
+
+    @ApiModelProperty("主键")
+    private Integer id;
+
+    @ApiModelProperty("服务标签（1：按摩 2：陪玩）")
+    private Integer serviceTag;
+
+    @ApiModelProperty("服务类目名称")
+    private String name;
+
+    @ApiModelProperty("服务类目图标")
+    private String icon;
+
+    public ClientServiceCategoryVO(ServiceCategory entity) {
+        this.id = entity.getId();
+        this.serviceTag = entity.getServiceTag();
+        this.name = entity.getName();
+        this.icon = entity.getIcon();
+    }
+
+}

nightFragrance-massage/src/main/java/com/ylx/servicecategory/service/ServiceCategoryService.java

@@ -3,6 +3,7 @@ package com.ylx.servicecategory.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.servicecategory.domain.ServiceCategory;
+import com.ylx.servicecategory.domain.vo.ClientServiceCategoryVO;
 
 import java.util.List;
 
@@ -58,4 +59,6 @@ public interface ServiceCategoryService extends IService<ServiceCategory> {
      * @return 是否删除成功
      */
     Boolean deleteServiceCategory(Long id);
+
+    Page<ClientServiceCategoryVO> page(Page<ServiceCategory> page);
 }

nightFragrance-massage/src/main/java/com/ylx/servicecategory/service/impl/ServiceCategoryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ylx.servicecategory.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,6 +9,7 @@ import com.ylx.common.utils.StringUtils;
 import com.ylx.project.domain.Project;
 import com.ylx.project.mapper.ProjectMapper;
 import com.ylx.servicecategory.domain.ServiceCategory;
+import com.ylx.servicecategory.domain.vo.ClientServiceCategoryVO;
 import com.ylx.servicecategory.mapper.ServiceCategoryMapper;
 import com.ylx.servicecategory.service.ServiceCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 服务类目服务实现类
@@ -24,6 +27,9 @@ public class ServiceCategoryServiceImpl extends ServiceImpl<ServiceCategoryMappe
 
     @Autowired
     private ProjectMapper projectMapper;
+    private static final int ONLINE = 1;
+    private static final int NOT_DELETE = 0;
+    private static final int IS_DISPLAY = 1;
 
 
     /**
@@ -161,6 +167,31 @@ public class ServiceCategoryServiceImpl extends ServiceImpl<ServiceCategoryMappe
         return true;
     }
 
+    @Override
+    public Page<ClientServiceCategoryVO> page(Page<ServiceCategory> page) {
+        LambdaQueryWrapper<ServiceCategory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ServiceCategory::getIsDelete, NOT_DELETE)
+                .eq(ServiceCategory::getIsOnline, ONLINE)
+                .eq(ServiceCategory::getIsHomeDisplay, IS_DISPLAY)
+                .orderByDesc(ServiceCategory::getSort);
+
+        Page<ServiceCategory> serviceCategoryrPage = this.baseMapper.selectPage(page, wrapper);
+        Page<ClientServiceCategoryVO> pageData = new Page<>(
+                serviceCategoryrPage.getCurrent(),
+                serviceCategoryrPage.getSize(),
+                serviceCategoryrPage.getTotal()
+        );
+
+        if (CollectionUtil.isNotEmpty(serviceCategoryrPage.getRecords())) {
+            List<ClientServiceCategoryVO> voList = serviceCategoryrPage.getRecords().stream()
+                    .map(ClientServiceCategoryVO::new)
+                    .collect(Collectors.toList());
+            pageData.setRecords(voList);
+        }
+
+        return pageData;
+    }
+
     private void checkAddParam(ServiceCategory serviceCategory) {
         checkRequiredParam(serviceCategory);
     }