From 188d4a1658fc823e37833719f89d91c5bd42a3cd Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Wed, 31 Jul 2024 15:16:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3agv=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InstructionServiceImpl.java           | 10 +++++++---
 .../java/org/nl/acs/opc/DeviceOpcProtocolRunable.java  |  6 ++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 12af9f6a5..015f99011 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -412,10 +412,14 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         if (StrUtil.isEmpty(dto.getLink_num())) {
             dto.setIs_send(task.getLink_num());
         }
-        if (ObjectUtil.isNotEmpty(task.getTask_type()) && task.getClass_type().length()==2) {
-            dto.setInstruction_type(task.getClass_type());
-        } else {
+        if (StrUtil.isEmpty(task.getClass_type())){
             dto.setInstruction_type(task.getTask_type());
+        }else {
+            if (ObjectUtil.isNotEmpty(task.getTask_type()) && task.getClass_type().length() == 2) {
+                dto.setInstruction_type(task.getClass_type());
+            } else {
+                dto.setInstruction_type(task.getTask_type());
+            }
         }
 
         // 起点设备与终点设备相同则为初始指令
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
index 865722848..39d7eb413 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
@@ -264,6 +264,12 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                             if (log.isWarnEnabled()) {
                                 log.warn("{} 所有内容都为空, all_null:{} ,暂定{}ms", tag, all_null, 5000);
                             }
+                            LuceneLogDto logDto = LuceneLogDto.builder()
+                                    .device_code("OPC数据源")
+                                    .content("OPC数据源:" + tag + "内容为：" + all_null)
+                                    .build();
+                            logDto.setLog_level(4);
+                            luceneExecuteLogService.deviceExecuteLog(logDto);
                             ThreadUtl.sleep((long) (5000));
                             break start;
                         }