|
@@ -61,6 +61,7 @@
|
|
</if>
|
|
</if>
|
|
and t1.status =1
|
|
and t1.status =1
|
|
</where>
|
|
</where>
|
|
|
|
+ order by t1.device_id,t1.date_create
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="selectAttributes" resultMap="alarmSettingMap">
|
|
<select id="selectAttributes" resultMap="alarmSettingMap">
|
|
@@ -69,6 +70,7 @@
|
|
inner join sms_device_type t2 on t1.device_type_id=t2.id and t2.status =1
|
|
inner join sms_device_type t2 on t1.device_type_id=t2.id and t2.status =1
|
|
inner join sms_device_attribute t3 on t2.id=t3.device_type_id and t3.status =1
|
|
inner join sms_device_attribute t3 on t2.id=t3.device_type_id and t3.status =1
|
|
where t1.id=#{deviceId} and t1.status=1
|
|
where t1.id=#{deviceId} and t1.status=1
|
|
|
|
+ order by t3.name
|
|
</select>
|
|
</select>
|
|
|
|
|
|
</mapper>
|
|
</mapper>
|