缓存更改，首页取数修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/init/CacheContext.java

@@ -84,7 +84,6 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicPowerstation>  wplsG = new ArrayList<>(); //光电集合
     public static List<ProBasicPowerstation>  zwpls = new ArrayList<>();
     public static List<ProBasicCompany>  cpls = new ArrayList<>();
-    public static List<ProBasicCompany>  companyList = new ArrayList<>();
     public static List<ProBasicRegion>  rgls = new ArrayList<>();
     public static List<ProBasicEnergyGroup>  gpls = new ArrayList<>();
     public static List<ProBasicPowerstationPoint> powerpointls = new ArrayList<>();
@@ -219,8 +218,7 @@ public class CacheContext implements CommandLineRunner {
 
 
         rgls=proBasicRegionService.list().stream().filter(i->i.getIsAble()==1).collect(Collectors.toList());
-        companyList = proBasicCompanyService.list().stream().filter (i->i.getId().equals("SXJ_KGDL_FLFD_ZGS") || i.getId().equals("SXJ_KGDL_GFFD_ZGS")
-                || i.getId().equals("NMM_KGDL_QH_ZGS")).collect(Collectors.toList());
+
 
         if  (!rgls.isEmpty())
         {

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

@@ -114,7 +114,7 @@ public class MonitorService {
                         ProBasicPowerstationPoint glvalue = proBasicPowerstationPointService.getPowerstationPoint(id, ContantXk.SSZGL);
                         gl = edosUtil.getRealData(glvalue).getPointValueInDouble();
                         xx.put("gl", MathUtil.twoBit(gl));
-                    }else if (CacheContext.wpmap.containsKey(id) && id.endsWith("GDC_STA")){
+                    } else if (CacheContext.wpmap.containsKey(id) && id.endsWith("GDC_STA")) {
                         xx.put("zczjts", Double.valueOf(wp.getJrquantityZc()));
                         xx.put("jzzjts", Double.valueOf(wp.getJrquantityJz()));
                         xx.put("zjrl", wp.getJrCapacity());
@@ -138,13 +138,13 @@ public class MonitorService {
             if (!wpls1.isEmpty()) {
                 double xlgl = 0.0;
                 double i = 0;
-                for (ProBasicLine ls :  CacheContext.lnls) {
+                for (ProBasicLine ls : CacheContext.lnls) {
                     Map<String, Double> xl = new LinkedHashMap<>();
                     String lineid = ls.getId();
                     i++;
                     ProBasicPowerstationPoint xlglvalue = proBasicPowerstationPointService.getPowerstationPoint(lineid, ContantXk.SSZGL);
                     xlgl = edosUtil.getRealData(xlglvalue).getPointValueInDouble();
-                    xl.put("i",i);
+                    xl.put("i", i);
                     xl.put("xlgl", MathUtil.twoBit(xlgl));
                     xlmap.put(lineid, xl);
                 }
@@ -193,7 +193,7 @@ public class MonitorService {
                         fjztls.add(proBasicEquipmentPointService.getEquipmentPoint(wt.getId(), ContantXk.MXZT).getNemCode());
                     }
 
-                }else if (wp.getId().endsWith("GDC_STA") && CacheContext.wpwtmap.containsKey(wp.getId())){
+                } else if (wp.getId().endsWith("GDC_STA") && CacheContext.wpwtmap.containsKey(wp.getId())) {
                     List<ProBasicEquipment> wtls = CacheContext.wpwtmap.get(wp.getId());
                     for (ProBasicEquipment wt : wtls) {
                         gfztls.add(proBasicEquipmentPointService.getEquipmentPoint(wt.getId(), ContantXk.MXZT).getNemCode());
@@ -234,13 +234,13 @@ public class MonitorService {
                         }
                     }
 
-                    mxztmap.put("fd_djnum",fd_djnum);
-                    mxztmap.put("fd_yxnum",fd_yxnum);
-                    mxztmap.put("fd_gznum",fd_gznum);
-                    mxztmap.put("fd_lxnum",fd_lxnum);
-                    mxztmap.put("fd_jxnum",fd_jxnum);
-                    mxztmap.put("fd_xdnum",fd_xdnum);
-                    mxztmap.put("fd_slnum",fd_slnum);
+                    mxztmap.put("fd_djnum", fd_djnum);
+                    mxztmap.put("fd_yxnum", fd_yxnum);
+                    mxztmap.put("fd_gznum", fd_gznum);
+                    mxztmap.put("fd_lxnum", fd_lxnum);
+                    mxztmap.put("fd_jxnum", fd_jxnum);
+                    mxztmap.put("fd_xdnum", fd_xdnum);
+                    mxztmap.put("fd_slnum", fd_slnum);
                 }
 
                 if (!gfztlist.isEmpty() && gfztlist.size() == gfztls.size()) {
@@ -274,17 +274,17 @@ public class MonitorService {
                         }
                     }
 
-                    mxztmap.put("gf_djnum",gf_djnum);
-                    mxztmap.put("gf_yxnum",gf_yxnum);
-                    mxztmap.put("gf_gznum",gf_gznum);
-                    mxztmap.put("gf_lxnum",gf_lxnum);
-                    mxztmap.put("gf_jxnum",gf_jxnum);
-                    mxztmap.put("gf_xdnum",gf_xdnum);
-                    mxztmap.put("gf_slnum",gf_slnum);
+                    mxztmap.put("gf_djnum", gf_djnum);
+                    mxztmap.put("gf_yxnum", gf_yxnum);
+                    mxztmap.put("gf_gznum", gf_gznum);
+                    mxztmap.put("gf_lxnum", gf_lxnum);
+                    mxztmap.put("gf_jxnum", gf_jxnum);
+                    mxztmap.put("gf_xdnum", gf_xdnum);
+                    mxztmap.put("gf_slnum", gf_slnum);
                 }
-                
+
             }
-            map.put("mxztmap",mxztmap);
+            map.put("mxztmap", mxztmap);
 
 
             /**********************************************首页明细状态统计**********************************************************/
@@ -294,6 +294,9 @@ public class MonitorService {
 
             double aqts = 0.0;
             double sjgl = 0.0;
+            double llgl = 0.0;
+            double ssfs = 0.0;
+            double gzzs = 0.0;
             double jys = 0.0;
             double jym = 0.0;
             double co2 = 0.0;
@@ -301,50 +304,71 @@ public class MonitorService {
 
             Map<String, Double> qt = new HashMap<>();
 
-            if (wpId.equals(QS) || wpId.equals(FD) || wpId.equals(GF)) {
-                wpId = "SXJ_RGN" + wpId;
-                //安全天数
-                ProBasicPowerstationPoint aqtsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.AQTS);
-                aqts = edosUtil.getRealData(aqtsvalue).getPointValueInDouble();
-                //实时功率
-                ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
-                sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();
-                //节约水
-                ProBasicPowerstationPoint jysvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYS);
-                jys = edosUtil.getRealData(jysvalue).getPointValueInDouble();
-                //节约煤
-                ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
-                jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
-                //减排二氧化碳
-                ProBasicPowerstationPoint co2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHT);
-                co2 = edosUtil.getRealData(co2value).getPointValueInDouble();
-                //减排二氧化硫
-                ProBasicPowerstationPoint so2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHL);
-                so2 = edosUtil.getRealData(so2value).getPointValueInDouble();
-
-            } else {
-                //安全天数
-                ProBasicPowerstationPoint aqtsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.AQTS);
-                aqts = edosUtil.getRealData(aqtsvalue).getPointValueInDouble();
-                //实时功率
-                ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
-                sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();
-                //节约水
-                ProBasicPowerstationPoint jysvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYS);
-                jys = edosUtil.getRealData(jysvalue).getPointValueInDouble();
-                //减排二氧化碳
-                ProBasicPowerstationPoint co2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHT);
-                co2 = edosUtil.getRealData(co2value).getPointValueInDouble();
-                //减排二氧化硫
-                ProBasicPowerstationPoint so2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHL);
-                so2 = edosUtil.getRealData(so2value).getPointValueInDouble();
-                //节约煤
-                ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
-                jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
-
-            }
+//            if (wpId.equals(QS) || wpId.equals(FD) || wpId.equals(GF)) {
+//                wpId = "SXJ_RGN" + wpId;
+//                //安全天数
+//                ProBasicPowerstationPoint aqtsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.AQTS);
+//                aqts = edosUtil.getRealData(aqtsvalue).getPointValueInDouble();
+//                //实时功率
+//                ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
+//                sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();
+//                //节约水
+//                ProBasicPowerstationPoint jysvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYS);
+//                jys = edosUtil.getRealData(jysvalue).getPointValueInDouble();
+//                //节约煤
+//                ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
+//                jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
+//                //减排二氧化碳
+//                ProBasicPowerstationPoint co2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHT);
+//                co2 = edosUtil.getRealData(co2value).getPointValueInDouble();
+//                //减排二氧化硫
+//                ProBasicPowerstationPoint so2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHL);
+//                so2 = edosUtil.getRealData(so2value).getPointValueInDouble();
+//
+//            } else {
+
+            //安全天数
+            ProBasicPowerstationPoint aqtsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.AQTS);
+            aqts = edosUtil.getRealData(aqtsvalue).getPointValueInDouble();
+
+            //实时功率
+            ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
+            sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();
+
+            //实时风速
+            ProBasicPowerstationPoint ssfsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
+            ssfs = edosUtil.getRealData(ssfsvalue).getPointValueInDouble();
+
+            //光照指数
+            ProBasicPowerstationPoint gzzsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.RPJGZD);
+            gzzs = edosUtil.getRealData(gzzsvalue).getPointValueInDouble();
+
+            //理论功率
+            ProBasicPowerstationPoint llglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
+            llgl = edosUtil.getRealData(llglvalue).getPointValueInDouble();
+
+            //节约水
+            ProBasicPowerstationPoint jysvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYS);
+            jys = edosUtil.getRealData(jysvalue).getPointValueInDouble();
+
+            //减排二氧化碳
+            ProBasicPowerstationPoint co2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHT);
+            co2 = edosUtil.getRealData(co2value).getPointValueInDouble();
+
+            //减排二氧化硫
+            ProBasicPowerstationPoint so2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHL);
+            so2 = edosUtil.getRealData(so2value).getPointValueInDouble();
+
+            //节约煤
+            ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
+            jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
+
+//            }
             qt.put("aqts", MathUtil.twoBit(aqts));
             qt.put("sjgl", MathUtil.twoBit(sjgl));
+            qt.put("llgl", MathUtil.twoBit(llgl));
+            qt.put("gzzs", MathUtil.twoBit(gzzs));
+            qt.put("ssfs", MathUtil.twoBit(ssfs));
             qt.put("jys", MathUtil.twoBit(jys));
             qt.put("jym", MathUtil.twoBit(jym));
             qt.put("co2", MathUtil.twoBit(co2));
@@ -716,7 +740,7 @@ public class MonitorService {
 
             /**********************************************首页清洁能源公司以及系统接入信息展示**********************************************************/
 
-            List<ProBasicCompany> cplist = CacheContext.companyList;
+            List<ProBasicCompany> cplist = CacheContext.cpls;
             double qjny_fd_zjrl = 0;
             double qjny_gf_zjrl = 0;
             double qjny_fcts = 0;