Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
device-new-platform
Commits
f9ec10ef
Commit
f9ec10ef
authored
Aug 26, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改文件存储路径
parent
a332877d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
9 deletions
+6
-9
device-manager-ui/admin/src/views/Home.vue
device-manager-ui/admin/src/views/Home.vue
+5
-6
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
...als/xhx/module/device/service/impl/DeviceServiceImpl.java
+0
-2
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceStatController.java
...m/mortals/xhx/module/device/web/DeviceStatController.java
+1
-1
No files found.
device-manager-ui/admin/src/views/Home.vue
View file @
f9ec10ef
...
@@ -509,9 +509,8 @@ export default {
...
@@ -509,9 +509,8 @@ export default {
this
.
pushChart
.
resize
();
this
.
pushChart
.
resize
();
},
},
syncDeviceStat
()
{
syncDeviceStat
()
{
this
.
$post
(
"
/device/stat/syncDeviceStat
"
,
{
siteId
:
1
})
this
.
$post
(
"
/device/stat/syncDeviceStat
"
,
{})
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
console
.
log
(
res
.
data
);
if
(
res
.
code
==
1
)
{
if
(
res
.
code
==
1
)
{
this
.
statData
=
res
.
data
.
data
[
0
];
this
.
statData
=
res
.
data
.
data
[
0
];
}
else
{
}
else
{
...
@@ -526,7 +525,7 @@ export default {
...
@@ -526,7 +525,7 @@ export default {
findDeviceTotalStat
(
beforeday
)
{
findDeviceTotalStat
(
beforeday
)
{
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
//当前选择站点id
//当前选择站点id
query
.
siteId
=
1
//
query.siteId=1
console
.
log
(
query
);
console
.
log
(
query
);
this
.
$post
(
"
/device/stat/list
"
,
query
)
this
.
$post
(
"
/device/stat/list
"
,
query
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
...
@@ -558,7 +557,7 @@ export default {
...
@@ -558,7 +557,7 @@ export default {
findDeviceStat
(
beforeday
)
{
findDeviceStat
(
beforeday
)
{
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
query
.
siteId
=
1
//
query.siteId=1
this
.
$post
(
"
/device/stat/list
"
,
query
)
this
.
$post
(
"
/device/stat/list
"
,
query
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
code
==
1
)
{
if
(
res
.
code
==
1
)
{
...
@@ -588,7 +587,7 @@ export default {
...
@@ -588,7 +587,7 @@ export default {
findDeviceAlarm
(
beforeday
)
{
findDeviceAlarm
(
beforeday
)
{
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
query
.
siteId
=
1
//
query.siteId=1
this
.
$post
(
"
/device/stat/list
"
,
query
)
this
.
$post
(
"
/device/stat/list
"
,
query
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
code
==
1
)
{
if
(
res
.
code
==
1
)
{
...
@@ -617,7 +616,7 @@ export default {
...
@@ -617,7 +616,7 @@ export default {
findDevicePush
(
beforeday
)
{
findDevicePush
(
beforeday
)
{
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
query
.
siteId
=
1
//
query.siteId=1
this
.
$post
(
"
/device/stat/list
"
,
query
)
this
.
$post
(
"
/device/stat/list
"
,
query
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
code
==
1
)
{
if
(
res
.
code
==
1
)
{
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
View file @
f9ec10ef
...
@@ -339,8 +339,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
...
@@ -339,8 +339,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
*/
*/
@Override
@Override
public
void
deviceStat
(
Long
siteId
,
Context
context
)
{
public
void
deviceStat
(
Long
siteId
,
Context
context
)
{
//查询当天统计,如果有 则更新统计结果,否则新增
//查询当天统计,如果有 则更新统计结果,否则新增
DeviceStatEntity
deviceStatEntity
=
deviceStatService
.
selectOne
(
new
DeviceStatQuery
()
DeviceStatEntity
deviceStatEntity
=
deviceStatService
.
selectOne
(
new
DeviceStatQuery
()
.
siteId
(
siteId
)
.
siteId
(
siteId
)
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceStatController.java
View file @
f9ec10ef
...
@@ -68,7 +68,7 @@ public class DeviceStatController extends BaseCRUDJsonBodyMappingController<Devi
...
@@ -68,7 +68,7 @@ public class DeviceStatController extends BaseCRUDJsonBodyMappingController<Devi
try
{
try
{
if
(
ObjectUtils
.
isEmpty
(
deviceQuery
)||
ObjectUtils
.
isEmpty
(
deviceQuery
.
getSiteId
()))
throw
new
AppException
(
"请求站点Id不能为空!"
);
if
(
ObjectUtils
.
isEmpty
(
deviceQuery
)||
ObjectUtils
.
isEmpty
(
deviceQuery
.
getSiteId
()))
throw
new
AppException
(
"请求站点Id不能为空!"
);
//刷新成功,返回列
//刷新成功,返回列
deviceService
.
deviceStat
(
deviceQuery
.
getSiteId
(),
getContext
());
//
deviceService.deviceStat(deviceQuery.getSiteId(),getContext());
DeviceStatQuery
deviceStatQuery
=
new
DeviceStatQuery
();
DeviceStatQuery
deviceStatQuery
=
new
DeviceStatQuery
();
deviceStatQuery
.
setYear
(
DateUtil
.
year
(
new
Date
()));
deviceStatQuery
.
setYear
(
DateUtil
.
year
(
new
Date
()));
deviceStatQuery
.
setMonth
(
DateUtil
.
month
(
new
Date
())
+
1
);
deviceStatQuery
.
setMonth
(
DateUtil
.
month
(
new
Date
())
+
1
);
...
...
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