From f00d4d84a6562b9b3c5ee661a9af8c2d35d44ba1 Mon Sep 17 00:00:00 2001 From: Xusan <1105644308@QQ.COM> Date: Wed, 15 May 2024 14:22:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AddressBookController.java | 2 +- .../com/whdc/mapper/AddressBookMapper.java | 4 +-- .../com/whdc/model/entity/AddressBook.java | 3 --- .../java/com/whdc/model/vo/AddressBookVo.java | 26 +++++++++++++++++++ .../com/whdc/service/IAddressBookService.java | 4 +-- .../service/impl/AddressBookServiceImpl.java | 3 ++- 6 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/whdc/model/vo/AddressBookVo.java diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java index b872d7b..83bfe5f 100644 --- a/src/main/java/com/whdc/controller/AddressBookController.java +++ b/src/main/java/com/whdc/controller/AddressBookController.java @@ -61,7 +61,7 @@ public class AddressBookController { @ApiOperation(value = "分页查询") @PostMapping(value = "page") - public ResultJson page(@RequestBody AddressBootDto dto) { + public ResultJson page(@RequestBody AddressBootDto dto) { dto.setUserId(String.valueOf(StpUtil.getLoginId())); return ResultJson.ok(service.page(dto)); diff --git a/src/main/java/com/whdc/mapper/AddressBookMapper.java b/src/main/java/com/whdc/mapper/AddressBookMapper.java index e0522c6..b2bcae4 100644 --- a/src/main/java/com/whdc/mapper/AddressBookMapper.java +++ b/src/main/java/com/whdc/mapper/AddressBookMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.whdc.model.dto.AddressBootDto; import com.whdc.model.entity.AddressBook; -import com.whdc.model.vo.FcVo; +import com.whdc.model.vo.AddressBookVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,7 +14,7 @@ import java.util.List; */ public interface AddressBookMapper extends BaseMapper { - IPage page(@Param("page") IPage page, @Param("dto") AddressBootDto dto); + IPage page(@Param("page") IPage page, @Param("dto") AddressBootDto dto); List find(@Param("dto") AddressBook dto); diff --git a/src/main/java/com/whdc/model/entity/AddressBook.java b/src/main/java/com/whdc/model/entity/AddressBook.java index 2fd766b..f9c0b3e 100644 --- a/src/main/java/com/whdc/model/entity/AddressBook.java +++ b/src/main/java/com/whdc/model/entity/AddressBook.java @@ -85,8 +85,5 @@ public class AddressBook extends Model implements Serializable { @ApiModelProperty(value = "创建人id") private String createId; - @TableField(exist = false) - @ApiModelProperty(value = "置顶序号") - private String fsort; } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/vo/AddressBookVo.java b/src/main/java/com/whdc/model/vo/AddressBookVo.java new file mode 100644 index 0000000..7c5e2e2 --- /dev/null +++ b/src/main/java/com/whdc/model/vo/AddressBookVo.java @@ -0,0 +1,26 @@ +package com.whdc.model.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.whdc.model.entity.AddressBook; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Author xusan + * @Date 2024/5/13 10:17 + * @Notes + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(description = "常用联系人置顶联系人通讯录") +public class AddressBookVo extends AddressBook{ + + + @TableField(exist = false) + @ApiModelProperty(value = "常用联系人置顶联系人序号") + private Integer fsort; +} diff --git a/src/main/java/com/whdc/service/IAddressBookService.java b/src/main/java/com/whdc/service/IAddressBookService.java index a784f5c..f8cb016 100644 --- a/src/main/java/com/whdc/service/IAddressBookService.java +++ b/src/main/java/com/whdc/service/IAddressBookService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.whdc.model.dto.AddressBootDto; import com.whdc.model.entity.AddressBook; -import com.whdc.model.vo.FcVo; +import com.whdc.model.vo.AddressBookVo; import java.util.List; @@ -18,7 +18,7 @@ import java.util.List; public interface IAddressBookService extends IService { // 获取所有规则分页 - IPage page(AddressBootDto dto); + IPage page(AddressBootDto dto); // 获取所有规则 List find(AddressBook dto); diff --git a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java index de2e127..5b26ad4 100644 --- a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.AddressBookMapper; import com.whdc.model.dto.AddressBootDto; import com.whdc.model.entity.AddressBook; +import com.whdc.model.vo.AddressBookVo; import com.whdc.model.vo.FcVo; import com.whdc.service.IAddressBookService; import org.apache.commons.lang3.StringUtils; @@ -24,7 +25,7 @@ public class AddressBookServiceImpl extends ServiceImpl page(AddressBootDto dto) { + public IPage page(AddressBootDto dto) { String adcd = dto.getAdcd(); if (StringUtils.isNotBlank(adcd)) {