From 95ffc9e46e25d7632268dbe80a6f3c46658fc2ed Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Fri, 11 Apr 2025 10:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=8A=9F=E8=83=BD=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pq/service/impl/TerminalBaseServiceImpl.java | 16 ++--------------
 1 file changed, 2 insertions(+), 14 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 6bddd5cd7..82117698d 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
@@ -236,15 +236,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         //装置
         if (Objects.nonNull(addTerminalParam.getDeviceParam())) {
             List<Line> logsList = new ArrayList<>();
-
-
-
             LambdaQueryWrapper<Line> lineLambdaQueryWrapper = new LambdaQueryWrapper<>();
             if (CollectionUtil.isNotEmpty(addTerminalParam.getDeviceParam()) && StrUtil.isNotBlank(subIndex)) {
                 //校验变电站下的装置名称ip是否重复
                 checkDevNameAndIp(addTerminalParam, subIndex, lineLambdaQueryWrapper);
-
-
                 for (DeviceParam deviceParam : addTerminalParam.getDeviceParam()) {
                     //用于记录装置id
                     String devIdIndex;
@@ -287,7 +282,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         deviceDetail.setCheckFlag(1);
                         deviceDetail.setThisTimeCheck(PubUtils.localDateFormat(deviceParam.getThisTimeCheck()));
                         deviceDetail.setNextTimeCheck(PubUtils.localDateFormat(deviceParam.getNextTimeCheck()));
-                        deviceDetail.setLoginTime(PubUtils.localDateFormat(deviceParam.getNextTimeCheck()));
+                        deviceDetail.setLoginTime(PubUtils.localDateFormat(deviceParam.getLoginTime()));
                         deviceDetail.setUpdateTime(LocalDateTime.now());
 
                         //处理装置识别码秘钥
@@ -1529,12 +1524,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         lineDetailMapper.deleteById(point.getId());
         overlimitMapper.deleteById(point.getId());
         deptLineMapper.deleteById(point.getId());
-
-        // 通知设备重启
-        String[] pids = point.getPids().split(",");
-        if (pids.length > 4) {
-            askRestartDevice(pids[4], DeviceRebootType.LEDGER_MODIFY);
-        }
     }
 
     private List<Line> findChildren(String pid) {
@@ -1554,11 +1543,11 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
     @Transactional(rollbackFor = Exception.class)
     public Boolean delTerminal(String id) {
         List<Line> logsList = new ArrayList<>();
-
         Line obj = this.getById(id);
         if (Objects.isNull(obj)) {
             throw new BusinessException(CommonResponseEnum.FAIL);
         }
+        logsList.add(obj);
         LineBaseEnum lineBaseEnum = LineBaseEnum.getLineBaseEnumByCode(obj.getLevel());
         // 根据层级选择删除策略
         switch (lineBaseEnum) {
@@ -1590,7 +1579,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         if(CollUtil.isNotEmpty(logsList)){
             terminalLogsCat(logsList,2);
         }
-
         return true;
     }