Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
terminal-protocol-proxy-service
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fox-energy
backend
terminal-protocol-proxy-service
Commits
bfecaf10
You need to sign in or sign up before continuing.
Commit
bfecaf10
authored
Feb 03, 2023
by
xieshaojun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新代码
parent
98c6e0c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
CentralAirController.java
src/main/java/vc/thinker/web/CentralAirController.java
+1
-1
TerminalDataReportVO.java
src/main/java/vc/thinker/web/vo/TerminalDataReportVO.java
+3
-3
No files found.
src/main/java/vc/thinker/web/CentralAirController.java
View file @
bfecaf10
...
...
@@ -45,7 +45,7 @@ public class CentralAirController {
if
(
Objects
.
equals
(
reportVO
.
getProtocolCode
(),
ProtocolType
.
central_air_conditioning
.
getCode
())){
DataReportInfoDTO
dto
=
DataReportInfoDTO
.
builder
()
.
protocolCode
(
reportVO
.
getProtocolCode
())
.
deviceAddress
(
reportVO
.
getDeviceAddress
())
//
.deviceAddress(reportVO.getDeviceAddress())
.
timestamp
(
reportVO
.
getTimestamp
())
.
data
(
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
reportVO
.
getData
()),
DataReportParamDTO
.
class
))
.
build
();
...
...
src/main/java/vc/thinker/web/vo/TerminalDataReportVO.java
View file @
bfecaf10
...
...
@@ -24,9 +24,9 @@ public class TerminalDataReportVO implements Serializable {
@ValidatorEnum
(
message
=
"协议类型不支持"
,
enumClass
=
ProtocolType
.
class
)
private
String
protocolCode
;
@ApiModelProperty
(
"网关下设备唯一地址"
)
@NotNull
(
message
=
"网关下设备唯一地址不允许为空"
)
private
String
deviceAddress
;
//
@ApiModelProperty("网关下设备唯一地址")
//
@NotNull(message = "网关下设备唯一地址不允许为空")
//
private String deviceAddress;
@ApiModelProperty
(
"毫秒时间戳"
)
@NotNull
(
message
=
"毫秒时间戳不允许为空"
)
...
...
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