jxdz修改累计发电量

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-kingbase8.properties

@@ -259,6 +259,7 @@ hygf.icbc.aesKey=5xGJdh7qb+B95SUoxDlatg==
 hygf.icbc.camsPublicKey=7E095625BE87DF744C916E40BD6B1C1EA486125CA566006062D8FFBBD8BD536ABA64DA6B6A6070D65148A734F660A2A742372E5965E87F99CD644FAB5F6DF2B2hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
 hygf.icbc.outVendorId=071301
 hygf.icbc.projectId=PJ14001401B000160171
+hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
 
 ## 聚富通工行 生产环境配置
 #hygf.icbc.appId=11000000000000028870
@@ -269,4 +270,4 @@ hygf.icbc.projectId=PJ14001401B000160171
 #hygf.icbc.camsPublicKey=655CE8706E6ED9A30B92E57D8D645ADDE8C541C27C5C5AFD529C610C4C0B04F9074E3B6E933C50A3316AEA60CEF461BE4C7916D2AF51170D3A2631394A7F3939
 #hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMpjaWjngB4E3ATh+G1DVAmQnIpiPEFAEDqRfNGAVvvH35yDetqewKi0l7OEceTMN1C6NPym3zStvSoQayjYV+eIcZERkx31KhtFu9clZKgRTyPjdKMIth/wBtPKjL/5+PYalLdomM4ONthrPgnkN4x4R0+D4+EBpXo8gNiAFsNwIDAQAB
 #hygf.icbc.outVendorId=071301
-#hygf.icbc.projectId=PJ14001401B000160171
+#hygf.icbc.projectId=PJ14001401B000160171
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/FDZJCServiceImpl.java

@@ -100,6 +100,7 @@ public class FDZJCServiceImpl implements IJXDZService {
                 windStationDataVO.setOnGridEnergyMonth(data.getDouble("on_grid_energy_month"));
                 windStationDataVO.setOnGridEnergyYear(data.getDouble("on_grid_energy_year")/10000);
                 windStationDataVO.setOnGridEnergyGross(data.getDouble("on_grid_energy")/10000);
+                windStationDataVO.setGenerationGross(data.getDouble("generating_capacity")/10000);
             }
         }
     }
@@ -133,7 +134,6 @@ public class FDZJCServiceImpl implements IJXDZService {
                     }
                     if ("年发电量总和".equals(pointName)) {
                         windStationDataVO.setGenerationYear(jsonObject.getDouble("value"));
-                        windStationDataVO.setGenerationGross(jsonObject.getDouble("value"));
                     }
                     if ("日利用小时数".equals(pointName)) {
                         windStationDataVO.setUtilizeHours(jsonObject.getDouble("value"));