From a7340c744e6288159ace9ab8b08c239ddc26efba Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Sat, 19 Jul 2025 14:22:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?APP=E5=AE=A2=E6=88=B7=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=BB=91=E5=AE=9A-=E7=BB=91=E5=AE=9A=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/equipment/domain/Device.java | 3 +++ .../equipment/domain/vo/AppDeviceVo.java | 14 +++++++++++--- .../equipment/service/DeviceService.java | 8 ++++++++ .../equipment/service/impl/DeviceServiceImpl.java | 8 +++++++- .../service/impl/DeviceTypeServiceImpl.java | 2 +- .../resources/mapper/equipment/DeviceMapper.xml | 3 ++- 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java index 8c2fd0f..fbffbd3 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java @@ -121,5 +121,8 @@ public class Device extends TenantEntity { private Long bindingUserId; + /** + * 绑定时间 + */ private Date bindingTime; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java index 029d23a..e948312 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java @@ -1,10 +1,12 @@ package com.fuyuanshen.equipment.domain.vo; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + @Data -public class AppDeviceVo { +public class AppDeviceVo implements Serializable { private Long id; @@ -39,7 +41,7 @@ public class AppDeviceVo { private String typeName; /** - * 蓝牙名称 + * 蓝牙名称 */ private String bluetoothName; @@ -49,4 +51,10 @@ public class AppDeviceVo { * 1 正常 */ private Integer deviceStatus; + + /** + * 绑定时间 + */ + private Date bindingTime; + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java index 4ff7dd8..7d18d1e 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java @@ -85,6 +85,14 @@ public interface DeviceService extends IService { */ void unbindDevice(DeviceForm deviceForm); + + /** + * WEB端查看APP客户设备绑定 + * + * @param bo + * @param pageQuery + * @return + */ TableDataInfo queryAppDeviceList(DeviceQueryCriteria bo, PageQuery pageQuery); int bindDevice(AppDeviceBo bo); 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 0b339af..5534d9d 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 @@ -470,7 +470,13 @@ public class DeviceServiceImpl extends ServiceImpl impleme } - + /** + * WEB端查看APP客户设备绑定 + * + * @param bo + * @param pageQuery + * @return + */ @Override public TableDataInfo queryAppDeviceList(DeviceQueryCriteria bo, PageQuery pageQuery) { if (bo.getBindingUserId() == null) { diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java index f8eeb58..fcc373e 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java @@ -179,7 +179,7 @@ public class DeviceTypeServiceImpl extends ServiceImpl devices = deviceMapper.selectList(new QueryWrapper() .eq("device_type", deviceTypeGrant.getDeviceTypeId())); if (CollectionUtil.isNotEmpty(devices)) { - throw new RuntimeException("该设备类型已绑定设备，无法删除"); + throw new RuntimeException("该设备类型已绑定设备，无法删除！！！"); } deviceTypeId.add(deviceTypeGrant.getDeviceTypeId()); } diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml index afc3344..06fe6bc 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml @@ -138,7 +138,8 @@ d.device_pic, dt.type_name, dt.communication_mode, - d.bluetooth_name + d.bluetooth_name, + d.binding_time from device d inner join device_type dt on d.device_type = dt.id where d.binding_user_id = #{criteria.bindingUserId} From 69c4cc20044bdffd5544b7009d6f67e4c090a83e Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Sat, 19 Jul 2025 14:28:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?APP=E8=AE=BE=E5=A4=87=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=912?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/app/service/AppDeviceShareService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java index 82dcaa9..996c97c 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java @@ -95,7 +95,10 @@ public class AppDeviceShareService { return code.equals(smsCode); } public int deviceShare(AppDeviceShareBo bo) { - validateSmsCode(AppLoginHelper.getTenantId(), bo.getPhonenumber(), bo.getSmsCode()); + boolean flag = validateSmsCode(AppLoginHelper.getTenantId(), bo.getPhonenumber(), bo.getSmsCode()); + if(!flag){ + throw new ServiceException("验证码错误"); + } Device device = deviceMapper.selectById(bo.getDeviceId()); if(device==null){ From bb096f53cd5354af0a49b0bd6287aa675de52173 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Sat, 19 Jul 2025 16:16:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4demo=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 67f04f5..3920c97 100644 --- a/pom.xml +++ b/pom.xml @@ -83,10 +83,7 @@ fys 123456 - - - true - + prod @@ -96,6 +93,10 @@ fys 123456 + + + true +