From 30b4f03f6b72d524d48aa6879aaa8d7335bacaf4 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 16 Jul 2024 14:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B8=E5=88=AB=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/device/impl/LineWarningServiceImpl.java  | 12 ++++++------
 .../com/njcn/user/service/impl/UserServiceImpl.java  |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

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<LineWarningMapper, Li
     private final WordUtil2 wordUtil2;
 
     private final DataVMapper dataVMapper;
-    private final IDataIMapper dataIMapper;
+    private final DataIMapper dataIMapper;
     private final DataHarmRateVMapper dataHarmRateVMapper;
     private final DataInHarmVMapper dataInHarmVMapper;
     private final DataPltMapper dataPltMapper;
@@ -807,7 +807,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class);
         influxQueryWrapper2.eq(DataV::getLineId, lineIndex)
                 .eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
-                .eq(DataV::getPhasicType,"T")
+                .eq(DataV::getPhaseType,"T")
                 .max(DataV::getFreqDev)
                 .between(DataV::getTime, startTime, endTime);
         return dataVMapper.getStatisticsByWraper(influxQueryWrapper2);
@@ -820,14 +820,14 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
         influxQueryWrapper.eq(DataV::getLineId, lineIndex)
                 .eq(DataV::getValueType, InfluxDbSqlConstant.MIN)
-                .regular(DataV::getPhasicType,Arrays.asList("A","B","C"))
+                .regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
                 .min(DataV::getVuDev)
                 .between(DataV::getTime, startTime, endTime);
         List<DataV> 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<LineWarningMapper, Li
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
         influxQueryWrapper.eq(DataV::getLineId, lineIndex)
                 .eq(DataV::getValueType, InfluxDbSqlConstant.CP95)
-                .regular(DataV::getPhasicType,Arrays.asList("A","B","C"))
+                .regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
                 .max(DataV::getVThd)
                 .between(DataV::getTime, startTime, endTime);
         return dataVMapper.getStatisticsByWraper(influxQueryWrapper);
@@ -866,7 +866,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
         influxQueryWrapper.eq(DataV::getLineId, lineIndex)
                 .eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
-                .eq(DataV::getPhasicType,"T")
+                .eq(DataV::getPhaseType,"T")
                 .max(DataV::getVUnbalance)
                 .between(DataV::getTime, startTime, endTime);
         return dataVMapper.getStatisticsByWraper(influxQueryWrapper);
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
index 007a69e57..d60a508b9 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
@@ -118,7 +118,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public void judgeUserStatus(String loginName) {
         User user = getUserByLoginName(loginName);
-
         if (Objects.isNull(user)) {
             throw new BusinessException(UserResponseEnum.LOGIN_WRONG_PWD);
         }