Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

调整相别名称

Browse Source
This commit is contained in:
hongawen
2024-07-16 14:52:52 +08:00
parent ee41b0a554
commit 30b4f03f6b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
private final WordUtil2 wordUtil2; private final WordUtil2 wordUtil2;
private final DataVMapper dataVMapper; private final DataVMapper dataVMapper;
private final IDataIMapper dataIMapper; private final DataIMapper dataIMapper;
private final DataHarmRateVMapper dataHarmRateVMapper; private final DataHarmRateVMapper dataHarmRateVMapper;
private final DataInHarmVMapper dataInHarmVMapper; private final DataInHarmVMapper dataInHarmVMapper;
private final DataPltMapper dataPltMapper; private final DataPltMapper dataPltMapper;
@@ -807,7 +807,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class); InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper2.eq(DataV::getLineId, lineIndex) influxQueryWrapper2.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MAX) .eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
.eq(DataV::getPhasicType,"T") .eq(DataV::getPhaseType,"T")
.max(DataV::getFreqDev) .max(DataV::getFreqDev)
.between(DataV::getTime, startTime, endTime); .between(DataV::getTime, startTime, endTime);
return dataVMapper.getStatisticsByWraper(influxQueryWrapper2); return dataVMapper.getStatisticsByWraper(influxQueryWrapper2);
@@ -820,14 +820,14 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.eq(DataV::getLineId, lineIndex) influxQueryWrapper.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MIN) .eq(DataV::getValueType, InfluxDbSqlConstant.MIN)
.regular(DataV::getPhasicType,Arrays.asList("A","B","C")) .regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
.min(DataV::getVuDev) .min(DataV::getVuDev)
.between(DataV::getTime, startTime, endTime); .between(DataV::getTime, startTime, endTime);
List<DataV> result = new ArrayList<>(dataVMapper.getStatisticsByWraper(influxQueryWrapper)); List<DataV> result = new ArrayList<>(dataVMapper.getStatisticsByWraper(influxQueryWrapper));
InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class); InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper2.eq(DataV::getLineId, lineIndex) influxQueryWrapper2.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MAX) .eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
.regular(DataV::getPhasicType,Arrays.asList("A","B","C")) .regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
.max(DataV::getVuDev) .max(DataV::getVuDev)
.between(DataV::getTime, startTime, endTime); .between(DataV::getTime, startTime, endTime);
result.addAll(dataVMapper.getStatisticsByWraper(influxQueryWrapper2)); result.addAll(dataVMapper.getStatisticsByWraper(influxQueryWrapper2));
@@ -853,7 +853,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.eq(DataV::getLineId, lineIndex) influxQueryWrapper.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.CP95) .eq(DataV::getValueType, InfluxDbSqlConstant.CP95)
.regular(DataV::getPhasicType,Arrays.asList("A","B","C")) .regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
.max(DataV::getVThd) .max(DataV::getVThd)
.between(DataV::getTime, startTime, endTime); .between(DataV::getTime, startTime, endTime);
return dataVMapper.getStatisticsByWraper(influxQueryWrapper); return dataVMapper.getStatisticsByWraper(influxQueryWrapper);
@@ -866,7 +866,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.eq(DataV::getLineId, lineIndex) influxQueryWrapper.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MAX) .eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
.eq(DataV::getPhasicType,"T") .eq(DataV::getPhaseType,"T")
.max(DataV::getVUnbalance) .max(DataV::getVUnbalance)
.between(DataV::getTime, startTime, endTime); .between(DataV::getTime, startTime, endTime);
return dataVMapper.getStatisticsByWraper(influxQueryWrapper); return dataVMapper.getStatisticsByWraper(influxQueryWrapper);

1
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
View File

@@ -118,7 +118,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
@Override @Override
public void judgeUserStatus(String loginName) { public void judgeUserStatus(String loginName) {
User user = getUserByLoginName(loginName); User user = getUserByLoginName(loginName);
if (Objects.isNull(user)) { if (Objects.isNull(user)) {
throw new BusinessException(UserResponseEnum.LOGIN_WRONG_PWD); throw new BusinessException(UserResponseEnum.LOGIN_WRONG_PWD);
} }