|
@@ -19,7 +19,6 @@ import com.gyee.runeconomy.util.DateUtils;
|
|
import com.gyee.runeconomy.util.StringUtils;
|
|
import com.gyee.runeconomy.util.StringUtils;
|
|
import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
|
|
import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
@@ -28,7 +27,6 @@ import java.text.SimpleDateFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.function.Function;
|
|
import java.util.function.Function;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
-import java.util.stream.Stream;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* @ClassName : WindturbinegoodnessService
|
|
* @ClassName : WindturbinegoodnessService
|
|
@@ -913,7 +911,7 @@ public class WindturbinegoodnessService {
|
|
equipmentInfoDay6s.getRecords().forEach(i -> {
|
|
equipmentInfoDay6s.getRecords().forEach(i -> {
|
|
PvVo vo = new PvVo();
|
|
PvVo vo = new PvVo();
|
|
vo.setWtid(i.getWindturbineId());
|
|
vo.setWtid(i.getWindturbineId());
|
|
- vo.setWtname(wtmap.get(i.getWindturbineId()).getNemName());
|
|
|
|
|
|
+ vo.setWtname(wtmap.get(i.getWindturbineId()).getAname());
|
|
vo.setModel(modelMap.get(wtmap.get(i.getWindturbineId()).getModelId()).getAname());
|
|
vo.setModel(modelMap.get(wtmap.get(i.getWindturbineId()).getModelId()).getAname());
|
|
vo.setRxtxl(DoubleUtils.keepPrecision(i.getRxtxl(), 2));
|
|
vo.setRxtxl(DoubleUtils.keepPrecision(i.getRxtxl(), 2));
|
|
vo.setRlsl(DoubleUtils.keepPrecision(i.getRlsl(), 2));
|
|
vo.setRlsl(DoubleUtils.keepPrecision(i.getRlsl(), 2));
|