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
777f4375
Commit
777f4375
authored
3 years ago
by
王晓倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
地图弹窗设备实时数据接口
parent
f3f82940
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
56 additions
and
11 deletions
+56
-11
TDeviceReportDataController.java
...ontroller/dataMonitoring/TDeviceReportDataController.java
+16
-0
ITDeviceReportDataService.java
.../com/zehong/system/service/ITDeviceReportDataService.java
+8
-0
TDeviceReportDataServiceImpl.java
...ong/system/service/impl/TDeviceReportDataServiceImpl.java
+15
-0
reportData.js
gassafety-web/src/api/dataMonitoring/reportData.js
+10
-2
markerInfoWindow.vue
...fety-web/src/components/PopWindowGis/markerInfoWindow.vue
+3
-4
markerInfoWindowWarn.vue
...-web/src/components/PopWindowGis/markerInfoWindowWarn.vue
+4
-5
No files found.
gassafety-admin/src/main/java/com/zehong/web/controller/dataMonitoring/TDeviceReportDataController.java
View file @
777f4375
...
...
@@ -91,6 +91,22 @@ public class TDeviceReportDataController extends BaseController
return
AjaxResult
.
success
(
deviceReportDataVo
);
}
/**
* 地图弹窗获取设备监控数据详细信息
*/
@GetMapping
(
value
=
"getWindowData/{deviceId}"
)
public
AjaxResult
getWindowData
(
@PathVariable
(
"deviceId"
)
int
deviceId
)
throws
Exception
{
TDeviceReportData
deviceReportData
=
null
;
try
{
deviceReportData
=
tDeviceReportDataService
.
selectWindowDataByDeviceId
(
deviceId
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
throw
new
Exception
(
"地图弹窗获取设备监控数据详细信息失败"
);
}
return
AjaxResult
.
success
(
deviceReportData
);
}
/**
* 新增设备监控
*/
...
...
This diff is collapsed.
Click to expand it.
gassafety-system/src/main/java/com/zehong/system/service/ITDeviceReportDataService.java
View file @
777f4375
...
...
@@ -23,6 +23,14 @@ public interface ITDeviceReportDataService
*/
public
DeviceReportDataVo
selectTDeviceReportDataByDeviceId
(
int
deviceId
)
throws
Exception
;
/**
* 地图弹窗获取实时数据
*
* @param deviceId 设备ID
* @return 设备监控
*/
public
TDeviceReportData
selectWindowDataByDeviceId
(
int
deviceId
)
throws
Exception
;
/**
* 查询设备监控列表
*
...
...
This diff is collapsed.
Click to expand it.
gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceReportDataServiceImpl.java
View file @
777f4375
...
...
@@ -61,6 +61,21 @@ public class TDeviceReportDataServiceImpl implements ITDeviceReportDataService
return
deviceReportDataVo
;
}
/**
* 查询设备监控
*
* @param deviceId 设备ID
* @return 设备监控
*/
@Override
public
TDeviceReportData
selectWindowDataByDeviceId
(
int
deviceId
)
throws
Exception
{
TDeviceInfo
tDeviceInfo
=
tDeviceInfoMapper
.
selectTDeviceInfoById
(
deviceId
);
TDeviceReportData
tDeviceReportData
=
tDeviceReportDataMapper
.
selectTDeviceReportDataByDeviceNum
(
tDeviceInfo
.
getIotNo
());
return
tDeviceReportData
;
}
/**
* 查询设备监控列表
*
...
...
This diff is collapsed.
Click to expand it.
gassafety-web/src/api/dataMonitoring/reportData.js
View file @
777f4375
...
...
@@ -19,9 +19,17 @@ export function realtimeData(query) {
}
// 查询设备监控详细
export
function
getData
(
device
ReportData
Id
)
{
export
function
getData
(
deviceId
)
{
return
request
({
url
:
'/dataMonitoring/reportData/'
+
deviceReportDataId
,
url
:
'/dataMonitoring/reportData/'
+
deviceId
,
method
:
'get'
})
}
// 查询设备监控详细
export
function
getWindowData
(
deviceId
)
{
return
request
({
url
:
'/dataMonitoring/reportData/getWindowData/'
+
deviceId
,
method
:
'get'
})
}
...
...
This diff is collapsed.
Click to expand it.
gassafety-web/src/components/PopWindowGis/markerInfoWindow.vue
View file @
777f4375
...
...
@@ -109,7 +109,7 @@
上报时间:
<span
class=
"reportTime"
></span>
</div>
</el-col>
</div>
</div>
<div
v-if=
"data.deviceType==4"
class=
"windowwarn-content"
style=
"
border-bottom: 1px solid #e2e2e2;
padding: 10px 0 2px 22px;
...
...
@@ -140,7 +140,7 @@
</template>
<
script
>
import
{
realtimeData
,
get
Data
}
from
"@/api/dataMonitoring/reportData"
;
import
{
getWindow
Data
}
from
"@/api/dataMonitoring/reportData"
;
import
moment
from
"moment"
;
//line移入时的的infowindow
export
default
{
...
...
@@ -153,7 +153,6 @@ export default {
data
(){
return
{
deviceId
:
""
,
alarm
:{},
}
},
mounted
()
{
...
...
@@ -179,7 +178,7 @@ export default {
});
},
getDataid
()
{
get
Data
(
this
.
data
.
deviceId
).
then
(
response
=>
{
getWindow
Data
(
this
.
data
.
deviceId
).
then
(
response
=>
{
this
.
changeValue
(
response
.
data
)
})
...
...
This diff is collapsed.
Click to expand it.
gassafety-web/src/components/PopWindowGis/markerInfoWindowWarn.vue
View file @
777f4375
...
...
@@ -119,7 +119,7 @@
上报时间:
<span
class=
"reportTime"
></span>
</div>
</el-col>
</div>
</div>
<div
v-if=
"data.deviceType==4"
class=
"windowwarn-content"
style=
"
border-bottom: 1px solid #e2e2e2;
padding: 10px 0 2px 22px;
...
...
@@ -157,7 +157,7 @@
</template>
<
script
>
import
{
realtimeData
,
get
Data
}
from
"@/api/dataMonitoring/reportData"
;
import
{
getWindow
Data
}
from
"@/api/dataMonitoring/reportData"
;
import
moment
from
"moment"
;
//line移入时的的infowindow
export
default
{
...
...
@@ -165,7 +165,6 @@
obj
:
{
typs
:
Object
},
title
:
""
,
data
:
{},
// realtime:{},
map
:
null
,
},
data
()
{
...
...
@@ -198,7 +197,7 @@
methods
:
{
moment
,
getDataid
()
{
getData
(
this
.
data
.
deviceId
).
then
(
response
=>
{
get
Window
Data
(
this
.
data
.
deviceId
).
then
(
response
=>
{
this
.
changeValue
(
response
.
data
)
})
...
...
@@ -450,4 +449,4 @@
display
:
flex
;
justify-content
:
space-between
;
}
</
style
>
\ No newline at end of file
</
style
>
This diff is collapsed.
Click to expand it.
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