|
|
@ -111,7 +111,13 @@ public class I2syncServiceImpl implements I2syncService {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<I2syncRecord> listRecord(Integer modevtypeId) {
|
|
|
|
public List<I2syncRecord> listRecord(Integer modevtypeId) {
|
|
|
|
List<I2syncRecord> list = recordRepository.findByModevtypeId(modevtypeId);
|
|
|
|
List<I2syncRecord> list;
|
|
|
|
|
|
|
|
if (modevtypeId != null) {
|
|
|
|
|
|
|
|
list = recordRepository.findByModevtypeId(modevtypeId);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
list = recordRepository.findAll();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for (I2syncRecord record : list) {
|
|
|
|
for (I2syncRecord record : list) {
|
|
|
|
List<NSensor> sensorList = sensorRepository.findByDevId(record.getEqmid());
|
|
|
|
List<NSensor> sensorList = sensorRepository.findByDevId(record.getEqmid());
|
|
|
|
if (!CollectionUtils.isEmpty(sensorList)) {
|
|
|
|
if (!CollectionUtils.isEmpty(sensorList)) {
|
|
|
|