Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
耿迪迪
gassafety
Commits
ac7f0330
Commit
ac7f0330
authored
Aug 06, 2021
by
耿迪迪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询报警设备 gengdidi
parent
66eb8ffe
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
62 additions
and
1 deletion
+62
-1
TDeviceAlarmController.java
...web/controller/dataMonitoring/TDeviceAlarmController.java
+9
-0
TDeviceAlarmMapper.java
...ain/java/com/zehong/system/mapper/TDeviceAlarmMapper.java
+6
-0
ITDeviceAlarmService.java
.../java/com/zehong/system/service/ITDeviceAlarmService.java
+6
-0
TDeviceAlarmServiceImpl.java
...m/zehong/system/service/impl/TDeviceAlarmServiceImpl.java
+9
-0
TDeviceAlarmMapper.xml
...m/src/main/resources/mapper/system/TDeviceAlarmMapper.xml
+20
-0
deviceAlarm.js
gassafety-web/src/api/dataMonitoring/deviceAlarm.js
+12
-1
No files found.
gassafety-admin/src/main/java/com/zehong/web/controller/dataMonitoring/TDeviceAlarmController.java
View file @
ac7f0330
...
...
@@ -102,4 +102,13 @@ public class TDeviceAlarmController extends BaseController
{
return
toAjax
(
tDeviceAlarmService
.
deleteTDeviceAlarmByIds
(
alarmIds
));
}
/**
* 查询报警设备
* @return TDeviceAlarm
*/
@GetMapping
(
"selectAlarmDevice"
)
public
List
<
TDeviceAlarm
>
selectAlarmDevice
(){
return
tDeviceAlarmService
.
selectAlarmDevice
();
}
}
gassafety-system/src/main/java/com/zehong/system/mapper/TDeviceAlarmMapper.java
View file @
ac7f0330
...
...
@@ -58,4 +58,10 @@ public interface TDeviceAlarmMapper
* @return 结果
*/
public
int
deleteTDeviceAlarmByIds
(
int
[]
alarmIds
);
/**
* 查询报警设备
* @return TDeviceAlarm
*/
List
<
TDeviceAlarm
>
selectAlarmDevice
();
}
gassafety-system/src/main/java/com/zehong/system/service/ITDeviceAlarmService.java
View file @
ac7f0330
...
...
@@ -59,4 +59,10 @@ public interface ITDeviceAlarmService
* @return 结果
*/
public
int
deleteTDeviceAlarmById
(
int
alarmId
);
/**
* 查询报警设备
* @return TDeviceAlarm
*/
List
<
TDeviceAlarm
>
selectAlarmDevice
();
}
gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceAlarmServiceImpl.java
View file @
ac7f0330
...
...
@@ -139,4 +139,13 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
{
return
tDeviceAlarmMapper
.
deleteTDeviceAlarmById
(
alarmId
);
}
/**
* 查询报警设备
* @return TDeviceAlarm
*/
@Override
public
List
<
TDeviceAlarm
>
selectAlarmDevice
(){
return
tDeviceAlarmMapper
.
selectAlarmDevice
();
}
}
gassafety-system/src/main/resources/mapper/system/TDeviceAlarmMapper.xml
View file @
ac7f0330
...
...
@@ -97,4 +97,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{alarmId}
</foreach>
</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>
\ No newline at end of file
gassafety-web/src/api/dataMonitoring/deviceAlarm.js
View file @
ac7f0330
...
...
@@ -50,4 +50,15 @@ export function exportDeviceAlarm(query) {
method
:
'get'
,
params
:
query
})
}
\ No newline at end of file
}
//查询报警设备
export
function
selectAlarmDevice
()
{
return
request
({
url
:
'/dataMonitoring/deviceAlarm/selectAlarmDevice'
,
method
:
'get'
,
params
:
query
})
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment