Commit ac7f0330 authored by 耿迪迪's avatar 耿迪迪

查询报警设备 gengdidi

parent 66eb8ffe
...@@ -102,4 +102,13 @@ public class TDeviceAlarmController extends BaseController ...@@ -102,4 +102,13 @@ public class TDeviceAlarmController extends BaseController
{ {
return toAjax(tDeviceAlarmService.deleteTDeviceAlarmByIds(alarmIds)); return toAjax(tDeviceAlarmService.deleteTDeviceAlarmByIds(alarmIds));
} }
/**
* 查询报警设备
* @return TDeviceAlarm
*/
@GetMapping("selectAlarmDevice")
public List<TDeviceAlarm> selectAlarmDevice (){
return tDeviceAlarmService.selectAlarmDevice();
}
} }
...@@ -58,4 +58,10 @@ public interface TDeviceAlarmMapper ...@@ -58,4 +58,10 @@ public interface TDeviceAlarmMapper
* @return 结果 * @return 结果
*/ */
public int deleteTDeviceAlarmByIds(int[] alarmIds); public int deleteTDeviceAlarmByIds(int[] alarmIds);
/**
* 查询报警设备
* @return TDeviceAlarm
*/
List<TDeviceAlarm> selectAlarmDevice ();
} }
...@@ -59,4 +59,10 @@ public interface ITDeviceAlarmService ...@@ -59,4 +59,10 @@ public interface ITDeviceAlarmService
* @return 结果 * @return 结果
*/ */
public int deleteTDeviceAlarmById(int alarmId); public int deleteTDeviceAlarmById(int alarmId);
/**
* 查询报警设备
* @return TDeviceAlarm
*/
List<TDeviceAlarm> selectAlarmDevice ();
} }
...@@ -139,4 +139,13 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService ...@@ -139,4 +139,13 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
{ {
return tDeviceAlarmMapper.deleteTDeviceAlarmById(alarmId); return tDeviceAlarmMapper.deleteTDeviceAlarmById(alarmId);
} }
/**
* 查询报警设备
* @return TDeviceAlarm
*/
@Override
public List<TDeviceAlarm> selectAlarmDevice (){
return tDeviceAlarmMapper.selectAlarmDevice();
}
} }
...@@ -97,4 +97,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -97,4 +97,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{alarmId} #{alarmId}
</foreach> </foreach>
</delete> </delete>
<select id="selectAlarmDevice" resultMap="TDeviceAlarmResult">
SELECT
alarm_id,
device_id,
device_type,
order_id,
alarm_type,
alarm_value,
start_time,
end_time,
deal_status,
update_time,
create_time
FROM
t_device_alarm
WHERE
end_time IS NULL
</select>
</mapper> </mapper>
\ No newline at end of file
...@@ -50,4 +50,15 @@ export function exportDeviceAlarm(query) { ...@@ -50,4 +50,15 @@ export function exportDeviceAlarm(query) {
method: 'get', method: 'get',
params: query params: query
}) })
} }
\ No newline at end of file
//查询报警设备
export function selectAlarmDevice() {
return request({
url: '/dataMonitoring/deviceAlarm/selectAlarmDevice',
method: 'get',
params: query
})
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment