refactor: 修改mapper类名

mini-app/src/main/java/com/onsiteservice/miniapp/controller/address/ServiceAddressController.java

@@ -4,6 +4,7 @@ import com.onsiteservice.common.annotation.user.CurrentUserId;
 import com.onsiteservice.core.result.Result;
 import com.onsiteservice.dao.common.page.PageInfoVO;
 import com.onsiteservice.dao.common.page.PageParams;
+import com.onsiteservice.miniapp.controller.address.dto.PageServiceAddressDTO;
 import com.onsiteservice.miniapp.controller.address.dto.SaveServiceAddressDTO;
 import com.onsiteservice.miniapp.controller.address.dto.UpdateServiceAddressDTO;
 import com.onsiteservice.miniapp.controller.address.vo.ServiceAddressVO;
@@ -41,9 +42,9 @@ public class ServiceAddressController {
 
 
     @ApiOperation(value = "分页查询列表")
-    @PostMapping("get/page")
-    public Result<PageInfoVO> getPage(@RequestBody @NonNull @Validated PageParams param) {
-        return success(serviceAddressService.getPage(param), "获取分页列表");
+    @PostMapping("page")
+    public Result<PageInfoVO<ServiceAddressVO>> getPage(@RequestBody @NonNull @Validated PageServiceAddressDTO dto, @CurrentUserId Long uid) {
+        return serviceAddressService.getPage(dto, uid);
     }
 
     @ApiOperation(value = "根据id查询服务地址")
@@ -52,12 +53,6 @@ public class ServiceAddressController {
         return success(serviceAddressService.selectById(id));
     }
 
-    @ApiOperation(value = "获取用户所有服务地址")
-    @GetMapping("get/all")
-    public Result<List<ServiceAddressVO>> getAll(@CurrentUserId Long userId) {
-        return success(serviceAddressService.selectByUserId(userId));
-    }
-
     @ApiOperation(value = "新增服务地址")
     @PostMapping("save")
     public Result save(@RequestBody @NonNull @Validated SaveServiceAddressDTO dto, @CurrentUserId Long userId) {

mini-app/src/main/java/com/onsiteservice/miniapp/controller/address/dto/PageServiceAddressDTO.java

+package com.onsiteservice.miniapp.controller.address.dto;
+
+import com.onsiteservice.dao.common.page.PageParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <P></P>
+ *
+ * @author 李宁
+ * @version v1.0
+ * @since 2022/7/7 17:07
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class PageServiceAddressDTO extends PageParams {
+}

mini-app/src/main/java/com/onsiteservice/miniapp/mapper/address/ServiceAddressMapper.java → mini-app/src/main/java/com/onsiteservice/miniapp/mapper/address/ServiceAddressBizMapper.java

 package com.onsiteservice.miniapp.mapper.address;
 
 
+import com.onsiteservice.entity.address.ServiceAddress;
+import com.onsiteservice.miniapp.controller.address.dto.PageServiceAddressDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * @author 潘维吉
  * @date 2022-07-07 08:31
  * @description ServiceAddressBizMapper业务接口
  */
-public interface ServiceAddressMapper {
+public interface ServiceAddressBizMapper {
+
 
+    List<ServiceAddress> selectServiceAddressPage(@Param("dto") PageServiceAddressDTO dto, @Param("uid") Long uid);
 
 }

mini-app/src/main/java/com/onsiteservice/miniapp/mapper/category/ServiceCategoryMapper.java → mini-app/src/main/java/com/onsiteservice/miniapp/mapper/category/ServiceCategoryBizMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2022-07-07 08:31
  * @description ServiceCategoryBizMapper业务接口
  */
-public interface ServiceCategoryMapper {
+public interface ServiceCategoryBizMapper {
 
     List<ServiceCategory> selectServiceCategoryPage(@Param("dto") PageServiceCategoryDTO dto);
 

mini-app/src/main/java/com/onsiteservice/miniapp/mapper/category/ServiceSubclassMapper.java → mini-app/src/main/java/com/onsiteservice/miniapp/mapper/category/ServiceSubclassBizMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2022-07-07 08:31
  * @description ServiceSubclassBizMapper业务接口
  */
-public interface ServiceSubclassMapper {
+public interface ServiceSubclassBizMapper {
 
     List<ServiceSubclass> selectServiceSubclassPage(@Param("dto") PageServiceSubclassDTO dto);
 

mini-app/src/main/java/com/onsiteservice/miniapp/mapper/order/ServiceOrderMapper.java → mini-app/src/main/java/com/onsiteservice/miniapp/mapper/order/ServiceOrderBizMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2022-07-07 08:31
  * @description ServiceOrderBizMapper业务接口
  */
-public interface ServiceOrderMapper {
+public interface ServiceOrderBizMapper {
 
     List<ServiceOrder> selectServiceOrderPage(@Param("dto") PageServiceOrderDTO dto, @Param("uid") Long uid);
 

mini-app/src/main/java/com/onsiteservice/miniapp/service/address/ServiceAddressService.java

 package com.onsiteservice.miniapp.service.address;
 
+import com.onsiteservice.core.result.Result;
+import com.onsiteservice.core.result.ResultGenerator;
 import com.onsiteservice.entity.address.ServiceAddress;
+import com.onsiteservice.miniapp.controller.address.dto.PageServiceAddressDTO;
 import com.onsiteservice.miniapp.controller.address.dto.SaveServiceAddressDTO;
 import com.onsiteservice.miniapp.controller.address.dto.UpdateServiceAddressDTO;
 import com.onsiteservice.miniapp.controller.address.vo.ServiceAddressVO;
-import com.onsiteservice.miniapp.mapper.address.ServiceAddressMapper;
+import com.onsiteservice.miniapp.mapper.address.ServiceAddressBizMapper;
 
 import com.onsiteservice.dao.common.AbstractMapper;
-import com.onsiteservice.dao.common.page.PageParams;
 import com.onsiteservice.dao.common.page.PageInfoVO;
 import com.github.pagehelper.PageHelper;
 import com.onsiteservice.util.AttrCopyUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Condition;
@@ -28,14 +29,16 @@ import static com.onsiteservice.core.result.ResultGenerator.success;
 public class ServiceAddressService extends AbstractMapper<ServiceAddress> {
 
     @Resource
-    private ServiceAddressMapper serviceAddressMapper;
+    private ServiceAddressBizMapper serviceAddressBizMapper;
 
     /**
      * 分页查询列表
      */
-    public PageInfoVO getPage(PageParams param) {
-        PageHelper.startPage(param.getPage(), param.getSize());
-        return new PageInfoVO(this.selectAll());
+    public Result<PageInfoVO<ServiceAddressVO>> getPage(PageServiceAddressDTO dto, Long uid) {
+        PageHelper.startPage(dto.getPage(), dto.getSize());
+        List<ServiceAddress> serviceAddressList = serviceAddressBizMapper.selectServiceAddressPage(dto, uid);
+        List<ServiceAddressVO> serviceAddressVOList = serviceAddressList.parallelStream().map(e -> AttrCopyUtils.copy(e, new ServiceAddressVO())).collect(Collectors.toList());
+        return ResultGenerator.success(new PageInfoVO<>(serviceAddressVOList));
     }
 
 

mini-app/src/main/java/com/onsiteservice/miniapp/service/category/ServiceCategoryService.java

@@ -5,11 +5,10 @@ import com.onsiteservice.core.result.Result;
 import com.onsiteservice.core.result.ResultGenerator;
 import com.onsiteservice.dao.common.AbstractMapper;
 import com.onsiteservice.dao.common.page.PageInfoVO;
-import com.onsiteservice.dao.common.page.PageParams;
 import com.onsiteservice.entity.category.ServiceCategory;
 import com.onsiteservice.miniapp.controller.category.dto.PageServiceCategoryDTO;
 import com.onsiteservice.miniapp.controller.category.vo.ServiceCategoryVO;
-import com.onsiteservice.miniapp.mapper.category.ServiceCategoryMapper;
+import com.onsiteservice.miniapp.mapper.category.ServiceCategoryBizMapper;
 import com.onsiteservice.util.AttrCopyUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,14 +22,14 @@ import java.util.stream.Collectors;
 public class ServiceCategoryService extends AbstractMapper<ServiceCategory> {
 
     @Resource
-    private ServiceCategoryMapper serviceCategoryMapper;
+    private ServiceCategoryBizMapper serviceCategoryBizMapper;
 
     /**
      * 分页查询列表
      */
     public Result<PageInfoVO<ServiceCategoryVO>> getPage(PageServiceCategoryDTO dto) {
         PageHelper.startPage(dto.getPage(), dto.getSize());
-        List<ServiceCategory> serviceCategoryList = serviceCategoryMapper.selectServiceCategoryPage(dto);
+        List<ServiceCategory> serviceCategoryList = serviceCategoryBizMapper.selectServiceCategoryPage(dto);
         List<ServiceCategoryVO> serviceCategoryVOList = serviceCategoryList.parallelStream()
                 .map(e -> AttrCopyUtils.copy(e, new ServiceCategoryVO())).collect(Collectors.toList());
         return ResultGenerator.success(new PageInfoVO<>(serviceCategoryVOList));

mini-app/src/main/java/com/onsiteservice/miniapp/service/category/ServiceSubclassService.java

@@ -8,7 +8,7 @@ import com.onsiteservice.dao.common.page.PageInfoVO;
 import com.onsiteservice.entity.category.ServiceSubclass;
 import com.onsiteservice.miniapp.controller.category.dto.PageServiceSubclassDTO;
 import com.onsiteservice.miniapp.controller.category.vo.ServiceSubclassVO;
-import com.onsiteservice.miniapp.mapper.category.ServiceSubclassMapper;
+import com.onsiteservice.miniapp.mapper.category.ServiceSubclassBizMapper;
 import com.onsiteservice.util.AttrCopyUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,11 +22,11 @@ import java.util.stream.Collectors;
 public class ServiceSubclassService extends AbstractMapper<ServiceSubclass> {
 
     @Resource
-    private ServiceSubclassMapper serviceSubclassMapper;
+    private ServiceSubclassBizMapper serviceSubclassBizMapper;
 
     public Result<PageInfoVO<ServiceSubclassVO>> getPage(PageServiceSubclassDTO dto) {
         PageHelper.startPage(dto.getPage(), dto.getSize());
-        List<ServiceSubclass> serviceSubclassList = serviceSubclassMapper.selectServiceSubclassPage(dto);
+        List<ServiceSubclass> serviceSubclassList = serviceSubclassBizMapper.selectServiceSubclassPage(dto);
         List<ServiceSubclassVO> serviceSubclassVOList = serviceSubclassList.parallelStream()
                 .map(e -> AttrCopyUtils.copy(e, new ServiceSubclassVO())).collect(Collectors.toList());
         return ResultGenerator.success(new PageInfoVO<>(serviceSubclassVOList));

mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderService.java

@@ -13,7 +13,7 @@ import com.onsiteservice.miniapp.controller.order.dto.PageServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.dto.SaveServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.dto.ValuationServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.vo.ServiceOrderVO;
-import com.onsiteservice.miniapp.mapper.order.ServiceOrderMapper;
+import com.onsiteservice.miniapp.mapper.order.ServiceOrderBizMapper;
 import com.onsiteservice.miniapp.service.address.ServiceAddressService;
 import com.onsiteservice.util.AttrCopyUtils;
 import org.springframework.stereotype.Service;
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
     @Resource
-    private ServiceOrderMapper serviceOrderMapper;
+    private ServiceOrderBizMapper serviceOrderBizMapper;
 
     @Resource
     private ServiceAddressService serviceAddressService;
@@ -53,7 +53,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
     public Result<PageInfoVO<ServiceOrderVO>> selectByUserId(PageServiceOrderDTO dto, Long uid) {
         PageHelper.startPage(dto.getPage(), dto.getSize());
-        List<ServiceOrder> serviceOrders = serviceOrderMapper.selectServiceOrderPage(dto, uid);
+        List<ServiceOrder> serviceOrders = serviceOrderBizMapper.selectServiceOrderPage(dto, uid);
         List<ServiceOrderVO> serviceOrderVOList = serviceOrders.parallelStream()
                 .map(e -> AttrCopyUtils.copy(e, new ServiceOrderVO())).collect(Collectors.toList());
         return ResultGenerator.success(new PageInfoVO<>(serviceOrderVOList));

mini-app/src/main/resources/mapper/address/ServiceAddressMapper.xml → mini-app/src/main/resources/mapper/address/ServiceAddressBizMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.onsiteservice.miniapp.mapper.address.ServiceAddressMapper">
+<mapper namespace="com.onsiteservice.miniapp.mapper.address.ServiceAddressBizMapper">
 
+    <select id="selectServiceAddressPage" resultType="com.onsiteservice.entity.address.ServiceAddress">
+        select * from service_address where account_no=#{uid,jdbcType=BIGINT}
+    </select>
 
 </mapper>

mini-app/src/main/resources/mapper/category/ServiceCategoryMapper.xml → mini-app/src/main/resources/mapper/category/ServiceCategoryBizMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.onsiteservice.miniapp.mapper.category.ServiceCategoryMapper">
+<mapper namespace="com.onsiteservice.miniapp.mapper.category.ServiceCategoryBizMapper">
 
     <select id="selectServiceCategoryPage" resultType="com.onsiteservice.entity.category.ServiceCategory">
         select * from service_category

mini-app/src/main/resources/mapper/category/ServiceSubclassMapper.xml → mini-app/src/main/resources/mapper/category/ServiceSubclassBizMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.onsiteservice.miniapp.mapper.category.ServiceSubclassMapper">
+<mapper namespace="com.onsiteservice.miniapp.mapper.category.ServiceSubclassBizMapper">
 
     <select id="selectServiceSubclassPage" resultType="com.onsiteservice.entity.category.ServiceSubclass">
         select * from service_subclass

mini-app/src/main/resources/mapper/order/ServiceOrderMapper.xml → mini-app/src/main/resources/mapper/order/ServiceOrderBizMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.onsiteservice.miniapp.mapper.order.ServiceOrderMapper">
+<mapper namespace="com.onsiteservice.miniapp.mapper.order.ServiceOrderBizMapper">
 
 
     <select id="selectServiceOrderPage" resultType="com.onsiteservice.entity.order.ServiceOrder">