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
3a8e8bb0
Commit
3a8e8bb0
authored
May 06, 2021
by
linruibiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口编写
parent
6d328439
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
76 additions
and
0 deletions
+76
-0
BaseRestController.java
...java/com/syc/slm/slmbi/controller/BaseRestController.java
+4
-0
VariableController.java
...java/com/syc/slm/slmbi/controller/VariableController.java
+12
-0
VariableHistoryCurveDataDTO.java
...va/com/syc/slm/slmbi/dto/VariableHistoryCurveDataDTO.java
+28
-0
VariableService.java
src/main/java/com/syc/slm/slmbi/service/VariableService.java
+8
-0
VariableServiceImpl.java
...a/com/syc/slm/slmbi/service/impl/VariableServiceImpl.java
+24
-0
No files found.
src/main/java/com/syc/slm/slmbi/controller/BaseRestController.java
View file @
3a8e8bb0
...
...
@@ -67,6 +67,10 @@ public class BaseRestController {
@Value
(
"${dc_client.interfaces.variableHistoryStatus}"
)
protected
String
variableHistoryStatus
;
@Value
(
"${dc_client.interfaces.historyCurve}"
)
protected
String
historyCurve
;
@ModelAttribute
...
...
src/main/java/com/syc/slm/slmbi/controller/VariableController.java
View file @
3a8e8bb0
...
...
@@ -129,6 +129,18 @@ public class VariableController extends BaseRestController{
});
}
@GetMapping
(
"/history-curve"
)
@ApiOperation
(
"获取变量历史曲线数据"
)
@ApiImplicitParam
(
name
=
"appId"
,
value
=
"租户id"
,
required
=
true
,
dataTypeClass
=
String
.
class
)
public
R
<
List
<
Map
<
String
,
Object
>>>
getVariableHistoryCurve
(
HttpServletRequest
request
,
@PathVariable
String
appId
,
VariableHistoryCurveDataDTO
variableDTO
)
{
return
call
(()
->
{
CurrentUser
currentUser
=
getCurrentUser
(
request
);
return
variableService
.
getVariableHistoryCurve
(
variableDTO
,
currentUser
,
dcClientHost
+
historyCurve
);
});
}
@PostMapping
(
"/send"
)
@ApiOperation
(
"下发"
)
@ApiImplicitParam
(
name
=
"appId"
,
value
=
"租户id"
,
required
=
true
,
dataTypeClass
=
String
.
class
)
...
...
src/main/java/com/syc/slm/slmbi/dto/VariableHistoryCurveDataDTO.java
0 → 100644
View file @
3a8e8bb0
package
com
.
syc
.
slm
.
slmbi
.
dto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
* slm-bi
* 历史曲线DTO
* @author : lin
* @date : 2021-03-30 15:05
**/
@ApiModel
(
"变量DTO"
)
@Data
public
class
VariableHistoryCurveDataDTO
{
@ApiModelProperty
(
value
=
"所属设备"
,
required
=
true
)
private
String
deviceId
;
@ApiModelProperty
(
value
=
"变量id"
,
required
=
true
)
private
String
variableId
;
@ApiModelProperty
(
value
=
"变量Code"
,
required
=
true
)
private
String
variableCode
;
@ApiModelProperty
(
value
=
"开始时间(时间戳)"
,
required
=
true
)
private
String
startTime
;
@ApiModelProperty
(
value
=
"结束时间(时间戳)"
,
required
=
true
)
private
String
endTime
;
@ApiModelProperty
(
value
=
"请填时间格式如(yyyy-MM-dd HH:mm:ss)"
,
required
=
true
)
private
String
format
;
}
src/main/java/com/syc/slm/slmbi/service/VariableService.java
View file @
3a8e8bb0
...
...
@@ -87,4 +87,12 @@ public interface VariableService {
* @return
*/
Map
<
String
,
Object
>
historyStatus
(
String
uri
,
String
deviceId
,
String
variableCode
,
String
startTime
,
String
endTime
,
CurrentUser
currentUser
);
/**
* 获取历史双曲线
* @param variableDTO
* @param currentUser
* @return
*/
List
<
Map
<
String
,
Object
>>
getVariableHistoryCurve
(
VariableHistoryCurveDataDTO
variableDTO
,
CurrentUser
currentUser
,
String
uri
);
}
src/main/java/com/syc/slm/slmbi/service/impl/VariableServiceImpl.java
View file @
3a8e8bb0
...
...
@@ -320,6 +320,30 @@ public class VariableServiceImpl implements VariableService {
return
result
.
detach
();
}
@Override
public
List
<
Map
<
String
,
Object
>>
getVariableHistoryCurve
(
VariableHistoryCurveDataDTO
variableDTO
,
CurrentUser
user
,
String
uri
)
{
if
(
StringUtils
.
isBlank
(
variableDTO
.
getDeviceId
())){
throw
new
SysException
(
"请传入设备id"
);
}
if
(
StringUtils
.
isBlank
(
variableDTO
.
getVariableCode
())){
throw
new
SysException
(
"请传入变量code"
);
}
if
(
StringUtils
.
isBlank
(
variableDTO
.
getEndTime
())){
throw
new
SysException
(
"请传入结束时间"
);
}
if
(
StringUtils
.
isBlank
(
variableDTO
.
getStartTime
())){
throw
new
SysException
(
"请传入开始时间"
);
}
Map
<
String
,
String
>
uriVariables
=
SlmConstants
.
gson
.
fromJson
(
SlmConstants
.
gson
.
toJson
(
variableDTO
),
new
TypeToken
<
Map
<
String
,
String
>>(){}.
getType
());
uriVariables
.
put
(
"appId"
,
user
.
getAppId
());
R
<
List
<
Map
<
String
,
Object
>>>
result
=
RestTemplateUtils
.
get
(
uri
,
new
TypeToken
<
R
<
List
<
Map
<
String
,
Object
>>>>()
{}.
getType
(),
uriVariables
);
return
result
.
detach
();
}
private
R
<
Map
<
String
,
String
>>
setDeptAndRole
(
CurrentUser
user
,
String
uri
){
Map
<
String
,
String
>
uriVariables
=
Maps
.
newHashMap
();
uriVariables
.
put
(
"appId"
,
user
.
getAppId
());
...
...
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