BUG修改

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

@@ -204,6 +204,7 @@ public class CacheContext implements CommandLineRunner {
         proBasicOrganizeTreesMap = proBasicOrganizeTrees.stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId, Function.identity()));
 
         organizeEquipmentList = proBasicOrganizeEquipmentService.list().stream().filter(pboe -> pboe.getIsAble() == 1).collect(Collectors.toList());
+        organizeEquipmentList = organizeEquipmentList.stream().filter(oe->"IN".equals(oe.getEqType())).collect(Collectors.toList());
         wtPowerCurveFittingList = wtPowerCurveFittingService.list();
         inPowerCurveFittingList = inPowerCurveFittingService.list();
         inPowerCurveFittingMap = inPowerCurveFittingList.stream().collect(Collectors.groupingBy(ProEconInPowerCurveFitting::getInverterId));

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/IProEconCleaningInputService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.runeconomy.model.auto.ProEconCleaningInput;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -17,5 +18,5 @@ import java.util.Date;
 public interface IProEconCleaningInputService extends IService<ProEconCleaningInput> {
 
     IPage<ProEconCleaningInput> getList(String windpowerstationId, String windpowerstationName, String begindate, String planEnddate, String pageNum, String pageSize);
-
+    List<ProEconCleaningInput> getlist(Date beginDate, Date endDate);
 }

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -67,7 +67,9 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
         qw.lambda().orderByAsc(ProEconEquipmentInfoDayTop::getWindturbineId);
         List<ProEconEquipmentInfoDayTop> list = baseMapper.selectList(qw);
         list.forEach(i->{
-            i.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getNemName());
+            if (CacheContext.wtmap != null && CacheContext.wtmap.containsKey(i.getWindturbineId())) {
+                i.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getNemName());
+            }
         });
 
         list = list.stream().filter(wv -> {

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -66,7 +66,7 @@ public class BenchmarkingService {
 
         SortUtils.sort(result, "orderNum", SortUtils.ASC);
 
-        result.add(0, company);
+        result.add(0,company);
         return result;
     }
 
@@ -148,17 +148,17 @@ public class BenchmarkingService {
     }
 
     //public List<ProBasicOrganizeTree> modellist(String wpids) {
-    //    if (CacheContext.wtls == null) {
-    //        return new ArrayList<>();
-    //    }
-    //
-    //    return CacheContext.wtls.stream()
-    //            .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && wpids.contains(wt.getPcodes()))
-    //            .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
-    //            .values()
-    //            .stream()
-    //            .collect(Collectors.toList());
-    //}
+//    if (CacheContext.wtls == null) {
+//        return new ArrayList<>();
+//    }
+//
+//    return CacheContext.wtls.stream()
+//            .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && wpids.contains(wt.getPcodes()))
+//            .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
+//            .values()
+//            .stream()
+//            .collect(Collectors.toList());
+//}
     public List<ProBasicOrganizeTree> modellist(String wpids) {
         if (CacheContext.wtls == null) {
             return new ArrayList<>();
@@ -190,10 +190,10 @@ public class BenchmarkingService {
                 .collect(Collectors.toList());
 
 
-        for (ProBasicOrganizeEquipment sqlist : collect) {
+        for (ProBasicOrganizeEquipment sqlist :collect) {
             for (ProBasicOrganizeTree sq : CacheContext.sqls) {
 
-                if (sqlist.getSquareId().equals(sq.getId())) {
+                if (sqlist.getSquareId().equals(sq.getId())){
                     sqlist.setParentCode(sq.getAname());
                 }
             }
@@ -983,7 +983,7 @@ public class BenchmarkingService {
 
 
     public List<WxsslVo> details(String id, String beginDate, String endDate, String target, String sort) {
-        if (endDate == null) {
+        if(endDate==null){
             beginDate = beginDate + "-01";
         }
         List<WxsslVo> resultList = new ArrayList<>();
@@ -1025,15 +1025,6 @@ public class BenchmarkingService {
         } else {
             SortUtils.sort(resultList, "ordernum", SortUtils.ASC);
         }
-        if (!id.endsWith("ZGS")) {
-            wxsslVoList = wxsslVoList.stream().filter(wv -> {
-                boolean b = false;
-                if (StringUtils.isNotEmpty(wv.getName())) {
-                    b = wv.getName().contains("逆变器") || wv.getName().contains("风机");
-                }
-                return b;
-            }).collect(Collectors.toList());
-        }
         return wxsslVoList;
     }
 
@@ -1066,7 +1057,7 @@ public class BenchmarkingService {
 
         SortUtils.sort(result, "orderNum", SortUtils.ASC);
 
-        result.add(0, company);
+        result.add(0,company);
         return result;
     }
 
@@ -1320,10 +1311,10 @@ public class BenchmarkingService {
             for (String s1 : splitMd) {
 
 
-                //                    List<String> wtls = CacheContext.wtls.stream().filter(c -> !Objects.isNull(c.getModelId()) && c.getNemName().contains("逆变器") &&
-                //                            s1.equals(c.getModelId())).map(ot -> ot.getId()).collect(Collectors.toList());
+//                    List<String> wtls = CacheContext.wtls.stream().filter(c -> !Objects.isNull(c.getModelId()) && c.getNemName().contains("逆变器") &&
+//                            s1.equals(c.getModelId())).map(ot -> ot.getId()).collect(Collectors.toList());
 
-                List<String> wtls = CacheContext.organizeEquipmentList.stream().filter(
+                List<String> wtls  = CacheContext.organizeEquipmentList.stream().filter(
                         oe -> wpids.contains(oe.getWindpowerstationId())).map(ot -> ot.getWindturbineId()).collect(Collectors.toList());
 
                 if (wtls.size() == 0) continue;
@@ -1356,7 +1347,7 @@ public class BenchmarkingService {
                 peeidls.add(infoDay1);
             }
         } else if (model.isEmpty()) {
-            List<String> wtls = CacheContext.organizeEquipmentList.stream().filter(
+            List<String> wtls  = CacheContext.organizeEquipmentList.stream().filter(
                     oe -> wpids.contains(oe.getWindpowerstationId())).map(ot -> ot.getWindturbineId()).collect(Collectors.toList());
 
             QueryWrapper<ProEconEquipmentInfoDay1> wiqw = qw.clone().in("windturbine_id", wtls);
@@ -1364,7 +1355,7 @@ public class BenchmarkingService {
 
             ProEconEquipmentInfoDay1 infoDay1 = new ProEconEquipmentInfoDay1();
 
-            for (ProBasicOrganizeTree t1 : CacheContext.wtls) {
+            for (ProBasicOrganizeTree t1: CacheContext.wtls){
                 for (ProEconEquipmentInfoDay1 listl : listls) {
                     infoDay1.setRfdl((infoDay1.getRfdl() != null ? infoDay1.getRfdl() : 0) + (listl.getRfdl() != null ? listl.getRfdl() : 0));
                     infoDay1.setRllfdl((infoDay1.getRllfdl() != null ? infoDay1.getRllfdl() : 0) + (listl.getRllfdl() != null ? listl.getRllfdl() : 0));
@@ -1401,7 +1392,7 @@ public class BenchmarkingService {
                         WxsslVo vo = new WxsslVo();
 
                         if (type.equals(TYPE_WIND)) {
-                            //                        vo.setId(i.getWindpowerstationId());
+//                        vo.setId(i.getWindpowerstationId());
                             vo.setName(i.getWindturbineId());
                             vo.setOrdernum(station.get(i.getWindpowerstationId()).doubleValue());
                         } else if (type.equals(TYPE_PROJECT)) {
@@ -1502,4 +1493,5 @@ public class BenchmarkingService {
         //        SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
         return resultList;
     }
+
 }

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/goodness/WindturbinegoodnessService.java

@@ -921,20 +921,23 @@ public class WindturbinegoodnessService {
         equipmentInfoDay6s.getRecords().forEach(i -> {
             PvVo vo = new PvVo();
             vo.setWtid(i.getWindturbineId());
-            vo.setWtname(wtmap.get(i.getWindturbineId()).getNemName());
-            vo.setModel(modelMap.get(wtmap.get(i.getWindturbineId()).getModelId()).getAname());
-            vo.setRxtxl(DoubleUtils.keepPrecision(i.getRxtxl(), 2));
-            vo.setRlsl(DoubleUtils.keepPrecision(i.getRlsl(), 2));
-            vo.setRzhxl(DoubleUtils.keepPrecision(i.getRnbqzhxl(), 2));
-
-            vo.setYxtxl(DoubleUtils.keepPrecision(i.getYxtxl(), 2));
-            vo.setYlsl(DoubleUtils.keepPrecision(i.getYlsl(), 2));
-            vo.setYzhxl(DoubleUtils.keepPrecision(i.getYnbqzhxl(), 2));
-
-            vo.setNxtxl(DoubleUtils.keepPrecision(i.getNxtxl(), 2));
-            vo.setNlsl(DoubleUtils.keepPrecision(i.getNlsl(), 2));
-            vo.setNzhxl(DoubleUtils.keepPrecision(i.getNnbqzhxl(), 2));
-            resultList.add(vo);
+            if (wtmap != null && wtmap.containsKey(i.getWindturbineId())) {
+                vo.setWtname(wtmap.get(i.getWindturbineId()).getNemName());
+                vo.setModel(modelMap.get(wtmap.get(i.getWindturbineId()).getModelId()).getAname());
+                vo.setRxtxl(DoubleUtils.keepPrecision(i.getRxtxl(), 2));
+                vo.setRlsl(DoubleUtils.keepPrecision(i.getRlsl(), 2));
+                vo.setRzhxl(DoubleUtils.keepPrecision(i.getRnbqzhxl(), 2));
+
+                vo.setYxtxl(DoubleUtils.keepPrecision(i.getYxtxl(), 2));
+                vo.setYlsl(DoubleUtils.keepPrecision(i.getYlsl(), 2));
+                vo.setYzhxl(DoubleUtils.keepPrecision(i.getYnbqzhxl(), 2));
+
+                vo.setNxtxl(DoubleUtils.keepPrecision(i.getNxtxl(), 2));
+                vo.setNlsl(DoubleUtils.keepPrecision(i.getNlsl(), 2));
+                vo.setNzhxl(DoubleUtils.keepPrecision(i.getNnbqzhxl(), 2));
+            }
+                resultList.add(vo);
+
         });
 
         if (StringUtils.isNotEmpty(target)) {
@@ -978,22 +981,24 @@ public class WindturbinegoodnessService {
         List<ProEconEquipmentInfoDay6> equipmentInfoDay6s = proEconEquipmentInfoDay6Service.list(qw);
 
         equipmentInfoDay6s.stream().forEach(i -> {
-            PvVo vo = new PvVo();
-            vo.setWtid(i.getWindturbineId());
-            vo.setWtname(wtmap.get(i.getWindturbineId()).getNemName());
-            vo.setDate(i.getRecordDate());
-            vo.setModel(modelMap.get(wtmap.get(i.getWindturbineId()).getModelId()).getAname());
-            vo.setRxtxl(DoubleUtils.keepPrecision(i.getRxtxl(), 2));
-            vo.setRlsl(DoubleUtils.keepPrecision(i.getRlsl(), 2));
-            vo.setRzhxl(DoubleUtils.keepPrecision(i.getRnbqzhxl(), 2));
-
-            vo.setYxtxl(DoubleUtils.keepPrecision(i.getYxtxl(), 2));
-            vo.setYlsl(DoubleUtils.keepPrecision(i.getYlsl(), 2));
-            vo.setYzhxl(DoubleUtils.keepPrecision(i.getYnbqzhxl(), 2));
-
-            vo.setNxtxl(DoubleUtils.keepPrecision(i.getNxtxl(), 2));
-            vo.setNlsl(DoubleUtils.keepPrecision(i.getNlsl(), 2));
-            vo.setNzhxl(DoubleUtils.keepPrecision(i.getNnbqzhxl(), 2));
+                    PvVo vo = new PvVo();
+                    if (wtmap != null && wtmap.containsKey(i.getWindturbineId())) {
+                     vo.setWtname(wtmap.get(i.getWindturbineId()).getNemName());
+                    vo.setWtid(i.getWindturbineId());
+                    vo.setDate(i.getRecordDate());
+                    vo.setModel(modelMap.get(wtmap.get(i.getWindturbineId()).getModelId()).getAname());
+                    vo.setRxtxl(DoubleUtils.keepPrecision(i.getRxtxl(), 2));
+                    vo.setRlsl(DoubleUtils.keepPrecision(i.getRlsl(), 2));
+                    vo.setRzhxl(DoubleUtils.keepPrecision(i.getRnbqzhxl(), 2));
+
+                    vo.setYxtxl(DoubleUtils.keepPrecision(i.getYxtxl(), 2));
+                    vo.setYlsl(DoubleUtils.keepPrecision(i.getYlsl(), 2));
+                    vo.setYzhxl(DoubleUtils.keepPrecision(i.getYnbqzhxl(), 2));
+
+                    vo.setNxtxl(DoubleUtils.keepPrecision(i.getNxtxl(), 2));
+                    vo.setNlsl(DoubleUtils.keepPrecision(i.getNlsl(), 2));
+                    vo.setNzhxl(DoubleUtils.keepPrecision(i.getNnbqzhxl(), 2));
+                }
             resultList.add(vo);
         });
 

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -760,12 +760,14 @@ public class SpecificService {
             SpecificTargetVo vo = new SpecificTargetVo();
             String wpid = i.getForeignKeyId();
             vo.setWpid(wpid);
-            if(wpid.contains("_ZGS")){
+            if("_ZGS".contains(wpid)){
                 vo.setWpname(CacheContext.cpmap.get(companys).getAname());
-            }else if(wpid.contains("_RGN")){
+            }else if("_RGN".contains(wpid)){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
 
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
@@ -815,8 +817,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -833,7 +837,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -912,8 +918,10 @@ public class SpecificService {
                 vo.setWpname(CacheContext.cpmap.get(companys).getAname());
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
-            }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+            }else {
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)){
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+            }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -962,8 +970,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -980,7 +990,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -1059,7 +1071,9 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -1108,8 +1122,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -1126,7 +1142,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -1206,7 +1224,9 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -1255,8 +1275,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -1273,7 +1295,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -1352,7 +1376,9 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -1401,8 +1427,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -1419,7 +1447,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -1498,7 +1528,9 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -1547,8 +1579,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -1564,8 +1598,10 @@ public class SpecificService {
                             vo1.setWpname(CacheContext.cpmap.get(companys).getAname());
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
-                        }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        }else {
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)){
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -1644,7 +1680,9 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -1693,8 +1731,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -1710,8 +1750,10 @@ public class SpecificService {
                             vo1.setWpname(CacheContext.cpmap.get(companys).getAname());
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
-                        }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        }else {
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)){
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -1790,7 +1832,9 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -1839,8 +1883,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -1857,7 +1903,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -1936,7 +1984,9 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -1985,8 +2035,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -2003,7 +2055,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -2082,7 +2136,9 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -2131,8 +2187,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -2149,7 +2207,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -2228,7 +2288,9 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -2277,8 +2339,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -2295,7 +2359,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -2375,7 +2441,9 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
@@ -2424,8 +2492,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -2442,7 +2512,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);
@@ -3063,7 +3135,7 @@ public class SpecificService {
         }
         if (companys.endsWith("ZGS")){
             currentqw.eq("company_id",companys);
-        }else {
+        }else if (companys.endsWith("RGN")){
             currentqw.eq("region_id",companys);
         }
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
@@ -3111,13 +3183,25 @@ public class SpecificService {
             }else if(wpid.contains("_RGN")){
                 vo.setWpname(CacheContext.rgmap.get(companys).getAname());
             }else{
-                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                }
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
             for (ProBasicOrganizeTree wp : wpls) {
                 if (i.getForeignKeyId().equals(wp.getId()) && wp.getJrCapacity() !=null) {
-                    vo.setCurrent(DoubleUtils.keepPrecision((i.getYfdl().doubleValue() / 10000) / wp.getJrCapacity(), 2));
+//                    vo.setCurrent(DoubleUtils.keepPrecision((i.getYfdl().doubleValue() / 10000) / wp.getJrCapacity(), 2));
+                    double yfdl = i.getYfdl().doubleValue();
+                    double jrCapacity = wp.getJrCapacity();
+
+                    if (Double.isFinite(yfdl) && Double.isFinite(jrCapacity) && jrCapacity != 0) {
+                        double result = yfdl / 10000 / jrCapacity;
+                        vo.setCurrent(DoubleUtils.keepPrecision(result, 2));
+                    } else {
+                        // 处理出现无穷大或非数字的情况
+                        vo.setCurrent(0.0);
+                    }
                 }else if (wpid.contains("JS_RGN")){
                     for (ProBasicOrganizeTree cp : rgls) {
                         vo.setCurrent(DoubleUtils.keepPrecision((i.getYfdl().doubleValue() / 10000) / cp.getJrCapacity(), 2));
@@ -3137,10 +3221,32 @@ public class SpecificService {
                 ProEconPowerstationInfoDay1 tqinfoday = optional.get();
                 for (ProBasicOrganizeTree wp : wpls) {
                     if (i.getWpid().equals(wp.getId())&& wp.getJrCapacity() !=null) {
-                        i.setSameperiod(DoubleUtils.keepPrecision((tqinfoday.getYfdl().doubleValue() / 10000) /wp.getJrCapacity(), 2));
+//                        i.setSameperiod(DoubleUtils.keepPrecision((tqinfoday.getYfdl().doubleValue() / 10000) /wp.getJrCapacity(), 2));
+                        double yfdl = tqinfoday.getYfdl().doubleValue();
+                        double jrCapacity = wp.getJrCapacity();
+
+                        if (Double.isFinite(yfdl) && Double.isFinite(jrCapacity) && jrCapacity != 0) {
+                            double result = yfdl / 10000 / jrCapacity;
+                            i.setSameperiod(DoubleUtils.keepPrecision(result, 2));
+                        } else {
+                            // 处理出现无穷大或非数字的情况
+                            i.setSameperiod(0.0); // 或者采取其他处理方式
+                        }
                     }else if (i.getWpid().contains("JS_RGN")) {
                         for (ProBasicOrganizeTree cp : rgls){
-                            i.setSameperiod(DoubleUtils.keepPrecision((tqinfoday.getYfdl().doubleValue() / 10000) / cp.getJrCapacity(), 2));
+//                            i.setSameperiod(DoubleUtils.keepPrecision((tqinfoday.getYfdl().doubleValue() / 10000) / cp.getJrCapacity(), 2));
+
+                            double yfdl = tqinfoday.getYfdl().doubleValue();
+                            double jrCapacity = cp.getJrCapacity();
+
+                            if (Double.isFinite(yfdl) && Double.isFinite(jrCapacity) && jrCapacity != 0) {
+                                double result = yfdl / 10000 / jrCapacity;
+                                i.setSameperiod(DoubleUtils.keepPrecision(result, 2));
+                            } else {
+                                // 处理出现无穷大或非数字的情况
+                                i.setSameperiod(0.0); // 或者采取其他处理方式
+                            }
+
                          }
                     }else if(i.getWpid().equals(wp.getId())){
                         i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getYfdl().doubleValue() / 10000, 2));
@@ -3185,8 +3291,10 @@ public class SpecificService {
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
-                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
-                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                        vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                    }
                 }
                 vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
@@ -3203,7 +3311,9 @@ public class SpecificService {
                         }else if(wpid.contains("_RGN")){
                             vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
                         }else{
-                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            if (CacheContext.wpmap != null && CacheContext.wpmap.containsKey(wpid)) {
+                                vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                            }
                         }
                         vo1.setYear(Integer.parseInt(year));
                         vo1.setMonth(x);