Commit bfecaf10 authored by xieshaojun's avatar xieshaojun

更新代码

parent 98c6e0c2
...@@ -45,7 +45,7 @@ public class CentralAirController { ...@@ -45,7 +45,7 @@ public class CentralAirController {
if (Objects.equals(reportVO.getProtocolCode(),ProtocolType.central_air_conditioning.getCode())){ if (Objects.equals(reportVO.getProtocolCode(),ProtocolType.central_air_conditioning.getCode())){
DataReportInfoDTO dto = DataReportInfoDTO.builder() DataReportInfoDTO dto = DataReportInfoDTO.builder()
.protocolCode(reportVO.getProtocolCode()) .protocolCode(reportVO.getProtocolCode())
.deviceAddress(reportVO.getDeviceAddress()) //.deviceAddress(reportVO.getDeviceAddress())
.timestamp(reportVO.getTimestamp()) .timestamp(reportVO.getTimestamp())
.data(JSONObject.parseObject(JSONObject.toJSONString(reportVO.getData()), DataReportParamDTO.class)) .data(JSONObject.parseObject(JSONObject.toJSONString(reportVO.getData()), DataReportParamDTO.class))
.build(); .build();
......
...@@ -24,9 +24,9 @@ public class TerminalDataReportVO implements Serializable { ...@@ -24,9 +24,9 @@ public class TerminalDataReportVO implements Serializable {
@ValidatorEnum(message = "协议类型不支持",enumClass = ProtocolType.class) @ValidatorEnum(message = "协议类型不支持",enumClass = ProtocolType.class)
private String protocolCode; private String protocolCode;
@ApiModelProperty("网关下设备唯一地址") // @ApiModelProperty("网关下设备唯一地址")
@NotNull(message = "网关下设备唯一地址不允许为空") // @NotNull(message = "网关下设备唯一地址不允许为空")
private String deviceAddress; // private String deviceAddress;
@ApiModelProperty("毫秒时间戳") @ApiModelProperty("毫秒时间戳")
@NotNull(message = "毫秒时间戳不允许为空") @NotNull(message = "毫秒时间戳不允许为空")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment