fys/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main' into dyf-device

Browse Source
This commit is contained in:
daiyongfei
2025-07-08 14:46:35 +08:00
parent 64daff1647 f41bb097fd
commit ca47160c92
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java
View File

@ -59,8 +59,8 @@ public class Device extends TenantEntity {
@Schema(name = "原始设备")
private Long originalDeviceId;
/*@Schema( name = "设备编号")
private String deviceNo;*/
@Schema( name = "设备编号")
private String deviceNo;
@Schema(name = "设备名称")
private String deviceName;

7
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.fuyuanshen.equipment.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.lang.generator.SnowflakeGenerator;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -192,6 +193,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
device.setDeviceType(deviceTypes.getId());
BeanUtil.copyProperties(deviceForm, device, true);
device.setDeviceNo(createDeviceNo());
deviceMapper.insert(device);
// 新增设备类型记录
@ -209,7 +211,10 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
deviceAssignmentsService.save(assignments);
}
private String createDeviceNo() {
String uuidStr = UUID.fastUUID().toString(); // 获取带 - 的标准格式字符串
return uuidStr.replaceAll("-", "");
}
/**
* 更新设备信息