修改首页状态取值，修改缓存取数

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

@@ -120,7 +120,7 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String,Map<String, ProBasicPowerstationPoint>> propointmap =new HashMap<>();
 //    public static Map<String,Map<String, ProBasicPowerstationPoint>> pjPointmap =new HashMap<>(); //期次测点
     public static Map<String,Map<String, ProBasicPowerstationPoint>> wppointmap =new HashMap<>();
-    public static Map<String,Map<String, ProBasicPowerstationPoint>> pointwpmap =new HashMap<>();
+//    public static Map<String,Map<String, ProBasicPowerstationPoint>> pointwpmap =new HashMap<>();
     public static Map<String,Map<String, ProBasicPowerstationPoint>> subwppointmap =new HashMap<>();
     public static Map<String,Map<String, ProBasicPowerstationPoint>> weatherwppointmap =new HashMap<>();
     public static Map<String,Map<String, ProBasicPowerstationPoint>> companypointmap =new HashMap<>();
@@ -536,11 +536,11 @@ public class CacheContext implements CommandLineRunner {
         }
 
 
-        Map<String,ProBasicPowerstationPoint> items=null;
-        powerpointls = proBasicPowerstationPointService.list().stream().filter(i ->i.getId() != null).collect(Collectors.toList());
-        if(powerpointls!=null && !powerpointls.isEmpty()){
-            for(int i=0;i<powerpointls.size();i++){
-
+//        Map<String,ProBasicPowerstationPoint> items=null;
+//        powerpointls = proBasicPowerstationPointService.list().stream().filter(i ->i.getId() != null).collect(Collectors.toList());
+//        if(powerpointls!=null && !powerpointls.isEmpty()){
+//            for(int i=0;i<powerpointls.size();i++){
+//
 //                if(pjmap.containsKey(powerpointls.get(i).getWindpowerstationId()))
 //                {
 //                    ProBasicPowerstationPoint point=powerpointls.get(i);
@@ -567,19 +567,19 @@ public class CacheContext implements CommandLineRunner {
 //                    }
 //                }else
 //                {
-                    ProBasicPowerstationPoint point = powerpointls.get(i);
-                    if(pointwpmap.containsKey(point.getWindpowerstationId())){
-                        items=pointwpmap.get(point.getWindpowerstationId());
-                        items.put(point.getUniformCode(), point);
-                    }
-                    else{
-                        items=new HashMap<String,ProBasicPowerstationPoint>();
-                        pointwpmap.put(point.getWindpowerstationId(), items);
-                        items.put(point.getUniformCode(), point);
-                    }
+//                    ProBasicPowerstationPoint point = powerpointls.get(i);
+//                    if(pointwpmap.containsKey(point.getWindpowerstationId())){
+//                        items=pointwpmap.get(point.getWindpowerstationId());
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                    else{
+//                        items=new HashMap<String,ProBasicPowerstationPoint>();
+//                        pointwpmap.put(point.getWindpowerstationId(), items);
+//                        items.put(point.getUniformCode(), point);
+//                    }
 //                }
-            }
-        }
+//            }
+//        }
 
 
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProBasicPowerstationPointServiceImpl.java

@@ -51,9 +51,44 @@ public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPo
         {
             if(wpId.endsWith("0") || wpId.endsWith("-1") ||wpId.endsWith("-2") || CacheContext.wpmap.containsKey(wpId))
             {
-                if(CacheContext.pointwpmap.containsKey(wpId))
+                if(CacheContext.wppointmap.containsKey(wpId))
                 {
-                    Map<String, ProBasicPowerstationPoint> map=CacheContext.pointwpmap.get(wpId);
+                    Map<String, ProBasicPowerstationPoint> map=CacheContext.wppointmap.get(wpId);
+                    if(map.containsKey(uniformCode))
+                    {
+                        point=map.get(uniformCode);
+                    }
+                }else if (CacheContext.subwppointmap.containsKey(wpId))
+                {
+                    Map<String, ProBasicPowerstationPoint> map=CacheContext.subwppointmap.get(wpId);
+                    if(map.containsKey(uniformCode))
+                    {
+                        point=map.get(uniformCode);
+                    }
+                }else if (CacheContext.weatherwppointmap.containsKey(wpId))
+                {
+                    Map<String, ProBasicPowerstationPoint> map=CacheContext.weatherwppointmap.get(wpId);
+                    if(map.containsKey(uniformCode))
+                    {
+                        point=map.get(uniformCode);
+                    }
+                }else if (CacheContext.companypointmap.containsKey(wpId))
+                {
+                    Map<String, ProBasicPowerstationPoint> map=CacheContext.companypointmap.get(wpId);
+                    if(map.containsKey(uniformCode))
+                    {
+                        point=map.get(uniformCode);
+                    }
+                }else if (CacheContext.regionpointmap.containsKey(wpId))
+                {
+                    Map<String, ProBasicPowerstationPoint> map=CacheContext.regionpointmap.get(wpId);
+                    if(map.containsKey(uniformCode))
+                    {
+                        point=map.get(uniformCode);
+                    }
+                }else if (CacheContext.grouppointmap.containsKey(wpId))
+                {
+                    Map<String, ProBasicPowerstationPoint> map=CacheContext.grouppointmap.get(wpId);
                     if(map.containsKey(uniformCode))
                     {
                         point=map.get(uniformCode);

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

@@ -180,7 +180,7 @@ public class MonitorService {
             double fd_jclyxnum = 0;
             //限电降出力
             double fd_xdjclnum = 0;
-            //停机
+            //限电停机
             double fd_tjnum = 0;
             //故障停机
             double fd_gztjnum = 0;
@@ -235,73 +235,79 @@ public class MonitorService {
                 List<String> fjztls = new ArrayList<>();
                 List<String> gfztls = new ArrayList<>();
 
-                if (wp.getId().endsWith("FDC_STA") && CacheContext.wpwtmap.containsKey(wp.getId())) {
-                    List<ProBasicEquipment> wtls = CacheContext.wpwtmap.get(wp.getId());
-                    for (ProBasicEquipment wt : wtls) {
-                        fjztls.add(proBasicEquipmentPointService.getEquipmentPoint(wt.getId(), ContantXk.MXZT).getNemCode());
+                if (wp.getId().endsWith("FDC_STA") && CacheContext.wpmapls.containsKey(wp.getId())) {
+                    List<ProBasicPowerstation> wpls = CacheContext.wpmapls.get(wp.getId());
+                    for (ProBasicPowerstation wt : wpls) {
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.GZTSMX).getNemCode());    //故障台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.JXTSMX).getNemCode());    //检修台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.DJTSMX).getNemCode());//待机台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.SDTJTSMX).getNemCode());//手动停机台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XNTSMX).getNemCode());//性能台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XDTJTSMX).getNemCode());//限电停机台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.LXTSMX).getNemCode());//离线台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
+
+                        List<PointData> fjztlist = edosUtil.getRealData(fjztls);
+
+                        fd_gztjnum += fjztlist.get(0).getPointValueInDouble();
+                        fd_gzcnslnum += fjztlist.get(1).getPointValueInDouble();
+                        fd_jxtjnum += fjztlist.get(2).getPointValueInDouble();
+                        fd_jxclslnum += fjztlist.get(3).getPointValueInDouble();
+                        fd_dfnum += fjztlist.get(4).getPointValueInDouble();
+                        fd_jclyxnum += fjztlist.get(5).getPointValueInDouble();
+                        fd_sdtjnum += fjztlist.get(6).getPointValueInDouble();
+                        fd_zcfdnum += fjztlist.get(7).getPointValueInDouble();
+                        fd_tjnum += fjztlist.get(8).getPointValueInDouble();
+                        fd_xdjclnum += fjztlist.get(9).getPointValueInDouble();
+                        fd_sldwnum += fjztlist.get(10).getPointValueInDouble();
+                        fd_slhjnum += fjztlist.get(11).getPointValueInDouble();
+                        fd_lxnum += fjztlist.get(12).getPointValueInDouble();
+                        fd_wznum += fjztlist.get(13).getPointValueInDouble();
                     }
 
-                } 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());
+                } else if (wp.getId().endsWith("GDC_STA") && CacheContext.wpmapls.containsKey(wp.getId())) {
+                    List<ProBasicPowerstation> wtls = CacheContext.wpmapls.get(wp.getId());
+                    for (ProBasicPowerstation wt : wtls) {
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.GZTSMX).getNemCode());    //故障台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.JXTSMX).getNemCode());    //检修台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.DJTSMX).getNemCode());//待机台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.SDTJTSMX).getNemCode());//手动停机台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XNTSMX).getNemCode());//性能台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XDTJTSMX).getNemCode());//限电停机台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.LXTSMX).getNemCode());//离线台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
+
+                        List<PointData> gfztlist = edosUtil.getRealData(gfztls);
+
+                        gf_gztjnum += gfztlist.get(0).getPointValueInDouble();
+                        gf_gzcnslnum += gfztlist.get(1).getPointValueInDouble();
+                        gf_jxtjnum += gfztlist.get(2).getPointValueInDouble();
+                        gf_jxclslnum += gfztlist.get(3).getPointValueInDouble();
+                        gf_dfnum += gfztlist.get(4).getPointValueInDouble();
+                        gf_jclyxnum += gfztlist.get(5).getPointValueInDouble();
+                        gf_sdtjnum += gfztlist.get(6).getPointValueInDouble();
+                        gf_zcfdnum += gfztlist.get(7).getPointValueInDouble();
+                        gf_tjnum += gfztlist.get(8).getPointValueInDouble();
+                        gf_xdjclnum += gfztlist.get(9).getPointValueInDouble();
+                        gf_sldwnum += gfztlist.get(10).getPointValueInDouble();
+                        gf_slhjnum += gfztlist.get(11).getPointValueInDouble();
+                        gf_lxnum += gfztlist.get(12).getPointValueInDouble();
+                        gf_wznum += gfztlist.get(13).getPointValueInDouble();
                     }
                 }
 
-                List<PointData> fjztlist = edosUtil.getRealData(fjztls);
-                List<PointData> gfztlist = edosUtil.getRealData(gfztls);
-
-                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);
@@ -325,59 +331,6 @@ public class MonitorService {
                     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);
@@ -400,7 +353,157 @@ public class MonitorService {
                     mxztmap.put("gf_xdnum", gf_xdjclnum + gf_tjnum);
                     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);
@@ -1498,8 +1601,21 @@ public class MonitorService {
             zjrlmap.put("zjrl", zjrl);
 
 
-            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap = CacheContext.pointwpmap;
-            Map<String, ProBasicPowerstationPoint> wtpointmap = pointwpmap.get(wpId);
+            Map<String, ProBasicPowerstationPoint> wtpointmap = null;
+            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap = CacheContext.wppointmap;
+            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap1 = CacheContext.companypointmap;
+            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap2 = CacheContext.regionpointmap;
+            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap3 = CacheContext.grouppointmap;
+
+            if (pointwpmap.containsKey(wpId)){
+                wtpointmap = pointwpmap.get(wpId);
+            }else if (pointwpmap1.containsKey(wpId)) {
+                wtpointmap = pointwpmap1.get(wpId);
+            }else if (pointwpmap2.containsKey(wpId)){
+                wtpointmap = pointwpmap2.get(wpId);
+            }else if (pointwpmap3.containsKey(wpId)){
+                wtpointmap = pointwpmap3.get(wpId);
+            }
 
             List<String> year = new ArrayList<>();
             year.add(wtpointmap.get(ContantXk.NFDL).getNemCode());
@@ -1599,8 +1715,23 @@ public class MonitorService {
                     wplist.add(wp);
                 }
             }
-            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap = CacheContext.pointwpmap;
-            Map<String, ProBasicPowerstationPoint> wtpointmap = pointwpmap.get(wpId);
+
+            Map<String, ProBasicPowerstationPoint> wtpointmap = null;
+            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap = CacheContext.wppointmap;
+            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap1 = CacheContext.companypointmap;
+            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap2 = CacheContext.regionpointmap;
+            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap3 = CacheContext.grouppointmap;
+
+            if (pointwpmap.containsKey(wpId)){
+                wtpointmap = pointwpmap.get(wpId);
+            }else if (pointwpmap1.containsKey(wpId)) {
+                wtpointmap = pointwpmap1.get(wpId);
+            }else if (pointwpmap2.containsKey(wpId)){
+                wtpointmap = pointwpmap2.get(wpId);
+            }else if (pointwpmap3.containsKey(wpId)){
+                wtpointmap = pointwpmap3.get(wpId);
+            }
+
             String month = wtpointmap.get(ContantXk.YFDL).getNemCode();
             String rfdl = wtpointmap.get(ContantXk.RFDL).getNemCode();