经济运行首页 修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -70,29 +70,29 @@ public class EconomyPointHomePageService {
     private Map<String, ProEconPowerstationInfoDay2> wstimemap = new HashMap<>();
 
 
-    /** 综合场用电率  */
+    /**
+     * 综合场用电率
+     */
     private List<ProEconPowerstationInfoDay5> zhcydllist = new ArrayList<>();
 
-    /** 电量统计分析 */
+    /**
+     * 电量统计分析
+     */
     private List<ProEconPowerstationInfoDay1> dltjfxlist = new ArrayList<>();
 
     private List<ProEconPowerstationInfoDay4> threeRateCurvelist = new ArrayList<>();//三率曲线数据
 
     private BigDecimal capacity = null;
 
-    private Map<String,BigDecimal> wsdlfx = null;//五损电量分析
-
-    private List<Map<String,Object>> zhcydl = null;//综合场用电率
-
-    private List<Map<String,Object>> dltjfxList = null;//电量统计分析
-
-    private List<Map<String,Object>> slqxList = null;//三率曲线
-
-    private Map<String,Object> fdinfomap = null;//发电（风能利用率、发电量、欠发电量）
+    private Map<String, BigDecimal> wsdlfx = null;//五损电量分析
 
+    private List<Map<String, Object>> zhcydl = null;//综合场用电率
 
+    private List<Map<String, Object>> dltjfxList = null;//电量统计分析
 
+    private List<Map<String, Object>> slqxList = null;//三率曲线
 
+    private Map<String, Object> fdinfomap = null;//发电（风能利用率、发电量、欠发电量）
 
 
     /**
@@ -107,15 +107,14 @@ public class EconomyPointHomePageService {
      * @param dateType
      * @return
      */
-    public Map<String,Object> getEconomyPointHomePageInfo(String foreignKeyId, String regionId, String companyId,String staType, String dateType,String pointCode) throws ParseException {
+    public Map<String, Object> getEconomyPointHomePageInfo(String foreignKeyId, String regionId, String companyId, String staType, String dateType, String pointCode) throws ParseException {
 
-        Map<String,Object> allmap = new HashMap<>();
+        Map<String, Object> allmap = new HashMap<>();
         //获取当前时间
         String strdate = DateUtils.toDate1(new Date());
         Date date = DateUtils.parseDate(strdate);
 
 
-
         /** 五损 */
         wsmap = proEconPowerstationInfoDay1Service.getEconFiveLoss(foreignKeyId, staType, dateType, date);
 
@@ -134,7 +133,7 @@ public class EconomyPointHomePageService {
         /** 装机容量 */
         capacity = new BigDecimal(proBasicCompanyService.getProBasicCompanyCapacity(regionId, companyId));
         //综合场用电量
-        zhcydllist =  proEconPowerstationInfoDay5Service.getEconZhcydldb(foreignKeyId, staType, dateType, date);
+        zhcydllist = proEconPowerstationInfoDay5Service.getEconZhcydldb(foreignKeyId, staType, dateType, date);
 
         //电量统计分析
         dltjfxlist = proEconPowerstationInfoDay1Service.getEconFiveLosslist(foreignKeyId, staType, dateType, date);
@@ -142,15 +141,14 @@ public class EconomyPointHomePageService {
         //三率曲线
         threeRateCurvelist = proEconPowerstationInfoDay4Service.getEconThreeRateCurve(foreignKeyId, staType, dateType, date);
 
-        List<ProEconPointCodeDTO> pointCodeDTO =  proEconPointCodeService.getEconPointRanking(regionId, companyId, pointCode);
+        List<ProEconPointCodeDTO> pointCodeDTO = proEconPointCodeService.getEconPointRanking(regionId, companyId, pointCode);
         /**  场站信息 */
-        List<ProBasicPowerstation> powerstationList =  proBasicPowerstationService.getProBasicPowerstationlist(regionId,companyId,staType);
+        List<ProBasicPowerstation> powerstationList = proBasicPowerstationService.getProBasicPowerstationlist(regionId, companyId, staType);
         wsdlfx = new HashMap<>();//五损电量分析
-        zhcydl= new ArrayList<>();//综合场用电率
+        zhcydl = new ArrayList<>();//综合场用电率
         dltjfxList = new ArrayList<>();//电量统计分析
-        fdinfomap =  new HashMap<>();//（风能利用率、发电量、欠发电量）
-        slqxList =  new ArrayList<>();//三率曲线
-
+        fdinfomap = new HashMap<>();//（风能利用率、发电量、欠发电量）
+        slqxList = new ArrayList<>();//三率曲线
 
 
         switch (dateType) {
@@ -190,99 +188,105 @@ public class EconomyPointHomePageService {
                 yearfdinfo();
                 break;
         }
-        allmap.put("zbl",dto);//页面第一行的
-        allmap.put("stationinfo",powerstationList);//场站性息（装机容量）
-        allmap.put("sldlfx",wsdlfx);//损失电量分析
-        allmap.put("zhcydl",zhcydl);//综合场用电率
-        allmap.put("dltjfx",dltjfxList);//电量统计分析
-        allmap.put("fdlinfo",fdinfomap);//发电量 欠发电量  风能利用率
-        allmap.put("slqx",slqxList);//三率曲线
-        allmap.put("zbphl",pointCodeDTO);//排行榜
-
+        allmap.put("zbl", dto);//页面第一行的
+        allmap.put("stationinfo", powerstationList);//场站性息（装机容量）
+        allmap.put("sldlfx", wsdlfx);//损失电量分析
+        allmap.put("zhcydl", zhcydl);//综合场用电率
+        allmap.put("dltjfx", dltjfxList);//电量统计分析
+        allmap.put("fdlinfo", fdinfomap);//发电量 欠发电量  风能利用率
+        allmap.put("slqx", slqxList);//三率曲线
+        allmap.put("zbphl", pointCodeDTO);//排行榜
 
 
         return allmap;
     }
 
 
-
-   /** （风能利用率、发电量、欠发电量） */
+    /**
+     * （风能利用率、发电量、欠发电量）
+     */
     private void currfdinfo() {
         ProEconPowerstationInfoDay1 fdinfo = wsmap.get("currFiveInfo");
-        if(null != fdinfo){
-            fdinfomap.put("fdl",fdinfo.getRfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
-            fdinfomap.put("qfdl",fdinfo.getRqfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
-            if(compare0(fdinfo.getRllfdl())){
-                fdinfomap.put("fnlyl", compare100(fdinfo.getRfdl().divide(fdinfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))));
-            }else {
-                fdinfomap.put("fnlyl",0);
-            }
-
-
+        if (null != fdinfo) {
+            fdinfomap.put("fdl", fdinfo.getRfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
+            fdinfomap.put("qfdl", fdinfo.getRqfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
+            fdinfomap.put("fnlyl", compare0(fdinfo.getRllfdl()) ? compare100(fdinfo.getRfdl().divide(fdinfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+        }else {
+            fdinfomap.put("fdl", new BigDecimal(0));
+            fdinfomap.put("qfdl", new BigDecimal(0));
+            fdinfomap.put("fnlyl", new BigDecimal(0));
         }
 
     }
+
     private void monthfdinfo() {
         ProEconPowerstationInfoDay1 fdinfo = wsmap.get("currFiveInfo");
-        if(null != fdinfo){
-            fdinfomap.put("fdl",fdinfo.getYfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
-            fdinfomap.put("qfdl",fdinfo.getYqfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
-            fdinfomap.put("fnlyl", compare0(fdinfo.getYllfdl())?compare100(fdinfo.getYfdl().divide(fdinfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))):new BigDecimal(0));
+        if (null != fdinfo) {
+            fdinfomap.put("fdl", fdinfo.getYfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
+            fdinfomap.put("qfdl", fdinfo.getYqfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
+            fdinfomap.put("fnlyl", compare0(fdinfo.getYllfdl()) ? compare0(fdinfo.getYllfdl()) ? compare100(fdinfo.getYfdl().divide(fdinfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0) : new BigDecimal(0));
 
 
+        } else {
+            fdinfomap.put("fdl", new BigDecimal(0));
+            fdinfomap.put("qfdl", new BigDecimal(0));
+            fdinfomap.put("fnlyl", new BigDecimal(0));
         }
     }
+
     private void yearfdinfo() {
         ProEconPowerstationInfoDay1 fdinfo = wsmap.get("currFiveInfo");
-        if(null != fdinfo){
-            fdinfomap.put("fdl",fdinfo.getNfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
-            fdinfomap.put("qfdl",fdinfo.getNqfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
-            fdinfomap.put("fnlyl", compare0(fdinfo.getNllfdl())?compare100(fdinfo.getNfdl().divide(fdinfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))):new BigDecimal(0));
-
+        if (null != fdinfo) {
+            fdinfomap.put("fdl", fdinfo.getNfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
+            fdinfomap.put("qfdl", fdinfo.getNqfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));
+            fdinfomap.put("fnlyl", compare0(fdinfo.getNllfdl()) ? compare0(fdinfo.getNllfdl()) ? compare100(fdinfo.getNfdl().divide(fdinfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0) : new BigDecimal(0));
+
+        } else {
+            fdinfomap.put("fdl", new BigDecimal(0));
+            fdinfomap.put("qfdl", new BigDecimal(0));
+            fdinfomap.put("fnlyl", new BigDecimal(0));
         }
     }
 
 
-
     /**
      * 三率曲线
      */
     private void currThreeRateCurve() {
-        threeRateCurvelist.stream().forEach(i->{
+        threeRateCurvelist.stream().forEach(i -> {
             Map<String, Object> m = new HashMap<>();
-            m.put("fwjsl",i.getRfwjsl());
-            m.put("ztzhjsl",i.getRztzhjsl());
-            m.put("gzxqjsl",i.getRgzxqjsl());
-            m.put("date",DateUtils.toDate1(i.getRecordDate()));
+            m.put("fwjsl", i.getRfwjsl());
+            m.put("ztzhjsl", i.getRztzhjsl());
+            m.put("gzxqjsl", i.getRgzxqjsl());
+            m.put("date", DateUtils.toDate1(i.getRecordDate()));
             slqxList.add(m);
         });
 
     }
+
     private void monthThreeRateCurve() {
-        threeRateCurvelist.stream().forEach(i->{
+        threeRateCurvelist.stream().forEach(i -> {
             Map<String, Object> m = new HashMap<>();
-            m.put("fwjsl",i.getYfwjsl());
-            m.put("ztzhjsl",i.getYztzhjsl());
-            m.put("gzxqjsl",i.getYgzxqjsl());
-            m.put("date",DateUtils.toDate1(i.getRecordDate()));
+            m.put("fwjsl", i.getYfwjsl());
+            m.put("ztzhjsl", i.getYztzhjsl());
+            m.put("gzxqjsl", i.getYgzxqjsl());
+            m.put("date", DateUtils.toDate1(i.getRecordDate()));
             slqxList.add(m);
         });
     }
 
     private void yearThreeRateCurve() {
-        threeRateCurvelist.stream().forEach(i->{
+        threeRateCurvelist.stream().forEach(i -> {
             Map<String, Object> m = new HashMap<>();
-            m.put("fwjsl",i.getNfwjsl());
-            m.put("ztzhjsl",i.getNztzhjsl());
-            m.put("gzxqjsl",i.getNgzxqjsl());
-            m.put("date",DateUtils.toDate1(i.getRecordDate()));
+            m.put("fwjsl", i.getNfwjsl());
+            m.put("ztzhjsl", i.getNztzhjsl());
+            m.put("gzxqjsl", i.getNgzxqjsl());
+            m.put("date", DateUtils.toDate1(i.getRecordDate()));
             slqxList.add(m);
         });
     }
 
 
-
-
     /**
      * 电量统计分析
      */
@@ -297,7 +301,7 @@ public class EconomyPointHomePageService {
             m.put("xddl", (i.getRxdtjssdl().add(i.getRxdjclssdl())).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));//限电
             m.put("gzdl", i.getRgzssdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));      //故障
             m.put("xndl", i.getRxnssdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));//性能
-            m.put("date",DateUtils.toDate1(i.getRecordDate()));
+            m.put("date", DateUtils.toDate1(i.getRecordDate()));
             dltjfxList.add(m);
         });
     }
@@ -311,7 +315,7 @@ public class EconomyPointHomePageService {
             m.put("xddl", (i.getYxdtjssdl().add(i.getRxdjclssdl())).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));//限电
             m.put("gzdl", (i.getYgzssdl()).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));      //故障
             m.put("xndl", (i.getYxnssdl()).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));//性能
-            m.put("date",DateUtils.toDate1(i.getRecordDate()));
+            m.put("date", DateUtils.toDate1(i.getRecordDate()));
             dltjfxList.add(m);
         });
     }
@@ -325,112 +329,161 @@ public class EconomyPointHomePageService {
             m.put("xddl", (i.getNxdtjssdl().add(i.getRxdjclssdl())).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));//限电
             m.put("gzdl", (i.getNgzssdl()).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));      //故障
             m.put("xndl", (i.getNxnssdl()).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));//性能
-            m.put("date",DateUtils.toDate1(i.getRecordDate()));
+            m.put("date", DateUtils.toDate1(i.getRecordDate()));
             dltjfxList.add(m);
         });
     }
 
 
-
-
-    /**综合厂用电率 */
-    private void currZhcydl(){
-        zhcydllist.stream().forEach(i->{
-            Map<String,Object> m = new HashMap<>();
-            if(compare0(i.getRfdldb())){
-                m.put("key",DateUtils.toDate1(i.getRecordDate()));
-                m.put("value", compare0(i.getRfdldb())?compare100(i.getRzhcydldb().divide(i.getRfdldb(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))):new BigDecimal(0));
-            }else {
-                m.put("key",DateUtils.toDate1(i.getRecordDate()));
-                m.put("value",0);
+    /**
+     * 综合厂用电率
+     */
+    private void currZhcydl() {
+        zhcydllist.stream().forEach(i -> {
+            Map<String, Object> m = new HashMap<>();
+            if (compare0(i.getRfdldb())) {
+                m.put("key", DateUtils.toDate1(i.getRecordDate()));
+                m.put("value", compare0(i.getRfdldb()) ? compare100(i.getRzhcydldb().divide(i.getRfdldb(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            } else {
+                m.put("key", DateUtils.toDate1(i.getRecordDate()));
+                m.put("value", 0);
             }
             zhcydl.add(m);
         });
     }
 
-    private void monthZhcydl(){
-        zhcydllist.stream().forEach(i->{
-            Map<String,Object> m = new HashMap<>();
-            if(compare0(i.getYfdldb())){
-                m.put("key",DateUtils.toDate1(i.getRecordDate()));
-                m.put("value", compare0(i.getYfdldb())?compare100(i.getYzhcydldb().divide(i.getYfdldb(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-            }else {
-                m.put("key",DateUtils.toDate1(i.getRecordDate()));
-                m.put("value",0);
+    private void monthZhcydl() {
+        zhcydllist.stream().forEach(i -> {
+            Map<String, Object> m = new HashMap<>();
+            if (compare0(i.getYfdldb())) {
+                m.put("key", DateUtils.toDate1(i.getRecordDate()));
+                m.put("value", compare0(i.getYfdldb()) ? compare100(i.getYzhcydldb().divide(i.getYfdldb(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            } else {
+                m.put("key", DateUtils.toDate1(i.getRecordDate()));
+                m.put("value", 0);
             }
             zhcydl.add(m);
         });
     }
 
-    private void yearZhcydl(){
-        zhcydllist.stream().forEach(i->{
-            Map<String,Object> m = new HashMap<>();
-            if(compare0(i.getNfdldb())){
-                m.put("key",DateUtils.toDate1(i.getRecordDate()));
-                m.put("value", compare0(i.getNfdldb())?compare100(i.getNzhcydldb().divide(i.getNfdldb(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-            }else {
-                m.put("key",DateUtils.toDate1(i.getRecordDate()));
-                m.put("value",0);
+    private void yearZhcydl() {
+        zhcydllist.stream().forEach(i -> {
+            Map<String, Object> m = new HashMap<>();
+            if (compare0(i.getNfdldb())) {
+                m.put("key", DateUtils.toDate1(i.getRecordDate()));
+                m.put("value", compare0(i.getNfdldb()) ? compare100(i.getNzhcydldb().divide(i.getNfdldb(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            } else {
+                m.put("key", DateUtils.toDate1(i.getRecordDate()));
+                m.put("value", 0);
             }
             zhcydl.add(m);
         });
     }
 
 
-    /** 损失电量分析*/
+    /**
+     * 损失电量分析
+     */
     private void currFiveDlFx() {
         ProEconPowerstationInfoDay1 fiveInfo = wsmap.get("currFiveInfo");
 
-        //发电量
-        wsdlfx.put("fdl",  compare0(fiveInfo.getRllfdl())?compare100(fiveInfo.getRfdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //受累
-        wsdlfx.put("sldl", compare0(fiveInfo.getRllfdl())?compare100((fiveInfo.getRcwsldwssdl().add(fiveInfo.getRcwsltqssdl())).divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //检修
-        wsdlfx.put("jxdl", compare0(fiveInfo.getRllfdl())?compare100(fiveInfo.getRjxssdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //限电
-        wsdlfx.put("xddl", compare0(fiveInfo.getRllfdl())?compare100((fiveInfo.getRxdtjssdl().add(fiveInfo.getRxdjclssdl())).divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //故障
-        wsdlfx.put("gzdl", compare0(fiveInfo.getRllfdl())?compare100(fiveInfo.getRgzssdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //性能
-        wsdlfx.put("xndl", compare0(fiveInfo.getRllfdl())?compare100(fiveInfo.getRxnssdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
+        if (null != fiveInfo) {
+            //发电量
+            wsdlfx.put("fdl", compare0(fiveInfo.getRllfdl()) ? compare100(fiveInfo.getRfdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //受累
+            wsdlfx.put("sldl", compare0(fiveInfo.getRllfdl()) ? compare100((fiveInfo.getRcwsldwssdl().add(fiveInfo.getRcwsltqssdl())).divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //检修
+            wsdlfx.put("jxdl", compare0(fiveInfo.getRllfdl()) ? compare100(fiveInfo.getRjxssdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //限电
+            wsdlfx.put("xddl", compare0(fiveInfo.getRllfdl()) ? compare100((fiveInfo.getRxdtjssdl().add(fiveInfo.getRxdjclssdl())).divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //故障
+            wsdlfx.put("gzdl", compare0(fiveInfo.getRllfdl()) ? compare100(fiveInfo.getRgzssdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //性能
+            wsdlfx.put("xndl", compare0(fiveInfo.getRllfdl()) ? compare100(fiveInfo.getRxnssdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+
+        } else {
+            //发电量
+            wsdlfx.put("fdl", new BigDecimal(0));
+            //受累
+            wsdlfx.put("sldl", new BigDecimal(0));
+            //检修
+            wsdlfx.put("jxdl", new BigDecimal(0));
+            //限电
+            wsdlfx.put("xddl", new BigDecimal(0));
+            //故障
+            wsdlfx.put("gzdl", new BigDecimal(0));
+            //性能
+            wsdlfx.put("xndl", new BigDecimal(0));
+
+        }
+
 
     }
+
     private void monthFiveDlFx() {
         ProEconPowerstationInfoDay1 fiveInfo = wsmap.get("currFiveInfo");
-        //发电量
-        wsdlfx.put("fdl",  compare0(fiveInfo.getYllfdl())? compare100(fiveInfo.getYfdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //受累
-        wsdlfx.put("sldl", compare0(fiveInfo.getYllfdl())? compare100((fiveInfo.getYcwsldwssdl().add(fiveInfo.getYcwsltqssdl())).divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //检修
-        wsdlfx.put("jxdl", compare0(fiveInfo.getYllfdl())? compare100(fiveInfo.getYjxssdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //限电
-        wsdlfx.put("xddl", compare0(fiveInfo.getYllfdl())? compare100((fiveInfo.getYxdtjssdl().add(fiveInfo.getYxdjclssdl())).divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //故障
-        wsdlfx.put("gzdl", compare0(fiveInfo.getYllfdl())? compare100(fiveInfo.getYgzssdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //性能
-        wsdlfx.put("xndl", compare0(fiveInfo.getYllfdl())? compare100(fiveInfo.getYxnssdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-
+        if (null != fiveInfo) {
+            //发电量
+            wsdlfx.put("fdl", compare0(fiveInfo.getYllfdl()) ? compare100(fiveInfo.getYfdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //受累
+            wsdlfx.put("sldl", compare0(fiveInfo.getYllfdl()) ? compare100((fiveInfo.getYcwsldwssdl().add(fiveInfo.getYcwsltqssdl())).divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //检修
+            wsdlfx.put("jxdl", compare0(fiveInfo.getYllfdl()) ? compare100(fiveInfo.getYjxssdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //限电
+            wsdlfx.put("xddl", compare0(fiveInfo.getYllfdl()) ? compare100((fiveInfo.getYxdtjssdl().add(fiveInfo.getYxdjclssdl())).divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //故障
+            wsdlfx.put("gzdl", compare0(fiveInfo.getYllfdl()) ? compare100(fiveInfo.getYgzssdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //性能
+            wsdlfx.put("xndl", compare0(fiveInfo.getYllfdl()) ? compare100(fiveInfo.getYxnssdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+
+        } else {
+            //发电量
+            wsdlfx.put("fdl", new BigDecimal(0));
+            //受累
+            wsdlfx.put("sldl", new BigDecimal(0));
+            //检修
+            wsdlfx.put("jxdl", new BigDecimal(0));
+            //限电
+            wsdlfx.put("xddl", new BigDecimal(0));
+            //故障
+            wsdlfx.put("gzdl", new BigDecimal(0));
+            //性能
+            wsdlfx.put("xndl", new BigDecimal(0));
+        }
     }
 
     private void yearFiveDlFx() {
         ProEconPowerstationInfoDay1 fiveInfo = wsmap.get("currFiveInfo");
-        //发电量
-        wsdlfx.put("fdl", compare0(fiveInfo.getNllfdl()) ? compare100(fiveInfo.getNfdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //受累
-        wsdlfx.put("sldl", compare0(fiveInfo.getNllfdl()) ? compare100((fiveInfo.getNcwsldwssdl().add(fiveInfo.getNcwsltqssdl())).divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //检修
-        wsdlfx.put("jxdl", compare0(fiveInfo.getNllfdl()) ? compare100(fiveInfo.getNjxssdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //限电
-        wsdlfx.put("xddl", compare0(fiveInfo.getNllfdl()) ? compare100((fiveInfo.getNxdtjssdl().add(fiveInfo.getNxdjclssdl())).divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //故障
-        wsdlfx.put("gzdl", compare0(fiveInfo.getNllfdl()) ? compare100(fiveInfo.getNgzssdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))): new BigDecimal(0));
-        //性能
-        wsdlfx.put("xndl", compare0(fiveInfo.getNllfdl()) ? compare100(fiveInfo.getNxnssdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+        if (null != fiveInfo) {
+            //发电量
+            wsdlfx.put("fdl", compare0(fiveInfo.getNllfdl()) ? compare100(fiveInfo.getNfdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //受累
+            wsdlfx.put("sldl", compare0(fiveInfo.getNllfdl()) ? compare100((fiveInfo.getNcwsldwssdl().add(fiveInfo.getNcwsltqssdl())).divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //检修
+            wsdlfx.put("jxdl", compare0(fiveInfo.getNllfdl()) ? compare100(fiveInfo.getNjxssdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //限电
+            wsdlfx.put("xddl", compare0(fiveInfo.getNllfdl()) ? compare100((fiveInfo.getNxdtjssdl().add(fiveInfo.getNxdjclssdl())).divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //故障
+            wsdlfx.put("gzdl", compare0(fiveInfo.getNllfdl()) ? compare100(fiveInfo.getNgzssdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+            //性能
+            wsdlfx.put("xndl", compare0(fiveInfo.getNllfdl()) ? compare100(fiveInfo.getNxnssdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+        } else {
+            //发电量
+            wsdlfx.put("fdl", new BigDecimal(0));
+            //受累
+            wsdlfx.put("sldl", new BigDecimal(0));
+            //检修
+            wsdlfx.put("jxdl", new BigDecimal(0));
+            //限电
+            wsdlfx.put("xddl", new BigDecimal(0));
+            //故障
+            wsdlfx.put("gzdl", new BigDecimal(0));
+            //性能
+            wsdlfx.put("xndl", new BigDecimal(0));
+        }
     }
 
 
-
-
     /**
      * 五损经济指标
      */
@@ -678,17 +731,17 @@ public class EconomyPointHomePageService {
 
             if (null != ringThreeInfo) {
 
-                dto.setRingFwjszzl(compare0(ringThreeInfo.getYfwjsl())?compare100((currThreeInfo.getYfwjsl().subtract(ringThreeInfo.getYfwjsl())).divide(ringThreeInfo.getYfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))):new BigDecimal(0));
-                dto.setRingZtzhzzl(compare0(ringThreeInfo.getYztzhjsl())?compare100((currThreeInfo.getYztzhjsl().subtract(ringThreeInfo.getYztzhjsl())).divide(ringThreeInfo.getYztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))):new BigDecimal(0));
-                dto.setRingXqjszzl(compare0(ringThreeInfo.getYgzxqjsl())?compare100((currThreeInfo.getYgzxqjsl().subtract(ringThreeInfo.getYgzxqjsl())).divide(ringThreeInfo.getYgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))):new BigDecimal(0));
+                dto.setRingFwjszzl(compare0(ringThreeInfo.getYfwjsl()) ? compare100((currThreeInfo.getYfwjsl().subtract(ringThreeInfo.getYfwjsl())).divide(ringThreeInfo.getYfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+                dto.setRingZtzhzzl(compare0(ringThreeInfo.getYztzhjsl()) ? compare100((currThreeInfo.getYztzhjsl().subtract(ringThreeInfo.getYztzhjsl())).divide(ringThreeInfo.getYztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+                dto.setRingXqjszzl(compare0(ringThreeInfo.getYgzxqjsl()) ? compare100((currThreeInfo.getYgzxqjsl().subtract(ringThreeInfo.getYgzxqjsl())).divide(ringThreeInfo.getYgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
 
             }
 
             if (null != withThreeInfo) {
 
-                dto.setWithFwjszzl(compare0(withThreeInfo.getYfwjsl())?compare100((currThreeInfo.getYfwjsl().subtract(withThreeInfo.getYfwjsl())).divide(withThreeInfo.getYfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))):new BigDecimal(0));
-                dto.setWithZtzhzzl(compare0(withThreeInfo.getYztzhjsl())?compare100((currThreeInfo.getYztzhjsl().subtract(withThreeInfo.getYztzhjsl())).divide(withThreeInfo.getYztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))):new BigDecimal(0));
-                dto.setWithXqjszzl(compare0(withThreeInfo.getYgzxqjsl())?compare100((currThreeInfo.getYgzxqjsl().subtract(withThreeInfo.getYgzxqjsl())).divide(withThreeInfo.getYgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))):new BigDecimal(0));
+                dto.setWithFwjszzl(compare0(withThreeInfo.getYfwjsl()) ? compare100((currThreeInfo.getYfwjsl().subtract(withThreeInfo.getYfwjsl())).divide(withThreeInfo.getYfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+                dto.setWithZtzhzzl(compare0(withThreeInfo.getYztzhjsl()) ? compare100((currThreeInfo.getYztzhjsl().subtract(withThreeInfo.getYztzhjsl())).divide(withThreeInfo.getYztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
+                dto.setWithXqjszzl(compare0(withThreeInfo.getYgzxqjsl()) ? compare100((currThreeInfo.getYgzxqjsl().subtract(withThreeInfo.getYgzxqjsl())).divide(withThreeInfo.getYgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0));
 
             }
 
@@ -710,17 +763,17 @@ public class EconomyPointHomePageService {
 
             if (null != ringThreeInfo) {
 
-                dto.setRingFwjszzl(compare0(ringThreeInfo.getNfwjsl())?(currThreeInfo.getNfwjsl().subtract(ringThreeInfo.getNfwjsl())).divide(ringThreeInfo.getNfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")): new BigDecimal(0));
-                dto.setRingZtzhzzl(compare0(ringThreeInfo.getNztzhjsl())?(currThreeInfo.getNztzhjsl().subtract(ringThreeInfo.getNztzhjsl())).divide(ringThreeInfo.getNztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")): new BigDecimal(0));
-                dto.setRingXqjszzl(compare0(ringThreeInfo.getNgzxqjsl())?(currThreeInfo.getNgzxqjsl().subtract(ringThreeInfo.getNgzxqjsl())).divide(ringThreeInfo.getNgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")): new BigDecimal(0));
+                dto.setRingFwjszzl(compare0(ringThreeInfo.getNfwjsl()) ? (currThreeInfo.getNfwjsl().subtract(ringThreeInfo.getNfwjsl())).divide(ringThreeInfo.getNfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")) : new BigDecimal(0));
+                dto.setRingZtzhzzl(compare0(ringThreeInfo.getNztzhjsl()) ? (currThreeInfo.getNztzhjsl().subtract(ringThreeInfo.getNztzhjsl())).divide(ringThreeInfo.getNztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")) : new BigDecimal(0));
+                dto.setRingXqjszzl(compare0(ringThreeInfo.getNgzxqjsl()) ? (currThreeInfo.getNgzxqjsl().subtract(ringThreeInfo.getNgzxqjsl())).divide(ringThreeInfo.getNgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")) : new BigDecimal(0));
 
             }
 
             if (null != withThreeInfo) {
 
-                dto.setWithFwjszzl(compare0(withThreeInfo.getNfwjsl())?(currThreeInfo.getNfwjsl().subtract(withThreeInfo.getNfwjsl())).divide(withThreeInfo.getNfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")): new BigDecimal(0));
-                dto.setWithZtzhzzl(compare0(withThreeInfo.getNztzhjsl())?(currThreeInfo.getNztzhjsl().subtract(withThreeInfo.getNztzhjsl())).divide(withThreeInfo.getNztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")): new BigDecimal(0));
-                dto.setWithXqjszzl(compare0(withThreeInfo.getNgzxqjsl())?(currThreeInfo.getNgzxqjsl().subtract(withThreeInfo.getNgzxqjsl())).divide(withThreeInfo.getNgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")): new BigDecimal(0));
+                dto.setWithFwjszzl(compare0(withThreeInfo.getNfwjsl()) ? (currThreeInfo.getNfwjsl().subtract(withThreeInfo.getNfwjsl())).divide(withThreeInfo.getNfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")) : new BigDecimal(0));
+                dto.setWithZtzhzzl(compare0(withThreeInfo.getNztzhjsl()) ? (currThreeInfo.getNztzhjsl().subtract(withThreeInfo.getNztzhjsl())).divide(withThreeInfo.getNztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")) : new BigDecimal(0));
+                dto.setWithXqjszzl(compare0(withThreeInfo.getNgzxqjsl()) ? (currThreeInfo.getNgzxqjsl().subtract(withThreeInfo.getNgzxqjsl())).divide(withThreeInfo.getNgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")) : new BigDecimal(0));
 
             }
 
@@ -752,7 +805,7 @@ public class EconomyPointHomePageService {
 
         if (null != currFiveInfo && null != currDlInfo) {
 
-            BigDecimal currZhcydl = compare0(currFiveInfo.getRfdl())?compare100(currDlInfo.getRzhcydldb().divide(currFiveInfo.getRfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))):new BigDecimal(0);
+            BigDecimal currZhcydl = compare0(currFiveInfo.getRfdl()) ? compare100(currDlInfo.getRzhcydldb().divide(currFiveInfo.getRfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))) : new BigDecimal(0);
             dto.setCurrZhcydl(currZhcydl);
 
             if (null != ringFiveInfo && null != ringDlInfo && compare0(ringFiveInfo.getRfdl())) {
@@ -787,14 +840,14 @@ public class EconomyPointHomePageService {
 
         if (null != currTimeInfo) {
 
-            double currhours = DateUtils.hoursDiff1(new Date(),DateUtils.getStartOfDay(new Date()));
+            double currhours = DateUtils.hoursDiff1(new Date(), DateUtils.getStartOfDay(new Date()));
             BigDecimal currhours2 = new BigDecimal(0.00).valueOf(currhours);
             currhours2 = compare0(currhours2) ? currhours2 : new BigDecimal(1);
             BigDecimal currSbklyl = currhours2.subtract((currTimeInfo.getRhjgzxsmx().add(currTimeInfo.getRhjjxtjxs()))).divide(currhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
             dto.setCurrSbklyl(currSbklyl);
             if (null != ringTimeInfo) {
 
-                int ringhours = DateUtils.hoursDiff(new Date(),DateUtils.getMonthFirstZero());
+                int ringhours = DateUtils.hoursDiff(new Date(), DateUtils.getMonthFirstZero());
                 BigDecimal ringhours2 = new BigDecimal(0.00).valueOf((int) ringhours);
                 BigDecimal ringSbklyl = ringhours2.subtract((ringTimeInfo.getRhjgzxsmx().add(ringTimeInfo.getRhjjxtjxs()))).divide(ringhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
                 BigDecimal ringSbklyzzl = (currSbklyl.subtract(ringSbklyl)).divide(ringSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
@@ -802,7 +855,7 @@ public class EconomyPointHomePageService {
             }
             if (null != withTimeInfo) {
 
-                int withhours = DateUtils.hoursDiff(new Date(),DateUtils.getYearFirstZero());
+                int withhours = DateUtils.hoursDiff(new Date(), DateUtils.getYearFirstZero());
                 BigDecimal withhours2 = new BigDecimal(0.00).valueOf((int) withhours);
                 BigDecimal withSbklyl = withhours2.subtract((withTimeInfo.getRhjgzxsmx().add(withTimeInfo.getRhjjxtjxs()))).divide(withhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
                 BigDecimal withSbklyzzl = (currSbklyl.subtract(withSbklyl)).divide(withSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
@@ -853,13 +906,13 @@ public class EconomyPointHomePageService {
 
         if (null != currTimeInfo) {
 
-            int currhours = DateUtils.hoursDiff(new Date(),DateUtils.getStartOfDay(new Date()));
+            int currhours = DateUtils.hoursDiff(new Date(), DateUtils.getStartOfDay(new Date()));
             BigDecimal currhours2 = new BigDecimal(0.00).valueOf((int) currhours);
             BigDecimal currSbklyl = currhours2.subtract((currTimeInfo.getYhjgzxsmx().add(currTimeInfo.getYhjjxtjxs()))).divide(currhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
             dto.setCurrSbklyl(currSbklyl);
             if (null != ringTimeInfo) {
 
-                int ringhours = DateUtils.hoursDiff(new Date(),DateUtils.getMonthFirstZero());
+                int ringhours = DateUtils.hoursDiff(new Date(), DateUtils.getMonthFirstZero());
                 BigDecimal ringhours2 = new BigDecimal(0.00).valueOf((int) ringhours);
                 BigDecimal ringSbklyl = ringhours2.subtract((ringTimeInfo.getYhjgzxsmx().add(ringTimeInfo.getYhjjxtjxs()))).divide(ringhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
                 BigDecimal ringSbklyzzl = (currSbklyl.subtract(ringSbklyl)).divide(ringSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
@@ -867,7 +920,7 @@ public class EconomyPointHomePageService {
             }
             if (null != withTimeInfo) {
 
-                int withhours = DateUtils.hoursDiff(new Date(),DateUtils.getYearFirstZero());
+                int withhours = DateUtils.hoursDiff(new Date(), DateUtils.getYearFirstZero());
                 BigDecimal withhours2 = new BigDecimal(0.00).valueOf((int) withhours);
                 BigDecimal withSbklyl = withhours2.subtract((withTimeInfo.getYhjgzxsmx().add(withTimeInfo.getYhjjxtjxs()))).divide(withhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
                 BigDecimal withSbklyzzl = (currSbklyl.subtract(withSbklyl)).divide(withSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
@@ -932,14 +985,14 @@ public class EconomyPointHomePageService {
 
         if (null != currTimeInfo) {
 
-            int currhours = DateUtils.hoursDiff(new Date(),DateUtils.getStartOfDay(new Date()));
+            int currhours = DateUtils.hoursDiff(new Date(), DateUtils.getStartOfDay(new Date()));
             BigDecimal currhours2 = new BigDecimal(0).valueOf((int) currhours);
             currhours2 = compare0(currhours2) ? currhours2 : new BigDecimal(1);
             BigDecimal currSbklyl = currhours2.subtract((currTimeInfo.getNhjgzxsmx().add(currTimeInfo.getNhjjxtjxs()))).divide(currhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
             dto.setCurrSbklyl(currSbklyl);
             if (null != ringTimeInfo) {
 
-                int ringhours = DateUtils.hoursDiff(new Date(),DateUtils.getMonthFirstZero());
+                int ringhours = DateUtils.hoursDiff(new Date(), DateUtils.getMonthFirstZero());
                 BigDecimal ringhours2 = new BigDecimal(0).valueOf((int) ringhours);
                 ringhours2 = compare0(ringhours2) ? ringhours2 : new BigDecimal(1);
                 BigDecimal ringSbklyl = ringhours2.subtract((ringTimeInfo.getNhjgzxsmx().add(ringTimeInfo.getNhjjxtjxs()))).divide(ringhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
@@ -948,7 +1001,7 @@ public class EconomyPointHomePageService {
             }
             if (null != withTimeInfo) {
 
-                int withhours = DateUtils.hoursDiff(new Date(),DateUtils.getYearFirstZero());
+                int withhours = DateUtils.hoursDiff(new Date(), DateUtils.getYearFirstZero());
                 BigDecimal withhours2 = new BigDecimal(0).valueOf((int) withhours);
                 withhours2 = compare0(withhours2) ? withhours2 : new BigDecimal(1);
                 BigDecimal withSbklyl = withhours2.subtract((withTimeInfo.getNhjgzxsmx().add(withTimeInfo.getNhjjxtjxs()))).divide(withhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
@@ -960,25 +1013,24 @@ public class EconomyPointHomePageService {
     }
 
 
-    private BigDecimal compare100(BigDecimal a){
-        BigDecimal b = new BigDecimal (100);
-        if(b.compareTo(a) == -1){
-            a = new BigDecimal (100);;
+    private BigDecimal compare100(BigDecimal a) {
+        BigDecimal b = new BigDecimal(100);
+        if (b.compareTo(a) == -1) {
+            a = new BigDecimal(100);
+            ;
         }
         return a;
 
     }
 
-    private boolean compare0(BigDecimal a){
-        BigDecimal b = new BigDecimal (0.00);
-        if(b.compareTo(a.setScale(2,BigDecimal.ROUND_HALF_UP)) == 0){
-           return false;
+    private boolean compare0(BigDecimal a) {
+        BigDecimal b = new BigDecimal(0.00);
+        if (b.compareTo(a.setScale(2, BigDecimal.ROUND_HALF_UP)) == 0) {
+            return false;
         }
         return true;
 
     }
 
 
-
-
 }