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
b1a1cc75
Commit
b1a1cc75
authored
Feb 07, 2023
by
xieshaojun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新代码
parent
a79b1962
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
CentralAirController.java
src/main/java/vc/thinker/web/CentralAirController.java
+5
-7
TerminalDataReportVO.java
src/main/java/vc/thinker/web/vo/TerminalDataReportVO.java
+2
-1
No files found.
src/main/java/vc/thinker/web/CentralAirController.java
View file @
b1a1cc75
...
...
@@ -12,14 +12,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RestController
;
import
vc.thinker.config.interceptor.ServiceLimit
;
import
vc.thinker.response.SimpleResponse
;
import
vc.thinker.thirdpartyproxy.ProtocolType
;
import
vc.thinker.thirdpartyproxy.protocolimpls.centralAir.CentralAirProtocol
;
import
vc.thinker.thirdpartyproxy.protocolimpls.centralAir.dto.DataReportInfoDTO
;
import
vc.thinker.thirdpartyproxy.protocolimpls.centralAir.dto.DataReportParamDTO
;
import
vc.thinker.web.vo.TerminalDataReportVO
;
import
javax.validation.Valid
;
import
java.util.Objects
;
/**
* @author HeTongHao
...
...
@@ -42,7 +40,7 @@ public class CentralAirController {
public
SimpleResponse
dataReport
(
@RequestBody
@Valid
TerminalDataReportVO
reportVO
)
{
SimpleResponse
simpleResponse
=
new
SimpleResponse
();
simpleResponse
.
setCode
(
"200"
);
if
(
Objects
.
equals
(
reportVO
.
getProtocolCode
(),
ProtocolType
.
central_air_conditioning
.
getCode
())){
//
if (Objects.equals(reportVO.getProtocolCode(),ProtocolType.central_air_conditioning.getCode())){
DataReportInfoDTO
dto
=
DataReportInfoDTO
.
builder
()
.
protocolCode
(
reportVO
.
getProtocolCode
())
//.deviceAddress(reportVO.getDeviceAddress())
...
...
@@ -53,10 +51,10 @@ public class CentralAirController {
simpleResponse
.
setSuccess
(
true
);
simpleResponse
.
setMessage
(
"处理成功"
);
return
simpleResponse
;
}
simpleResponse
.
setSuccess
(
false
);
simpleResponse
.
setMessage
(
"处理失败"
);
return
simpleResponse
;
//
}
//
simpleResponse.setSuccess(false);
//
simpleResponse.setMessage("处理失败");
//
return simpleResponse;
}
}
src/main/java/vc/thinker/web/vo/TerminalDataReportVO.java
View file @
b1a1cc75
...
...
@@ -21,7 +21,8 @@ public class TerminalDataReportVO implements Serializable {
private
static
final
long
serialVersionUID
=
-
3628045573564814316L
;
@ApiModelProperty
(
"协议编码"
)
@ValidatorEnum
(
message
=
"协议类型不支持"
,
enumClass
=
ProtocolType
.
class
)
@NotNull
(
message
=
"协议编码不允许为空"
)
// @ValidatorEnum(message = "协议类型不支持",enumClass = ProtocolType.class)
private
String
protocolCode
;
// @ApiModelProperty("网关下设备唯一地址")
...
...
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