经济运行代码优化

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/homepage/EconomyHomePageController.java

@@ -43,7 +43,7 @@ public class EconomyHomePageController {
     @ApiOperation(value = "经济运行-首页", notes = "经济运行-首页")
     public R getEconomyPointHomePageInfo(@RequestParam(value = "regionId", required = false) String regionId,
                                          @RequestParam(value = "companyId", required = false) String companyId,
-                                         @RequestParam(value = "foreignKeyId", required = false) String foreignKeyId,
+                                         @RequestParam(value = "foreignKeyId", required = true) String foreignKeyId,
                                          @RequestParam(value = "staType", required = true) String staType,
                                          @RequestParam(value = "dateType", required = true) String dateType,
                                          @RequestParam(value = "pointCode", required = false) String pointCode

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/response/EconHomePagePointRateDTO.java

@@ -96,6 +96,7 @@ public class EconHomePagePointRateDTO {
         if(null == currGzsll){
             return new BigDecimal(0.00);
         }
+        currGzsll = compare100(currGzsll);
         return currGzsll;
     }
 
@@ -103,6 +104,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringGzslzzl){
             return new BigDecimal(0.00);
         }
+        ringGzslzzl = compare100(ringGzslzzl);
         return ringGzslzzl;
     }
 
@@ -110,6 +112,7 @@ public class EconHomePagePointRateDTO {
         if(null == withGzslzzl){
             return new BigDecimal(0.00);
         }
+        withGzslzzl = compare100(withGzslzzl);
         return withGzslzzl;
     }
 
@@ -117,6 +120,7 @@ public class EconHomePagePointRateDTO {
         if(null == currJxsll){
             return new BigDecimal(0.00);
         }
+        currJxsll = compare100(currJxsll);
         return currJxsll;
     }
 
@@ -124,6 +128,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringJxslzzl){
             return new BigDecimal(0.00);
         }
+        ringJxslzzl = compare100(ringJxslzzl);
         return ringJxslzzl;
     }
 
@@ -131,6 +136,7 @@ public class EconHomePagePointRateDTO {
         if(null == withJxslzzl){
             return new BigDecimal(0.00);
         }
+        withJxslzzl = compare100(withJxslzzl);
         return withJxslzzl;
     }
 
@@ -138,6 +144,7 @@ public class EconHomePagePointRateDTO {
         if(null == currXdsll){
             return new BigDecimal(0.00);
         }
+        currXdsll = compare100(currXdsll);
         return currXdsll;
     }
 
@@ -145,6 +152,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringXdslzzl){
             return new BigDecimal(0.00);
         }
+        ringXdslzzl = compare100(ringXdslzzl);
         return ringXdslzzl;
     }
 
@@ -152,6 +160,7 @@ public class EconHomePagePointRateDTO {
         if(null == withXdslzzl){
             return new BigDecimal(0.00);
         }
+        withXdslzzl = compare100(withXdslzzl);
         return withXdslzzl;
     }
 
@@ -159,6 +168,7 @@ public class EconHomePagePointRateDTO {
         if(null == currSlsll){
             return new BigDecimal(0.00);
         }
+        currSlsll = compare100(currSlsll);
         return currSlsll;
     }
 
@@ -166,6 +176,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringSlslzzl){
             return new BigDecimal(0.00);
         }
+        ringSlslzzl = compare100(ringSlslzzl);
         return ringSlslzzl;
     }
 
@@ -173,6 +184,7 @@ public class EconHomePagePointRateDTO {
         if(null == withSlslzzl){
             return new BigDecimal(0.00);
         }
+        withSlslzzl = compare100(withSlslzzl);
         return withSlslzzl;
     }
 
@@ -180,6 +192,7 @@ public class EconHomePagePointRateDTO {
         if(null == currXNsll){
             return new BigDecimal(0.00);
         }
+        currXNsll = compare100(currXNsll);
         return currXNsll;
     }
 
@@ -187,6 +200,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringXnslzzl){
             return new BigDecimal(0.00);
         }
+        ringXnslzzl = compare100(ringXnslzzl);
         return ringXnslzzl;
     }
 
