From 5bc56ca36d3362d29bf7793d5491c3a61af3e1ff Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 3 Jul 2025 14:17:53 +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 --- .../controller/CustomerController.java | 2 ++ .../customer/domain/vo/ConsumerVo.java | 21 +++++++------------ .../mapper/customer/CustomerMapper.xml | 8 +++---- .../controller/DeviceController.java | 2 +- .../service/impl/DeviceServiceImpl.java | 6 ++++++ 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java index 471aa23..b38095a 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java @@ -1,6 +1,7 @@ package com.fuyuanshen.customer.controller; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.crypto.digest.BCrypt; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuyuanshen.common.core.domain.ResponseVO; import com.fuyuanshen.common.core.utils.StringUtils; @@ -63,6 +64,7 @@ public class CustomerController { if (StringUtils.isBlank(customer.getPassword())) { throw new BadRequestException("账号密码不能为空"); } + customer.setPassword(BCrypt.hashpw(customer.getPassword())); customerService.addCustomer(customer); return ResponseVO.success("新增客户成功！！！"); } diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/vo/ConsumerVo.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/vo/ConsumerVo.java index 874bba3..d17971c 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/vo/ConsumerVo.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/vo/ConsumerVo.java @@ -1,6 +1,7 @@ package com.fuyuanshen.customer.domain.vo; +import com.fuyuanshen.common.tenant.core.TenantEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -16,11 +17,10 @@ import java.util.Objects; */ @Getter @Setter -public class ConsumerVo implements Serializable { +public class ConsumerVo extends TenantEntity { @Schema(name = "ID", hidden = true) - private Long id; - + private Long customerId; @Schema(hidden = true) private Long deptId; @@ -31,9 +31,8 @@ public class ConsumerVo implements Serializable { @Schema(hidden = true) private Byte userLevel; - @Schema(name = "账号") - private String username; + private String userName; @Schema(name = "用户昵称") private String nickName; @@ -65,15 +64,9 @@ public class ConsumerVo implements Serializable { @Schema(name = "最后修改密码的时间", hidden = true) private Date pwdResetTime; - /** - * 租户ID - */ - @Schema(hidden = true) - private Long tenantId; - - private List children; + @Override public boolean equals(Object o) { if (this == o) { @@ -83,13 +76,13 @@ public class ConsumerVo implements Serializable { return false; } ConsumerVo consumer = (ConsumerVo) o; - return Objects.equals(id, consumer.id) && Objects.equals(username, consumer.username); + return Objects.equals(customerId, consumer.customerId) && Objects.equals(userName, consumer.userName); } @Override public int hashCode() { - return Objects.hash(id, username); + return Objects.hash(customerId, userName); } 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 99f404e..eeb2e85 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,8 +1,8 @@ - + - + @@ -94,7 +94,7 @@ diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java index 663006c..62f6bc3 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java @@ -120,7 +120,7 @@ public class DeviceController { // @Log("撤回设备") - @Operation(summary = "撤回设备") + @Operation(summary = "撤回分配设备") @PostMapping(value = "/withdraw") public ResponseVO withdrawDevice(@Validated @ModelAttribute DeviceForm deviceForm) { try { 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 432a54a..f5b91f3 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 @@ -253,6 +253,12 @@ public class DeviceServiceImpl extends ServiceImpl impleme device.setId( null); device.setCurrentOwnerId(customerId); deviceMapper.insert( device); + + DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType()); + deviceType.setId( null); + device.setCurrentOwnerId(customerId); + deviceTypeMapper.insert( deviceType); + }); }