|
|
@@ -191,7 +191,7 @@ public class MonitorService {
|
|
|
//停机
|
|
|
double fd_tjnum = 0;
|
|
|
//故障停机
|
|
|
- double fd_sltjnum = 0;
|
|
|
+ double fd_gztjnum = 0;
|
|
|
//故障场内受累
|
|
|
double fd_gzcnslnum = 0;
|
|
|
//检修停机
|
|
|
@@ -220,13 +220,13 @@ public class MonitorService {
|
|
|
//停机
|
|
|
double gf_tjnum = 0;
|
|
|
//故障停机
|
|
|
- double gf_sltjnum = 0;
|
|
|
+ double gf_gztjnum = 0;
|
|
|
//故障场内受累
|
|
|
double gf_gzcnslnum = 0;
|
|
|
//检修停机
|
|
|
double gf_jxtjnum = 0;
|
|
|
//检修场内受累
|
|
|
- double gf_jxlslnum = 0;
|
|
|
+ double gf_jxclslnum = 0;
|
|
|
//受累电网
|
|
|
double gf_sldwnum = 0;
|
|
|
//受累环境
|
|
|
@@ -236,7 +236,7 @@ public class MonitorService {
|
|
|
//未知
|
|
|
double gf_wznum = 0;
|
|
|
|
|
|
- Map<String, Double> mxztmap = new HashMap<>();
|
|
|
+ Map<String, Double> mxztmap = new LinkedHashMap<>();
|
|
|
|
|
|
for (ProBasicPowerstation wp : wplist) {
|
|
|
|
|
|
@@ -276,7 +276,7 @@ public class MonitorService {
|
|
|
fd_jclyxnum++;
|
|
|
break;
|
|
|
case 4:
|
|
|
- fd_sltjnum++;
|
|
|
+ fd_gztjnum++;
|
|
|
break;
|
|
|
case 5:
|
|
|
fd_gzcnslnum++;
|
|
|
@@ -285,7 +285,7 @@ public class MonitorService {
|
|
|
fd_jxtjnum++;
|
|
|
break;
|
|
|
case 7:
|
|
|
- gf_jxlslnum++;
|
|
|
+ fd_jxclslnum++;
|
|
|
break;
|
|
|
case 8:
|
|
|
fd_xdjclnum++;
|
|
|
@@ -314,16 +314,25 @@ public class MonitorService {
|
|
|
mxztmap.put("fd_sdtjnum", fd_sdtjnum);
|
|
|
mxztmap.put("fd_zcfdnum", fd_zcfdnum);
|
|
|
mxztmap.put("fd_jclyxnum", fd_jclyxnum);
|
|
|
- mxztmap.put("fd_sltjnum", fd_sltjnum);
|
|
|
+ mxztmap.put("fd_gztjnum", fd_gztjnum);
|
|
|
mxztmap.put("fd_gzcnslnum", fd_gzcnslnum);
|
|
|
mxztmap.put("fd_jxtjnum", fd_jxtjnum);
|
|
|
- mxztmap.put("gf_jxlslnum", gf_jxlslnum);
|
|
|
+ mxztmap.put("fd_jxclslnum", fd_jxclslnum);
|
|
|
mxztmap.put("fd_xdjclnum", fd_xdjclnum);
|
|
|
mxztmap.put("fd_tjnum", fd_tjnum);
|
|
|
mxztmap.put("fd_sldwnum", fd_sldwnum);
|
|
|
mxztmap.put("fd_slhjnum", fd_slhjnum);
|
|
|
mxztmap.put("fd_wznum", fd_wznum);
|
|
|
mxztmap.put("fd_lxnum", fd_lxnum);
|
|
|
+
|
|
|
+ mxztmap.put("fd_djnum",fd_dfnum + fd_sdtjnum);
|
|
|
+ mxztmap.put("fd_yxnum",fd_zcfdnum + fd_jclyxnum);
|
|
|
+ mxztmap.put("fd_gznum",fd_gzcnslnum + fd_gztjnum);
|
|
|
+ mxztmap.put("fd_jxnum",fd_jxtjnum + fd_jxclslnum);
|
|
|
+ mxztmap.put("fd_xdnum",fd_xdjclnum + fd_tjnum);
|
|
|
+ mxztmap.put("fd_slnum",fd_slhjnum + fd_sldwnum);
|
|
|
+ mxztmap.put("fd_lxyznum",fd_wznum + fd_lxnum);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
if (!gfztlist.isEmpty() && gfztlist.size() == gfztls.size()) {
|
|
|
@@ -343,7 +352,7 @@ public class MonitorService {
|
|
|
gf_jclyxnum++;
|
|
|
break;
|
|
|
case 4:
|
|
|
- gf_sltjnum++;
|
|
|
+ gf_gztjnum++;
|
|
|
break;
|
|
|
case 5:
|
|
|
gf_gzcnslnum++;
|
|
|
@@ -352,7 +361,7 @@ public class MonitorService {
|
|
|
gf_jxtjnum++;
|
|
|
break;
|
|
|
case 7:
|
|
|
- gf_jxlslnum++;
|
|
|
+ gf_jxclslnum++;
|
|
|
break;
|
|
|
case 8:
|
|
|
gf_xdjclnum++;
|
|
|
@@ -381,16 +390,24 @@ public class MonitorService {
|
|
|
mxztmap.put("gf_sdtjnum", gf_sdtjnum);
|
|
|
mxztmap.put("gf_zcfdnum", gf_zcfdnum);
|
|
|
mxztmap.put("gf_jclyxnum", gf_jclyxnum);
|
|
|
- mxztmap.put("gf_sltjnum", gf_sltjnum);
|
|
|
+ mxztmap.put("gf_gztjnum", gf_gztjnum);
|
|
|
mxztmap.put("gf_gzcnslnum", gf_gzcnslnum);
|
|
|
mxztmap.put("gf_jxtjnum", gf_jxtjnum);
|
|
|
- mxztmap.put("gf_jxlslnum", gf_jxlslnum);
|
|
|
+ mxztmap.put("gf_jxclslnum", gf_jxclslnum);
|
|
|
mxztmap.put("gf_xdjclnum", gf_xdjclnum);
|
|
|
mxztmap.put("gf_tjnum", gf_tjnum);
|
|
|
mxztmap.put("gf_sldwnum", gf_sldwnum);
|
|
|
mxztmap.put("gf_slhjnum", gf_slhjnum);
|
|
|
mxztmap.put("gf_wznum", gf_wznum);
|
|
|
mxztmap.put("gf_lxnum", gf_lxnum);
|
|
|
+
|
|
|
+ mxztmap.put("gf_djnum",gf_dfnum + gf_sdtjnum);
|
|
|
+ mxztmap.put("gf_yxnum",gf_zcfdnum + gf_jclyxnum);
|
|
|
+ mxztmap.put("gf_gznum",gf_gzcnslnum + gf_gztjnum);
|
|
|
+ mxztmap.put("gf_jxnum",gf_jxtjnum + gf_jxclslnum);
|
|
|
+ mxztmap.put("gf_xdnum",gf_xdjclnum + gf_tjnum);
|
|
|
+ mxztmap.put("gf_slnum",gf_slhjnum + gf_sldwnum);
|
|
|
+ mxztmap.put("gf_lxyznum",gf_wznum + gf_lxnum);
|
|
|
}
|
|
|
|
|
|
}
|
wangb