|
|
@ -8,9 +8,9 @@ import com.xydl.cac.model.SensorDetail;
|
|
|
|
import com.xydl.cac.model.SensorUpdateModel;
|
|
|
|
import com.xydl.cac.model.SensorUpdateModel;
|
|
|
|
import com.xydl.cac.repository.NPointRepository;
|
|
|
|
import com.xydl.cac.repository.NPointRepository;
|
|
|
|
import com.xydl.cac.repository.NSensorRepository;
|
|
|
|
import com.xydl.cac.repository.NSensorRepository;
|
|
|
|
import com.xydl.cac.repository.UnitRepository;
|
|
|
|
|
|
|
|
import com.xydl.cac.service.DataService;
|
|
|
|
import com.xydl.cac.service.DataService;
|
|
|
|
import com.xydl.cac.service.NSensorService;
|
|
|
|
import com.xydl.cac.service.NSensorService;
|
|
|
|
|
|
|
|
import com.xydl.cac.service.UnitService;
|
|
|
|
import com.xydl.cac.service.ZsbService;
|
|
|
|
import com.xydl.cac.service.ZsbService;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
@ -34,7 +34,7 @@ public class NSensorServiceImpl implements NSensorService {
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
NPointRepository pointRepository;
|
|
|
|
NPointRepository pointRepository;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
UnitRepository unitRepository;
|
|
|
|
UnitService unitService;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
DataService dataService;
|
|
|
|
DataService dataService;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
@ -129,10 +129,7 @@ public class NSensorServiceImpl implements NSensorService {
|
|
|
|
List<NPoint> pointList = new ArrayList<>();
|
|
|
|
List<NPoint> pointList = new ArrayList<>();
|
|
|
|
for (NPoint point : points) {
|
|
|
|
for (NPoint point : points) {
|
|
|
|
if (StringUtils.isNotBlank(point.getField())) {
|
|
|
|
if (StringUtils.isNotBlank(point.getField())) {
|
|
|
|
List<Unit> unitList = unitRepository.findByField(point.getField());
|
|
|
|
point.setUnit(unitService.findUnitInCache(point.getField()));
|
|
|
|
if (!CollectionUtils.isEmpty(unitList)) {
|
|
|
|
|
|
|
|
point.setUnit(unitList.get(0).getUnit());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
pointList.add(point);
|
|
|
|
pointList.add(point);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|