@@ -194,6 +208,7 @@ public class EconHomePagePointRateDTO {
         if(null == withXnslzzl){
             return new BigDecimal(0.00);
         }
+        withXnslzzl = compare100(withXnslzzl);
         return withXnslzzl;
     }
 
@@ -201,6 +216,7 @@ public class EconHomePagePointRateDTO {
         if(null == currFwjsl){
             return new BigDecimal(0.00);
         }
+        currFwjsl = compare100(currFwjsl);
         return currFwjsl;
     }
 
@@ -208,6 +224,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringFwjszzl){
             return new BigDecimal(0.00);
         }
+        ringFwjszzl = compare100(ringFwjszzl);
         return ringFwjszzl;
     }
 
@@ -215,6 +232,7 @@ public class EconHomePagePointRateDTO {
         if(null == withFwjszzl){
             return new BigDecimal(0.00);
         }
+        withFwjszzl = compare100(withFwjszzl);
         return withFwjszzl;
     }
 
@@ -222,6 +240,7 @@ public class EconHomePagePointRateDTO {
         if(null == currZtzhl){
             return new BigDecimal(0.00);
         }
+        currZtzhl = compare100(currZtzhl);
         return currZtzhl;
     }
 
@@ -229,6 +248,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringZtzhzzl){
             return new BigDecimal(0.00);
         }
+        ringZtzhzzl = compare100(ringZtzhzzl);
         return ringZtzhzzl;
     }
 
@@ -236,6 +256,7 @@ public class EconHomePagePointRateDTO {
         if(null == withZtzhzzl){
             return new BigDecimal(0.00);
         }
+        withZtzhzzl = compare100(withZtzhzzl);
         return withZtzhzzl;
     }
 
@@ -243,6 +264,7 @@ public class EconHomePagePointRateDTO {
         if(null == currXqjsl){
             return new BigDecimal(0.00);
         }
+        currXqjsl = compare100(currXqjsl);
         return currXqjsl;
     }
 
@@ -250,6 +272,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringXqjszzl){
             return new BigDecimal(0.00);
         }
+        ringXqjszzl = compare100(ringXqjszzl);
         return ringXqjszzl;
     }
 
@@ -257,6 +280,7 @@ public class EconHomePagePointRateDTO {
         if(null == withXqjszzl){
             return new BigDecimal(0.00);
         }
+        withXqjszzl = compare100(withXqjszzl);
         return withXqjszzl;
     }
 
@@ -264,6 +288,7 @@ public class EconHomePagePointRateDTO {
         if(null == currZhcydl){
             return new BigDecimal(0.00);
         }
+        currZhcydl = compare100(currZhcydl);
         return currZhcydl;
     }
 
@@ -271,6 +296,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringZhcydzzl){
             return new BigDecimal(0.00);
         }
+        ringZhcydzzl = compare100(ringZhcydzzl);
         return ringZhcydzzl;
     }
 
@@ -278,6 +304,7 @@ public class EconHomePagePointRateDTO {
         if(null == withZhcydzzl){
             return new BigDecimal(0.00);
         }
+        withZhcydzzl = compare100(withZhcydzzl);
         return withZhcydzzl;
     }
 
@@ -285,6 +312,7 @@ public class EconHomePagePointRateDTO {
         if(null == currGlqxfhl){
             return new BigDecimal(0.00);
         }
+        currGlqxfhl = compare100(currGlqxfhl);
         return currGlqxfhl;
     }
 
@@ -292,6 +320,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringGlqxfhzzl){
             return new BigDecimal(0.00);
         }
+        ringGlqxfhzzl = compare100(ringGlqxfhzzl);
         return ringGlqxfhzzl;
     }
 
@@ -299,6 +328,7 @@ public class EconHomePagePointRateDTO {
         if(null == withGlqxfhzzl){
             return new BigDecimal(0.00);
         }
+        withGlqxfhzzl = compare100(withGlqxfhzzl);
         return withGlqxfhzzl;
     }
 
@@ -306,6 +336,7 @@ public class EconHomePagePointRateDTO {
         if(null == currSbklyl){
             return new BigDecimal(0.00);
         }
+        currSbklyl = compare100(currSbklyl);
         return currSbklyl;
     }
 
