dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WEB：客户管理

Browse Source
This commit is contained in:
daiyongfei
2025-07-03 11:39:49 +08:00
parent abe9dc2fe8
commit b06e071196
11 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/controller/CustomerController.java → fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java
View File

@ -1,14 +1,14 @@
package com.fuyuanshen.fyscustomer.controller;
package com.fuyuanshen.customer.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuyuanshen.common.core.domain.PageResult;
import com.fuyuanshen.common.core.domain.ResponseVO;
import com.fuyuanshen.common.core.utils.StringUtils;
import com.fuyuanshen.fyscustomer.domain.Customer;
import com.fuyuanshen.fyscustomer.domain.query.UserQueryCriteria;
import com.fuyuanshen.fyscustomer.domain.vo.ConsumerVo;
import com.fuyuanshen.fyscustomer.service.CustomerService;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.customer.domain.Customer;
import com.fuyuanshen.customer.domain.query.UserQueryCriteria;
import com.fuyuanshen.customer.domain.vo.ConsumerVo;
import com.fuyuanshen.customer.service.CustomerService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.undertow.util.BadRequestException;
@ -42,10 +42,9 @@ public class CustomerController {
*/
@Operation(summary = "分页查询客户")
@GetMapping(value = "/customer")
public ResponseVO<PageResult<ConsumerVo>> queryCustomer(UserQueryCriteria criteria) {
Page<Customer> page = new Page<>(criteria.getPage(), criteria.getSize());
PageResult<ConsumerVo> pageUsers = customerService.queryCustomers(criteria, page);
return ResponseVO.success(pageUsers);
public TableDataInfo<ConsumerVo> queryCustomer(UserQueryCriteria criteria) {
Page<Customer> page = new Page<>(criteria.getPageNum(), criteria.getPageSize());
return customerService.queryCustomers(criteria, page);
}

6
fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/Customer.java → fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/Customer.java
View File

@ -1,4 +1,4 @@
package com.fuyuanshen.fyscustomer.domain;
package com.fuyuanshen.customer.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.fuyuanshen.common.core.constant.SystemConstants;
@ -100,6 +100,10 @@ public class Customer extends TenantEntity {
@TableLogic
private String delFlag;
@NotNull
@Schema(name = "是否启用")
private Boolean enabled;
/**
* 最后登录IP
*/

6
fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/query/UserQueryCriteria.java → fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.fuyuanshen.fyscustomer.domain.query;
package com.fuyuanshen.customer.domain.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -56,10 +56,10 @@ public class UserQueryCriteria implements Serializable {
private List<Timestamp> createTime;
@Schema(name = "页码", example = "1")
private Integer page = 1;
private Integer pageNum = 1;
@Schema(name = "每页数据量", example = "10")
private Integer size = 10;
private Integer pageSize = 10;
@Schema(name = "偏移量", hidden = true)
private long offset;

3
fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/vo/ConsumerVo.java → fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/vo/ConsumerVo.java
View File

@ -1,4 +1,4 @@
package com.fuyuanshen.fyscustomer.domain.vo;
package com.fuyuanshen.customer.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
@ -9,7 +9,6 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Set;
/**
* @author: 默苍璃

6
fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/mapper/CustomerMapper.java → fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/mapper/CustomerMapper.java
View File

@ -1,8 +1,8 @@
package com.fuyuanshen.fyscustomer.mapper;
package com.fuyuanshen.customer.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fuyuanshen.fyscustomer.domain.Customer;
import com.fuyuanshen.fyscustomer.domain.query.UserQueryCriteria;
import com.fuyuanshen.customer.domain.Customer;
import com.fuyuanshen.customer.domain.query.UserQueryCriteria;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

12
fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/service/CustomerService.java → fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/CustomerService.java
View File

@ -1,10 +1,10 @@
package com.fuyuanshen.fyscustomer.service;
package com.fuyuanshen.customer.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuyuanshen.common.core.domain.PageResult;
import com.fuyuanshen.fyscustomer.domain.Customer;
import com.fuyuanshen.fyscustomer.domain.query.UserQueryCriteria;
import com.fuyuanshen.fyscustomer.domain.vo.ConsumerVo;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.customer.domain.Customer;
import com.fuyuanshen.customer.domain.query.UserQueryCriteria;
import com.fuyuanshen.customer.domain.vo.ConsumerVo;
import io.undertow.util.BadRequestException;
import java.util.List;
@ -24,7 +24,7 @@ public interface CustomerService {
* @param page
* @return
*/
PageResult<ConsumerVo> queryCustomers(UserQueryCriteria criteria, Page<Customer> page);
TableDataInfo<ConsumerVo> queryCustomers(UserQueryCriteria criteria, Page<Customer> page);
/**

20
fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/service/impl/CustomerServiceImpl.java → fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java
View File

@ -1,17 +1,16 @@
package com.fuyuanshen.fyscustomer.service.impl;
package com.fuyuanshen.customer.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuyuanshen.common.core.domain.PageResult;
import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.utils.PageUtil;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.fyscustomer.domain.Customer;
import com.fuyuanshen.fyscustomer.domain.query.UserQueryCriteria;
import com.fuyuanshen.fyscustomer.domain.vo.ConsumerVo;
import com.fuyuanshen.fyscustomer.mapper.CustomerMapper;
import com.fuyuanshen.fyscustomer.service.CustomerService;
import com.fuyuanshen.customer.domain.Customer;
import com.fuyuanshen.customer.domain.query.UserQueryCriteria;
import com.fuyuanshen.customer.domain.vo.ConsumerVo;
import com.fuyuanshen.customer.mapper.CustomerMapper;
import com.fuyuanshen.customer.service.CustomerService;
import io.undertow.util.BadRequestException;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@ -39,13 +38,14 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
* @return
*/
@Override
public PageResult<ConsumerVo> queryCustomers(UserQueryCriteria criteria, Page<Customer> page) {
public TableDataInfo<ConsumerVo> queryCustomers(UserQueryCriteria criteria, Page<Customer> page) {
criteria.setOffset(page.offset());
criteria.setPid(LoginHelper.getUserId());
List<Customer> users = customerMapper.findCustomers(criteria);
List<ConsumerVo> consumerVoList = BeanUtil.copyToList(users, ConsumerVo.class);
Long total = customerMapper.countCustomers(criteria);
return PageUtil.toPage(consumerVoList, total);
// return PageUtil.toPage(consumerVoList, total);
return new TableDataInfo<ConsumerVo>(consumerVoList, total);
}