Przeglądaj źródła

受累管理功能数据录入-影响容量bug

chenminghua 2 lat temu
rodzic
commit
6b966a51c8

+ 4 - 4
web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/GhostService.java

@@ -573,8 +573,8 @@ public class GhostService {
         Long end = involvedVo.getEnd();
         List<Line> lines = involvedVo.getLines();
         Double ssdl = involvedVo.getSsdl();
-        //Double yxrl = involvedVo.getYxrl();
-        Double impactcapacity = involvedVo.getImpactcapacity();
+        Double yxrl = involvedVo.getYxrl();
+        //Double impactcapacity = involvedVo.getImpactcapacity();
         String type = involvedVo.getType();
 
         List<Involved> resultList = new ArrayList<>();
@@ -592,8 +592,8 @@ public class GhostService {
             involved.setEnddate(DateUtils.parseLongToDate(end));
             involved.setFaulttype(type);
             involved.setPowerloss(ssdl*(lineMap.get(line.getId()).getCapacity()/zcapacity));
-            //involved.setImpactcapacity(yxrl*(lineMap.get(line.getId()).getCapacity()/zcapacity));
-            involved.setImpactcapacity(impactcapacity*(lineMap.get(line.getId()).getCapacity()/zcapacity));
+            involved.setImpactcapacity(yxrl*(lineMap.get(line.getId()).getCapacity()/zcapacity));
+            //involved.setImpactcapacity(impactcapacity*(lineMap.get(line.getId()).getCapacity()/zcapacity));
             double hours = DateUtils.hoursDiff2(DateUtils.parseLongToDate(begin), DateUtils.parseLongToDate(end));
             involved.setFaultduration(hours);
             involved.setType(involvedVo.getNwb());  //内报、外报

+ 2 - 2
web/gdsx-ghost/src/main/java/com/gyee/ghost/vo/InvolvedVo.java

@@ -17,8 +17,8 @@ public class InvolvedVo {
     public Double ssdl;  //损失电量
     public List<Line> lines;   //勾选线路
     public String type;  //类型
-   // public Double yxrl;  //影响容量
+    public Double yxrl;  //影响容量
     public String nwb;  //内报外报
-    public Double impactcapacity;  //影响容量
+    //public Double impactcapacity;  //影响容量
 
 }