diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index 38dbfe10..cc2be309 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -36,7 +36,6 @@ import com.njcn.gather.detection.util.socket.FormalTestManager; import com.njcn.gather.device.pojo.enums.CommonEnum; import com.njcn.gather.device.pojo.enums.PatternEnum; import com.njcn.gather.device.pojo.po.PqDev; -import com.njcn.gather.device.pojo.po.PqDevSub; import com.njcn.gather.device.pojo.po.PqStandardDev; import com.njcn.gather.device.pojo.vo.PqDevVO; import com.njcn.gather.device.service.IPqDevService; @@ -740,7 +739,7 @@ public class ResultServiceImpl implements IResultService { case F: //Pst=1(变动率=1.459%*1) List flicker = scriptDtlIndexList.stream().filter(x -> "Flicker".equals(x.getValueType())).collect(Collectors.toList()); - dtlType.setScriptTypeName("Pst=" + flicker.get(0).getChagFre() + "(变动率=" + flicker.get(0).getChagValue() + "%*" + flicker.get(0).getChagFre() + ")"); + dtlType.setScriptTypeName("(变动频度=" + flicker.get(0).getChagFre() + "次/min" + "变动率=" + flicker.get(0).getChagValue() + "%"); break; /** * 暂态