diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java index eb681e311..9f38ea1c4 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java @@ -86,7 +86,7 @@ public class LineWarningServiceImpl extends MppServiceImpl result = new ArrayList<>(dataVMapper.getStatisticsByWraper(influxQueryWrapper)); InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class); influxQueryWrapper2.eq(DataV::getLineId, lineIndex) .eq(DataV::getValueType, InfluxDbSqlConstant.MAX) - .regular(DataV::getPhasicType,Arrays.asList("A","B","C")) + .regular(DataV::getPhaseType,Arrays.asList("A","B","C")) .max(DataV::getVuDev) .between(DataV::getTime, startTime, endTime); result.addAll(dataVMapper.getStatisticsByWraper(influxQueryWrapper2)); @@ -853,7 +853,7 @@ public class LineWarningServiceImpl extends MppServiceImpl implements IU @Override public void judgeUserStatus(String loginName) { User user = getUserByLoginName(loginName); - if (Objects.isNull(user)) { throw new BusinessException(UserResponseEnum.LOGIN_WRONG_PWD); }