修改电站；列表接口

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/ImasterDataServiceImpl.java

@@ -220,7 +220,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
 //                jpStation.setRealTimePower();
 
             jpStation.setPrice(0.45);
-            jpStation.setRatedPower(100D);
+            jpStation.setRatedPower(1735.440);
             jpStation.setStationContact(imasterStationList.getContactPerson());
             // jpStation.setModuleCount(ObjectUtils.isEmpty(Math.toIntExact(imasterStationDetail.getModule()))?0:Math.toIntExact(imasterStationDetail.getModule()));
             //并网类型

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -451,7 +451,7 @@ public class JpStationController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "电站列表统计",   notes = "电站列表统计")
     @GetMapping(value = "/getjpStationConservation")
     @UserLimits
-    public ResponseModel< List<Map<String,Object>>> getjpStationConservation(JpStationDto reviewDto) {
+    public ResponseModel< Page<Map<String,Object>>> getjpStationConservation(JpStationDto reviewDto) {
         JpStationDto jpStation= jpStationMapper.getCountJpStationdata(reviewDto);
 
 
@@ -461,22 +461,31 @@ public class JpStationController extends BaseController {
         Map<String,Object> map=new HashMap<>();
         DecimalFormat format2 = new DecimalFormat("#.00");
         //炭
+        map.put("name1","实时功率");
+        map.put("name2","组件总容量");
+
         map.put("value1",format2.format(jpStation.getRealTimePower()));
         //硫
         map.put("value2",format2.format(jpStation.getCapacity()));
 
 
         Map<String,Object> map2=new HashMap<>();
+        map2.put("name1","当日电量");
+        map2.put("name2","当日收益");
         //炭
         map2.put("value1",format2.format(jpStation.getDayGenerate()));
         //硫
         map2.put("value2",format2.format(jpStation.getDayIncome()));
         Map<String,Object> map3=new HashMap<>();
+        map3.put("name1","当月电量");
+        map3.put("name2","当月收益");
         //炭
         map3.put("value1",format2.format(jpStation.getMonthGenerate()));
         //硫
         map3.put("value2",format2.format(jpStation.getMonthIncome()));
         Map<String,Object> map4=new HashMap<>();
+        map4.put("name1","累计电量");
+        map4.put("name2","累计收益");
         //炭
         map4.put("value1",format2.format(jpStation.getYearGenerate()));
         //硫
@@ -486,8 +495,9 @@ public class JpStationController extends BaseController {
         date.add(map4);
         date.add(map2);
         date.add(map3);
-
-        return ResponseHelper.buildResponse(date);
+        Page<Map<String,Object>> page = new Page<>(1, 4);
+        page.setRecords(date);
+        return ResponseHelper.buildResponse(page);
     }
 
 
@@ -532,7 +542,7 @@ public class JpStationController extends BaseController {
     //日满发小时排行
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "节能减排",   notes = "节能减排")
+    @ApiOperation(httpMethod = "GET",value = "日满发小时排行",   notes = "日满发小时排行")
     @GetMapping(value = "/getDayGenerateph")
     public ResponseModel< List<Map<String,Object>>> getDayGenerateph(JpStationDto reviewDto,String type,String dateTime ) {
 

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

@@ -362,37 +362,40 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
         map.put("y",listy);
         return map;
     }
+    @UserLimits
     public Page<JpStationDto> queryReport(int pageNum, int pageSize, JpStationDto reviewDto,String type)   {
         //权限
         List<String> statioId=new ArrayList();
-
-            List<JpStation> dataJpStation= this.getJpStation(reviewDto);
+        List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
+            if(reviewDto.getThirdStationIds()==null){
                 for (JpStation jpStation : dataJpStation) {
                     statioId.add(jpStation.getThirdStationId());
                 }
                 reviewDto.setThirdStationIds(statioId);
+            }
+
 
         PageHelper.startPage(pageNum, pageSize);
         List<JpStationDto> list = null;
         switch (type){
             case"day":
                 LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
-                wapper.in(reviewDto.getThirdStationIds()!=null,DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
-                wapper.eq(DayGenerate::getDayTime,reviewDto.getTimeDate());
+                wapper.in(DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
+                wapper.eq(reviewDto.getTimeDate()!=null,DayGenerate::getDayTime,reviewDto.getTimeDate());
                 List<DayGenerate> listday=   dayGenerateMapper.selectList(wapper);
                 list = getJpStationDtoday(  dataJpStation,   listday);
                 break;
             case"month":
                 LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
-                wapper1.in(reviewDto.getThirdStationIds()!=null,MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
-                wapper1.eq(MonthGenerate::getMonthTime,reviewDto.getTimeDate());
+                wapper1.in(MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
+                wapper1.eq(reviewDto.getTimeDate()!=null,MonthGenerate::getMonthTime,reviewDto.getTimeDate());
                 List<MonthGenerate> listmonth=  monthGenerateMapper.selectList(wapper1);
                 list = getJpStationDtomonth(  dataJpStation,   listmonth);
                 break;
             case"year":
                 LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
-                wapper2.in(reviewDto.getThirdStationIds()!=null,YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
-                wapper2.eq(YearGenerate::getYear,reviewDto.getTimeDate());
+                wapper2.in(YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
+                wapper2.eq(reviewDto.getTimeDate()!=null,YearGenerate::getYear,reviewDto.getTimeDate());
                 List<YearGenerate> listyear=  yearGenerateMapper.selectList(wapper2);
                 list = getJpStationDtoyear(  dataJpStation,   listyear);
                 break;