From 2aaf47ead1a69ccbaf6a0167ae161aafd3622114 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 十一月 2025 08:14:35 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index e0d46c5..d805c8b 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -1,7 +1,5 @@
 package com.zy.core.thread.impl;
 
-import HslCommunication.Profinet.Siemens.SiemensPLCS;
-import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.DateUtils;
@@ -109,8 +107,7 @@
 
     @Override
     public boolean connect() {
-        SiemensS7Net siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, deviceConfig.getIp());
-        zyCrnConnectDriver = new ZyCrnConnectDriver(siemensS7Net, deviceConfig);
+        zyCrnConnectDriver = new ZyCrnConnectDriver(deviceConfig);
         new Thread(zyCrnConnectDriver).start();
         DeviceConnectPool.put(SlaveType.Crn, deviceConfig.getDeviceNo(), zyCrnConnectDriver);
         return true;
@@ -194,6 +191,8 @@
                 basCrnp = new BasCrnp();
                 basCrnp.setCrnNo(deviceConfig.getDeviceNo());
                 basCrnp.setStatus(1);
+                basCrnp.setInEnable("N");
+                basCrnp.setOutEnable("N");
                 basCrnp.setCreateTime(new Date());
                 basCrnpService.insert(basCrnp);
             }

--
Gitblit v1.9.1