diff --git a/src/main/java/com/zjyr/beidouservice/mapper/SensorDataMapper.java b/src/main/java/com/zjyr/beidouservice/mapper/SensorDataMapper.java index 8dbc572..3d5dab5 100644 --- a/src/main/java/com/zjyr/beidouservice/mapper/SensorDataMapper.java +++ b/src/main/java/com/zjyr/beidouservice/mapper/SensorDataMapper.java @@ -8,7 +8,7 @@ import java.util.List; public interface SensorDataMapper { List selectAll(); - SensorData getSensorDataById(@Param("devId") Integer devId); + SensorData getSensorDataById(@Param("devId") Long devId); int addSensorData(@Param("sensor") SensorData sensorData); diff --git a/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorData.java b/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorData.java index 94eabec..ee8e172 100644 --- a/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorData.java +++ b/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorData.java @@ -1,7 +1,5 @@ package com.zjyr.beidouservice.pojo.entry; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.zjyr.beidouservice.common.impl.SensorControlTunnelName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/zjyr/beidouservice/pojo/vo/binary/QuerySensorProtocol.java b/src/main/java/com/zjyr/beidouservice/pojo/vo/binary/QuerySensorProtocol.java index 4bccfa8..622a418 100644 --- a/src/main/java/com/zjyr/beidouservice/pojo/vo/binary/QuerySensorProtocol.java +++ b/src/main/java/com/zjyr/beidouservice/pojo/vo/binary/QuerySensorProtocol.java @@ -10,9 +10,7 @@ public class QuerySensorProtocol { private byte city; private byte nControlInfo; - /** - * The Controll contents. - */ + //private List controllContents; } diff --git a/src/main/java/com/zjyr/beidouservice/service/SensorDataService.java b/src/main/java/com/zjyr/beidouservice/service/SensorDataService.java index 9eabccd..bc44d8e 100644 --- a/src/main/java/com/zjyr/beidouservice/service/SensorDataService.java +++ b/src/main/java/com/zjyr/beidouservice/service/SensorDataService.java @@ -11,5 +11,5 @@ public interface SensorDataService { void addNewSensor(SensorStatusInfo sensorList); - SensorStatusInfo getSensorDataById(Integer sensorId); + SensorStatusInfo getSensorDataById(Long sensorId); } diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/SensorDataServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/SensorDataServiceImpl.java index f4e9608..7801c13 100644 --- a/src/main/java/com/zjyr/beidouservice/service/impl/SensorDataServiceImpl.java +++ b/src/main/java/com/zjyr/beidouservice/service/impl/SensorDataServiceImpl.java @@ -68,7 +68,7 @@ public class SensorDataServiceImpl implements SensorDataService { @Override public void addNewSensor(SensorStatusInfo v) { SensorData s = SensorData.builder() - .deviceId(v.getSensorId().intValue()) + .deviceId(v.getSensorId().longValue()) .channelType(v.getTunnelName()) .command(v.getCommand()) .startAddr(v.getStartAddr().intValue()) @@ -91,7 +91,7 @@ public class SensorDataServiceImpl implements SensorDataService { } @Override - public SensorStatusInfo getSensorDataById(Integer sensorId) { + public SensorStatusInfo getSensorDataById(Long sensorId) { SensorData s = sensorDataMapper.getSensorDataById(sensorId); if (s != null) {