From 440aec266b60a618c13b7608e5f960cc8b3ae711 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Tue, 1 Jul 2025 09:32:22 +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=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../encrypt/utils/EncryptUtilsTest.java | 5 +- .../equipment/domain/DeviceType.java | 24 ++---- .../equipment/service/DeviceTypeService.java | 3 +- .../service/impl/DeviceTypeServiceImpl.java | 85 ++++--------------- .../mapper/equipment/DeviceTypeMapper.xml | 22 ----- 5 files changed, 28 insertions(+), 111 deletions(-) diff --git a/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java index 833dd6f..04662bf 100644 --- a/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java @@ -1,6 +1,5 @@ package com.fuyuanshen.common.encrypt.utils; -import com.fuyuanshen.common.core.domain.model.LoginBody; import com.fuyuanshen.common.core.domain.model.PasswordLoginBody; /** @@ -40,8 +39,8 @@ public class EncryptUtilsTest { loginBody.setClientId("e5cd7e4891bf95d1d19206ce24a7b32e"); loginBody.setGrantType("password"); loginBody.setTenantId("894078"); - loginBody.setCode("2"); - loginBody.setUuid("3ccffe0db9a7458cb732f95736019c6f"); + loginBody.setCode("21"); + loginBody.setUuid("39785885a3ef42d59501502848cd1dcb"); // loginBody.setUsername("admin"); // loginBody.setPassword("admin123"); loginBody.setUsername("dyf"); diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java index d46ee46..075d305 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fuyuanshen.common.tenant.core.TenantEntity; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -19,36 +20,29 @@ import lombok.Data; public class DeviceType extends TenantEntity { @TableId(value = "id", type = IdType.AUTO) - // @Schema(value = "ID", hidden = true) + @Schema(name = "ID", hidden = true) private Long id; - // @Schema(value = "客户号") + @Schema(name = "客户号") private Long customerId; - // @Schema(value = "创建该类型的客户") + @Schema(name = "创建该类型的客户") private Long ownerCustomerId; - /** - * 租户ID - */ - // @TableField(value = "tenant_id") - // @Schema(hidden = true) - // private Long tenantId; - @NotBlank(message = "设备类型名称不能为空") - // @Schema(value = "类型名称", required = true) + @Schema(name = "类型名称", required = true) private String typeName; - // @Schema(value = "是否支持蓝牙") + @Schema(name = "是否支持蓝牙") private Boolean isSupportBle; - // @Schema(value = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗") + @Schema(name = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗") private String locateMode; - // @Schema(value = "联网方式", example = "0:无;1:4G;2:WIFI") + @Schema(name = "联网方式", example = "0:无;1:4G;2:WIFI") private String networkWay; - // @Schema(value = "通讯方式", example = "0:4G;1:蓝牙") + @Schema(name = "通讯方式", example = "0:4G;1:蓝牙") private String communicationMode; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java index 8bde705..81ed641 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java @@ -32,7 +32,6 @@ public interface DeviceTypeService extends IService { */ List queryAll(DeviceTypeQueryCriteria criteria); - /** * 查询所有设备类型 * @@ -48,7 +47,7 @@ public interface DeviceTypeService extends IService { void create(DeviceType resources); /** - * 编辑 + * 修改设备类型 * * @param resources / */ 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 a5d132f..a064039 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuyuanshen.common.core.domain.PageResult; import com.fuyuanshen.common.core.utils.PageUtil; +import com.fuyuanshen.common.satoken.utils.LoginHelper; import com.fuyuanshen.equipment.domain.DeviceType; import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria; import com.fuyuanshen.equipment.mapper.DeviceMapper; @@ -37,11 +38,16 @@ public class DeviceTypeServiceImpl extends ServiceImpl queryAll(DeviceTypeQueryCriteria criteria, Page page) { - return PageUtil.toPage(deviceTypeMapper.findAll(criteria, page)); } + @Override + public List queryAll(DeviceTypeQueryCriteria criteria) { + return deviceTypeMapper.findAll(criteria); + } + + /** * 查询所有设备类型 * @@ -49,32 +55,9 @@ public class DeviceTypeServiceImpl extends ServiceImpl queryDeviceTypes() { - // // JwtUserDto userCache = userCacheManager.getUserCache(SecurityUtils.getCurrentUsername()); - // User currentUser = userMapper.findByUsername(SecurityUtils.getCurrentUsername()); - // DeviceTypeQueryCriteria criteria = new DeviceTypeQueryCriteria(); - // // 非超级管理员增加数据隔离(根据租户隔离) - // // if (userCache.getUser().getTenantId() != null && !userCache.getUser().getTenantId().equals(UserConstants.SUPER_ADMIN_ID)) { - // // List users = userMapper.findByTenantId(userCache.getUser().getTenantId()); - // // Set userIds = users.stream().map(User::getId).collect(Collectors.toSet()); - // // criteria.setCustomerIds(userIds); - // // } - // - // // 非超级管理员增加数据隔离(只能看到自己创建的设备类型) - // if (currentUser.getTenantId() != null && !currentUser.getTenantId().equals(UserConstants.SUPER_ADMIN_ID)) { - // // - // QueryWrapper wrapper = new QueryWrapper<>(); - // wrapper.eq("username", SecurityUtils.getCurrentUsername()); - // User user = userMapper.selectOne(wrapper); - // criteria.setCustomerId(user.getId()); - // } - // - // return deviceTypeMapper.findAll(criteria); - return null; - } - - - @Override - public List queryAll(DeviceTypeQueryCriteria criteria) { + DeviceTypeQueryCriteria criteria = new DeviceTypeQueryCriteria(); + Long userId = LoginHelper.getUserId(); + criteria.setCustomerId(userId); return deviceTypeMapper.findAll(criteria); } @@ -87,19 +70,10 @@ public class DeviceTypeServiceImpl extends ServiceImpl deviceList = deviceMapper.selectList(new QueryWrapper().eq("device_type", resources.getId())); - // if (CollectionUtil.isNotEmpty(deviceList)) { - // throw new BadRequestException("该设备类型下已有设备，请先解绑设备！！！"); - // } - // - // DeviceType deviceType = getById(resources.getId()); - // deviceType.copy(resources); - // Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - // deviceType.setUpdateTime(timestamp); - // deviceTypeMapper.updateById(deviceType); + deviceTypeMapper.updateById(resources); } @@ -133,24 +97,7 @@ public class DeviceTypeServiceImpl extends ServiceImpl ids) { - // // 查询所有与 device 关联的 deviceType IDs - // List deviceList = deviceMapper.selectList(new QueryWrapper().in("device_type", ids)); - // // 提取与 device 关联的 deviceType IDs - // List filteredIds = deviceList.stream() - // .map(Device::getDeviceType) - // .distinct() - // .collect(Collectors.toList()); - // // 从原始 ids 中移除已关联 device 的 id（即过滤掉能查到结果的 id） - // List idsToBeDeleted = ids.stream() - // .filter(id -> !filteredIds.contains(id)) - // .collect(Collectors.toList()); - // if (idsToBeDeleted.isEmpty()) { - // throw new BadRequestException("选中设备类型已绑定设备，请先解绑设备！！！"); - // } - // // 删除过滤后的 id 列表 - // deviceTypeMapper.deleteBatchIds(idsToBeDeleted); - // deviceTypeGrantsMapper.delete(new QueryWrapper().in("device_type_id", idsToBeDeleted)); - + deviceTypeMapper.deleteByIds(ids); } 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 388b193..f69fff7 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 @@ -20,28 +20,6 @@ - - -