|
@@ -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()); //内报、外报
|