From b06e071196e249807aac1bf736270d477ade520b Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 3 Jul 2025 11:39:49 +0800 Subject: [PATCH] =?UTF-8?q?WEB=EF=BC=9A=E5=AE=A2=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fys-admin/src/main/resources/application.yml | 2 ++ .../common/core/domain/PageResult.java | 4 ++-- .../controller/CustomerController.java | 19 +++++++++--------- .../domain/Customer.java | 6 +++++- .../domain/query/UserQueryCriteria.java | 6 +++--- .../domain/vo/ConsumerVo.java | 3 +-- .../mapper/CustomerMapper.java | 6 +++--- .../service/CustomerService.java | 12 +++++------ .../service/impl/CustomerServiceImpl.java | 20 +++++++++---------- .../mapper/customer/CustomerMapper.xml | 16 +++++++-------- .../service/impl/DeviceServiceImpl.java | 4 ++-- 11 files changed, 51 insertions(+), 47 deletions(-) rename fys-modules/fys-customer/src/main/java/com/fuyuanshen/{fyscustomer => customer}/controller/CustomerController.java (80%) rename fys-modules/fys-customer/src/main/java/com/fuyuanshen/{fyscustomer => customer}/domain/Customer.java (94%) rename fys-modules/fys-customer/src/main/java/com/fuyuanshen/{fyscustomer => customer}/domain/query/UserQueryCriteria.java (94%) rename fys-modules/fys-customer/src/main/java/com/fuyuanshen/{fyscustomer => customer}/domain/vo/ConsumerVo.java (96%) rename fys-modules/fys-customer/src/main/java/com/fuyuanshen/{fyscustomer => customer}/mapper/CustomerMapper.java (87%) rename fys-modules/fys-customer/src/main/java/com/fuyuanshen/{fyscustomer => customer}/service/CustomerService.java (71%) rename fys-modules/fys-customer/src/main/java/com/fuyuanshen/{fyscustomer => customer}/service/impl/CustomerServiceImpl.java (81%) diff --git a/fys-admin/src/main/resources/application.yml b/fys-admin/src/main/resources/application.yml index 7970540..b10ed90 100644 --- a/fys-admin/src/main/resources/application.yml +++ b/fys-admin/src/main/resources/application.yml @@ -214,6 +214,8 @@ springdoc: packages-to-scan: com.fuyuanshen.workflow - group: 设备管理模块 packages-to-scan: com.fuyuanshen.equipment + - group: 客户管理模块 + packages-to-scan: com.fuyuanshen.customer # 防止XSS攻击 xss: diff --git a/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/PageResult.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/PageResult.java index 2ab8173..2d46205 100644 --- a/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/PageResult.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/PageResult.java @@ -18,7 +18,7 @@ import java.util.List; @AllArgsConstructor public class PageResult implements Serializable { - private List content; + private List rows; - private long totalElements; + private long total; } diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/controller/CustomerController.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java similarity index 80% rename from fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/controller/CustomerController.java rename to fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java index ca03770..471aa23 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/controller/CustomerController.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java @@ -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> queryCustomer(UserQueryCriteria criteria) { - Page page = new Page<>(criteria.getPage(), criteria.getSize()); - PageResult pageUsers = customerService.queryCustomers(criteria, page); - return ResponseVO.success(pageUsers); + public TableDataInfo queryCustomer(UserQueryCriteria criteria) { + Page page = new Page<>(criteria.getPageNum(), criteria.getPageSize()); + return customerService.queryCustomers(criteria, page); } diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/Customer.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/Customer.java similarity index 94% rename from fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/Customer.java rename to fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/Customer.java index 2bc96f2..9886065 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/Customer.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/Customer.java @@ -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 */ diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/query/UserQueryCriteria.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java similarity index 94% rename from fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/query/UserQueryCriteria.java rename to fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java index 1bffc1d..d4b6f5b 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/query/UserQueryCriteria.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java @@ -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 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; diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/vo/ConsumerVo.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/vo/ConsumerVo.java similarity index 96% rename from fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/vo/ConsumerVo.java rename to fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/vo/ConsumerVo.java index 6ea6096..874bba3 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/domain/vo/ConsumerVo.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/vo/ConsumerVo.java @@ -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: 默苍璃 diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/mapper/CustomerMapper.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/mapper/CustomerMapper.java similarity index 87% rename from fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/mapper/CustomerMapper.java rename to fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/mapper/CustomerMapper.java index 23743cb..831c46c 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/mapper/CustomerMapper.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/mapper/CustomerMapper.java @@ -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; diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/service/CustomerService.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/CustomerService.java similarity index 71% rename from fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/service/CustomerService.java rename to fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/CustomerService.java index b4b3e26..12f4a2c 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/service/CustomerService.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/CustomerService.java @@ -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 queryCustomers(UserQueryCriteria criteria, Page page); + TableDataInfo queryCustomers(UserQueryCriteria criteria, Page page); /** diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/service/impl/CustomerServiceImpl.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java similarity index 81% rename from fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/service/impl/CustomerServiceImpl.java rename to fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java index f0cb1bb..bbb27d1 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/service/impl/CustomerServiceImpl.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java @@ -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 i * @return */ @Override - public PageResult queryCustomers(UserQueryCriteria criteria, Page page) { + public TableDataInfo queryCustomers(UserQueryCriteria criteria, Page page) { criteria.setOffset(page.offset()); criteria.setPid(LoginHelper.getUserId()); List users = customerMapper.findCustomers(criteria); List consumerVoList = BeanUtil.copyToList(users, ConsumerVo.class); Long total = customerMapper.countCustomers(criteria); - return PageUtil.toPage(consumerVoList, total); + // return PageUtil.toPage(consumerVoList, total); + return new TableDataInfo(consumerVoList, total); } diff --git a/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml b/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml index a716d27..99f404e 100644 --- a/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml +++ b/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml @@ -1,7 +1,7 @@ - + @@ -92,9 +92,9 @@ - select - u.user_id as id, u.nick_name , u.username, u.enabled, u.create_time + u.user_id as id, u.nick_name , u.user_name, u.enabled, u.create_time from sys_user u @@ -118,7 +118,7 @@ order by u.user_id desc - limit #{criteria.offset}, #{criteria.size} + limit #{criteria.offset}, #{criteria.pageSize} @@ -150,7 +150,7 @@ - select u.user_id as customerId, u.nick_name, u.user_name, @@ -170,8 +170,8 @@ - select u.user_id as customerId, u.nick_name, u.user_name, @@ -186,7 +186,7 @@ - select u.* from sys_user u diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index 46df5f5..432a54a 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -17,8 +17,8 @@ import com.fuyuanshen.equipment.domain.vo.CustomerVo; import com.fuyuanshen.equipment.mapper.DeviceMapper; import com.fuyuanshen.equipment.mapper.DeviceTypeMapper; import com.fuyuanshen.equipment.service.DeviceService; -import com.fuyuanshen.fyscustomer.domain.Customer; -import com.fuyuanshen.fyscustomer.mapper.CustomerMapper; +import com.fuyuanshen.customer.domain.Customer; +import com.fuyuanshen.customer.mapper.CustomerMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value;