修改历史发电趋势

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

@@ -457,7 +457,12 @@ public class JpStationController extends BaseController {
         JpStationDto jpStation= jpStationMapper.getCountJpStationdata(reviewDto);
         List<Map<String,Object>> powerRatio=new ArrayList<>();
         Map<String,Object> map=new HashMap<>();
-        map.put("value",String.format("%.4f",jpStation.getRealTimePower()/jpStation.getRatedPower()));
+        if(jpStation!=null&&jpStation.getRealTimePower()!=null&&jpStation.getRatedPower()!=null&&jpStation.getRatedPower()>0){
+            map.put("value",String.format("%.4f",jpStation.getRealTimePower()/jpStation.getRatedPower()));
+        }else{
+            jpStation=new JpStationDto();
+            map.put("value",0);
+        }
         powerRatio.add(map);
         jpStation.setPowerRatio(powerRatio);
         List<JpStationDto> list=new ArrayList<>();

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

@@ -60,7 +60,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     @Autowired
     YearGenerateMapper   yearGenerateMapper;
 
-    private static double FDL=0.0001;
+    private static double FDL=0.001;
 
     /**
      * 分页查询
@@ -214,16 +214,21 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
             if(type.equals("month")){
                 map= getDayListOfMonth(reviewDto.getTimeDateMonth());
-                data= dayGenerateMapper.getDayGeneratqx(reviewDto.getTimeDateMonth(), statioId);
+                if(statioId!=null&&!statioId.isEmpty()) {
 
+                    data = dayGenerateMapper.getDayGeneratqx(reviewDto.getTimeDateMonth(), statioId);
+                }
             }else if(type.equals("year")){
                 map= getyearListOfMonth(reviewDto.getTimeDateYear());
-                data= dayGenerateMapper.getMonthGenerateqx(reviewDto.getTimeDateYear(),statioId);
+                if(statioId!=null&&!statioId.isEmpty()) {
+                    data = dayGenerateMapper.getMonthGenerateqx(reviewDto.getTimeDateYear(), statioId);
+                }
             }else{
                 map= getyearList();
-                data= dayGenerateMapper.getYearGenerateqx(null, statioId);
+                if(statioId!=null&&!statioId.isEmpty()) {
+                    data = dayGenerateMapper.getYearGenerateqx(null, statioId);
+                }
             }
-
             listx =map.get("x");
             listy =map.get("y");
             if(data!=null&&!data.isEmpty()){