Merge branch 'dev1125' of http://36.40.66.175:5000/moa/amos-boot-biz into dev1125

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DayGenerateEX.java

@@ -50,7 +50,7 @@ public class DayGenerateEX {
     /**
      * 累计发电量
      */
-    @ExcelProperty(value = "累计发电量（kWh）", index = 8)
+    @ExcelProperty(value = "累计发电量（MWh）", index = 8)
     private Double accumulatedPower;
     /**
      * 状态

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java

@@ -96,7 +96,7 @@ public class JpStationDto extends BaseDto {
 	/**
 	 * 累计发电量
 	 */
-    @ExcelProperty(value = "累计发电量（kWh）", index = 6)
+    @ExcelProperty(value = "累计发电量（MWh）", index = 6)
 	private Double accumulatedPower;
     @ExcelIgnore
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MonthGenerateEX.java

@@ -52,6 +52,6 @@ public class MonthGenerateEX {
     /**
      * 累计发电量
      */
-    @ExcelProperty(value = "累计发电量（kWh）", index = 8)
+    @ExcelProperty(value = "累计发电量（MWh）", index = 8)
     private Double accumulatedPower;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/YearGenerateEX.java

@@ -46,6 +46,6 @@ public class YearGenerateEX {
     /**
      * 累计发电量
      */
-    @ExcelProperty(value = "累计发电量（kWh）", index = 8)
+    @ExcelProperty(value = "累计发电量（MWh）", index = 8)
     private Double accumulatedPower;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java

@@ -455,7 +455,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
                     hd.setThirdStationId(jpStation.getThirdStationId());
-                    hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FD:null);
+                    hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower():null);
                     hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()*FD/jpStation.getCapacity())));
                     hd.setCumulativeIncome(jpStation.getCumulativeIncome());
                     ld.add(hd);
@@ -475,7 +475,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
             hd.setUserName(jpStation.getUserName());
             hd.setStationContact(jpStation.getStationContact());
             hd.setState(jpStation.getState());
-            hd.setAccumulatedPower(jpStation.getAccumulatedPower());
+            hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null);
             hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()/jpStation.getCapacity())));
             hd.setCumulativeIncome(jpStation.getCumulativeIncome());
             ld.add(hd);
@@ -495,7 +495,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setUserName(jpStation.getUserName());
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
-                    hd.setAccumulatedPower(jpStation.getAccumulatedPower());
+                    hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null);
                     hd.setThirdStationId(jpStation.getThirdStationId());
                     hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setDayGenerate(dayGenerate.getGenerate());
@@ -521,7 +521,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
                     hd.setThirdStationId(jpStation.getThirdStationId());
-                    hd.setAccumulatedPower(jpStation.getAccumulatedPower());
+                    hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null);
                     hd.setMonthGenerate(dayGenerate.getGenerate());
                     hd.setMonthIncome(dayGenerate.getIncome());
                     hd.setTimeDate(dayGenerate.getMonthTime());
@@ -545,7 +545,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setUserName(jpStation.getUserName());
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
-                    hd.setAccumulatedPower(jpStation.getAccumulatedPower());
+                    hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null);
+
                     hd.setThirdStationId(jpStation.getThirdStationId());
                     hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setYearGenerate(dayGenerate.getGenerate());
@@ -637,7 +638,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setUserName(jpStation.getUserName());
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
-                    hd.setAccumulatedPower(jpStation.getAccumulatedPower());
+                    hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null);
 
                     hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setDayGenerate(dayGenerate.getGenerate());
@@ -661,7 +662,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setName(jpStation.getName());
                     hd.setUserName(jpStation.getUserName());
                     hd.setStationContact(jpStation.getStationContact());
-                    hd.setAccumulatedPower(jpStation.getAccumulatedPower());
+                    hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null);
                     hd.setMonthGenerate(dayGenerate.getGenerate());
                     hd.setMonthIncome(dayGenerate.getIncome());
                     hd.setTimeDate(dayGenerate.getMonthTime());
@@ -684,7 +685,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setName(jpStation.getName());
                     hd.setUserName(jpStation.getUserName());
                     hd.setStationContact(jpStation.getStationContact());
-                    hd.setAccumulatedPower(jpStation.getAccumulatedPower());
+                    hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FDL:null);
 
                     hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setYearGenerate(dayGenerate.getGenerate());