fix: 数据报表里增加单位

dev
huangfeng 1 year ago
parent 992c0e6bd4
commit abd54e55b5

@ -51,6 +51,8 @@ public class NPoint {
@Transient @Transient
private int row; private int row;
@Transient
private String unit;
@Transient @Transient
private List<Object> data; private List<Object> data;

@ -8,6 +8,7 @@ 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.ZsbService; import com.xydl.cac.service.ZsbService;
@ -33,6 +34,8 @@ public class NSensorServiceImpl implements NSensorService {
@Resource @Resource
NPointRepository pointRepository; NPointRepository pointRepository;
@Resource @Resource
UnitRepository unitRepository;
@Resource
DataService dataService; DataService dataService;
@Resource @Resource
ZsbService zsbService; ZsbService zsbService;
@ -126,6 +129,10 @@ 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());
if (!CollectionUtils.isEmpty(unitList)) {
point.setUnit(unitList.get(0).getUnit());
}
pointList.add(point); pointList.add(point);
} }
} }

Loading…
Cancel
Save