diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java index ad28481b..b846c205 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java @@ -137,4 +137,13 @@ public interface DeviceMapper extends BaseMapper { List getDeviceUsageFrequency(@Param("days") int days); List queryOnlineStatusList(); + + /** + * 根据设备类型ID查询设备数量 + * + * @param deviceTypeId 设备类型ID + * @return 设备数量 + */ + int countByDeviceTypeId(@Param("deviceTypeId") Long deviceTypeId); + } \ No newline at end of file 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 d0f3815f..e4c7f4cc 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 @@ -224,6 +224,16 @@ public class DeviceTypeServiceImpl extends ServiceImpl 0) { + throw new RuntimeException("该设备类型下已有绑定设备,无法修改设备类型名称!!!"); + } + } + + // List devices = deviceMapper.selectList(new QueryWrapper() // .eq("device_type", deviceTypeGrants.getDeviceTypeId())); // if (CollectionUtil.isNotEmpty(devices)) { 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 b57f59e2..44059604 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 @@ -497,4 +497,11 @@ FROM device a left join device_type b on a.device_type = b.id where b.communication_mode in (0, 2) and a.online_status in (1,2) + + + \ No newline at end of file