From 08b1f73af18fbf585b06aa58ddb2c2231d226502 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Tue, 8 Jul 2025 11:09:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/web/config/ResourcesConfig.java | 1 + .../mapper/DeviceTypeGrantsMapper.java | 18 ++++++ .../service/impl/DeviceTypeServiceImpl.java | 64 ++++++++++++------- .../equipment/DeviceTypeGrantsMapper.xml | 19 ++++++ .../mapper/equipment/DeviceTypeMapper.xml | 16 ++--- 5 files changed, 87 insertions(+), 31 deletions(-) create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceTypeGrantsMapper.java create mode 100644 fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceTypeGrantsMapper.xml diff --git a/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/ResourcesConfig.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/ResourcesConfig.java index 0a0ae28..628fa0f 100644 --- a/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/ResourcesConfig.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/ResourcesConfig.java @@ -58,4 +58,5 @@ public class ResourcesConfig implements WebMvcConfigurer { public GlobalExceptionHandler globalExceptionHandler() { return new GlobalExceptionHandler(); } + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceTypeGrantsMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceTypeGrantsMapper.java new file mode 100644 index 0000000..543e3ef --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceTypeGrantsMapper.java @@ -0,0 +1,18 @@ +package com.fuyuanshen.equipment.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fuyuanshen.equipment.domain.DeviceTypeGrants; +import org.apache.ibatis.annotations.Mapper; + +/** +* @author 97433 +* @description 针对表【device_type_grants】的数据库操作Mapper +* @createDate 2025-06-19 13:49:33 +* @Entity generator.domain.DeviceTypeGrants +*/ +@Mapper +public interface DeviceTypeGrantsMapper extends BaseMapper { + + +} 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 fa9e8f0..6244f07 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 @@ -11,10 +11,12 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.common.satoken.utils.LoginHelper; import com.fuyuanshen.equipment.domain.Device; import com.fuyuanshen.equipment.domain.DeviceType; +import com.fuyuanshen.equipment.domain.DeviceTypeGrants; import com.fuyuanshen.equipment.domain.form.DeviceTypeForm; import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria; import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria; import com.fuyuanshen.equipment.mapper.DeviceMapper; +import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper; import com.fuyuanshen.equipment.mapper.DeviceTypeMapper; import com.fuyuanshen.equipment.service.DeviceTypeService; import lombok.RequiredArgsConstructor; @@ -22,6 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -37,6 +40,8 @@ public class DeviceTypeServiceImpl extends ServiceImpl ids) { - List invalidIds = new ArrayList<>(); - List invalidId2 = new ArrayList<>(); - for (Long id : ids) { - DeviceType deviceType = deviceTypeMapper.selectById(id); - if (deviceType == null || !Objects.equals(deviceType.getOwnerCustomerId(), LoginHelper.getUserId())) { - invalidIds.add(id); - } - DeviceQueryCriteria deviceQueryCriteria = new DeviceQueryCriteria(); - deviceQueryCriteria.setDeviceType(id); - List devices = deviceMapper.findAll(deviceQueryCriteria); - if (!devices.isEmpty()) { - invalidId2.add(id); - } - } - if (!invalidIds.isEmpty()) { - throw new RuntimeException("以下设备类型无法删除(ID 不存在或无权限): " + invalidIds); - } - if (!invalidId2.isEmpty()) { - throw new RuntimeException("以下设备类型无法删除(已绑定设备): " + invalidId2); - } - - deviceTypeMapper.deleteByIds(ids); + deviceTypeGrantsMapper.deleteByIds(ids); + // + // List invalidIds = new ArrayList<>(); + // List invalidId2 = new ArrayList<>(); + // for (Long id : ids) { + // DeviceType deviceType = deviceTypeMapper.selectById(id); + // if (deviceType == null || !Objects.equals(deviceType.getOwnerCustomerId(), LoginHelper.getUserId())) { + // invalidIds.add(id); + // } + // DeviceQueryCriteria deviceQueryCriteria = new DeviceQueryCriteria(); + // deviceQueryCriteria.setDeviceType(id); + // List devices = deviceMapper.findAll(deviceQueryCriteria); + // if (!devices.isEmpty()) { + // invalidId2.add(id); + // } + // } + // if (!invalidIds.isEmpty()) { + // throw new RuntimeException("以下设备类型无法删除(ID 不存在或无权限): " + invalidIds); + // } + // if (!invalidId2.isEmpty()) { + // throw new RuntimeException("以下设备类型无法删除(已绑定设备): " + invalidId2); + // } + // + // deviceTypeMapper.deleteByIds(ids); } diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceTypeGrantsMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceTypeGrantsMapper.xml new file mode 100644 index 0000000..3f52045 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceTypeGrantsMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + id,device_type_id,customer_id,grantor_customer_id,granted_at,assignment_id + + diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceTypeMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceTypeMapper.xml index a48b7be..56f47cc 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceTypeMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceTypeMapper.xml @@ -2,7 +2,7 @@ - + @@ -19,29 +19,27 @@ , type_name, is_support_ble, locate_mode, network_way, create_by, update_by, create_time, update_time,communication_mode - \ No newline at end of file