|
@@ -440,7 +440,7 @@
|
|
|
</select>
|
|
|
<!--查询设备地图参数数据-->
|
|
|
<select id="selectDeviceMapParam" resultMap="deviceDataMap">
|
|
|
- select distinct t1.id device_id,t1.device_code,t1.device_name,t1.point_x,point_y,t1.address,t2.attribute_id, ifnull(t2.remark, t3.`name`) attribute_name,t3.unit,
|
|
|
+ select distinct t1.id device_id,t1.device_code,t1.device_name,t1.point_x,point_y,t1.address,t2.attribute_id, ifnull(t2.remark, t3.`name`) attribute_name,t3.unit,t2.parm_type attribute_type,
|
|
|
t2.seq,case when t2.attribute_id is null then null when t6.id is null then 0 else 1 end is_alarm,concat(t11.alarm_condition,cast(t11.alarm_value as char)+0) alarm_range
|
|
|
<if test="flag == null or flag ==0">
|
|
|
,if (t4.alarm_count>0, 1, 0) device_state
|