From 46179beb547406b553e1f2ae9a69ef7cabc134d3 Mon Sep 17 00:00:00 2001
From: zhangbaojian <1065122561@qq.com>
Date: Thu, 4 May 2023 11:08:13 +0800
Subject: [PATCH] =?UTF-8?q?zbj//1.=E5=8F=B0=E8=B4=A6=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E4=BF=AE=E6=94=B9=E5=8F=B0=E8=B4=A6=E9=87=8D?=
 =?UTF-8?q?=E8=A6=81=E5=8F=82=E6=95=B0=E6=89=8D=E9=9C=80=E8=A6=81=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=97=A5=E5=BF=97=20=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TerminalBaseServiceImpl.java | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
index c01d2fd59..3a4c8ea7e 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
@@ -424,7 +424,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                         overlimitMapper.insert(overlimit);
 
 
-
                                     }
 
                                 }
@@ -719,10 +718,15 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                     overlimit.setUvoltageDev(updateLineBO.getUvoltageDev());
                                     overlimitMapper.insert(overlimit);
                                 }
-                                //获取用户信息
-                                String userName = RequestUtil.getUsername();
-                                String index = RequestUtil.getUserIndex();
-                                queryUpdateAndInsertLog(userName, index, lineDetail, lineDetailRes);
+                                if (!Objects.equals(lineDetail.getCt1(), lineDetailRes.getCt1()) || !Objects.equals(lineDetail.getCt2(), lineDetailRes.getCt2())
+                                        || !Objects.equals(lineDetail.getPt1(), lineDetailRes.getPt1()) || !Objects.equals(lineDetail.getPt2(), lineDetailRes.getPt2())
+                                        || !Objects.equals(lineDetail.getDevCapacity(), lineDetailRes.getDevCapacity()) || !Objects.equals(lineDetail.getShortCapacity(), lineDetailRes.getShortCapacity())
+                                        || !Objects.equals(lineDetail.getStandardCapacity(), lineDetailRes.getStandardCapacity()) || !Objects.equals(lineDetail.getDealCapacity(), lineDetailRes.getDealCapacity())) {
+                                    //获取用户信息
+                                    String userName = RequestUtil.getUsername();
+                                    String index = RequestUtil.getUserIndex();
+                                    queryUpdateAndInsertLog(userName, index, lineDetail, lineDetailRes);
+                                }
                             }
                         }
                     }
@@ -762,9 +766,9 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             sbOld.append("ct变比: ").append(oldLine.getCt1()).append(" : ").append(oldLine.getCt2()).append(";");
         }
         //设备容量
-        if (!Objects.equals(newLine.getDealCapacity(), oldLine.getDealCapacity())) {
-            sbNew.append("设备容量: ").append(newLine.getDealCapacity()).append(";");
-            sbOld.append("设备容量: ").append(oldLine.getDealCapacity()).append(";");
+        if (!Objects.equals(newLine.getDevCapacity(), oldLine.getDevCapacity())) {
+            sbNew.append("设备容量: ").append(newLine.getDevCapacity()).append(";");
+            sbOld.append("设备容量: ").append(oldLine.getDevCapacity()).append(";");
         }
         //短路容量
         if (!Objects.equals(newLine.getShortCapacity(), oldLine.getShortCapacity())) {
@@ -1940,7 +1944,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 if (Objects.isNull(temp)) {
                     temp = assembleLine(substationName, LineBaseEnum.SUB_LEVEL.getCode(), pids.get(LineBaseEnum.GD_LEVEL.getCode()), pids);
                     //处理电压等级字典表
-                    DictData substationScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubStationScale(),DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
+                    DictData substationScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubStationScale(), DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
                     if (Objects.isNull(substationScale)) {
                         terminalBaseExcelMsgs.add(assembleBaseMsg(terminalBaseExcel, "字典电压等级不存在"));
                         continue;
@@ -2043,7 +2047,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         }
                     }
                     //处理电压等级字典表
-                    DictData subvScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubvScale(),DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
+                    DictData subvScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubvScale(), DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
                     if (Objects.isNull(subvScale)) {
                         terminalBaseExcelMsgs.add(assembleBaseMsg(terminalBaseExcel, "字典电压等级：" + terminalBaseExcel.getSubStationScale() + "不存在"));
                         continue;