逆变器分析详情页接口

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/goodness/StationAnalysisController.java

@@ -78,20 +78,69 @@ public class StationAnalysisController {
 
 
     /**
-     * 逆变器分析二次页面
+     * 逆变器分析详情页
      */
-    @GetMapping("/analyse/inverterAnalyse2")
+    @GetMapping("/analyse/inverterAnalyseDetails")
     @ResponseBody
-    @ApiOperation(value = "逆变器分析二次页面", notes = "逆变器分析二次页面")
+    @ApiOperation(value = "逆变器分析详情页", notes = "逆变器分析详情页")
     public R inverterAnalysis2(
             @RequestParam(value = "wtid", required = true) String wtid,
             @RequestParam(value = "beginDate", required = true) String beginDate,
             @RequestParam(value = "endDate", required = true) String endDate,
+            @RequestParam(value = "interval", defaultValue = "900",required = false) Long interval,
             @RequestParam(value = "target", required = false) String target,
             @RequestParam(value = "sort", required = false) String sort
     ) throws Exception {
 
-        List<InverterAnalysis2> resultList = windturbinegoodnessService.inverterAnalysis2(wtid, beginDate, endDate, target, sort);
+        List<InverterAnalysis2> resultList = windturbinegoodnessService.inverterAnalysis2(wtid, beginDate, endDate, interval,target, sort);
+
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+
+    /**
+     * 清洗分析
+     */
+   /* @GetMapping("/analyse/cleanAnalyse")
+    @ResponseBody
+    @ApiOperation(value = "清洗分析", notes = "清洗分析")
+    public R cleanAnalysis(
+            @RequestParam(value = "companys", required = true) String companys,
+            @RequestParam(value = "wpid", required = true) String wpid,
+            @RequestParam(value = "wtid", required = true) String wtid,
+            @RequestParam(value = "type", required = true) String type,
+            @RequestParam(value = "branch", required = false) String branch,
+            @RequestParam(value = "target", required = false) String target,
+            @RequestParam(value = "sort", required = false) String sort
+    ) {
+        List<InverterAnalysis2> resultList = windturbinegoodnessService.cleanAnalysis(companys,wpid, wtid,type,branch,target,sort);
+
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }*/
+
+
+    /**
+     * 清洗分析详情页
+     */
+    @GetMapping("/analyse/cleanAnalyseDetails")
+    @ResponseBody
+    @ApiOperation(value = "清洗分析详情页", notes = "清洗分析详情页")
+    public R cleanAnalysis2(
+            @RequestParam(value = "branch", required = true) String branch,
+            @RequestParam(value = "beginDate", required = true) String beginDate,
+            @RequestParam(value = "endDate", required = true) String endDate,
+            @RequestParam(value = "target", required = false) String target,
+            @RequestParam(value = "sort", required = false) String sort
+    ) {
+        List<InverterAnalysis2> resultList = windturbinegoodnessService.cleanAnalysis2(branch,beginDate,endDate,target,sort);
 
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));

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

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.fitting.ProBasicEquipmentBranchPoint;
 import com.gyee.runeconomy.model.fitting.ProBasicOrganizeEquipment;
 import com.gyee.runeconomy.model.fitting.ProEconInPowerCurveFitting;
 import com.gyee.runeconomy.service.auto.*;
+import com.gyee.runeconomy.service.fitting.IProBasicEquipmentBranchPointService;
 import com.gyee.runeconomy.service.fitting.IProBasicOrganizeEquipmentService;
 import com.gyee.runeconomy.service.fitting.IProEconInPowerCurveFittingService;
 import com.gyee.runeconomy.service.realtimelibrary.TheoreticalPowerService;
@@ -94,6 +96,9 @@ public class CacheContext implements CommandLineRunner {
     @Resource
     private IProEconInPowerCurveFittingService inPowerCurveFittingService;
 
+    @Resource
+    private IProBasicEquipmentBranchPointService proBasicEquipmentBranchPointService;
+
     public static List<ProBasicBranch> bnls = new ArrayList<>();
     //    public static List<ProBasicEquipment> wtls = new ArrayList<>();
     //    public static List<ProBasicProject> pjls = new ArrayList<>();
@@ -120,41 +125,41 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicOrganizeTree> fdwpls = new ArrayList<>();//风电场站
     public static List<ProBasicOrganizeTree> wtls = new ArrayList<>();//设备
     public static List<ProBasicOrganizeTree> pjls = new ArrayList<>();//期次
-    public static List<ProBasicOrganizeTree>  lnls = new ArrayList<>();
-    public static List<ProBasicOrganizeTree>  subwpls = new ArrayList<>(); //变电所
-    public static List<ProBasicOrganizeTree>  wplsf = new ArrayList<>();
-    public static List<ProBasicOrganizeTree>  wplsG = new ArrayList<>(); //光电集合
-    public static List<ProEconPowerstationInfoDay7>  station7ls = new ArrayList<>();
-    public static List<ProEconPowerstationInfoDay1>  station1ls = new ArrayList<>();
-
-    public static Map<String,ProBasicOrganizeTree> sqmap = new HashMap<>();
-    public static Map<String,ProEconPowerstationInfoDay7> station7map = new HashMap<>();
-    public static Map<String,ProEconPowerstationInfoDay1> station1map = new HashMap<>();
-    public static Map<String,ProBasicOrganizeTree> cpmap = new HashMap<>();
-    public static Map<String,ProBasicOrganizeTree> rgmap = new HashMap<>();
-    public static Map<String,ProBasicOrganizeTree> gpmap = new HashMap<>();
+    public static List<ProBasicOrganizeTree> lnls = new ArrayList<>();
+    public static List<ProBasicOrganizeTree> subwpls = new ArrayList<>(); //变电所
+    public static List<ProBasicOrganizeTree> wplsf = new ArrayList<>();
+    public static List<ProBasicOrganizeTree> wplsG = new ArrayList<>(); //光电集合
+    public static List<ProEconPowerstationInfoDay7> station7ls = new ArrayList<>();
+    public static List<ProEconPowerstationInfoDay1> station1ls = new ArrayList<>();
+
+    public static Map<String, ProBasicOrganizeTree> sqmap = new HashMap<>();
+    public static Map<String, ProEconPowerstationInfoDay7> station7map = new HashMap<>();
+    public static Map<String, ProEconPowerstationInfoDay1> station1map = new HashMap<>();
+    public static Map<String, ProBasicOrganizeTree> cpmap = new HashMap<>();
+    public static Map<String, ProBasicOrganizeTree> rgmap = new HashMap<>();
+    public static Map<String, ProBasicOrganizeTree> gpmap = new HashMap<>();
     public static Map<String, ProBasicOrganizeTree> wtmap = new HashMap<>();
     public static Map<String, ProBasicOrganizeTree> pjmap = new HashMap<>();
     public static Map<String, ProBasicOrganizeTree> lnmap = new HashMap<>();
     public static Map<String, ProBasicOrganizeTree> wpmap = new HashMap<>();
-    public static Map<Object,List<ProBasicOrganizeTree>> rgcpmap = new HashMap<>();//区域子公司
-    public static Map<Object,List<ProBasicOrganizeTree>> cpwpmap = new HashMap<>();//公司场站
-    public static Map<Object,List<ProBasicOrganizeTree>> wpwtmap = new HashMap<>();
-    public static Map<Object,List<ProBasicOrganizeTree>> pjwtmap = new HashMap<>();
-    public static Map<String,List<ProBasicOrganizeTree>> protreejmap = new HashMap<>();
-    public static Map<Object,List<ProBasicOrganizeTree>> lnwtmap = new HashMap<>();
-    public static Map<Object,List<ProBasicOrganizeTree>> cmwtlsmap = new HashMap<>();
-    public static Map<Object,List<ProBasicOrganizeTree>> rgwtlsmap = new HashMap<>();
-    public static Map<Object,List<ProBasicOrganizeTree>> sqwtmap = new HashMap<>();
-    public static Map<Object,List<ProBasicOrganizeTree>> prolinemap = new HashMap<>();
-    public static Map<String,List<ProBasicOrganizeTree>> wpmapls = new HashMap<>();
-    public static Map<Object,Map<String,ProBasicOrganizeTree>> cmwtmap = new HashMap<>();
-    public static Map<Object,List<ProBasicOrganizeTree>> wppromap = new HashMap<>();
-    public static Map<String,String> wtstandardmap = new HashMap<>();//标杆
-
-    public static Map<String,List<ProBasicBranch>> wtbnmap = new HashMap<>();
-    public static List<ProBasicMeterPoint>  meterpoints = new ArrayList<>();
-    public static Map<String,ProBasicMeterPoint>  meterpointMap = new HashMap<>();
+    public static Map<Object, List<ProBasicOrganizeTree>> rgcpmap = new HashMap<>();//区域子公司
+    public static Map<Object, List<ProBasicOrganizeTree>> cpwpmap = new HashMap<>();//公司场站
+    public static Map<Object, List<ProBasicOrganizeTree>> wpwtmap = new HashMap<>();
+    public static Map<Object, List<ProBasicOrganizeTree>> pjwtmap = new HashMap<>();
+    public static Map<String, List<ProBasicOrganizeTree>> protreejmap = new HashMap<>();
+    public static Map<Object, List<ProBasicOrganizeTree>> lnwtmap = new HashMap<>();
+    public static Map<Object, List<ProBasicOrganizeTree>> cmwtlsmap = new HashMap<>();
+    public static Map<Object, List<ProBasicOrganizeTree>> rgwtlsmap = new HashMap<>();
+    public static Map<Object, List<ProBasicOrganizeTree>> sqwtmap = new HashMap<>();
+    public static Map<Object, List<ProBasicOrganizeTree>> prolinemap = new HashMap<>();
+    public static Map<String, List<ProBasicOrganizeTree>> wpmapls = new HashMap<>();
+    public static Map<Object, Map<String, ProBasicOrganizeTree>> cmwtmap = new HashMap<>();
+    public static Map<Object, List<ProBasicOrganizeTree>> wppromap = new HashMap<>();
+    public static Map<String, String> wtstandardmap = new HashMap<>();//标杆
+
+    public static Map<String, List<ProBasicBranch>> wtbnmap = new HashMap<>();
+    public static List<ProBasicMeterPoint> meterpoints = new ArrayList<>();
+    public static Map<String, ProBasicMeterPoint> meterpointMap = new HashMap<>();
     public static Map<String, Map<String, ProBasicEquipmentPoint>> bnAimap = new HashMap<>();
     public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = new HashMap<>();// 风电机测点AI表
     public static Map<String, Map<String, ProBasicPowerstationPoint>> linepointmap = new HashMap<>();
@@ -166,19 +171,19 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String, Map<String, ProBasicPowerstationPoint>> regionpointmap = new HashMap<>();
     public static Map<String, Map<String, ProBasicPowerstationPoint>> grouppointmap = new HashMap<>();
 
-    public static Map<String,ProEconEquipmentmodel> modelMap = new HashMap<>();
-    public static Map<String,Double> modelpower = new HashMap<>();
+    public static Map<String, ProEconEquipmentmodel> modelMap = new HashMap<>();
+    public static Map<String, Double> modelpower = new HashMap<>();
 
-    public static Map<String,Map<Double,ProBasicModelPower>> modelpowermap = new TreeMap<>();
+    public static Map<String, Map<Double, ProBasicModelPower>> modelpowermap = new TreeMap<>();
 
     public static List<ProBasicModelPower> mpls = new ArrayList<>();
 
     public static List<ProEconEquipmentmodel> equipmentmodels = new ArrayList<>();
 
-    public static List<ProBasicModelPowerRd> theoreticalPowerList=new ArrayList<>();
-    public static Map<String, Map<Double,ProBasicModelPowerRd>> theoreticalPowerMap = new HashMap<>(); //理论，保证功率
-    public static Map<String, Map<Double,ProEconWtPowerCurveFitting>> curveFittingPowerMap = new HashMap<>(); //自算，最优功率
-    public static Map<String,List<ProBasicStatusPoint>> statusMap = new HashMap<>();
+    public static List<ProBasicModelPowerRd> theoreticalPowerList = new ArrayList<>();
+    public static Map<String, Map<Double, ProBasicModelPowerRd>> theoreticalPowerMap = new HashMap<>(); //理论，保证功率
+    public static Map<String, Map<Double, ProEconWtPowerCurveFitting>> curveFittingPowerMap = new HashMap<>(); //自算，最优功率
+    public static Map<String, List<ProBasicStatusPoint>> statusMap = new HashMap<>();
     public static List<ProBasicOrganizeTree> proBasicOrganizeTrees;
     public static Map<String, ProBasicOrganizeTree> proBasicOrganizeTreesMap;
     public static List<ProBasicOrganizeEquipment> organizeEquipmentList;//把树形展开的设备列表
@@ -188,6 +193,7 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicEquipmentPoint> proBasicEquipmentPointList;
 
     public static List<ProBasicPowerstationPoint> proBasicPowerstationPoint;
+    public static List<ProBasicEquipmentBranchPoint> proBasicEquipmentBranchPointList;
 
     @Override
     public void run(String... args) throws Exception {
@@ -203,6 +209,8 @@ public class CacheContext implements CommandLineRunner {
 
         proBasicEquipmentPointList = proBasicEquipmentPointService.list();
         proBasicPowerstationPoint = proBasicPowerstationPointService.list();
+        proBasicEquipmentBranchPointList = proBasicEquipmentBranchPointService.list();
+
 
         //List<String> pbotids = proBasicOrganizeTrees.stream().map(pbot -> pbot.getId()).collect(Collectors.toList());
         //Map<String, Object> pbotidMap = redisService.batchGetKeys(pbotids);
@@ -246,48 +254,40 @@ public class CacheContext implements CommandLineRunner {
             }
         }
 
-        treels = proBasicOrganizeTreeService.list().stream().filter(i->i.getIsAble()==1).collect(Collectors.toList());
+        treels = proBasicOrganizeTreeService.list().stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
 
         //树形方阵
-        sqls = proBasicOrganizeTreeService.list().stream().filter(i->i.getOrgType().equals("AG") && i.getIsAble()==1).collect(Collectors.toList());
-        if (!sqls.isEmpty())
-        {
-            for (ProBasicOrganizeTree sq : sqls)
-            {
-                sqmap.put(sq.getParentCode(),sq);
+        sqls = proBasicOrganizeTreeService.list().stream().filter(i -> i.getOrgType().equals("AG") && i.getIsAble() == 1).collect(Collectors.toList());
+        if (!sqls.isEmpty()) {
+            for (ProBasicOrganizeTree sq : sqls) {
+                sqmap.put(sq.getParentCode(), sq);
             }
         }
         List<ProBasicOrganizeTree> proBasicOrganizeTrees = proBasicOrganizeTreeService.list();
         proBasicOrganizeTrees = proBasicOrganizeTrees.stream().filter(pbot -> pbot.getIsAble() == 1).collect(Collectors.toList());
 
 
-        station7ls = proEconPowerstationInfoDay7Service.list().stream().filter(i->i.getId()!=null).collect(Collectors.toList());
-        if (!station7ls.isEmpty())
-        {
-            for (ProEconPowerstationInfoDay7 sq : station7ls)
-            {
-                station7map.put(sq.getForeignKeyId(),sq);
+        station7ls = proEconPowerstationInfoDay7Service.list().stream().filter(i -> i.getId() != null).collect(Collectors.toList());
+        if (!station7ls.isEmpty()) {
+            for (ProEconPowerstationInfoDay7 sq : station7ls) {
+                station7map.put(sq.getForeignKeyId(), sq);
             }
 
         }
 
-        station1ls = proEconPowerstationInfoDay1Service.list().stream().filter(i->i.getId()!=null).collect(Collectors.toList());
-        if (!station1ls.isEmpty())
-        {
-            for (ProEconPowerstationInfoDay1 sq : station1ls)
-            {
-                station1map.put(sq.getForeignKeyId(),sq);
+        station1ls = proEconPowerstationInfoDay1Service.list().stream().filter(i -> i.getId() != null).collect(Collectors.toList());
+        if (!station1ls.isEmpty()) {
+            for (ProEconPowerstationInfoDay1 sq : station1ls) {
+                station1map.put(sq.getForeignKeyId(), sq);
             }
 
         }
 
         //三级公司
-        cpls=proBasicOrganizeTreeService.list().stream().filter(i->i.getIsAble().equals(1) && i.getOrgType().contains("ZGS")).collect(Collectors.toList());
-        if (!cpls.isEmpty())
-        {
-            for(ProBasicOrganizeTree sq:cpls)
-            {
-                cpmap.put(sq.getId(),sq);
+        cpls = proBasicOrganizeTreeService.list().stream().filter(i -> i.getIsAble().equals(1) && i.getOrgType().contains("ZGS")).collect(Collectors.toList());
+        if (!cpls.isEmpty()) {
+            for (ProBasicOrganizeTree sq : cpls) {
+                cpmap.put(sq.getId(), sq);
 
                 if (redisService.hasKey(sq.getParentCode() + "0")) {
                     String cp0String = redisService.get(sq.getParentCode() + "0");
@@ -311,7 +311,6 @@ public class CacheContext implements CommandLineRunner {
         }
 
 
-
         //区域树形
         rgls = proBasicOrganizeTrees.stream().filter(i -> i.getOrgType().contains("RGN")).collect(Collectors.toList());
         if (!rgls.isEmpty()) {
@@ -380,10 +379,9 @@ public class CacheContext implements CommandLineRunner {
             }
         }
 
-        wpls = proBasicOrganizeTreeService.list().stream().filter(i->i.getIsAble()==1 && i.getOrgType().contains("STA")).collect(Collectors.toList());
-        for(ProBasicOrganizeTree wp:wpls)
-        {
-            if (cpwpmap.containsKey(wp.getOrgType().contains("STA"))){
+        wpls = proBasicOrganizeTreeService.list().stream().filter(i -> i.getIsAble() == 1 && i.getOrgType().contains("STA")).collect(Collectors.toList());
+        for (ProBasicOrganizeTree wp : wpls) {
+            if (cpwpmap.containsKey(wp.getOrgType().contains("STA"))) {
                 cpwpmap.get(wp.getOrgType().contains("STA")).add(wp);
             } else {
                 List<ProBasicOrganizeTree> wps = new ArrayList<>();
@@ -395,8 +393,6 @@ public class CacheContext implements CommandLineRunner {
         fdwpls = wpls.stream().filter(wpl -> "F".equals(wpl.getEleType())).collect(Collectors.toList());
 
 
-
-
         //树形设备
         wtls = proBasicOrganizeTrees.stream().filter(i -> i.getId().endsWith("_EQ")).collect(Collectors.toList());
         logger.info(wtls.size() + "");
@@ -472,7 +468,6 @@ public class CacheContext implements CommandLineRunner {
         });
 
 
-
         //树形初始化标杆风机
         for (ProBasicOrganizeTree wt : wtls) {
             if (wpwtmap.containsKey(wt.getOrgType().contains("LN"))) {
@@ -505,7 +500,6 @@ public class CacheContext implements CommandLineRunner {
         }
 
 
-
         //期次场站树形
         pjls = proBasicOrganizeTrees.stream().filter(i -> i.getOrgType().contains("EG")).collect(Collectors.toList());
 
@@ -526,8 +520,7 @@ public class CacheContext implements CommandLineRunner {
         });
 
 
-
-        subwpls = proBasicOrganizeTreeService.list().stream().filter(i-> i.getIsAble()==1 && i.getOrgType().contains("SBS")).collect(Collectors.toList());
+        subwpls = proBasicOrganizeTreeService.list().stream().filter(i -> i.getIsAble() == 1 && i.getOrgType().contains("SBS")).collect(Collectors.toList());
         /*subwpls.stream().forEach(sub->{
 
             String subString = redisService.get(sub.getId());
@@ -550,7 +543,6 @@ public class CacheContext implements CommandLineRunner {
         });*/
 
 
-
         //树形线路
         lnls = proBasicOrganizeTrees.stream().filter(i -> StringUtils.isNotNull(pjmap.get(i.getParentCode()))).collect(Collectors.toList());
         lnls.stream().forEach(l -> {
@@ -593,7 +585,6 @@ public class CacheContext implements CommandLineRunner {
         });*/
 
 
-
         if (!wpls.isEmpty()) {
             for (ProBasicOrganizeTree wp : wpls) {
                 if (wp.getEleType().contains("F")) {

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

@@ -14,6 +14,7 @@ import com.gyee.runeconomy.dto.response.InverterAnalysis2;
 import com.gyee.runeconomy.dto.response.StationAnalysis;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.fitting.ProBasicEquipmentBranchPoint;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay6Service;
 import com.gyee.runeconomy.service.auto.IProEconWindturbineGoodnessService;
 import com.gyee.runeconomy.util.DateUtils;
@@ -1153,7 +1154,7 @@ public class WindturbinegoodnessService {
     /**
      * 逆变器分析二次页面
      */
-    public List<InverterAnalysis2> inverterAnalysis2(String wtid, String beginDate, String endDate, String target, String sort) throws Exception {
+    public List<InverterAnalysis2> inverterAnalysis2(String wtid, String beginDate, String endDate, Long interval, String target, String sort) throws Exception {
         Long startTs = DateUtils.parseDate1(beginDate).getTime() / 1000;
         Long endTs = DateUtils.parseDate1(endDate).getTime() / 1000;
         List<ProBasicEquipmentPoint> srg = CacheContext.proBasicEquipmentPointList.stream().filter(pbep -> "AIG010".equals(pbep.getUniformCode()) && wtid.equals(pbep.getWindturbineId())).collect(Collectors.toList());
@@ -1167,17 +1168,17 @@ public class WindturbinegoodnessService {
 
         //所有逆变器的输入功率测点
         //String srgTag = srg.stream().map(epp -> epp.getNemCode()).collect(Collectors.joining(";"));
-        List<PointData> historySrgDatas = edosUtil.getHistoryDatasSnap(srg.get(0).getNemCode(), startTs, endTs, null, 900L);
+        List<PointData> historySrgDatas = edosUtil.getHistoryDatasSnap(srg.get(0).getNemCode(), startTs, endTs, null, interval);
         Map<Long, PointData> srgMap = historySrgDatas.stream().collect(Collectors.toMap(PointData::getPointTime, Function.identity()));
 
         //所有逆变器的输出功率测点
         //String scgTag = scg.stream().map(epp -> epp.getNemCode()).collect(Collectors.joining(";"));
-        List<PointData> historyScgDatas = edosUtil.getHistoryDatasSnap(scg.get(0).getNemCode(), startTs, endTs, null, 900L);
+        List<PointData> historyScgDatas = edosUtil.getHistoryDatasSnap(scg.get(0).getNemCode(), startTs, endTs, null, interval);
         Map<Long, PointData> scgMap = historyScgDatas.stream().collect(Collectors.toMap(PointData::getPointTime, Function.identity()));
 
         //所有逆变器的输出电压测点
         //String srdTag = srd.stream().map(epp -> epp.getNemCode()).collect(Collectors.joining(";"));
-        List<PointData> historySrdDatas = edosUtil.getHistoryDatasSnap(srd.get(0).getNemCode(), startTs, endTs, null, 900L);
+        List<PointData> historySrdDatas = edosUtil.getHistoryDatasSnap(srd.get(0).getNemCode(), startTs, endTs, null, interval);
         Map<Long, PointData> srdMap = historySrdDatas.stream().collect(Collectors.toMap(PointData::getPointTime, Function.identity()));
 
         List<InverterAnalysis2> lpds = new ArrayList<>();
@@ -1203,4 +1204,19 @@ public class WindturbinegoodnessService {
 
         return lias2;
     }
+
+
+   /* public List<InverterAnalysis2> cleanAnalysis2(String branch, String beginDate, String endDate, String target, String sort) {
+        List<ProBasicEquipmentPoint> srg = CacheContext.proBasicEquipmentPointList.stream().filter(pbep -> "AIG010".equals(pbep.getUniformCode()) && wtid.equals(pbep.getWindturbineId())).collect(Collectors.toList());
+
+        List<ProBasicEquipmentBranchPoint> dl = CacheContext.proBasicEquipmentBranchPointList.stream().filter(pbqbp -> "ZLDL".equals(pbqbp.getUniformCode()) && branch.equals(pbqbp.getWindturbineId())).collect(Collectors.toList());
+
+        List<ProBasicEquipmentBranchPoint> dy = CacheContext.proBasicEquipmentBranchPointList.stream().filter(pbqbp -> "ZLDY".equals(pbqbp.getUniformCode()) && branch.equals(pbqbp.getWindturbineId())).collect(Collectors.toList());
+
+        List<String> srgCollect = srg.stream().map(epp -> epp.getNemCode()).collect(Collectors.toList());
+
+        edosUtil.getHistoryDatasRaw(dl.toString())
+    }*/
+
+
 }