From e76f0739e647fe8a7e0e2618914e2faff554b1b7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 17 十一月 2025 17:33:23 +0800
Subject: [PATCH] 解决冲突
---
mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAutoTestService.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAutoTestService.java b/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAutoTestService.java
index 6880525..10823d3 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAutoTestService.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAutoTestService.java
@@ -1,6 +1,5 @@
package com.mes.service;
-import com.mes.s7.enhanced.EnhancedS7Serializer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
@@ -12,15 +11,12 @@
* PLC鑷姩娴嬭瘯鏈嶅姟
* 瀹氭椂妯℃嫙PLC琛屼负锛屽悜PLC鍐欏叆娴嬭瘯鏁版嵁锛岀敤浜庤嚜鍔ㄦ祴璇昅ES绋嬪簭
*
- * @author zhoush
+ * @author huang
* @date 2025/10/30
*/
@Slf4j
@Service
public class PlcAutoTestService {
-
- @Resource
- private EnhancedS7Serializer s7Serializer;
@Resource
private PlcTestWriteService plcTestWriteService;
@@ -32,9 +28,6 @@
// 鑷姩娴嬭瘯闂撮殧锛堟绉掞級
@Value("${plc.auto.test.interval:5000}")
private long autoTestInterval;
-
- private static final int ON = 1;
- private static final int OFF = 0;
/**
* 瀹氭椂鑷姩娴嬭瘯浠诲姟
--
Gitblit v1.8.0