|
|
@@ -476,78 +476,81 @@ public class EquipmentPerformaCompareService {
|
|
|
vo.setWtid(i.getWindturbineId());
|
|
|
vo.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getAname());
|
|
|
Optional<ProEconWtwindDayInfo> first = fzyList.stream().filter(fzy -> fzy.getWindturbineId().equals(i.getWindturbineId())).findFirst();
|
|
|
- List<FzyVo> vos = getFzyVos(first,dateType);
|
|
|
- switch (dateType){
|
|
|
- case "1" :
|
|
|
- vo.setFdl(i.getRfdl());
|
|
|
- vo.setYfdl(i.getRyfdl());
|
|
|
- vo.setPjgl(i.getRpjgl());
|
|
|
- vo.setPjfs(i.getRpjfs());
|
|
|
- vo.setYxxs(i.getRyxxs());
|
|
|
- vo.setDjxs(i.getRdjxs());
|
|
|
- vo.setGzxs(i.getRgzxs());
|
|
|
- vo.setWhxs(i.getRjxxs());
|
|
|
- vo.setZdxs(i.getRzdxs());
|
|
|
- vo.setYxfs(i.getRyxfs());
|
|
|
- vo.setSsdl(i.getRssdl());
|
|
|
- vo.setBjcs(i.getRbjcs());
|
|
|
- vo.setTjcs(i.getRtjcs());
|
|
|
- vo.setBbhcs(i.getRbbhcs());
|
|
|
- vo.setSbklly(i.getRsbklyl());
|
|
|
- vo.setPjwd(i.getRpjwd());
|
|
|
- vo.setPjsd(i.getRpjsd());
|
|
|
- vo.setPjyq(i.getRpjyq());
|
|
|
- vo.setNhyd(i.getRnhyd());
|
|
|
- vo.setSjbz(i.getRsjbz());
|
|
|
- break;
|
|
|
- case "2":
|
|
|
- vo.setFdl(i.getYfdl());
|
|
|
- vo.setYfdl(i.getYyfdl());
|
|
|
- vo.setPjgl(i.getYpjgl());
|
|
|
- vo.setPjfs(i.getYpjfs());
|
|
|
- vo.setYxxs(i.getYyxxs());
|
|
|
- vo.setDjxs(i.getYdjxs());
|
|
|
- vo.setGzxs(i.getYgzxs());
|
|
|
- vo.setWhxs(i.getYjxxs());
|
|
|
- vo.setZdxs(i.getYzdxs());
|
|
|
- vo.setYxfs(i.getYyxfs());
|
|
|
- vo.setSsdl(i.getYssdl());
|
|
|
- vo.setBjcs(i.getYbjcs());
|
|
|
- vo.setTjcs(i.getYtjcs());
|
|
|
- vo.setBbhcs(i.getYbbhcs());
|
|
|
- vo.setSbklly(i.getYsbklyl());
|
|
|
- vo.setPjwd(i.getYpjwd());
|
|
|
- vo.setPjsd(i.getYpjsd());
|
|
|
- vo.setPjyq(i.getYpjyq());
|
|
|
- vo.setNhyd(i.getYnhyd());
|
|
|
- vo.setSjbz(i.getYsjbz());
|
|
|
- break;
|
|
|
- case "3":
|
|
|
- vo.setFdl(i.getNfdl());
|
|
|
- vo.setYfdl(i.getNyfdl());
|
|
|
- vo.setPjgl(i.getNpjgl());
|
|
|
- vo.setPjfs(i.getNpjfs());
|
|
|
- vo.setYxxs(i.getNyxxs());
|
|
|
- vo.setDjxs(i.getNdjxs());
|
|
|
- vo.setGzxs(i.getNgzxs());
|
|
|
- vo.setWhxs(i.getNjxxs());
|
|
|
- vo.setZdxs(i.getNzdxs());
|
|
|
- vo.setYxfs(i.getNyxfs());
|
|
|
- vo.setSsdl(i.getNssdl());
|
|
|
- vo.setBjcs(i.getNbjcs());
|
|
|
- vo.setTjcs(i.getNtjcs());
|
|
|
- vo.setBbhcs(i.getNbbhcs());
|
|
|
- vo.setSbklly(i.getNsbklyl());
|
|
|
- vo.setPjwd(i.getNpjwd());
|
|
|
- vo.setPjsd(i.getNpjsd());
|
|
|
- vo.setPjyq(i.getNpjyq());
|
|
|
- vo.setNhyd(i.getNnhyd());
|
|
|
- vo.setSjbz(i.getNsjbz());
|
|
|
- break;
|
|
|
+ if (first.isPresent()){
|
|
|
+ List<FzyVo> vos = getFzyVos(first,dateType);
|
|
|
+ switch (dateType){
|
|
|
+ case "1" :
|
|
|
+ vo.setFdl(i.getRfdl());
|
|
|
+ vo.setYfdl(i.getRyfdl());
|
|
|
+ vo.setPjgl(i.getRpjgl());
|
|
|
+ vo.setPjfs(i.getRpjfs());
|
|
|
+ vo.setYxxs(i.getRyxxs());
|
|
|
+ vo.setDjxs(i.getRdjxs());
|
|
|
+ vo.setGzxs(i.getRgzxs());
|
|
|
+ vo.setWhxs(i.getRjxxs());
|
|
|
+ vo.setZdxs(i.getRzdxs());
|
|
|
+ vo.setYxfs(i.getRyxfs());
|
|
|
+ vo.setSsdl(i.getRssdl());
|
|
|
+ vo.setBjcs(i.getRbjcs());
|
|
|
+ vo.setTjcs(i.getRtjcs());
|
|
|
+ vo.setBbhcs(i.getRbbhcs());
|
|
|
+ vo.setSbklly(i.getRsbklyl());
|
|
|
+ vo.setPjwd(i.getRpjwd());
|
|
|
+ vo.setPjsd(i.getRpjsd());
|
|
|
+ vo.setPjyq(i.getRpjyq());
|
|
|
+ vo.setNhyd(i.getRnhyd());
|
|
|
+ vo.setSjbz(i.getRsjbz());
|
|
|
+ break;
|
|
|
+ case "2":
|
|
|
+ vo.setFdl(i.getYfdl());
|
|
|
+ vo.setYfdl(i.getYyfdl());
|
|
|
+ vo.setPjgl(i.getYpjgl());
|
|
|
+ vo.setPjfs(i.getYpjfs());
|
|
|
+ vo.setYxxs(i.getYyxxs());
|
|
|
+ vo.setDjxs(i.getYdjxs());
|
|
|
+ vo.setGzxs(i.getYgzxs());
|
|
|
+ vo.setWhxs(i.getYjxxs());
|
|
|
+ vo.setZdxs(i.getYzdxs());
|
|
|
+ vo.setYxfs(i.getYyxfs());
|
|
|
+ vo.setSsdl(i.getYssdl());
|
|
|
+ vo.setBjcs(i.getYbjcs());
|
|
|
+ vo.setTjcs(i.getYtjcs());
|
|
|
+ vo.setBbhcs(i.getYbbhcs());
|
|
|
+ vo.setSbklly(i.getYsbklyl());
|
|
|
+ vo.setPjwd(i.getYpjwd());
|
|
|
+ vo.setPjsd(i.getYpjsd());
|
|
|
+ vo.setPjyq(i.getYpjyq());
|
|
|
+ vo.setNhyd(i.getYnhyd());
|
|
|
+ vo.setSjbz(i.getYsjbz());
|
|
|
+ break;
|
|
|
+ case "3":
|
|
|
+ vo.setFdl(i.getNfdl());
|
|
|
+ vo.setYfdl(i.getNyfdl());
|
|
|
+ vo.setPjgl(i.getNpjgl());
|
|
|
+ vo.setPjfs(i.getNpjfs());
|
|
|
+ vo.setYxxs(i.getNyxxs());
|
|
|
+ vo.setDjxs(i.getNdjxs());
|
|
|
+ vo.setGzxs(i.getNgzxs());
|
|
|
+ vo.setWhxs(i.getNjxxs());
|
|
|
+ vo.setZdxs(i.getNzdxs());
|
|
|
+ vo.setYxfs(i.getNyxfs());
|
|
|
+ vo.setSsdl(i.getNssdl());
|
|
|
+ vo.setBjcs(i.getNbjcs());
|
|
|
+ vo.setTjcs(i.getNtjcs());
|
|
|
+ vo.setBbhcs(i.getNbbhcs());
|
|
|
+ vo.setSbklly(i.getNsbklyl());
|
|
|
+ vo.setPjwd(i.getNpjwd());
|
|
|
+ vo.setPjsd(i.getNpjsd());
|
|
|
+ vo.setPjyq(i.getNpjyq());
|
|
|
+ vo.setNhyd(i.getNnhyd());
|
|
|
+ vo.setSjbz(i.getNsjbz());
|
|
|
+ break;
|
|
|
|
|
|
+ }
|
|
|
+ vo.setFzyList(vos);
|
|
|
+ vo.setJfpl(first.get().getCb());
|
|
|
}
|
|
|
- vo.setFzyList(vos);
|
|
|
- vo.setJfpl(first.get().getCb());
|
|
|
+
|
|
|
resultList.add(vo);
|
|
|
});
|
|
|
return resultList;
|
