经济运行首页代码提交,修改三率

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/Economic/EconomicController.java

@@ -40,12 +40,13 @@ public class EconomicController {
     @ApiOperation(value = "经济运行-首页", notes = "经济运行-首页")
     public R getEconomyPointHomePageInfo(@RequestParam(value = "companyId", required = false) String companyId,
                                          @RequestParam(value = "type", required = true) String type,
-                                         @RequestParam(value = "statype", required = true) String statype
+                                         @RequestParam(value = "statype", required = true) String statype,
+                                         @RequestParam(value = "datetype", required = true) String datetype
 
 
     ) throws Exception {
 
-        Map<String, Object> map = economicService.getEconomyPointInfo(companyId, type, statype);
+        Map<String, Object> map = economicService.getEconomyPointInfo(companyId, type, statype,datetype);
         if (null != map) {
             return R.data(ResultMsg.ok(map));
         } else {

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/dto/WxssVo.java

@@ -14,6 +14,7 @@ public class WxssVo {
     private BigDecimal slssdl;
     private BigDecimal llfdl;
     private BigDecimal gnlyl;
+    private BigDecimal ssdl;
 
     public String getId() {
         return id;
@@ -94,4 +95,12 @@ public class WxssVo {
     public void setLlfdl(BigDecimal llfdl) {
         this.llfdl = llfdl;
     }
+
+    public BigDecimal getSsdl() {
+        return ssdl;
+    }
+
+    public void setSsdl(BigDecimal ssdl) {
+        this.ssdl = ssdl;
+    }
 }

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/Economic/EconomicService.java

@@ -40,7 +40,7 @@ public class EconomicService {
      * @return
      * @throws ParseException
      */
-    public Map<String, Object> getEconomyPointInfo(String companyId, String type, String statype) throws ParseException {
+    public Map<String, Object> getEconomyPointInfo(String companyId, String type, String statype,String datetype) throws ParseException {
 
 
         //获取当前时间
@@ -73,23 +73,9 @@ public class EconomicService {
         }else {
             qyls = station1ls.stream().filter(wp -> wp.getForeignKeyId().contains(companyId) && wp.getRecordDate().equals(date)).collect(Collectors.toList());
         }
-        if (!station1ls.isEmpty()) {
-            for (ProEconPowerstationInfoDay1 st : qyls) {
-                fdtjmap.put("rfdl", st.getRfdl());
-                fdtjmap.put("yfdl", st.getYfdl());
-                fdtjmap.put("nfdl", st.getNfdl());
-                fdtjmap.put("gnlyl", st.getYfdl().divide(st.getYllfdl(), 2, BigDecimal.ROUND_HALF_UP).multiply(num1));
-                wxssmap.put("gzss", st.getYgzssdl());
-                wxssmap.put("whss", st.getYjxssdl());
-                wxssmap.put("xnss", st.getYxnssdl());
-                wxssmap.put("xdss", st.getYxdjclssdl().add(st.getYxdtjssdl()));
-                wxssmap.put("slss", st.getYcwsldwssdl().add(st.getYcwsltqssdl()).add(st.getYcnsljxssdl()).add(st.getYcnslgzssdl()));
-            }
-            map.put("fdtj", fdtjmap);
-            map.put("wxsstb", wxssmap);
-        }
 
 
+        //列表
         if (companyId.startsWith("JS_RGN") && type.equals("-1")) {
             gsls = station1ls.stream().filter(wp -> wp.getRegionId().contains("JS_RGN-1") && wp.getRecordDate().equals(date)).collect(Collectors.toList());
             trls = treels.stream().filter(wp -> wp.getId().endsWith("ZGS")).collect(Collectors.toList());
@@ -109,6 +95,78 @@ public class EconomicService {
             trls = treels.stream().filter(wp -> wp.getParentCode().endsWith(companyId)).collect(Collectors.toList());
         }
 
+        if (datetype.contains("r")) {
+            if (!station1ls.isEmpty()) {
+                for (ProEconPowerstationInfoDay1 st : qyls) {
+                    fdtjmap.put("rfdl", st.getRfdl());
+                    fdtjmap.put("llfdl", st.getRllfdl());
+                    fdtjmap.put("ssdl", st.getRllfdl().subtract(st.getRfdl()));
+                    fdtjmap.put("gnlyl", st.getRfdl().divide(st.getRllfdl(), 2, BigDecimal.ROUND_HALF_UP).multiply(num1));
+                    wxssmap.put("gzss", st.getRgzssdl());
+                    wxssmap.put("whss", st.getRjxssdl());
+                    wxssmap.put("xnss", st.getRxnssdl());
+                    wxssmap.put("xdss", st.getRxdjclssdl().add(st.getRxdtjssdl()));
+                    wxssmap.put("slss", st.getRcwsldwssdl().add(st.getRcwsltqssdl()).add(st.getRcnsljxssdl()).add(st.getRcnslgzssdl()));
+                }
+                map.put("fdtj", fdtjmap);
+                map.put("wxsstb", wxssmap);
+            }
+
+
+            //五项损失前五及列表
+            for (ProBasicOrganizeTree cp : trls) {
+
+                for (ProEconPowerstationInfoDay1 ss : gsls) {
+                    if (!cp.getId().contains(ss.getForeignKeyId())) {
+                        continue;
+                    }
+                    EconomicVo vo = new EconomicVo();
+                    WxssVo wxssVo = new WxssVo();
+
+                    wxssVo.setId(ss.getForeignKeyId());
+                    if (cp.getId().contains(ss.getForeignKeyId())) {
+                        wxssVo.setName(cp.getAname());
+                        vo.setName(cp.getAname());
+                    } else {
+                        continue;
+                    }
+                    wxssVo.setFdl(ss.getRfdl());
+                    wxssVo.setGzssdl(ss.getRgzssdl());
+                    wxssVo.setSlssdl(ss.getRcwsldwssdl().add(ss.getRcwsltqssdl()).add(ss.getRcnslgzssdl()).add(ss.getRcnsljxssdl()));
+                    wxssVo.setWhssdl(ss.getRjxssdl());
+                    wxssVo.setXdssdl(ss.getRxdjclssdl().add(ss.getRxdtjssdl()));
+                    wxssVo.setXnssdl(ss.getRxnssdl());
+                    wxssVo.setLlfdl(ss.getRllfdl());
+                    wxssVo.setGnlyl(ss.getRfdl().divide(ss.getRllfdl(), 2, BigDecimal.ROUND_HALF_UP).multiply(num1));
+                    wxssVo.setSsdl(ss.getRllfdl().subtract(ss.getRfdl()));
+                    lbls.add(wxssVo);
+
+                    //五损前五
+                    vo.setId(ss.getForeignKeyId());
+                    vo.setYfdl(ss.getRfdl());
+                    vo.setLlfdl(ss.getRllfdl());
+                    jsls.add(vo);
+                }
+            }
+        }else if (datetype.contains("y")){
+            if (!station1ls.isEmpty()) {
+                for (ProEconPowerstationInfoDay1 st : qyls) {
+                    fdtjmap.put("rfdl", st.getYfdl());
+                    fdtjmap.put("llfdl", st.getYllfdl());
+                    fdtjmap.put("ssdl", st.getYllfdl().subtract(st.getYfdl()));
+                    fdtjmap.put("gnlyl", st.getYfdl().divide(st.getYllfdl(), 2, BigDecimal.ROUND_HALF_UP).multiply(num1));
+                    wxssmap.put("gzss", st.getYgzssdl());
+                    wxssmap.put("whss", st.getYjxssdl());
+                    wxssmap.put("xnss", st.getYxnssdl());
+                    wxssmap.put("xdss", st.getYxdjclssdl().add(st.getYxdtjssdl()));
+                    wxssmap.put("slss", st.getYcwsldwssdl().add(st.getYcwsltqssdl()).add(st.getYcnsljxssdl()).add(st.getYcnslgzssdl()));
+                }
+                map.put("fdtj", fdtjmap);
+                map.put("wxsstb", wxssmap);
+            }
+
+
+            //五项损失前五及列表
             for (ProBasicOrganizeTree cp : trls) {
 
                 for (ProEconPowerstationInfoDay1 ss : gsls) {
@@ -133,6 +191,7 @@ public class EconomicService {
                     wxssVo.setXnssdl(ss.getYxnssdl());
                     wxssVo.setLlfdl(ss.getYllfdl());
                     wxssVo.setGnlyl(ss.getYfdl().divide(ss.getYllfdl(), 2, BigDecimal.ROUND_HALF_UP).multiply(num1));
+                    wxssVo.setSsdl(ss.getYllfdl().subtract(ss.getYfdl()));
                     lbls.add(wxssVo);
 
                     //五损前五
@@ -142,17 +201,62 @@ public class EconomicService {
                     jsls.add(vo);
                 }
             }
+        }else if (datetype.contains("n")){
+            if (!station1ls.isEmpty()) {
+                for (ProEconPowerstationInfoDay1 st : qyls) {
+                    fdtjmap.put("rfdl", st.getNfdl());
+                    fdtjmap.put("llfdl", st.getNllfdl());
+                    fdtjmap.put("ssdl", st.getNllfdl().subtract(st.getNfdl()));
+                    fdtjmap.put("gnlyl", st.getNfdl().divide(st.getNllfdl(), 2, BigDecimal.ROUND_HALF_UP).multiply(num1));
+                    wxssmap.put("gzss", st.getNgzssdl());
+                    wxssmap.put("whss", st.getNjxssdl());
+                    wxssmap.put("xnss", st.getNxnssdl());
+                    wxssmap.put("xdss", st.getNxdjclssdl().add(st.getNxdtjssdl()));
+                    wxssmap.put("slss", st.getNcwsldwssdl().add(st.getNcwsltqssdl()).add(st.getNcnsljxssdl()).add(st.getNcnslgzssdl()));
+                }
+                map.put("fdtj", fdtjmap);
+                map.put("wxsstb", wxssmap);
+            }
 
-        map.put("wxsslb", lbls);
 
-//        for (EconomicVo ll : jsls) {
-//            qwls.add(ll.getId());
-//            qwls.add(ll.getName());
-//            qwls.add(ll.getYfdl().divide(ll.getLlfdl(), 2, BigDecimal.ROUND_HALF_UP).multiply(num1));
-//        }
+            //五项损失前五及列表
+            for (ProBasicOrganizeTree cp : trls) {
+
+                for (ProEconPowerstationInfoDay1 ss : gsls) {
+                    if (!cp.getId().contains(ss.getForeignKeyId())) {
+                        continue;
+                    }
+                    EconomicVo vo = new EconomicVo();
+                    WxssVo wxssVo = new WxssVo();
+
+                    wxssVo.setId(ss.getForeignKeyId());
+                    if (cp.getId().contains(ss.getForeignKeyId())) {
+                        wxssVo.setName(cp.getAname());
+                        vo.setName(cp.getAname());
+                    } else {
+                        continue;
+                    }
+                    wxssVo.setFdl(ss.getNfdl());
+                    wxssVo.setGzssdl(ss.getNgzssdl());
+                    wxssVo.setSlssdl(ss.getNcwsldwssdl().add(ss.getNcwsltqssdl()).add(ss.getNcnslgzssdl()).add(ss.getNcnsljxssdl()));
+                    wxssVo.setWhssdl(ss.getNjxssdl());
+                    wxssVo.setXdssdl(ss.getNxdjclssdl().add(ss.getNxdtjssdl()));
+                    wxssVo.setXnssdl(ss.getNxnssdl());
+                    wxssVo.setLlfdl(ss.getNllfdl());
+                    wxssVo.setGnlyl(ss.getNfdl().divide(ss.getNllfdl(), 2, BigDecimal.ROUND_HALF_UP).multiply(num1));
+                    wxssVo.setSsdl(ss.getNllfdl().subtract(ss.getNfdl()));
+                    lbls.add(wxssVo);
+
+                    //五损前五
+                    vo.setId(ss.getForeignKeyId());
+                    vo.setYfdl(ss.getNfdl());
+                    vo.setLlfdl(ss.getNllfdl());
+                    jsls.add(vo);
+                }
+            }
+        }
 
-        // 从 list 集合中筛选出指定字段值从小到大的前五个数据
-//        qwls.stream().sorted().limit(5).collect(Collectors.toList());
+        map.put("wxsslb", lbls);
 
 
         int i = 0;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/threerate/ThreeRateService.java

@@ -9,7 +9,6 @@ import com.gyee.common.util.SortUtils;
 import com.gyee.runeconomy.dto.response.FwjslDTO;
 import com.gyee.runeconomy.dto.response.QxjslDTO;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDay5;
 import com.gyee.runeconomy.model.auto.ProEconFaultLiminatedefects;
 import com.gyee.runeconomy.service.auto.IProBasicOrganizeTreeService;
@@ -103,8 +102,8 @@ public class ThreeRateService {
     public List<QxjslDTO> getDefectsEliminatRateList(String companyId, String windpowerstationId,String beginDate, String endDate) {
 
 
-        Map<String, Integer> station =  proBasicPowerstationService.list()
-                .stream().collect(Collectors.toMap(ProBasicPowerstation::getId,ProBasicPowerstation::getOrderNum));
+        Map<String, Integer> station =  proBasicOrganizeTreeService.list()
+                .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId,ProBasicOrganizeTree::getOrderNum));
 
         List<String> wpids = new ArrayList<>();
         //场站模糊查询
@@ -213,8 +212,8 @@ public class ThreeRateService {
 
     private void getData1(List<FwjslDTO> resultList, List<ProEconEquipmentInfoDay5> list) {
 
-        Map<String, Integer> station =  proBasicPowerstationService.list()
-                .stream().collect(Collectors.toMap(ProBasicPowerstation::getId,ProBasicPowerstation::getOrderNum));
+        Map<String, Integer> station =  proBasicOrganizeTreeService.list()
+                .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId,ProBasicOrganizeTree::getOrderNum));
 
         AtomicReference<Double> wfz = new AtomicReference<>((double) 0);
         AtomicReference<Double> sfz = new AtomicReference<>((double) 0);
@@ -262,8 +261,8 @@ public class ThreeRateService {
     private void getData2(List<FwjslDTO> resultList, List<ProEconEquipmentInfoDay5> list) {
 
 
-        Map<String, Integer> station =  proBasicPowerstationService.list()
-                .stream().collect(Collectors.toMap(ProBasicPowerstation::getId,ProBasicPowerstation::getOrderNum));
+        Map<String, Integer> station =  proBasicOrganizeTreeService.list()
+                .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId,ProBasicOrganizeTree::getOrderNum));
         AtomicReference<Double> wfz = new AtomicReference<>((double) 0);
         AtomicReference<Double> sfz = new AtomicReference<>((double) 0);
         AtomicReference<Double> swfz = new AtomicReference<>((double) 0);
@@ -314,8 +313,8 @@ public class ThreeRateService {
     private void getData3(List<FwjslDTO> resultList, List<ProEconEquipmentInfoDay5> list) {
 
 
-        Map<String, Integer> station =  proBasicPowerstationService.list()
-                .stream().collect(Collectors.toMap(ProBasicPowerstation::getId,ProBasicPowerstation::getOrderNum));
+        Map<String, Integer> station =  proBasicOrganizeTreeService.list()
+                .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId,ProBasicOrganizeTree::getOrderNum));
 
 
         AtomicReference<Double> wfz = new AtomicReference<>((double) 0);