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

设备类型ID

Browse Source
This commit is contained in:
daiyongfei
2025-08-27 10:20:37 +08:00
parent 8b25fd9ba4
commit 837953bf3d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java
View File

@ -21,6 +21,12 @@ public class DeviceType extends TenantEntity {
@Schema(title = "ID", hidden = true) @Schema(title = "ID", hidden = true)
private Long id; private Long id;
/**
* 设备类型ID
*/
@TableField(exist = false)
private Long deviceTypeId;
@Schema(title = "客户号") @Schema(title = "客户号")
private Long customerId; private Long customerId;

5
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceTypeMapper.xml
View File

@ -4,6 +4,7 @@
<resultMap id="BaseResultMap" type="com.fuyuanshen.equipment.domain.DeviceType"> <resultMap id="BaseResultMap" type="com.fuyuanshen.equipment.domain.DeviceType">
<id column="grant_id" property="id"/> <id column="grant_id" property="id"/>
<result column="type_name" property="typeName"/> <result column="type_name" property="typeName"/>
<result column="device_type_id" property="deviceTypeId"/>
<result column="is_support_ble" property="isSupportBle"/> <result column="is_support_ble" property="isSupportBle"/>
<result column="locate_mode" property="locateMode"/> <result column="locate_mode" property="locateMode"/>
<result column="network_way" property="networkWay"/> <result column="network_way" property="networkWay"/>
@ -21,7 +22,7 @@
<!-- 查询所有设备类型 --> <!-- 查询所有设备类型 -->
<select id="findAll" resultMap="BaseResultMap"> <select id="findAll" resultMap="BaseResultMap">
SELECT DISTINCT dt.* ,dg.id AS grant_id ,dg.create_time AS Dcreate_time SELECT DISTINCT dt.* ,dg.id AS grant_id ,dg.create_time AS Dcreate_time,dt.id AS device_type_id
FROM device_type dt FROM device_type dt
JOIN device_type_grants dg ON dt.id = dg.device_type_id JOIN device_type_grants dg ON dt.id = dg.device_type_id
<where> <where>
@ -44,7 +45,7 @@
</select> </select>
<!-- 根据名称查询设备类型 --> <!-- 根据名称查询设备类型 -->
<select id="queryByName" resultMap="BaseResultMap" <select id="queryByName" resultMap="BaseResultMap"
parameterType="com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria"> parameterType="com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria">
SELECT dt.*, dg.id AS grant_id SELECT dt.*, dg.id AS grant_id
FROM device_type dt FROM device_type dt