|
|
@@ -437,156 +437,6 @@ public class MonitorService {
|
|
|
mxztmap.put("gf_slnum", gf_slhjnum + gf_sldwnum);
|
|
|
mxztmap.put("gf_lxyznum", gf_wznum + gf_lxnum);
|
|
|
|
|
|
-// if (!fjztlist.isEmpty() && fjztlist.size() == fjztls.size()) {
|
|
|
-// for (int i = 0; i < fjztlist.size(); i++) {
|
|
|
-// double fjzt = MathUtil.twoBit(MathUtil.twoBit(fjztlist.get(i).getPointValueInDouble()));
|
|
|
-// switch (Double.valueOf(fjzt).intValue()) {
|
|
|
-// case 0:
|
|
|
-// fd_dfnum++;
|
|
|
-// break;
|
|
|
-// case 1:
|
|
|
-// fd_sdtjnum++;
|
|
|
-// break;
|
|
|
-// case 2:
|
|
|
-// fd_zcfdnum++;
|
|
|
-// break;
|
|
|
-// case 3:
|
|
|
-// fd_jclyxnum++;
|
|
|
-// break;
|
|
|
-// case 4:
|
|
|
-// fd_gztjnum++;
|
|
|
-// break;
|
|
|
-// case 5:
|
|
|
-// fd_gzcnslnum++;
|
|
|
-// break;
|
|
|
-// case 6:
|
|
|
-// fd_jxtjnum++;
|
|
|
-// break;
|
|
|
-// case 7:
|
|
|
-// fd_jxclslnum++;
|
|
|
-// break;
|
|
|
-// case 8:
|
|
|
-// fd_xdjclnum++;
|
|
|
-// break;
|
|
|
-// case 9:
|
|
|
-// fd_tjnum++;
|
|
|
-// break;
|
|
|
-// case 10:
|
|
|
-// fd_sldwnum++;
|
|
|
-// break;
|
|
|
-// case 11:
|
|
|
-// fd_slhjnum++;
|
|
|
-// break;
|
|
|
-// case 12:
|
|
|
-// fd_wznum++;
|
|
|
-// break;
|
|
|
-// case 13:
|
|
|
-// fd_lxnum++;
|
|
|
-// break;
|
|
|
-// default:
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// mxztmap.put("fd_dfnum", fd_dfnum);
|
|
|
-// mxztmap.put("fd_sdtjnum", fd_sdtjnum);
|
|
|
-// mxztmap.put("fd_zcfdnum", fd_zcfdnum);
|
|
|
-// mxztmap.put("fd_jclyxnum", fd_jclyxnum);
|
|
|
-// mxztmap.put("fd_gztjnum", fd_gztjnum);
|
|
|
-// mxztmap.put("fd_gzcnslnum", fd_gzcnslnum);
|
|
|
-// mxztmap.put("fd_jxtjnum", fd_jxtjnum);
|
|
|
-// 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()) {
|
|
|
-// for (int i = 0; i < gfztlist.size(); i++) {
|
|
|
-// double gfzt = MathUtil.twoBit(MathUtil.twoBit(gfztlist.get(i).getPointValueInDouble()));
|
|
|
-// switch (Double.valueOf(gfzt).intValue()) {
|
|
|
-// case 0:
|
|
|
-// gf_dfnum++;
|
|
|
-// break;
|
|
|
-// case 1:
|
|
|
-// gf_sdtjnum++;
|
|
|
-// break;
|
|
|
-// case 2:
|
|
|
-// gf_zcfdnum++;
|
|
|
-// break;
|
|
|
-// case 3:
|
|
|
-// gf_jclyxnum++;
|
|
|
-// break;
|
|
|
-// case 4:
|
|
|
-// gf_gztjnum++;
|
|
|
-// break;
|
|
|
-// case 5:
|
|
|
-// gf_gzcnslnum++;
|
|
|
-// break;
|
|
|
-// case 6:
|
|
|
-// gf_jxtjnum++;
|
|
|
-// break;
|
|
|
-// case 7:
|
|
|
-// gf_jxclslnum++;
|
|
|
-// break;
|
|
|
-// case 8:
|
|
|
-// gf_xdjclnum++;
|
|
|
-// break;
|
|
|
-// case 9:
|
|
|
-// gf_tjnum++;
|
|
|
-// break;
|
|
|
-// case 10:
|
|
|
-// gf_sldwnum++;
|
|
|
-// break;
|
|
|
-// case 11:
|
|
|
-// gf_slhjnum++;
|
|
|
-// break;
|
|
|
-// case 12:
|
|
|
-// gf_wznum++;
|
|
|
-// break;
|
|
|
-// case 13:
|
|
|
-// gf_lxnum++;
|
|
|
-// break;
|
|
|
-// default:
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// mxztmap.put("gf_dfnum", gf_dfnum);
|
|
|
-// mxztmap.put("gf_sdtjnum", gf_sdtjnum);
|
|
|
-// mxztmap.put("gf_zcfdnum", gf_zcfdnum);
|
|
|
-// mxztmap.put("gf_jclyxnum", gf_jclyxnum);
|
|
|
-// mxztmap.put("gf_gztjnum", gf_gztjnum);
|
|
|
-// mxztmap.put("gf_gzcnslnum", gf_gzcnslnum);
|
|
|
-// mxztmap.put("gf_jxtjnum", gf_jxtjnum);
|
|
|
-// 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);
|
|
|
-// }
|
|
|
|
|
|
|
|
|
map.put("mxztmap", mxztmap);
|
|
|
@@ -797,8 +647,8 @@ public class MonitorService {
|
|
|
qt.put("fdzzjrl", rg.getJrwindCapacity() / 1000);
|
|
|
qt.put("gfzzjrl", rg.getJrCapacity() / 1000);
|
|
|
qt.put("zzjrl", (rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000);
|
|
|
- qt.put("ylyxs", (yfdl / 10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
|
|
|
- qt.put("nlyxs", (nfdl / 10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
|
|
|
+ qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
|
|
|
+ qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -807,15 +657,15 @@ public class MonitorService {
|
|
|
qt.put("fdzzjrl", cp.getJrwindCapacity() / 1000);
|
|
|
qt.put("gfzzjrl", cp.getJrCapacity() / 1000);
|
|
|
qt.put("zzjrl", (cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000);
|
|
|
- qt.put("ylyxs", (yfdl / 10000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
|
|
|
- qt.put("nlyxs", (nfdl / 10000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
|
|
|
+ qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
|
|
|
+ qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
|
|
|
}
|
|
|
}
|
|
|
for (ProBasicPowerstation wp : wplist) {
|
|
|
if (wpId.contains(wp.getId())) {
|
|
|
|
|
|
- qt.put("ylyxs", (yfdl / 10000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
|
|
|
- qt.put("nlyxs", (nfdl / 10000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
|
|
|
+ qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
|
|
|
+ qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
|
|
|
}
|
|
|
}
|
|
|
qt.put("aqts", MathUtil.twoBit(aqts));
|
|
|
@@ -1595,9 +1445,9 @@ public class MonitorService {
|
|
|
temp0 = sj.get(0).getPointValueInDouble();
|
|
|
temp1 = sj.get(1).getPointValueInDouble();
|
|
|
temp2 = sj.get(2).getPointValueInDouble();
|
|
|
- vos.get(0).setNfdl(StringUtils.round((temp0 /10000) / (zjrl/1000), 2));
|
|
|
- vos.get(1).setNfdl(StringUtils.round((temp1 /10000)/ (zjrl/1000), 2));
|
|
|
- vos.get(2).setNfdl(StringUtils.round((temp2/10000)/ (zjrl/1000), 2));
|
|
|
+ vos.get(0).setNfdl(StringUtils.round((temp0 /1000) / (zjrl/1000), 2));
|
|
|
+ vos.get(1).setNfdl(StringUtils.round((temp1 /1000)/ (zjrl/1000), 2));
|
|
|
+ vos.get(2).setNfdl(StringUtils.round((temp2/1000)/ (zjrl/1000), 2));
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -1613,7 +1463,7 @@ public class MonitorService {
|
|
|
|
|
|
PointData data = edosUtil.getSectionData(month, DateUtils.getEndOfDay(DateUtils.getMonthLast(date)).getTime());
|
|
|
PowercurveVo vo1 = new PowercurveVo();
|
|
|
- vo1.setYfdl(DoubleUtils.keepPrecision((data.getPointValueInDouble() /10000) / (zjrl/1000), 2));
|
|
|
+ vo1.setYfdl(DoubleUtils.keepPrecision((data.getPointValueInDouble() /1000) / (zjrl/1000), 2));
|
|
|
vo1.setHours(i);
|
|
|
vos.add(vo1);
|
|
|
date = DateUtils.addMonths(date, -1);
|
wangb@gyee-china.com