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
6606f2b6
Commit
6606f2b6
authored
Jun 19, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加设备上线和下线的业务日志记录
parent
f7eb0391
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
...xhx/module/sitestat/service/impl/SitestatServiceImpl.java
+6
-3
No files found.
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
View file @
6606f2b6
...
@@ -3,7 +3,6 @@ package com.mortals.xhx.module.sitestat.service.impl;
...
@@ -3,7 +3,6 @@ package com.mortals.xhx.module.sitestat.service.impl;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.TypeReference
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
...
@@ -226,7 +225,11 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
...
@@ -226,7 +225,11 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
public
String
getSiteTree
(
Context
context
)
{
public
String
getSiteTree
(
Context
context
)
{
if
(
platFormType
.
equalsIgnoreCase
(
PlatformTypeEnum
.
CLOUD
.
getValue
()))
{
if
(
platFormType
.
equalsIgnoreCase
(
PlatformTypeEnum
.
CLOUD
.
getValue
()))
{
String
token
=
context
.
getUser
().
getToken
();
String
token
=
context
.
getUser
().
getToken
();
JSONObject
jsonObject
=
new
JSONObject
();
if
(!
ObjectUtils
.
isEmpty
(
token
))
{
String
resp
=
siteFeign
.
siteTree
(
token
);
return
resp
;
}
/* JSONObject jsonObject = new JSONObject();
Map<String, Object> model = new HashMap<>();
Map<String, Object> model = new HashMap<>();
if (!ObjectUtils.isEmpty(token)) {
if (!ObjectUtils.isEmpty(token)) {
String resp = siteFeign.siteTree(token);
String resp = siteFeign.siteTree(token);
...
@@ -255,7 +258,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
...
@@ -255,7 +258,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
jsonObject.put(KEY_RESULT_DATA, model);
jsonObject.put(KEY_RESULT_DATA, model);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
return jsonObject.toJSONString();
return jsonObject.toJSONString();
}
}
*/
}
else
{
}
else
{
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
...
...
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