|
@@ -23,7 +23,6 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -286,7 +285,9 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
|
|
|
@Override
|
|
|
public List<RealScoreVO> rtRealScore(String deviceCode, Date startTime, Date endTime) {
|
|
|
LambdaQueryWrapper<HtAnalogData> queryWrapper = Wrappers.lambdaQuery();
|
|
|
- queryWrapper.select(HtAnalogData::getIa,HtAnalogData::getIb,HtAnalogData::getIc,HtAnalogData::getUa,HtAnalogData::getUb,HtAnalogData::getUc)
|
|
|
+ queryWrapper.select(HtAnalogData::getIa,HtAnalogData::getIb,HtAnalogData::getIc,
|
|
|
+ HtAnalogData::getUa,HtAnalogData::getUb,HtAnalogData::getUc,HtAnalogData::getDataTime,
|
|
|
+ HtAnalogData::getCos)
|
|
|
.eq(HtAnalogData::getDeviceName,deviceCode)
|
|
|
.between(HtAnalogData::getDataTime,startTime,endTime);
|
|
|
List<HtAnalogData> list = this.list(queryWrapper);
|