Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
slm-bi
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
林锐标
slm-bi
Commits
73350370
Commit
73350370
authored
May 11, 2021
by
梁光意
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改获取实时和历史变量数据
parent
0feb3e1e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
VariableController.java
...java/com/syc/slm/slmbi/controller/VariableController.java
+1
-1
VariableService.java
src/main/java/com/syc/slm/slmbi/service/VariableService.java
+1
-1
VariableServiceImpl.java
...a/com/syc/slm/slmbi/service/impl/VariableServiceImpl.java
+2
-2
No files found.
src/main/java/com/syc/slm/slmbi/controller/VariableController.java
View file @
73350370
...
...
@@ -89,7 +89,7 @@ public class VariableController extends BaseRestController{
@PostMapping
(
"/real-time"
)
@ApiOperation
(
"获取变量实时数据"
)
@ApiImplicitParam
(
name
=
"appId"
,
value
=
"租户id"
,
required
=
true
,
dataTypeClass
=
String
.
class
)
public
R
<
List
<
Map
<
String
,
List
<
Map
<
String
,
Object
>
>>>>
getVariableRealTimeDataList
(
HttpServletRequest
request
,
@PathVariable
String
appId
,
public
R
<
Map
<
String
,
List
<
Map
<
String
,
Object
>>>>
getVariableRealTimeDataList
(
HttpServletRequest
request
,
@PathVariable
String
appId
,
@RequestBody
VariableRealTimeDTO
variableDTO
)
{
return
call
(()
->
{
CurrentUser
currentUser
=
getCurrentUser
(
request
);
...
...
src/main/java/com/syc/slm/slmbi/service/VariableService.java
View file @
73350370
...
...
@@ -47,7 +47,7 @@ public interface VariableService {
* @param user
* @return
*/
List
<
Map
<
String
,
List
<
Map
<
String
,
Object
>
>>>
getVariableRealTimeDataList
(
@NonNull
String
uri
,
VariableRealTimeDTO
variableDTO
,
CurrentUser
user
);
Map
<
String
,
List
<
Map
<
String
,
Object
>>>
getVariableRealTimeDataList
(
@NonNull
String
uri
,
VariableRealTimeDTO
variableDTO
,
CurrentUser
user
);
/**
* 获取历史数据
...
...
src/main/java/com/syc/slm/slmbi/service/impl/VariableServiceImpl.java
View file @
73350370
...
...
@@ -119,7 +119,7 @@ public class VariableServiceImpl implements VariableService {
}
@Override
public
List
<
Map
<
String
,
List
<
Map
<
String
,
Object
>
>>>
getVariableRealTimeDataList
(
@NonNull
String
uri
,
VariableRealTimeDTO
variableDTO
,
CurrentUser
user
)
{
public
Map
<
String
,
List
<
Map
<
String
,
Object
>>>
getVariableRealTimeDataList
(
@NonNull
String
uri
,
VariableRealTimeDTO
variableDTO
,
CurrentUser
user
)
{
if
(
StringUtils
.
isBlank
(
uri
)){
throw
new
SysException
(
"请传入uri"
);
}
...
...
@@ -151,7 +151,7 @@ public class VariableServiceImpl implements VariableService {
// Map<String, String> uriVariables =SlmConstants.gson.fromJson(SlmConstants.gson.toJson(variableDTO),new TypeToken<Map<String,String>>(){}.getType());
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
user
.
getAppId
());
R
<
List
<
Map
<
String
,
List
<
Map
<
String
,
Object
>>>>>
result
=
RestTemplateUtils
.
post
(
uri
,
variableDTO
,
new
TypeToken
<
R
<
List
<
Map
<
String
,
List
<
Map
<
String
,
Object
>
>>>>>()
{}.
getType
(),
uriVariables
);
R
<
Map
<
String
,
List
<
Map
<
String
,
Object
>>>>
result
=
RestTemplateUtils
.
post
(
uri
,
variableDTO
,
new
TypeToken
<
R
<
Map
<
String
,
List
<
Map
<
String
,
Object
>>>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
...
...
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