Merge remote-tracking branch 'origin/master'

power-fitting-JN/src/main/java/com.gyee.power.fitting/dispersionanalysis/CalculateTask.java

@@ -73,17 +73,17 @@ public class CalculateTask {
                         if (doubleValue1 == doubleValue0) continue;
 
                         //0待机, 1运行, 2故障, 3检修, 4限电, 5受累, 6离线
-                        if (doubleValue1 == 1) {
+                        if (doubleValue0 == 1) {
                             stateCauseList.add(new StateCause(tbName, 1, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 2) {
+                        } else if (doubleValue0 == 2) {
                             stateCauseList.add(new StateCause(tbName, 2, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 3) {
+                        } else if (doubleValue0 == 3) {
                             stateCauseList.add(new StateCause(tbName, 3, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 4) {
+                        } else if (doubleValue0 == 4) {
                             stateCauseList.add(new StateCause(tbName, 4, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 5) {
+                        } else if (doubleValue0 == 5) {
                             stateCauseList.add(new StateCause(tbName, 5, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 6) {
+                        } else if (doubleValue0 == 6) {
                             stateCauseList.add(new StateCause(tbName, 6, ts1, ts0, ts0 - ts1));
                         } else {
                             stateCauseList.add(new StateCause(tbName, 0, ts1, ts0, ts0 - ts1));
@@ -113,31 +113,31 @@ public class CalculateTask {
                         if (doubleValue1 == doubleValue0) continue;
 
                         //0待机, 1手动停机, 2正常发电, 3发电降出力, 4故障, 5故障受累, 6检修, 7检修受累, 8限电降出力, 9限电停机, 10电网受累, 11环境受累, 12通讯中断, 13设备离线
-                        if (doubleValue1 == 1) {
+                        if (doubleValue0 == 1) {
                             stateCauseList.add(new StateCause(tbName, 1, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 2) {
+                        } else if (doubleValue0 == 2) {
                             stateCauseList.add(new StateCause(tbName, 2, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 3) {
+                        } else if (doubleValue0 == 3) {
                             stateCauseList.add(new StateCause(tbName, 3, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 4) {
+                        } else if (doubleValue0 == 4) {
                             stateCauseList.add(new StateCause(tbName, 4, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 5) {
+                        } else if (doubleValue0 == 5) {
                             stateCauseList.add(new StateCause(tbName, 5, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 6) {
+                        } else if (doubleValue0 == 6) {
                             stateCauseList.add(new StateCause(tbName, 6, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 7) {
+                        } else if (doubleValue0 == 7) {
                             stateCauseList.add(new StateCause(tbName, 7, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 8) {
+                        } else if (doubleValue0 == 8) {
                             stateCauseList.add(new StateCause(tbName, 8, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 9) {
+                        } else if (doubleValue0 == 9) {
                             stateCauseList.add(new StateCause(tbName, 9, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 10) {
+                        } else if (doubleValue0 == 10) {
                             stateCauseList.add(new StateCause(tbName, 10, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 11) {
+                        } else if (doubleValue0 == 11) {
                             stateCauseList.add(new StateCause(tbName, 11, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 12) {
+                        } else if (doubleValue0 == 12) {
                             stateCauseList.add(new StateCause(tbName, 12, ts1, ts0, ts0 - ts1));
-                        } else if (doubleValue1 == 13) {
+                        } else if (doubleValue0 == 13) {
                             stateCauseList.add(new StateCause(tbName, 13, ts1, ts0, ts0 - ts1));
                         } else {
                             stateCauseList.add(new StateCause(tbName, 0, ts1, ts0, ts0 - ts1));

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/custom/PhotovoltaicInfo.java

@@ -18,7 +18,7 @@ public class PhotovoltaicInfo {
     @Desc(des = "组件温度" ,uniformCode = "QXZZJWD")
     @JsonProperty("T")
     private double T;
-    @Desc(des = "光照强度",uniformCode = "RPJGZD")
+    @Desc(des = "光照强度",uniformCode = "GCGZQD")
     @JsonProperty("S")
     private double S;
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/NewIvPvCurveFittingService.java

@@ -655,7 +655,7 @@ public class NewIvPvCurveFittingService {
         //总辐射
         //        List<TsDoubleData> zfsDatas = adpClient.getHistorySnap(zfsPoint.getNemCode(), start, end, interval);
 
-        List<TsDoubleData> zfsDatas = remoteService.adapterfd().getHistorySnap(zfsPoint.getNemCode(), start, end, interval);
+        List<TsDoubleData> zfsDatas = remoteService.adaptergf().getHistorySnap(zfsPoint.getNemCode(), start, end, interval);
 
         //组件温度
         //        List<TsDoubleData> zjwdDatas = adpClient.getHistorySnap(zjwdPoint.getNemCode(), start, end, interval);