Merge branch 'master' of http://124.70.43.205:3000/xieshengjie/sis

common/src/main/java/com/gyee/common/vo/specific/SpecificTarget.java

@@ -12,4 +12,5 @@ public class SpecificTarget {
     private String wpname;
 //    private Integer year;
     List<SpecificTargetVo> targetList;
+    private Integer orderNum;
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/GenerationMain.java

@@ -59,80 +59,80 @@ public class GenerationMain {
 
 //        Date date =new Date();
 //
-        Calendar c=Calendar.getInstance();
-        c.set(Calendar.MONTH,7);
-        c.set(Calendar.DAY_OF_MONTH,2);
-        Date date =c.getTime();
-
-        for (int i = 0; i < 30; i++) {
-            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
-
-            windPowerInfo1Service.calLineInfoDay(date);
-            windPowerInfo1Service.calProjectInfoDay(date);
-            windPowerInfo1Service.calWindpowerInfoDay(date);
-            windPowerInfo1Service.calCompanyInfoDay(date);
-            windPowerInfo1Service.calRegionInfoDay(date);
-
-            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
-            windPowerInfo2Service.calLineInfoDay(date);
-            windPowerInfo2Service.calProjectInfoDay(date);
-            windPowerInfo2Service.calWindpowerInfoDay(date);
-            windPowerInfo2Service.calCompanyInfoDay(date);
-            windPowerInfo2Service.calRegionInfoDay(date);
-
-            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
-            windPowerInfo3Service.calLineInfoDay(date);
-            windPowerInfo3Service.calProjectInfoDay(date);
-            windPowerInfo3Service.calWindpowerInfoDay(date);
-            windPowerInfo3Service.calCompanyInfoDay(date);
-            windPowerInfo3Service.calRegionInfoDay(date);
-
-            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
-            windPowerInfo4Service.calLineInfoDay(date);
-            windPowerInfo4Service.calProjectInfoDay(date);
-            windPowerInfo4Service.calWindpowerInfoDay(date);
-            windPowerInfo4Service.calCompanyInfoDay(date);
-            windPowerInfo4Service.calRegionInfoDay(date);
-
-            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
-            windPowerInfo5Service.calLineInfoDay(date);
-            windPowerInfo5Service.calProjectInfoDay(date);
-            windPowerInfo5Service.calWindpowerInfoDay(date);
-            windPowerInfo5Service.calCompanyInfoDay(date);
-            windPowerInfo5Service.calRegionInfoDay(date);
-
-            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
-            windPowerInfo6Service.calLineInfoDay(date);
-            windPowerInfo6Service.calProjectInfoDay(date);
-            windPowerInfo6Service.calWindpowerInfoDay(date);
-            windPowerInfo6Service.calCompanyInfoDay(date);
-            windPowerInfo6Service.calRegionInfoDay(date);
-
-
-            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
-            equipmentInfo1Service.calEquipmentInfoDay(date);
-            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
-            equipmentInfo2Service.calEquipmentInfoDay(date);
-            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
-            equipmentInfo3Service.calEquipmentInfoDay(date);
-            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
-            equipmentInfo4Service.calEquipmentInfoDay(date);
-            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
-            equipmentInfo5Service.calEquipmentInfoDay(date);
-
-
-            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
-            wtAlysisDayService.calEquipmentInfoDay(date);
-
-            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
-            equipmentInfoDayTopService.calEquipmentInfoDayTop(date);
-            equipmentInfoDayTopService.calEquipmentInfoMonthTop(date);
-            equipmentInfoDayTopService.calEquipmentInfoYearTop(date);
-            c.add(Calendar.DAY_OF_MONTH, 1);
-            date = c.getTime();
-
-
-        }
+//        Calendar c=Calendar.getInstance();
+//        c.set(Calendar.MONTH,7);
+//        c.set(Calendar.DAY_OF_MONTH,2);
+//        Date date =c.getTime();
+//
+//        for (int i = 0; i < 30; i++) {
+//            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
+//
+//            windPowerInfo1Service.calLineInfoDay(date);
+//            windPowerInfo1Service.calProjectInfoDay(date);
+//            windPowerInfo1Service.calWindpowerInfoDay(date);
+//            windPowerInfo1Service.calCompanyInfoDay(date);
+//            windPowerInfo1Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
+//            windPowerInfo2Service.calLineInfoDay(date);
+//            windPowerInfo2Service.calProjectInfoDay(date);
+//            windPowerInfo2Service.calWindpowerInfoDay(date);
+//            windPowerInfo2Service.calCompanyInfoDay(date);
+//            windPowerInfo2Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
+//            windPowerInfo3Service.calLineInfoDay(date);
+//            windPowerInfo3Service.calProjectInfoDay(date);
+//            windPowerInfo3Service.calWindpowerInfoDay(date);
+//            windPowerInfo3Service.calCompanyInfoDay(date);
+//            windPowerInfo3Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
+//            windPowerInfo4Service.calLineInfoDay(date);
+//            windPowerInfo4Service.calProjectInfoDay(date);
+//            windPowerInfo4Service.calWindpowerInfoDay(date);
+//            windPowerInfo4Service.calCompanyInfoDay(date);
+//            windPowerInfo4Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
+//            windPowerInfo5Service.calLineInfoDay(date);
+//            windPowerInfo5Service.calProjectInfoDay(date);
+//            windPowerInfo5Service.calWindpowerInfoDay(date);
+//            windPowerInfo5Service.calCompanyInfoDay(date);
+//            windPowerInfo5Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
+//            windPowerInfo6Service.calLineInfoDay(date);
+//            windPowerInfo6Service.calProjectInfoDay(date);
+//            windPowerInfo6Service.calWindpowerInfoDay(date);
+//            windPowerInfo6Service.calCompanyInfoDay(date);
+//            windPowerInfo6Service.calRegionInfoDay(date);
+//
+//
+//            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
+//            equipmentInfo1Service.calEquipmentInfoDay(date);
+//            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
+//            equipmentInfo2Service.calEquipmentInfoDay(date);
+//            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
+//            equipmentInfo3Service.calEquipmentInfoDay(date);
+//            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
+//            equipmentInfo4Service.calEquipmentInfoDay(date);
+//            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
+//            equipmentInfo5Service.calEquipmentInfoDay(date);
+//
+//
+//            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
+//            wtAlysisDayService.calEquipmentInfoDay(date);
+//
+//            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
+//            equipmentInfoDayTopService.calEquipmentInfoDayTop(date);
+//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(date);
+//            equipmentInfoDayTopService.calEquipmentInfoYearTop(date);
+//            c.add(Calendar.DAY_OF_MONTH, 1);
+//            date = c.getTime();
+//
+//
+//        }
 
 
 //        Calendar c=Calendar.getInstance();

realtime/generationXK-service/src/main/java/com/gyee/generation/config/XxlJobConfig.java

@@ -18,7 +18,8 @@ import org.springframework.core.env.Environment;
 
 
 @Configuration
-@PropertySource("classpath:xxl-job-executorWP.properties")
+//@PropertySource("classpath:xxl-job-executor.properties")
+@PropertySource("classpath:xxl-job-executorWPGD.properties")
 //@PropertySource("classpath:xxl-job-executorRG.properties")
 public class XxlJobConfig implements EnvironmentAware {
     private Environment env;

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/AccessStatusService.java

@@ -53,11 +53,11 @@ public class AccessStatusService {
             ProBasicPowerstationPoint qcztPoint = powerstationPointMap.get(ContantXk.QCZT);
 
             ProBasicPowerstationPoint zycglpoint = powerstationPointMap.get(ContantXk.ZYCGL);
-            double djlzt = 0;
-            double fjzt = 0;
-            double agczt = 0;
-            double glyczt = 0;
-            double cftzt = 0;
+            double djlzt = 1;
+            double fjzt = 1;
+            double agczt = 1;
+            double glyczt = 1;
+            double cftzt = 1;
 
             double zycgl = 0;
             Optional<ProBasicMeterPoint> swdlOptional = meterpoints.stream().filter(me -> me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("出线") && me.getMeterSort().equals("主")).findFirst();
@@ -78,7 +78,7 @@ public class AccessStatusService {
             try {
                 double qczt = edosUtil.getSectionData(qcztPoint, currentDate.getTime()).getPointValueInDouble();
                 if (qczt == 6){
-                    fjzt = 1;
+                    fjzt = 0;
                 }
 
             } catch (Exception e) {
@@ -89,7 +89,7 @@ public class AccessStatusService {
                 try {
                     Long pointTime = edosUtil.getRealData(proBasicMeterPoint.getNemCode()).getPointTime();
                     if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        djlzt = 1;
+                        djlzt = 0;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -101,7 +101,7 @@ public class AccessStatusService {
                 try {
                     Long pointTime = edosUtil.getRealData(proBasicPowerstationPoint.getNemCode()).getPointTime();
                     if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        cftzt = 1;
+                        cftzt = 0;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -113,7 +113,7 @@ public class AccessStatusService {
                 try {
                     Long pointTime = edosUtil.getRealData(agcpowerstationPoint.getNemCode()).getPointTime();
                     if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        agczt = 1;
+                        agczt = 0;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -122,7 +122,7 @@ public class AccessStatusService {
                 try {
                     Long pointTime = edosUtil.getRealData(glycpowerstationPoint.getNemCode()).getPointTime();
                     if ((currentDate.getTime() - pointTime) / 1000 > Integer.parseInt(second)){
-                        glyczt = 1;
+                        glyczt = 0;
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/CalculationService.java

@@ -40,7 +40,8 @@ public class CalculationService {
         Date monthFirst = DateUtils.getMonthFirst(currentDate);
         double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
 
-        String toDate1 = DateUtils.toDate1(currentDate);
+
+        Date toDate1 = DateUtils.parseDate(DateUtils.toDate1(currentDate));
         Map<String,ProEconPowerstationInfoDay2> tempMap = new HashMap<>();
         QueryWrapper<ProEconPowerstationInfoDay2> qw = new QueryWrapper<>();
         qw.eq("record_date",toDate1);

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/ElectricityMeteringService.java

@@ -203,37 +203,38 @@ public class ElectricityMeteringService {
             AtomicReference<Double> ncydl = new AtomicReference<>((double) 0);
             proBasicPros.stream().forEach(line->{    //期次
                 try {
-                    double linerfdl = getLineValue(line.getId(), ContantXk.RFDLSYZ, currentDate, linepointmap);
+                    double linerfdl = getLineValue(line.getId(), ContantXk.RFDLSYZ, currentDate, propointmap);
                     rfdl.updateAndGet(v -> new Double((double) (v + linerfdl)));
-                    double lineyfdl = getLineValue(line.getId(), ContantXk.YFDLSYZ, currentDate, linepointmap);
+                    double lineyfdl = getLineValue(line.getId(), ContantXk.YFDLSYZ, currentDate, propointmap);
                     yfdl.updateAndGet(v -> new Double((double) (v + lineyfdl)));
-                    double linenfdl = getLineValue(line.getId(), ContantXk.NFDLSYZ, currentDate, linepointmap);
+                    double linenfdl = getLineValue(line.getId(), ContantXk.NFDLSYZ, currentDate, propointmap);
                     nfdl.updateAndGet(v -> new Double((double) (v + linenfdl)));
-                    double linerswdl = getLineValue(line.getId(), ContantXk.RSWDL, currentDate, linepointmap);
+                    double linerswdl = getLineValue(line.getId(), ContantXk.RSWDL, currentDate, propointmap);
                     rswdl.updateAndGet(v -> new Double((double) (v + linerswdl)));
-                    double lineyswdl = getLineValue(line.getId(), ContantXk.YSWDL, currentDate, linepointmap);
+                    double lineyswdl = getLineValue(line.getId(), ContantXk.YSWDL, currentDate, propointmap);
                     yswdl.updateAndGet(v -> new Double((double) (v + lineyswdl)));
-                    double linenswdl = getLineValue(line.getId(), ContantXk.NSWDL, currentDate, linepointmap);
+                    double linenswdl = getLineValue(line.getId(), ContantXk.NSWDL, currentDate, propointmap);
                     nswdl.updateAndGet(v -> new Double((double) (v + linenswdl)));
-                    double linergwgwdl = getLineValue(line.getId(), ContantXk.RGWGWDL, currentDate, linepointmap);
+                    double linergwgwdl = getLineValue(line.getId(), ContantXk.RGWGWDL, currentDate, propointmap);
                     rgwgwdl.updateAndGet(v -> new Double((double) (v + linergwgwdl)));
-                    double lineygwgwdl = getLineValue(line.getId(), ContantXk.YGWGWDL, currentDate, linepointmap);
+                    double lineygwgwdl = getLineValue(line.getId(), ContantXk.YGWGWDL, currentDate, propointmap);
                     ygwgwdl.updateAndGet(v -> new Double((double) (v + lineygwgwdl)));
-                    double linengwgwdl = getLineValue(line.getId(), ContantXk.NGWGWDL, currentDate, linepointmap);
+                    double linengwgwdl = getLineValue(line.getId(), ContantXk.NGWGWDL, currentDate, propointmap);
                     ngwgwdl.updateAndGet(v -> new Double((double) (v + linengwgwdl)));
-                    double linernwgwdl = getLineValue(line.getId(), ContantXk.RNWGWDL, currentDate, linepointmap);
+                    double linernwgwdl = getLineValue(line.getId(), ContantXk.RNWGWDL, currentDate, propointmap);
                     rnwgwdl.updateAndGet(v -> new Double((double) (v + linernwgwdl)));
-                    double lineynwgwdl = getLineValue(line.getId(), ContantXk.YNWGWDL, currentDate, linepointmap);
+                    double lineynwgwdl = getLineValue(line.getId(), ContantXk.YNWGWDL, currentDate, propointmap);
                     ynwgwdl.updateAndGet(v -> new Double((double) (v + lineynwgwdl)));
-                    double linennwgwdl = getLineValue(line.getId(), ContantXk.NNWGWDL, currentDate, linepointmap);
+                    double linennwgwdl = getLineValue(line.getId(), ContantXk.NNWGWDL, currentDate, propointmap);
                     nnwgwdl.updateAndGet(v -> new Double((double) (v + linennwgwdl)));
-                    double linercydl = getLineValue(line.getId(), ContantXk.RCYDL, currentDate, linepointmap);
+                    double linercydl = getLineValue(line.getId(), ContantXk.RCYDL, currentDate, propointmap);
                     rcydl.updateAndGet(v -> new Double((double) (v + linercydl)));
-                    double lineycydl = getLineValue(line.getId(), ContantXk.YCYDL, currentDate, linepointmap);
+                    double lineycydl = getLineValue(line.getId(), ContantXk.YCYDL, currentDate, propointmap);
                     ycydl.updateAndGet(v -> new Double((double) (v + lineycydl)));
-                    double linencydl = getLineValue(line.getId(), ContantXk.NCYDL, currentDate, linepointmap);
+                    double linencydl = getLineValue(line.getId(), ContantXk.NCYDL, currentDate, propointmap);
                     ncydl.updateAndGet(v -> new Double((double) (v + linencydl)));
                 } catch (Exception e) {
+
                     e.printStackTrace();
                 }
             });
@@ -278,7 +279,12 @@ public class ElectricityMeteringService {
     }
 
     private double getLineValue(String lineid, String uniformcode, Date currentDate, Map<String, Map<String, ProBasicPowerstationPoint>> linepointmap) throws Exception {
-        ProBasicPowerstationPoint proBasicWppoint = linepointmap.get(lineid).get(uniformcode);
+        ProBasicPowerstationPoint proBasicWppoint = null;
+        try{
+            proBasicWppoint = linepointmap.get(lineid).get(uniformcode);
+        }catch (Exception e){
+            linepointmap.get(lineid).get(uniformcode);
+        }
         return edosUtil.getSectionData(proBasicWppoint,currentDate.getTime()).getPointValueInDouble();
     }
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/RegionCalreService.java

@@ -164,321 +164,323 @@ public class RegionCalreService  {
                 finalFcComCount.getAndIncrement();
             }
             Map<String, ProBasicPowerstationPoint> powerstationPointMap1 = companypointmap.get(company.getId()+type);
-            ProBasicPowerstationPoint sspjfsPoint = null;
-            ProBasicPowerstationPoint sspjgzdPoint = null;
-
-
-            if (type.equals("-1")){
-                sspjfsPoint = powerstationPointMap1.get(ContantXk.SSPJFS);
+            if (powerstationPointMap1.size()>0){
+                ProBasicPowerstationPoint sspjfsPoint = null;
+                ProBasicPowerstationPoint sspjgzdPoint = null;
+
+                if (type.equals("-1")){
+                    sspjfsPoint = powerstationPointMap1.get(ContantXk.SSPJFS);
+
+                }else if(type.equals("-2")){
+                    sspjgzdPoint = powerstationPointMap1.get(ContantXk.SSPJGZD);
+
+                }else {
+                    sspjfsPoint = powerstationPointMap1.get(ContantXk.SSPJFS);
+                    sspjgzdPoint = powerstationPointMap1.get(ContantXk.SSPJGZD);
+
+                }
+                ProBasicPowerstationPoint sszglPoint = powerstationPointMap1.get(ContantXk.SSZGL);
+                ProBasicPowerstationPoint sszllglPoint = powerstationPointMap1.get(ContantXk.SSZLLGL);
+                ProBasicPowerstationPoint sszbzglPoint = powerstationPointMap1.get(ContantXk.SSZBZGL);
+                ProBasicPowerstationPoint ssznhglzsPoint = powerstationPointMap1.get(ContantXk.SSZNHGLZS);
+                ProBasicPowerstationPoint sszzyglPoint = powerstationPointMap1.get(ContantXk.SSZZYGL);
+                ProBasicPowerstationPoint sszkyglPoint = powerstationPointMap1.get(ContantXk.SSZKYGL);
+                ProBasicPowerstationPoint sszycglPoint = powerstationPointMap1.get(ContantXk.ZYCGL);
+
+                ProBasicPowerstationPoint gztsmxPoint = powerstationPointMap1.get(ContantXk.GZTSMX);
+                ProBasicPowerstationPoint cnslmxPoint = powerstationPointMap1.get(ContantXk.CNSLGZTSMX);
+                ProBasicPowerstationPoint jxtsmxPoint = powerstationPointMap1.get(ContantXk.JXTSMX);
+                ProBasicPowerstationPoint cnjxmxPoint = powerstationPointMap1.get(ContantXk.CNSLJXTSMX);
+                ProBasicPowerstationPoint djtsmxPoint = powerstationPointMap1.get(ContantXk.DJTSMX);
+                ProBasicPowerstationPoint qxjclmxPoint = powerstationPointMap1.get(ContantXk.QXJCLTSMX);
+                ProBasicPowerstationPoint sdtjmxPoint = powerstationPointMap1.get(ContantXk.SDTJTSMX);
+                ProBasicPowerstationPoint xntsmxPoint = powerstationPointMap1.get(ContantXk.XNTSMX);
+                ProBasicPowerstationPoint xdtjmxPoint = powerstationPointMap1.get(ContantXk.XDTJTSMX);
+                ProBasicPowerstationPoint xdjclmxPoint = powerstationPointMap1.get(ContantXk.XDJCLTSMX);
+                ProBasicPowerstationPoint cwsldwmxPoint = powerstationPointMap1.get(ContantXk.CWSLDWTSMX);
+                ProBasicPowerstationPoint cwsltqmxPoint = powerstationPointMap1.get(ContantXk.CWSLTQTSMX);
+                ProBasicPowerstationPoint lxtsmxPoint = powerstationPointMap1.get(ContantXk.LXTSMX);
+                ProBasicPowerstationPoint txzdmxPoint = powerstationPointMap1.get(ContantXk.TXZDTSMX);
+                ProBasicPowerstationPoint djtsPoint = powerstationPointMap1.get(ContantXk.DJTS);
+                ProBasicPowerstationPoint yxtsPoint = powerstationPointMap1.get(ContantXk.YXTS);
+                ProBasicPowerstationPoint gztsPoint = powerstationPointMap1.get(ContantXk.GZTJTS);
+                ProBasicPowerstationPoint whtsPoint = powerstationPointMap1.get(ContantXk.JXTJTS);
+                ProBasicPowerstationPoint xdtsPoint = powerstationPointMap1.get(ContantXk.XDTS);
+                ProBasicPowerstationPoint sltsPoint = powerstationPointMap1.get(ContantXk.SLTS);
+                ProBasicPowerstationPoint lxtsPoint = powerstationPointMap1.get(ContantXk.TXZDTS);
+
+                if (type.equals("-1")){
+                    ProBasicPowerstationPoint finalSspjfsfsPoint = sspjfsPoint;
+                    sspjfs.updateAndGet(v -> {
+                        try {
+                            return new Double((double) (v + edosUtil.getSectionData(finalSspjfsfsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        return v;
+                    });
+
+
+                }else if (type.equals("-2")){
+                    ProBasicPowerstationPoint finalSspjgzdPoint = sspjgzdPoint;
+                    sspjgzd.updateAndGet(v -> {
+                        try {
+                            return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        return v;
+                    });
+
+                }else {
+                    ProBasicPowerstationPoint finalSspjfsfsPoint = sspjfsPoint;
+                    sspjfs.updateAndGet(v -> {
+                        try {
+                            return new Double((double) (v + edosUtil.getSectionData(finalSspjfsfsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        return v;
+                    });
+                    ProBasicPowerstationPoint finalSspjgzdPoint = sspjgzdPoint;
+                    sspjgzd.updateAndGet(v -> {
+                        try {
+                            return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        return v;
+                    });
+                }
+                sszgl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(sszglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                zllgl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(sszllglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                zbzgl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(sszbzglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                znhglzs.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(ssznhglzsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                zzygl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(sszzyglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                zkygl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(sszkyglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                zycgl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(sszycglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
 
-            }else if(type.equals("-2")){
-                sspjgzdPoint = powerstationPointMap1.get(ContantXk.SSPJGZD);
 
-            }else {
-                sspjfsPoint = powerstationPointMap1.get(ContantXk.SSPJFS);
-                sspjgzdPoint = powerstationPointMap1.get(ContantXk.SSPJGZD);
 
-            }
-            ProBasicPowerstationPoint sszglPoint = powerstationPointMap1.get(ContantXk.SSZGL);
-            ProBasicPowerstationPoint sszllglPoint = powerstationPointMap1.get(ContantXk.SSZLLGL);
-            ProBasicPowerstationPoint sszbzglPoint = powerstationPointMap1.get(ContantXk.SSZBZGL);
-            ProBasicPowerstationPoint ssznhglzsPoint = powerstationPointMap1.get(ContantXk.SSZNHGLZS);
-            ProBasicPowerstationPoint sszzyglPoint = powerstationPointMap1.get(ContantXk.SSZZYGL);
-            ProBasicPowerstationPoint sszkyglPoint = powerstationPointMap1.get(ContantXk.SSZKYGL);
-            ProBasicPowerstationPoint sszycglPoint = powerstationPointMap1.get(ContantXk.ZYCGL);
-
-            ProBasicPowerstationPoint gztsmxPoint = powerstationPointMap1.get(ContantXk.GZTSMX);
-            ProBasicPowerstationPoint cnslmxPoint = powerstationPointMap1.get(ContantXk.CNSLGZTSMX);
-            ProBasicPowerstationPoint jxtsmxPoint = powerstationPointMap1.get(ContantXk.JXTSMX);
-            ProBasicPowerstationPoint cnjxmxPoint = powerstationPointMap1.get(ContantXk.CNSLJXTSMX);
-            ProBasicPowerstationPoint djtsmxPoint = powerstationPointMap1.get(ContantXk.DJTSMX);
-            ProBasicPowerstationPoint qxjclmxPoint = powerstationPointMap1.get(ContantXk.QXJCLTSMX);
-            ProBasicPowerstationPoint sdtjmxPoint = powerstationPointMap1.get(ContantXk.SDTJTSMX);
-            ProBasicPowerstationPoint xntsmxPoint = powerstationPointMap1.get(ContantXk.XNTSMX);
-            ProBasicPowerstationPoint xdtjmxPoint = powerstationPointMap1.get(ContantXk.XDTJTSMX);
-            ProBasicPowerstationPoint xdjclmxPoint = powerstationPointMap1.get(ContantXk.XDJCLTSMX);
-            ProBasicPowerstationPoint cwsldwmxPoint = powerstationPointMap1.get(ContantXk.CWSLDWTSMX);
-            ProBasicPowerstationPoint cwsltqmxPoint = powerstationPointMap1.get(ContantXk.CWSLTQTSMX);
-            ProBasicPowerstationPoint lxtsmxPoint = powerstationPointMap1.get(ContantXk.LXTSMX);
-            ProBasicPowerstationPoint txzdmxPoint = powerstationPointMap1.get(ContantXk.TXZDTSMX);
-            ProBasicPowerstationPoint djtsPoint = powerstationPointMap1.get(ContantXk.DJTS);
-            ProBasicPowerstationPoint yxtsPoint = powerstationPointMap1.get(ContantXk.YXTS);
-            ProBasicPowerstationPoint gztsPoint = powerstationPointMap1.get(ContantXk.GZTJTS);
-            ProBasicPowerstationPoint whtsPoint = powerstationPointMap1.get(ContantXk.JXTJTS);
-            ProBasicPowerstationPoint xdtsPoint = powerstationPointMap1.get(ContantXk.XDTS);
-            ProBasicPowerstationPoint sltsPoint = powerstationPointMap1.get(ContantXk.SLTS);
-            ProBasicPowerstationPoint lxtsPoint = powerstationPointMap1.get(ContantXk.TXZDTS);
-
-            if (type.equals("-1")){
-                ProBasicPowerstationPoint finalSspjfsfsPoint = sspjfsPoint;
-                sspjfs.updateAndGet(v -> {
+                gztsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(finalSspjfsfsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(gztsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                     return v;
                 });
-
-
-            }else if (type.equals("-2")){
-                ProBasicPowerstationPoint finalSspjgzdPoint = sspjgzdPoint;
-                sspjgzd.updateAndGet(v -> {
+                cngzmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(cnslmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                     return v;
                 });
-
-            }else {
-                ProBasicPowerstationPoint finalSspjfsfsPoint = sspjfsPoint;
-                sspjfs.updateAndGet(v -> {
+                jxtsmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(finalSspjfsfsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(jxtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                     return v;
                 });
-                ProBasicPowerstationPoint finalSspjgzdPoint = sspjgzdPoint;
-                sspjgzd.updateAndGet(v -> {
+                cnjxmx.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getSectionData(finalSspjgzdPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getSectionData(cnjxmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                djtsmx.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(djtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                qxjclmx.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(qxjclmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                sdtjmx.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(sdtjmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                xntsmx.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(xntsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                xdtjmx.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(xdtjmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                xdjclmx.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(xdjclmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                cwsldwmx.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(cwsldwmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                cwsltqmx.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(cwsltqmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                lxtsmx.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(lxtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                txzdmx.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(txzdmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                djts.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(djtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                yxts.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(yxtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                gzts.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(gztsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                whts.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(whtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                xdts.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(xdtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                slts.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(sltsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                lxts.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(lxtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                     return v;
                 });
             }
-            sszgl.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            zllgl.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszllglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            zbzgl.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszbzglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            znhglzs.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(ssznhglzsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            zzygl.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszzyglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            zkygl.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszkyglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            zycgl.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(sszycglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
 
-
-
-            gztsmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(gztsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            cngzmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(cnslmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            jxtsmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(jxtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            cnjxmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(cnjxmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            djtsmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(djtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            qxjclmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(qxjclmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            sdtjmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(sdtjmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            xntsmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(xntsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            xdtjmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(xdtjmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            xdjclmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(xdjclmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            cwsldwmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(cwsldwmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            cwsltqmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(cwsltqmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            lxtsmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(lxtsmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            txzdmx.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(txzdmxPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            djts.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(djtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            yxts.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(yxtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            gzts.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(gztsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            whts.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(whtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            xdts.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(xdtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            slts.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(sltsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
-            lxts.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getSectionData(lxtsPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
         });
         if (fcComCount.get()==0){
             fcComCount.getAndIncrement();

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/StatusService.java

@@ -297,6 +297,7 @@ public class StatusService {
                 }
                 else {
                     List<PointData> interruptionRealData = edosUtil.getRealData(interruptionList);
+                    long time = currentDate.getTime();
                     List<PointData> collect = interruptionRealData.stream().filter(i -> (currentDate.getTime() - i.getPointTime()) / 1000 > Integer.parseInt(second)).collect(Collectors.toList());
                     if (collect.size()!=interruptionRealData.size()){
                         double ssgl = edosUtil.getSectionData(ssglPoint,currentDate.getTime()).getPointValueInDouble();
@@ -715,12 +716,12 @@ public class StatusService {
                 //离线台数12
                 ProBasicPowerstationPoint lxnumPointNew = projectmap.get(ContantXk.LXTSMX);
                 PointData lxnumPoint = PointUtil.createPointData(currentDate,prolxnum.get(),lxnumPointNew.getNemCode(),lxnumPointNew.getName());
-                wpdwslnum.addAndGet(prolxnum.intValue());
+                wplxnum.addAndGet(prolxnum.intValue());
                 resultList.add(lxnumPoint);
                 //未知离线12
                 ProBasicPowerstationPoint wznumPointNew = projectmap.get(ContantXk.TXZDTSMX);
                 PointData wznumPoint = PointUtil.createPointData(currentDate,prowznum.get(),wznumPointNew.getNemCode(),wznumPointNew.getName());
-                wphjslnum.addAndGet(prowznum.intValue());
+                wpwznum.addAndGet(prowznum.intValue());
                 resultList.add(wznumPoint);
                 //离线台数6
                 ProBasicPowerstationPoint txzdPointNew = projectmap.get(ContantXk.TXZDTS);

realtime/generationXK-service/src/main/java/com/gyee/generation/task/SaticScheduleCALTask.java

@@ -112,7 +112,7 @@ public class SaticScheduleCALTask {
 
 
     /**
-     * 电计量计算指标
+     * 实时计算指标
      * 每秒执行一次
      */
     @XxlJob("realtime_CAL")

realtime/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -1415,7 +1415,7 @@ public class EdosUtil implements IEdosUtil {
         JSONObject jo = new JSONObject();
         jo.put("tagName", pd.getEdnaId());
         JSONObject joo = new JSONObject();
-        joo.put("ts", pd.getPointTime()*1000);
+        joo.put("ts", pd.getPointTime());
         joo.put("status", 0);
         joo.put("doubleValue", pd.getPointValueInDouble());
         jo.put("tsData", joo);

realtime/generationXK-service/src/main/resources/application-td.yml

@@ -1,5 +1,5 @@
 server:
-  port: 7012
+  port: 7071
   servlet:
     context-path: /
 
@@ -9,7 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-    host: 10.81.3.155
+    #host: 127.0.0.1
+    host: 192.168.11.250
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -27,15 +28,18 @@ spring:
         min-idle: 0
         max-idle: 8
         max-wait: -1
-    database: 0
+    database: 9
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.81.3.151:5432/wisdom
-    username: gdprod
-    password: gd123
+    url: jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD?rewriteBatchedStatements=true
+    username: postgres
+    password: postgres
+    #    url: jdbc:postgresql://124.70.75.91:5432/jn_test?rewriteBatchedStatements=true
+    #    username: postgres
+    #    password: gd123
     oracle-schema=:
     #    type: com.alibaba.druid.pool.DruidDataSource
     #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
@@ -83,29 +87,38 @@ logging:
     com.example: debug
 #db url
 db:
-  url: http://10.81.3.152:8011/ts
-td:
-  url: http://localhost:8011/ts
+  #url: http://127.0.0.1:8011/ts
+  url: http://192.168.11.250:8011/ts
+  #url: http://124.70.75.91:8011/ts
 #参与计算的场站
-runWindpowerstation: YLZ_FDC
+#runWindpowerstation: SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_GHTZ_HZJ_GDC_STA
+runWindpowerstation: SD_GDDL_WHWD_FDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次
-  di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC,NJL01_GC
+  di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC,NJL01_GC,YTY01_GC,PDL01_GC
 #判断数据终端
 second: 1800
 #判断降出力
-AI134: 17.4    #叶轮转速给定
+AI110: 17.4    #叶轮转速给定
 AI178: 17.4    #转矩给定
 #AI443:容量
 
-#计算电量直接取，如果不是1就是相减算
-typeOfElectric:
-  #直接取
-  direct: GJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC
-
-
-
+#功率曲线拟合
+curvefitting:
+  #维度
+  dimension: 20
+  #尺度
+  scale: 0.01
+initialcode: INITIAL
+##调用区间间隔时长，需要与XXLJOB调度时长结合，保证查询区间时长大于调度时长，单位分钟
+frequency:
+  #停机
+  shutdown: 6
+  #限电
+  powerrationing: 6
+  #切入切出
+  cutinandout: 6
 
 
 

realtime/generationXK-service/src/main/resources/application-jn.yml

@@ -1,5 +1,5 @@
 server:
-  port: 7012
+  port: 7070
   servlet:
     context-path: /
 
@@ -9,15 +9,16 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-    host: 10.81.3.155
+    #host: 127.0.0.1
+    host: 192.168.11.250
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
-#    cluster:
-#      #集群信息
-#      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
-#      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
-#      maxRedirects: 3
+    #    cluster:
+    #      #集群信息
+    #      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
     password:
     application:
       name: test
@@ -27,15 +28,18 @@ spring:
         min-idle: 0
         max-idle: 8
         max-wait: -1
-    database: 0
+    database: 9
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.81.3.151:5432/wisdom
-    username: gdprod
-    password: gd123
+    url: jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD?rewriteBatchedStatements=true
+    username: postgres
+    password: postgres
+    #    url: jdbc:postgresql://124.70.75.91:5432/jn_test?rewriteBatchedStatements=true
+    #    username: postgres
+    #    password: gd123
     oracle-schema=:
     #    type: com.alibaba.druid.pool.DruidDataSource
     #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
@@ -83,9 +87,12 @@ logging:
     com.example: debug
 #db url
 db:
-  url: http://10.81.3.152:8011/ts
+  #url: http://127.0.0.1:8011/ts
+  url: http://192.168.11.250:8011/ts
+  #url: http://124.70.75.91:8011/ts
 #参与计算的场站
-runWindpowerstation: GJY_FDC,DJY_FDC,YF_FDC,HSM_FDC,PTZ_FDC,YLZ_FDC,ZK_FDC,NJL_FDC,YTY_FDC,PDL_FDC
+runWindpowerstation: SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_GHTZ_HZJ_GDC_STA
+#runWindpowerstation: SD_GDDL_RZLX_FDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次
@@ -93,17 +100,25 @@ clauStatus:
 #判断数据终端
 second: 1800
 #判断降出力
-AI134: 17.4    #叶轮转速给定
+AI110: 17.4    #叶轮转速给定
 AI178: 17.4    #转矩给定
 #AI443:容量
 
-#计算电量直接取，如果不是1就是相减算
-typeOfElectric:
-  #直接取
-  direct: GJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC
-
-
-
+#功率曲线拟合
+curvefitting:
+  #维度
+  dimension: 20
+  #尺度
+  scale: 0.01
+initialcode: INITIAL
+##调用区间间隔时长，需要与XXLJOB调度时长结合，保证查询区间时长大于调度时长，单位分钟
+frequency:
+  #停机
+  shutdown: 6
+  #限电
+  powerrationing: 6
+  #切入切出
+  cutinandout: 6
 
 
 

realtime/generationXK-service/src/main/resources/application-xk.yml

@@ -91,8 +91,8 @@ db:
   url: http://192.168.11.250:8011/ts
   #url: http://124.70.75.91:8011/ts
 #参与计算的场站
-#runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_BH1_FDC_STA,SD_GDDL_BH2_FDC_STA,SD_GDDL_CG_FDC_STA,SD_GDDL_FJ_FDC_STA,SD_GDDL_YS_FDC_STA,SD_GDDL_FXFC_FDC_STA,SD_GDDL_JNSS_FDC_STA,SD_GDDL_WFBH_FDC_STA,SD_GDDL_PLHS_FDC_STA,SD_GDDL_JNCQ_FDC_STA,SD_GDDL_LXLN_FDC_STA,SD_GDDL_LQJS_FDC_STA,SD_GDDL_ZYXD_FDC_STA,SD_GDDL_ZYFS_FDC_STA
-runWindpowerstation: SD_GDDL_RZLX_FDC_STA
+runWindpowerstation: SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_GHTZ_HZJ_GDC_STA
+#runWindpowerstation: SD_GDDL_RZLX_FDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次

realtime/generationXK-service/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-#    active: xk
-    active: yun
+    active: gd
+#    active: yun
 
 #    active: td

realtime/generationXK-service/src/main/resources/xxl-job-executorWP.properties

@@ -6,20 +6,20 @@ xxl.job.accessToken=
 
 ### xxl-job executor appname
 ### 场站计算
-xxl.job.executor.appname=generationWP-job
+#xxl.job.executor.appname=generationWP-job
 ### 区域公司计算
-#xxl.job.executor.appname=generationRG-job
+xxl.job.executor.appname=generationWPGD-job
 ### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
 xxl.job.executor.address=
 ### xxl-job executor server-info
 xxl.job.executor.ip=
 #场站端口
-xxl.job.executor.port=9201
+#xxl.job.executor.port=9201
 #区域端口
-#xxl.job.executor.port=9202
+xxl.job.executor.port=9301
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=E:\\jobs\\generationWP-job
+xxl.job.executor.logpath=E:\\jobs\\generationWPGD-job
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

realtime/generationXK-service/src/test/java/com/gyee/generation/GenerationTest.java

@@ -44,6 +44,10 @@ public class GenerationTest {
     private RegionCalreService regionCalreService;
     @Resource
     private RegionCalService regionCalService;
+    @Resource
+    private AccessStatusService accessStatusService;
+    @Resource
+    private CalculationService calculationService;
 
     @Test
     public void test1() throws Exception {
@@ -70,5 +74,27 @@ public class GenerationTest {
 
     @Test
     public void test3() throws Exception {
+//        //场站接入状态，总预测功率
+//        accessStatusService.accessStatus();
+//        //全场状态
+//        accessStatusService.fullFieldState();
+
+
+        statusService.powerRationing();
+        statusService.statusReal();
+        statusService.calculateStatusNumber();
+
+//         realtimeService.savaRealtimeTarget();
+//        cycleCalculationService.saveCyle();
+
+//        electricityMeteringService.saveGenerationDatas();
+
+//        calculationService.calWp();
+
+//        regionCalService.companyCal();
+//        regionCalService.RegionCal();
+
+//        regionCalreService.companyCal();
+//        regionCalreService.RegionCal();
     }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/homepage/EconomyHomePageController.java

@@ -3,14 +3,17 @@ package com.gyee.runeconomy.controller.homepage;
 
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
+import com.gyee.runeconomy.dto.response.ProEconPointCodeDTO;
 import com.gyee.runeconomy.service.homepage.EconomyPointHomePageService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -21,6 +24,7 @@ import java.util.Map;
  * @author wang
  * @since 2022-11-22
  */
+@Log4j2
 @RestController
 @RequestMapping("//economy")
 public class EconomyHomePageController {
@@ -59,6 +63,33 @@ public class EconomyHomePageController {
     }
 
 
+    /**
+     * 首页指标排行
+     * @param foreignKeyId
+     * @param dateType
+     * @param pointCode
+     * @return
+     * @throws Exception
+     */
+    @GetMapping(value = "/point-ranking")
+    @ApiOperation(value = "经济运行-首页指标排行", notes = "经济运行-首页指标排行")
+    public R getEconomyPointRanking(
+            @RequestParam(value = "foreignKeyId", required = true) String foreignKeyId,
+            @RequestParam(value = "dateType", required = true) String dateType,
+            @RequestParam(value = "pointCode", required = true) String pointCode
+    )  {
+
+        List<ProEconPointCodeDTO> dtos = null;
+        try {
+            dtos = economyPointHomePageService.getEconomyPointRanking(foreignKeyId, dateType, pointCode);
+        } catch (Exception e) {
+            log.error("请求异常", e);
+            return R.error(ResultMsg.error());
+        }
+        return R.data(ResultMsg.ok(dtos));
+    }
+
+
 
 
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/performacompare/EquipmentPerformaCompareController.java

@@ -32,9 +32,10 @@ public class EquipmentPerformaCompareController {
 
     /**
      * 单机横向对比列表
-     *
-     * @param windturbineIds
-     * @param date
+     * @param type 风场 -1 ；光伏 -2
+     * @param dateType  日 1；月 2； 年 3
+     * @param windturbineIds 设别ids
+     * @param date 日期
      * @return
      */
     @GetMapping("/equipment-performa-compare")
@@ -42,17 +43,18 @@ public class EquipmentPerformaCompareController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R daydjhxdbtop(
             @RequestParam(value = "type", required = true) String type,
+            @RequestParam(value = "dateType", required = true) String dateType,
             @RequestParam(value = "windturbineIds", required = true) String windturbineIds,
             @RequestParam(value = "date", required = true) String date) {
 
-        List<Object> objects =  equipmentPerformaCompareService.getEquipmentPerformaCompareList(type, windturbineIds, date);
-
-
-        if (null != objects) {
+        List<Object> objects = null;
+        try {
+            objects = equipmentPerformaCompareService.getEquipmentPerformaCompareList(dateType, windturbineIds, date,type);
             return R.data(ResultMsg.ok(objects));
-        } else {
-            return R.error(ResultMsg.error());
+        } catch (Exception e) {
+            return R.data(ResultMsg.error());
         }
+
     }
 
 

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

@@ -89,7 +89,10 @@ public class PerformanceCurvefittingService {
             switch (dateType) {
 
                 case "1":
-                    List<ProEconWtCurveFitting> daylist = proEconWtCurveFittingService.getProEconWtCurveFittingList(wt,date);
+                    String dayCurve = redisService.get("dayCurve_"+wt);
+                    List<ProEconWtCurveFitting> daylist = JSONObject.parseObject(dayCurve, new TypeReference<List<ProEconWtCurveFitting>>() {
+                    });
+//                    List<ProEconWtCurveFitting> daylist = proEconWtCurveFittingService.getProEconWtCurveFittingList(wt,date);
 
                     daylist.stream().forEach(w -> {
                         doubleMap.put(w.getSpeed(), w.getActualPower());
@@ -97,7 +100,11 @@ public class PerformanceCurvefittingService {
                     zzsglMap.put(wt, doubleMap);
                     break;
                 case "2":
-                    List<ProEconWtCurveFittingMonth> monthlist = proEconWtCurveFittingMonthService.getProEconWtCurveFittingMonthList(wt,String.valueOf(month),String.valueOf(year));
+
+                    String monthCurve = redisService.get("monthCurve_"+wt);
+                    List<ProEconWtCurveFittingMonth> monthlist = JSONObject.parseObject(monthCurve, new TypeReference<List<ProEconWtCurveFittingMonth>>() {
+                    });
+//                    List<ProEconWtCurveFittingMonth> monthlist = proEconWtCurveFittingMonthService.getProEconWtCurveFittingMonthList(wt,String.valueOf(month),String.valueOf(year));
 
                     monthlist.stream().forEach(w -> {
                         doubleMap.put(w.getSpeed(), w.getActualPower());
@@ -105,7 +112,10 @@ public class PerformanceCurvefittingService {
                     zzsglMap.put(wt, doubleMap);
                     break;
                 case "3":
-                    List<ProEconWtCurveFittingYear>  yearslist = proEconWtCurveFittingYearService.getProEconWtCurveFittingYearList(wt,String.valueOf(year));
+                    String yearCurve = redisService.get("yearCurve_"+wt);
+                    List<ProEconWtCurveFittingYear> yearslist = JSONObject.parseObject(yearCurve, new TypeReference<List<ProEconWtCurveFittingYear>>() {
+                    });
+//                    List<ProEconWtCurveFittingYear>  yearslist = proEconWtCurveFittingYearService.getProEconWtCurveFittingYearList(wt,String.valueOf(year));
 
                     yearslist.stream().forEach(w -> {
                         doubleMap.put(w.getSpeed(), w.getActualPower());

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

@@ -53,7 +53,7 @@ public class ProEconWtPowerCurveFittingServiceImpl extends ServiceImpl<ProEconWt
         list.stream().forEach(i->{
             i.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getAname());
         });
-        Map<String, List<ProEconWtPowerCurveFitting>> map =  list.stream().collect(Collectors.groupingBy(ProEconWtPowerCurveFitting::getWindturbineId));
+        Map<String, List<ProEconWtPowerCurveFitting>> map =  list.stream().collect(Collectors.groupingBy(ProEconWtPowerCurveFitting::getNemCode));
         return map;
     }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -206,7 +206,20 @@ public class EconomyPointHomePageService {
         return allmap;
     }
 
-
+    /**
+     * 指标排行榜
+     * @param foreignKeyId
+     * @param dateType
+     * @param pointCode
+     * @return
+     */
+    public List<ProEconPointCodeDTO> getEconomyPointRanking(String foreignKeyId, String dateType,String pointCode){
+        //获取当前时间
+        String strdate = DateUtils.toDate1(new Date());
+        Date date = DateUtils.parseDate(strdate);
+        List<ProEconPointCodeDTO> pointCodeDTO = proEconPointCodeService.getEconPointRanking("", foreignKeyId, pointCode,date,dateType);
+        return pointCodeDTO;
+    }
     /**
      * （风能利用率、发电量、欠发电量）
      */

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/performacompare/EquipmentPerformaCompareService.java

@@ -33,19 +33,19 @@ public class EquipmentPerformaCompareService {
 
     /**
      * 单机横向对比列表
-     * @param type
+     * @param dateType
      * @param windturbineIds
      * @param date
      * @return
      */
-    public List<Object> getEquipmentPerformaCompareList(String type, String windturbineIds, String date) {
-
+    public List<Object> getEquipmentPerformaCompareList(String dateType, String windturbineIds, String date,String type) {
         List<Object> objects = new ArrayList<>();
-        List<ProEconWtAlysisDay>  list =  proEconWtAlysisDayService.getProEconWtAlysisDayList(windturbineIds,date);//风机性能分析数据
-        List<ProEconWtwindDayInfo> fzyList =  proEconWtwindDayInfoService.getProEconWtwindDayInfoList(windturbineIds,date);//风资源
-        List<DjhxdbtopVo> resultList = alysisConversionMethod(list,fzyList,type);//日月年指标转换记录
-        objects = convert(resultList);
-
+        if("-1".equals(type)){
+            List<ProEconWtAlysisDay>  list =  proEconWtAlysisDayService.getProEconWtAlysisDayList(windturbineIds,date);//风机性能分析数据
+            List<ProEconWtwindDayInfo> fzyList =  proEconWtwindDayInfoService.getProEconWtwindDayInfoList(windturbineIds,date);//风资源
+            List<DjhxdbtopVo> resultList = alysisConversionMethod(list,fzyList,dateType);//日月年指标转换记录
+            objects = convert(resultList);
+        }
         return objects;
     }
 
@@ -76,6 +76,7 @@ public class EquipmentPerformaCompareService {
     private List<Object> convert(List<DjhxdbtopVo> resultList) {
         List<Object> rList = new ArrayList<>();
         List<String> wtids = resultList.stream().map(i -> i.getWtid()).collect(Collectors.toList());
+        List<String> nemcode = resultList.stream().map(i -> i.getNemCode()).collect(Collectors.toList());
         DjhxdbInitVo fdj = new DjhxdbInitVo();
         fdj.setName("风电机");
         try {
@@ -83,7 +84,7 @@ public class EquipmentPerformaCompareService {
             LinkedHashMap addValMap = new LinkedHashMap();
             for (int j=0;j<wtids.size();j++){
                 addMap.put(String.valueOf(j+1), Class.forName("java.lang.String"));
-                addValMap.put(String.valueOf(j+1), wtids.get(j));
+                addValMap.put(String.valueOf(j+1), nemcode.get(j));
             }
             Object blo = new ClassUtil().dynamicClass(fdj, addMap, addValMap);
             rList.add(blo);
@@ -468,15 +469,15 @@ public class EquipmentPerformaCompareService {
     }
 
     //日月年指标转换方法
-    List<DjhxdbtopVo> alysisConversionMethod(List<ProEconWtAlysisDay>  list ,List<ProEconWtwindDayInfo>  fzyList ,String type ){
+    List<DjhxdbtopVo> alysisConversionMethod(List<ProEconWtAlysisDay>  list ,List<ProEconWtwindDayInfo>  fzyList ,String dateType ){
         List<DjhxdbtopVo> resultList = new ArrayList<>();
         list.stream().forEach(i->{
             DjhxdbtopVo vo = new DjhxdbtopVo();
             vo.setWtid(i.getWindturbineId());
             vo.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getAname());
             Optional<ProEconWtwindDayInfo> first = fzyList.stream().filter(fzy -> fzy.getWindturbineId().equals(i.getWindturbineId())).findFirst();
-            List<FzyVo> vos = getFzyVos(first,type);
-            switch (type){
+            List<FzyVo> vos = getFzyVos(first,dateType);
+            switch (dateType){
                 case "1" :
                     vo.setFdl(i.getRfdl());
                     vo.setYfdl(i.getRyfdl());
@@ -556,11 +557,11 @@ public class EquipmentPerformaCompareService {
 
 
 
-    List<FzyVo>  getFzyVos( Optional<ProEconWtwindDayInfo> first ,String type) {
+    List<FzyVo>  getFzyVos( Optional<ProEconWtwindDayInfo> first ,String dateType) {
         List<FzyVo> vos = new ArrayList<>();
         ProEconWtwindDayInfo winfo = first.get();
 
-        switch (type) {
+        switch (dateType) {
             case "1":
                 for (int j = 0; j < 16; j++) {
                     FzyVo vo = new FzyVo();

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
+import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.specific.SpecificCenterVo;
 import com.gyee.common.vo.specific.SpecificTarget;
 import com.gyee.common.vo.specific.SpecificTargetVo;
@@ -712,13 +713,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -746,7 +750,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -856,13 +860,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -890,7 +897,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -999,13 +1006,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1033,7 +1043,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
 
@@ -1143,13 +1153,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1177,7 +1190,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -1286,13 +1299,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1320,7 +1336,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -1429,13 +1445,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1463,7 +1482,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -1572,13 +1591,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1607,7 +1629,7 @@ public class SpecificService {
             });
         }
 
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
         return resultendList;
     }
 
@@ -1715,13 +1737,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1749,7 +1774,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -1858,13 +1883,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1892,7 +1920,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -2001,13 +2029,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -2035,7 +2066,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -2144,13 +2175,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -2178,7 +2212,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -2288,13 +2322,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -2322,7 +2359,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -2431,13 +2468,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     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());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -2465,7 +2505,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }