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}