|
|
@@ -389,7 +389,7 @@ public class SingleAnalysisService {
|
|
|
double xfqrhgl = 0.0;//风机小风切入合格率
|
|
|
double jfpl = 0.0;//风机小风切入
|
|
|
double llfdl=0.0;//理论发电量
|
|
|
- if (StringUtils.notEmp(wtdayls) && StringUtils.notEmp(wtdayls.get(0)) && !wtdayls.isEmpty()) {
|
|
|
+ if (StringUtils.notEmp(wtdayls) && !wtdayls.isEmpty() && StringUtils.notEmp(wtdayls.get(0)) ) {
|
|
|
|
|
|
SingleAnalysisVo wtd = wtdayls.get(0);
|
|
|
|
|
|
@@ -423,12 +423,12 @@ public class SingleAnalysisService {
|
|
|
|
|
|
|
|
|
|
|
|
- if (StringUtils.notEmp(wtday2ls) && StringUtils.notEmp(wtday2ls.get(0)) && !wtday2ls.isEmpty()) {
|
|
|
+ if (StringUtils.notEmp(wtday2ls) && !wtday2ls.isEmpty() && StringUtils.notEmp(wtday2ls.get(0)) ) {
|
|
|
SingleAnalysisVo wtd = wtday2ls.get(0);
|
|
|
glyzxxs = null != wtd.getGlyzxxs() ? wtd.getGlyzxxs() : 0.0;//风机平均功率一致性系数
|
|
|
}
|
|
|
vo.setGlyzxxs(StringUtils.round(glyzxxs, 2));
|
|
|
- if (StringUtils.notEmp(wtday3ls) && StringUtils.notEmp(wtday3ls.get(0)) && !wtday3ls.isEmpty()) {
|
|
|
+ if (StringUtils.notEmp(wtday3ls) && !wtday3ls.isEmpty() && StringUtils.notEmp(wtday3ls.get(0)) ) {
|
|
|
SingleAnalysisVo wtd = wtday3ls.get(0);
|
|
|
gzss = null != wtd.getGzss() ? wtd.getGzss() : 0.0;//风机故障损失合计
|
|
|
jxss = null != wtd.getJxss() ? wtd.getJxss() : 0.0;//风机检修损失合计
|
|
|
@@ -447,7 +447,7 @@ public class SingleAnalysisService {
|
|
|
|
|
|
vo.setLlfdl(StringUtils.round(llfdl, 2));
|
|
|
|
|
|
- if (StringUtils.notEmp(iols) && StringUtils.notEmp(iols.get(0)) && !iols.isEmpty()) {
|
|
|
+ if (StringUtils.notEmp(iols) && !iols.isEmpty() && StringUtils.notEmp(iols.get(0)) ) {
|
|
|
SingleAnalysisVo wtd = iols.get(0);
|
|
|
xfqr = null != wtd.getXfqr() ? wtd.getXfqr() : 0.0;//风机小风切入
|
|
|
xfqrhgl = null != wtd.getXfqrhgl() ? wtd.getXfqrhgl() : 0.0;//风机小风切入合格率
|
|
|
@@ -456,7 +456,7 @@ public class SingleAnalysisService {
|
|
|
vo.setXfqr(StringUtils.round(xfqr, 2));
|
|
|
vo.setXfqrhgl(StringUtils.round(xfqrhgl, 2));
|
|
|
|
|
|
- if (StringUtils.notEmp(wtdls) && StringUtils.notEmp(wtdls.get(0)) && !wtdls.isEmpty()) {
|
|
|
+ if (StringUtils.notEmp(wtdls) && !wtdls.isEmpty() && StringUtils.notEmp(wtdls.get(0)) ) {
|
|
|
SingleAnalysisVo wtd = wtdls.get(0);
|
|
|
jfpl = null != wtd.getJfpl() ? wtd.getJfpl() : 0.0;//静风频率
|
|
|
}
|
|
|
@@ -543,7 +543,7 @@ public class SingleAnalysisService {
|
|
|
|
|
|
}
|
|
|
|
|
|
- if (StringUtils.notEmp(wtday3ls) && StringUtils.notEmp(wtday3ls.get(0)) && !wtday3ls.isEmpty()) {
|
|
|
+ if (StringUtils.notEmp(wtday3ls) && !wtday3ls.isEmpty() && StringUtils.notEmp(wtday3ls.get(0)) ) {
|
|
|
for(Windturbineinfoday3 wtd:wtday3ls) {
|
|
|
|
|
|
SingleAnalysisVo vo = new SingleAnalysisVo();
|