@@ -313,6 +344,7 @@ public class EconHomePagePointRateDTO {
         if(null == ringSbklyzzl){
             return new BigDecimal(0.00);
         }
+        ringSbklyzzl = compare100(ringSbklyzzl);
         return ringSbklyzzl;
     }
 
@@ -320,6 +352,17 @@ public class EconHomePagePointRateDTO {
         if(null == withSbklyzzl){
             return new BigDecimal(0.00);
         }
+        withSbklyzzl = compare100(withSbklyzzl);
         return withSbklyzzl;
     }
+
+    private BigDecimal compare100(BigDecimal a) {
+        BigDecimal b = new BigDecimal(100);
+        if (b.compareTo(a) == -1) {
+            a = new BigDecimal(100);
+            ;
+        }
+        return a;
+
+    }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProBasicCompanyServiceImpl.java

@@ -8,7 +8,6 @@ import com.gyee.runeconomy.model.auto.ProBasicCompany;
 import com.gyee.runeconomy.service.auto.IProBasicCompanyService;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -27,12 +26,15 @@ public class ProBasicCompanyServiceImpl extends ServiceImpl<ProBasicCompanyMappe
 
 
         QueryWrapper<ProBasicCompany> qw = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(regionId)) {
-            qw.lambda().eq(ProBasicCompany::getRegionId, regionId);
-        }
-        if (StringUtils.isNotEmpty(companyId)) {
+
+        //判断后缀是区域还是公司
+        if (StringUtils.isNotEmpty(companyId) && companyId.endsWith("_ZGS")) {
             qw.lambda().eq(ProBasicCompany::getId, companyId);
         }
+        if (StringUtils.isNotEmpty(companyId) && companyId.endsWith("_RGN")) {
+            qw.lambda().eq(ProBasicCompany::getRegionId, companyId);
+        }
+
 
 
 //        BigDecimal sumall = new BigDecimal("0.0000");

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProBasicPowerstationServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.mapper.auto.ProBasicPowerstationMapper;
-import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
 import com.gyee.runeconomy.service.auto.IProBasicPowerstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -28,12 +27,13 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
 
         QueryWrapper<ProBasicPowerstation> qw = new QueryWrapper<>();
 
-        if (StringUtils.isNotEmpty(regionId)) {
-            qw.lambda().eq(ProBasicPowerstation::getRegionId, regionId);
-        }
-        if (StringUtils.isNotEmpty(companyId)) {
+        //判断后缀是区域还是公司
+        if (StringUtils.isNotEmpty(companyId) && companyId.endsWith("_ZGS")) {
             qw.lambda().eq(ProBasicPowerstation::getCompanyId, companyId);
         }
+        if (StringUtils.isNotEmpty(companyId) && companyId.endsWith("_RGN")) {
+            qw.lambda().eq(ProBasicPowerstation::getRegionId, companyId);
+        }
 
         List<ProBasicPowerstation> list = baseMapper.selectList(qw);
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconPointCodeServiceImpl.java

@@ -61,7 +61,12 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
     @Override
     public List<ProEconPointCodeDTO> getEconPointRanking(String regionId, String companyId, String pointCode, Date date, String dateType) {
         List<ProBasicPowerstation> powerstationList = proBasicPowerstationService.getProBasicPowerstationlist(regionId, companyId, "");
+
         ProEconPointCode proEconPointCode = getProEconPointCode(pointCode);
+        if (null == proEconPointCode){
+            proEconPointCode = getProEconPointCode("fdl");
+            pointCode = "fdl";
+        }
         List<ProEconPointCodeDTO> dtos = new ArrayList<>();
 
         switch (pointCode) {
@@ -120,7 +125,7 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
         List<String> newsta = powerstationList.stream().map(ProBasicPowerstation::getNemCode).collect(Collectors.toList());
         List<String> reduce1 = newsta.stream().filter(item -> !newsto.contains(item)).collect(Collectors.toList());
         for (String i : reduce1) {
-            if (dtos.size() >= 10) {
+            if (dtos.size() >= 5) {
                 break;
             }
             ProEconPointCodeDTO dto = new ProEconPointCodeDTO();
@@ -131,7 +136,7 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
 
         }
         dtos.sort(Comparator.comparing(ProEconPointCodeDTO::getValue).reversed());
-        List<ProEconPointCodeDTO> dtoss = dtos.stream().sorted(Comparator.comparing(ProEconPointCodeDTO::getValue)).limit(10).collect(Collectors.toList());
+        List<ProEconPointCodeDTO> dtoss = dtos.stream().sorted(Comparator.comparing(ProEconPointCodeDTO::getValue)).limit(5).collect(Collectors.toList());
         dtoss.sort(Comparator.comparing(ProEconPointCodeDTO::getValue).reversed());
         return dtoss;
     }
@@ -154,13 +159,13 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
             dto.setStationname(CacheContext.wpmap.get(i.getForeignKeyId()).getName());
             switch (dateType) {
                 case "r":
-                    dto.setValue(i.getRfdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getRfdl().divide(new BigDecimal(pointCode.getRatio()), 2, BigDecimal.ROUND_HALF_UP));
                     break;
                 case "y":
-                    dto.setValue(i.getYfdl());
+                    dto.setValue(i.getYfdl().divide(new BigDecimal(pointCode.getRatio()), 2, BigDecimal.ROUND_HALF_UP));
                     break;
                 case "n":
-                    dto.setValue(i.getNfdl());
+                    dto.setValue(i.getNfdl().divide(new BigDecimal(pointCode.getRatio()), 2, BigDecimal.ROUND_HALF_UP));
                     break;
             }
             dtos.add(dto);
@@ -186,13 +191,13 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
             dto.setStationname(CacheContext.wpmap.get(i.getForeignKeyId()).getName());
             switch (dateType) {
                 case "r":
-                    dto.setValue(i.getRqfdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getRqfdl().divide(new BigDecimal(pointCode.getRatio()), 2, BigDecimal.ROUND_HALF_UP));
                     break;
                 case "y":
-                    dto.setValue(i.getYqfdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getYqfdl().divide(new BigDecimal(pointCode.getRatio()), 2, BigDecimal.ROUND_HALF_UP));
                     break;
                 case "n":
-                    dto.setValue(i.getNqfdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getNqfdl().divide(new BigDecimal(pointCode.getRatio()), 2, BigDecimal.ROUND_HALF_UP));
                     break;
             }
             dtos.add(dto);
@@ -219,13 +224,13 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
                     case "r":
                         //发电量/理论发电量*100
                         //divide(fdinfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))
-                        dto.setValue(i.getRqfdl().divide(i.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP));
+                        dto.setValue(i.getRqfdl().divide(i.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(pointCode.getRatio())));
                         break;
                     case "y":
-                        dto.setValue(i.getRqfdl().divide(i.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP));
+                        dto.setValue(i.getRqfdl().divide(i.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(pointCode.getRatio())));
                         break;
                     case "n":
-                        dto.setValue(i.getRqfdl().divide(i.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP));
+                        dto.setValue(i.getRqfdl().divide(i.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(pointCode.getRatio())));
                         break;
                 }
                 dto.setValue(compare100(dto.getValue()));
@@ -254,13 +259,13 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
             dto.setStationname(CacheContext.wpmap.get(i.getForeignKeyId()).getName());
             switch (dateType) {
                 case "r":
-                    dto.setValue((i.getRcwsltqssdl().add(i.getRcwsldwssdl())).divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue((i.getRcwsltqssdl().add(i.getRcwsldwssdl())).divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
                 case "y":
-                    dto.setValue((i.getYcwsltqssdl().add(i.getYcwsldwssdl())).divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue((i.getYcwsltqssdl().add(i.getYcwsldwssdl())).divide(new BigDecimal(pointCode.getRatio()),2,BigDecimal.ROUND_HALF_UP));
                     break;
                 case "n":
-                    dto.setValue((i.getNcwsltqssdl().add(i.getNcwsldwssdl())).divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue((i.getNcwsltqssdl().add(i.getNcwsldwssdl())).divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
             }
             dtos.add(dto);
@@ -284,13 +289,13 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
             dto.setStationname(CacheContext.wpmap.get(i.getForeignKeyId()).getName());
             switch (dateType) {
                 case "r":
-                    dto.setValue(i.getRjxssdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getRjxssdl().divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
                 case "y":
-                    dto.setValue(i.getYjxssdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getYjxssdl().divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
                 case "n":
-                    dto.setValue(i.getNjxssdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getNjxssdl().divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
             }
             dtos.add(dto);
@@ -313,13 +318,13 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
             dto.setStationname(CacheContext.wpmap.get(i.getForeignKeyId()).getName());
             switch (dateType) {
                 case "r":
-                    dto.setValue((i.getRxdtjssdl().add(i.getRxdjclssdl())).divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue((i.getRxdtjssdl().add(i.getRxdjclssdl())).divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
                 case "y":
-                    dto.setValue((i.getYxdtjssdl().add(i.getYxdjclssdl())).divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue((i.getYxdtjssdl().add(i.getYxdjclssdl())).divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
                 case "n":
-                    dto.setValue((i.getNxdtjssdl().add(i.getNxdjclssdl())).divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue((i.getNxdtjssdl().add(i.getNxdjclssdl())).divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
             }
             dtos.add(dto);
@@ -342,13 +347,13 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
             dto.setStationname(CacheContext.wpmap.get(i.getForeignKeyId()).getName());
             switch (dateType) {
                 case "r":
-                    dto.setValue(i.getRgzssdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getRgzssdl().divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
                 case "y":
-                    dto.setValue(i.getYgzssdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getYgzssdl().divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
                 case "n":
-                    dto.setValue(i.getNgzssdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getNgzssdl().divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
             }
             dtos.add(dto);
@@ -371,13 +376,13 @@ public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMap
             dto.setStationname(CacheContext.wpmap.get(i.getForeignKeyId()).getName());
             switch (dateType) {
                 case "r":
-                    dto.setValue(i.getRxnssdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getRxnssdl().divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
                 case "y":
-                    dto.setValue(i.getYxnssdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getYxnssdl().divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
                 case "n":
-                    dto.setValue(i.getNxnssdl().divide(new BigDecimal(pointCode.getRatio())));
+                    dto.setValue(i.getNxnssdl().divide(new BigDecimal(pointCode.getRatio()), 2,BigDecimal.ROUND_HALF_UP));
                     break;
             }
             dtos.add(dto);

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -749,7 +749,7 @@ public class BenchmarkingService {
         for (int i=0;i<resultList.size();i++){
             resultList.get(i).setSlsslpm(i+1);
         }
-        SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
+//        SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
         return resultList;
     }
 

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

@@ -107,7 +107,7 @@ 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 regionId1, String companyId1, String staType, String dateType, String pointCode) throws ParseException {
 
         Map<String, Object> allmap = new HashMap<>();
         //获取当前时间
@@ -131,7 +131,7 @@ public class EconomyPointHomePageService {
         wstimemap = proEconPowerstationInfoDay2Service.getEconFiveLossTime(foreignKeyId, staType, dateType, date);
 
         /** 装机容量 */
-        capacity = new BigDecimal(proBasicCompanyService.getProBasicCompanyCapacity(regionId, companyId));
+        capacity = new BigDecimal(proBasicCompanyService.getProBasicCompanyCapacity("", foreignKeyId));
         //综合场用电量
         zhcydllist = proEconPowerstationInfoDay5Service.getEconZhcydldb(foreignKeyId, staType, dateType, date);
 
@@ -141,9 +141,9 @@ public class EconomyPointHomePageService {
         //三率曲线
         threeRateCurvelist = proEconPowerstationInfoDay4Service.getEconThreeRateCurve(foreignKeyId, staType, dateType, date);
 
-        List<ProEconPointCodeDTO> pointCodeDTO = proEconPointCodeService.getEconPointRanking(regionId, companyId, pointCode,date,dateType);
+        List<ProEconPointCodeDTO> pointCodeDTO = proEconPointCodeService.getEconPointRanking("", foreignKeyId, pointCode,date,dateType);
         /**  场站信息 */
-        List<ProBasicPowerstation> powerstationList = proBasicPowerstationService.getProBasicPowerstationlist(regionId, companyId, staType);
+        List<ProBasicPowerstation> powerstationList = proBasicPowerstationService.getProBasicPowerstationlist("", foreignKeyId, staType);
         wsdlfx = new HashMap<>();//五损电量分析
         zhcydl = new ArrayList<>();//综合场用电率
         dltjfxList = new ArrayList<>();//电量统计分析
@@ -208,8 +208,8 @@ public class EconomyPointHomePageService {
     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));
+            fdinfomap.put("fdl", fdinfo.getRfdl().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));
+            fdinfomap.put("qfdl", fdinfo.getRqfdl().divide(new BigDecimal(10000), 2, 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));
@@ -222,8 +222,8 @@ public class EconomyPointHomePageService {
     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("fdl", fdinfo.getYfdl().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));
+            fdinfomap.put("qfdl", fdinfo.getYqfdl().divide(new BigDecimal(10000), 2, 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));
 
 
@@ -237,8 +237,8 @@ public class EconomyPointHomePageService {
     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("fdl", fdinfo.getNfdl().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));
+            fdinfomap.put("qfdl", fdinfo.getNqfdl().divide(new BigDecimal(10000), 2, 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 {
@@ -295,12 +295,12 @@ public class EconomyPointHomePageService {
 
         dltjfxlist.stream().forEach(i -> {
             Map<String, Object> m = new HashMap<>();
-            m.put("fdl", i.getRfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP)); //发电量
-            m.put("sldl", (i.getRcwsldwssdl().add(i.getRcwsltqssdl())).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));  //受累
-            m.put("jxdl", i.getRjxssdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP)); //检修
-            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("fdl", i.getRfdl().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP)); //发电量
+            m.put("sldl", (i.getRcwsldwssdl().add(i.getRcwsltqssdl())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));  //受累
+            m.put("jxdl", i.getRjxssdl().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP)); //检修
+            m.put("xddl", (i.getRxdtjssdl().add(i.getRxdjclssdl())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));//限电
+            m.put("gzdl", i.getRgzssdl().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));      //故障
+            m.put("xndl", i.getRxnssdl().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));//性能
             m.put("date", DateUtils.toDate1(i.getRecordDate()));
             dltjfxList.add(m);
         });
@@ -309,12 +309,12 @@ public class EconomyPointHomePageService {
     private void monthDltjfx() {
         dltjfxlist.stream().forEach(i -> {
             Map<String, Object> m = new HashMap<>();
-            m.put("fdl", i.getYfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP)); //发电量
-            m.put("sldl", (i.getYcwsldwssdl().add(i.getRcwsltqssdl())).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));  //受累
-            m.put("jxdl", i.getYjxssdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP)); //检修
-            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("fdl", i.getYfdl().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP)); //发电量
+            m.put("sldl", (i.getYcwsldwssdl().add(i.getRcwsltqssdl())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));  //受累
+            m.put("jxdl", i.getYjxssdl().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP)); //检修
+            m.put("xddl", (i.getYxdtjssdl().add(i.getRxdjclssdl())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));//限电
+            m.put("gzdl", (i.getYgzssdl()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));      //故障
+            m.put("xndl", (i.getYxnssdl()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));//性能
             m.put("date", DateUtils.toDate1(i.getRecordDate()));
             dltjfxList.add(m);
         });
@@ -323,12 +323,12 @@ public class EconomyPointHomePageService {
     private void yearDltjfx() {
         dltjfxlist.stream().forEach(i -> {
             Map<String, Object> m = new HashMap<>();
-            m.put("fdl", i.getNfdl().divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP)); //发电量
-            m.put("sldl", (i.getNcwsldwssdl().add(i.getRcwsltqssdl())).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP));  //受累
-            m.put("jxdl", (i.getNjxssdl()).divide(new BigDecimal(10000), 6, BigDecimal.ROUND_HALF_UP)); //检修
-            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("fdl", i.getNfdl().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP)); //发电量
+            m.put("sldl", (i.getNcwsldwssdl().add(i.getRcwsltqssdl())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));  //受累
+            m.put("jxdl", (i.getNjxssdl()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP)); //检修
+            m.put("xddl", (i.getNxdtjssdl().add(i.getRxdjclssdl())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));//限电
+            m.put("gzdl", (i.getNgzssdl()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));      //故障
+            m.put("xndl", (i.getNxnssdl()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));//性能
             m.put("date", DateUtils.toDate1(i.getRecordDate()));
             dltjfxList.add(m);
         });