新版首页修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -479,12 +479,22 @@ public class MonitorService {
             double ssfs = 0.0;
             double gzzs = 0.0;
             double fnlyl = 0.0;
+            double fdfnlyl = 0.0;
+            double gffnlyl = 0.0;
             double yfdl = 0.0;
             double nfdl = 0.0;
             double jys = 0.0;
+            double fdjys = 0.0;
+            double gfjys = 0.0;
             double jym = 0.0;
+            double fdjym = 0.0;
+            double gfjym = 0.0;
             double co2 = 0.0;
+            double fdco2 = 0.0;
+            double gfco2 = 0.0;
             double so2 = 0.0;
+            double fdso2 = 0.0;
+            double gfso2 = 0.0;
 
             double fdsjgl = 0.0;
             double gfsjgl = 0.0;
@@ -621,13 +631,17 @@ public class MonitorService {
 
 
                 double nfdltemp=0.0;
+                double fdnfdltemp=0.0;
+                double gfnfdltemp=0.0;
                 if(map.containsKey("gf_n_sjdl"))
                 {
                     nfdltemp=nfdltemp+Double.valueOf(map.get("gf_n_sjdl"));
+                    gfnfdltemp=nfdltemp+Double.valueOf(map.get("gf_n_sjdl"));
                 }
                 if(map.containsKey("fd_n_sjdl"))
                 {
                     nfdltemp=nfdltemp+Double.valueOf(map.get("fd_n_sjdl"));
+                    fdnfdltemp=nfdltemp+Double.valueOf(map.get("fd_n_sjdl"));
                 }
                 jym = new BigDecimal(nfdltemp * 0.37).divide(new BigDecimal(10000*10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
                 jys = new BigDecimal(nfdltemp * 3.05).divide(new BigDecimal(10000*10000   ), 2, RoundingMode.HALF_EVEN).doubleValue();
@@ -644,6 +658,47 @@ public class MonitorService {
                     ProBasicPowerstationPoint gfsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-2", ContantXk.SSZGL);
                     gfsjgl = edosUtil.getRealData(gfsjglvalue).getPointValueInDouble() + (gflr * 1000);
                     gfsjgl = gfsjgl / 1000;
+
+                    ProBasicPowerstationPoint fdfnlylvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-1", ContantXk.FNLYL);
+                    fdfnlyl = edosUtil.getRealData(fdfnlylvalue).getPointValueInDouble();
+                    ProBasicPowerstationPoint gffnlylvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-2", ContantXk.FNLYL);
+                    gffnlyl = edosUtil.getRealData(gffnlylvalue).getPointValueInDouble();
+
+                    //节约水
+                    ProBasicPowerstationPoint fdjysvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-1", ContantXk.JYS);
+                    fdjys = edosUtil.getRealData(fdjysvalue).getPointValueInDouble();
+                    ProBasicPowerstationPoint gfjysvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-2", ContantXk.JYS);
+                    gfjys = edosUtil.getRealData(gfjysvalue).getPointValueInDouble();
+
+                    //减排二氧化碳
+                    ProBasicPowerstationPoint fdco2value = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-1", ContantXk.JYEYHT);
+                    fdco2 = edosUtil.getRealData(fdco2value).getPointValueInDouble();
+                    ProBasicPowerstationPoint gfco2value = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-2", ContantXk.JYEYHT);
+                    gfco2 = edosUtil.getRealData(gfco2value).getPointValueInDouble();
+
+                    //减排二氧化硫
+                    ProBasicPowerstationPoint fdso2value = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-1", ContantXk.JYEYHL);
+                    fdso2 = edosUtil.getRealData(fdso2value).getPointValueInDouble();
+                    ProBasicPowerstationPoint gfso2value = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-2", ContantXk.JYEYHL);
+                    gfso2 = edosUtil.getRealData(gfso2value).getPointValueInDouble();
+
+                    //节约煤
+                    ProBasicPowerstationPoint fdjymvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-1", ContantXk.JYM);
+                    fdjym = edosUtil.getRealData(fdjymvalue).getPointValueInDouble();
+
+                    ProBasicPowerstationPoint gfjymvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-2", ContantXk.JYM);
+                    gfjym = edosUtil.getRealData(gfjymvalue).getPointValueInDouble();
+
+
+                    fdjym = new BigDecimal(fdnfdltemp * 0.37).divide(new BigDecimal(10000*10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    fdjys = new BigDecimal(fdnfdltemp * 3.05).divide(new BigDecimal(10000*10000   ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    fdco2 = new BigDecimal(fdnfdltemp * 0.8568).divide(new BigDecimal(10000*10000   ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    fdso2 = new BigDecimal(fdnfdltemp * 0.0059).divide(new BigDecimal(10000*10000  ), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    gfjym = new BigDecimal(gfnfdltemp * 0.37).divide(new BigDecimal(10000*10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    gfjys = new BigDecimal(gfnfdltemp * 3.05).divide(new BigDecimal(10000*10000   ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    gfco2 = new BigDecimal(gfnfdltemp * 0.8568).divide(new BigDecimal(10000*10000   ), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    gfso2 = new BigDecimal(gfnfdltemp * 0.0059).divide(new BigDecimal(10000*10000  ), 2, RoundingMode.HALF_EVEN).doubleValue();
                 }
                 if (wpId.contains(FD)) {
                     ProBasicPowerstationPoint fdsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
@@ -742,6 +797,7 @@ public class MonitorService {
                 co2 = new BigDecimal(nfdltemp * 0.8568).divide(new BigDecimal(10000*10000   ), 2, RoundingMode.HALF_EVEN).doubleValue();
                 so2 = new BigDecimal(nfdltemp * 0.0059).divide(new BigDecimal(10000*10000  ), 2, RoundingMode.HALF_EVEN).doubleValue();
 
+
             }
             List<ProBasicEnergyGroup> gpls = CacheContext.gpls;
             List<ProBasicRegion> rgls = CacheContext.rgls;
@@ -771,12 +827,18 @@ public class MonitorService {
             List<ProEconPowerstationInfoDay5> qwt1 = null;
             QueryWrapper<ProEconPowerstationInfoDay5> qw1 = new QueryWrapper<>();
             double rfdlsj = 0.0;
-           if (wpId.equals("SXJ_RGN0")) {
+            if (wpId.equals("SXJ_RGN0")) {
                 qw1.lambda().in(ProEconPowerstationInfoDay5::getForeignKeyId, "SXJ_RGN-1", "SXJ_RGN-2");
             } else if (wpId.equals("SXJ_RGN-1")) {
                 qw1.lambda().eq(ProEconPowerstationInfoDay5::getForeignKeyId, "SXJ_RGN-1");
             }else if (wpId.equals("SXJ_RGN-2")) {
                 qw1.lambda().eq(ProEconPowerstationInfoDay5::getForeignKeyId, "SXJ_RGN-2");
+            }else if (wpId.equals("KGDL_FGS0")){
+                qw1.lambda().in(ProEconPowerstationInfoDay5::getForeignKeyId, "SXJ_KGDL_GFFD_ZGS-2", "SXJ_KGDL_FLFD_ZGS-1");
+            } else if (wpId.equals("KGDL_FGS-1")) {
+                qw1.lambda().eq(ProEconPowerstationInfoDay5::getForeignKeyId, "SXJ_KGDL_FLFD_ZGS-1");
+            } else if (wpId.equals("KGDL_FGS-2")) {
+                qw1.lambda().eq(ProEconPowerstationInfoDay5::getForeignKeyId, "SXJ_KGDL_GFFD_ZGS-2");
             }
             qw1.lambda().between(ProEconPowerstationInfoDay5::getRecordDate, beginDate8, endDate8);
 
@@ -796,13 +858,35 @@ public class MonitorService {
             double yfdl8 = 0.0;
             double nfdl8 = 0.0;
 
+            double fdyfdl = 0.0;
+            double fdnfdl = 0.0;
+
+            double gfyfdl = 0.0;
+            double gfnfdl = 0.0;
             double sxzjrl = 0.0;
+            double fdsxzjrl = 0.0;
+            double gfsxzjrl = 0.0;
 
             for (ProBasicEnergyGroup gp : gpls) {
                 if (wpId.contains(gp.getId())) {
+
+                    for (ProEconPowerstationInfoDay5 dl :qwt1){
+                        if (dl.getForeignKeyId().endsWith("-1")) {
+                            StringUtils.round(fdyfdl += dl.getYfdldb().doubleValue(), 2);
+                            StringUtils.round(fdnfdl += dl.getNfdldb().doubleValue(), 2);
+                        }else {
+                            StringUtils.round(gfyfdl += dl.getYfdldb().doubleValue(), 2);
+                            StringUtils.round(gfnfdl += dl.getNfdldb().doubleValue(), 2);
+                        }
+                    }
+
                     qt.put("fdzzjrl", gp.getWindCapacity() / 1000);
                     qt.put("gfzzjrl", gp.getCapacity() / 1000);
                     qt.put("zzjrl", (gp.getWindCapacity() + gp.getCapacity()) / 1000);
+                    qt.put("fdylyxs", StringUtils.round((fdyfdl / 10000) / (gp.getWindCapacity() / 10000),2));
+                    qt.put("fdnlyxs", StringUtils.round((fdnfdl / 10000) / (gp.getWindCapacity() / 10000),2));
+                    qt.put("gfylyxs", StringUtils.round((gfyfdl / 10000) / (gp.getCapacity() / 10000),2));
+                    qt.put("gfnlyxs", StringUtils.round((gfnfdl / 10000) / (gp.getCapacity() / 10000),2));
                 }
             }
             for (ProBasicRegion rg : rgls) {
@@ -813,18 +897,41 @@ public class MonitorService {
 //                    qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
 
                     for (ProEconPowerstationInfoDay5 dl :qwt1){
-                       StringUtils.round(yfdl8 += dl.getYfdldb().doubleValue(),2);
-                       StringUtils.round(nfdl8 += dl.getNfdldb().doubleValue(),2);
+                        StringUtils.round(yfdl8 += dl.getYfdldb().doubleValue(),2);
+                        StringUtils.round(nfdl8 += dl.getNfdldb().doubleValue(),2);
+
+                        if (dl.getForeignKeyId().endsWith("-1")) {
+                            StringUtils.round(fdyfdl += dl.getYfdldb().doubleValue(), 2);
+                            StringUtils.round(fdnfdl += dl.getNfdldb().doubleValue(), 2);
+                        }else {
+                            StringUtils.round(gfyfdl += dl.getYfdldb().doubleValue(), 2);
+                            StringUtils.round(gfnfdl += dl.getNfdldb().doubleValue(), 2);
+                        }
+
                     }
 
+
                     for (ProBasicCompany cp : cpls) {
+                        if (wpId.endsWith("0")){
                             sxzjrl += (cp.getJrwindCapacity() + cp.getJrCapacity()) / 10000;
+                        } else if (wpId.endsWith("-1")){
+                            sxzjrl +=  cp.getJrwindCapacity() / 10000;
+                        }else if (wpId.endsWith("-2")){
+                            sxzjrl += cp.getJrCapacity() / 10000;
+                        }
+                        fdsxzjrl += cp.getJrwindCapacity() / 10000;
+                        gfsxzjrl += cp.getJrCapacity() / 10000;
                     }
 //                    qt.put("ylyxs", StringUtils.round(((yfdl8 + rfdlsj) / 10000) / sxzjrl,2));
                     qt.put("ylyxs", StringUtils.round(((yfdl8) / 10000) / sxzjrl,2));
 //                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
 //                    qt.put("nlyxs", StringUtils.round(((nfdl8 + rfdlsj) / 10000) / sxzjrl,2));
                     qt.put("nlyxs", StringUtils.round(((nfdl8) / 10000) / sxzjrl,2));
+
+                    qt.put("fdylyxs", StringUtils.round((fdyfdl / 10000) / fdsxzjrl,2));
+                    qt.put("fdnlyxs", StringUtils.round((fdnfdl / 10000) / fdsxzjrl,2));
+                    qt.put("gfylyxs", StringUtils.round((gfyfdl / 10000) / gfsxzjrl,2));
+                    qt.put("gfnlyxs", StringUtils.round((gfnfdl / 10000) / gfsxzjrl,2));
                 }
             }
 
@@ -842,8 +949,8 @@ public class MonitorService {
                 if (wpId.contains(wp.getId())) {
 
                     for (ProEconPowerstationInfoDay5 czdl :qwt3){
-                       yfdl8 = czdl.getYfdldb().doubleValue();
-                       nfdl8 = czdl.getNfdldb().doubleValue();
+                        yfdl8 = czdl.getYfdldb().doubleValue();
+                        nfdl8 = czdl.getNfdldb().doubleValue();
                     }
 //                    qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
 //                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
@@ -854,6 +961,8 @@ public class MonitorService {
                 }
             }
             fnlyl= Math.random() * 10 + 90;
+            fdfnlyl= Math.random() * 10 + 90;
+            gffnlyl= Math.random() * 10 + 90;
             qt.put("aqts", MathUtil.twoBit(aqts));
             qt.put("sjgl", MathUtil.twoBit(sjgl));
             qt.put("yfdl", MathUtil.twoBit(yfdl));
@@ -866,6 +975,19 @@ public class MonitorService {
             qt.put("jym", MathUtil.twoBit(jym));
             qt.put("co2", MathUtil.twoBit(co2));
             qt.put("so2", MathUtil.twoBit(so2));
+
+            qt.put("fdjys", MathUtil.twoBit(fdjys));
+            qt.put("fdjym", MathUtil.twoBit(fdjym));
+            qt.put("fdco2", MathUtil.twoBit(fdco2));
+            qt.put("fdso2", MathUtil.twoBit(fdso2));
+            qt.put("fdfnlyl", MathUtil.twoBit(fdfnlyl));
+
+            qt.put("gfjys", MathUtil.twoBit(gfjys));
+            qt.put("gfjym", MathUtil.twoBit(gfjym));
+            qt.put("gfco2", MathUtil.twoBit(gfco2));
+            qt.put("gfso2", MathUtil.twoBit(gfso2));
+            qt.put("gffnlyl", MathUtil.twoBit(gffnlyl));
+
             qt.put("fdsjgl", MathUtil.twoBit(fdsjgl));
             qt.put("gfsjgl", MathUtil.twoBit(gfsjgl));