From 6c467481fdaccead755bb803224c555b42e5579b Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 17 四月 2025 19:12:42 +0800
Subject: [PATCH] 999

---
 src/main/java/com/zy/core/thread/DevpThread.java |  172 +--------------------------------------------------------
 1 files changed, 3 insertions(+), 169 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index d4561b8..46122e9 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -1,180 +1,14 @@
 package com.zy.core.thread;
 
-import HslCommunication.Core.Types.OperateResult;
-import HslCommunication.Core.Types.OperateResultExOne;
-import HslCommunication.Profinet.Siemens.SiemensPLCS;
-import HslCommunication.Profinet.Siemens.SiemensS7Net;
-import com.alibaba.fastjson.JSON;
-import com.zy.core.Slave;
 import com.zy.core.ThreadHandler;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.Task;
 import com.zy.core.model.protocol.StaProtocol;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
 
-import java.util.Arrays;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
-/**
- * 杈撻�佺嚎绾跨▼
- * Created by vincent on 2020/8/4
- */
-@Data
-@Slf4j
-public class DevpThread implements Runnable, ThreadHandler {
+public interface DevpThread extends ThreadHandler {
 
-    private Slave slave;
-    private SiemensS7Net siemensS7Net;
-    private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
+    Map<Integer, StaProtocol> getStation();
 
-    public DevpThread(Slave slave) {
-        this.slave = slave;
-        connect();
-    }
-
-    @Override
-    @SuppressWarnings("InfiniteLoopStatement")
-    public void run() {
-        while (true) {
-            try {
-                int step = 1;
-                Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
-                if (task != null) {
-                    step = task.getStep();
-                }
-                switch (step) {
-                    // 璇绘暟鎹�
-                    case 1:
-                        read();
-                        break;
-                    // 鍐欐暟鎹�
-                    case 2:
-                        write((StaProtocol)task.getData());
-                        break;
-                    default:
-                        break;
-                }
-                Thread.sleep(3000);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-        }
-    }
-
-    @Override
-    public boolean connect() {
-        boolean result = false;
-        siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
-        siemensS7Net.setRack((byte) 0);
-        siemensS7Net.setSlot((byte) 1);
-        OperateResult connect = siemensS7Net.ConnectServer();
-        if(connect.IsSuccess){
-            result = true;
-            log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-        } else {
-            log.info("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-        }
-        siemensS7Net.ConnectClose();
-        return result;
-    }
-
-    /**
-     * 璇诲彇鐘舵��
-     */
-    private void read(){
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 40);
-        for (int i = 1; i <= 8; i++) {
-            StaProtocol staProtocol = station.get(i);
-            if (null == staProtocol) {
-                staProtocol = new StaProtocol();
-                staProtocol.setSiteId(i);
-                station.put(i, staProtocol);
-            }
-            System.out.println("------");
-            System.out.println("绔欑偣缂栧彿锛�" + i);
-            System.out.println("宸ヤ綔鍙凤細" + siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
-            System.out.println("鐩爣绔欙細" + siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2+20));
-            staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));
-            staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2+20));
-        }
-        System.out.println("===> 鐘舵��");
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.40", (short) 10);
-        if (result1.IsSuccess) {
-//            System.out.println("鐘舵��:"+Arrays.toString(result1.Content));
-            System.out.println(Arrays.toString(siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 1)));
-        }
-    }
-
-    /**
-     * 鍐欏叆
-     */
-    private void write(StaProtocol staProtocol){
-        if (null == staProtocol) {
-            return;
-        }
-        OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-        System.out.println(((staProtocol.getSiteId() - 1) * 2) + 20);
-        OperateResult write1 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo());    // 鐩爣绔�
-        boolean[] status = new boolean[8];
-        status[0] = staProtocol.isAutoing();
-        status[1] = staProtocol.isLoading();
-        status[2] = staProtocol.isInEnable();
-        status[3] = staProtocol.isOutEnable();
-        status[4] = staProtocol.isEmptyMk();
-        OperateResult write2 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) + 40), status);     //  鐘舵��
-        if (!write.IsSuccess || !write1.IsSuccess || !write2.IsSuccess) {
-            log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
-        }
-    }
-
-    @Override
-    public void close() {
-
-    }
-
-    public static void main(String[] args) {
-        Slave slave = new Slave();
-        slave.setIp("192.168.2.125");
-        DevpThread devpThread = new DevpThread(slave);
-        boolean connect = devpThread.connect();
-        System.out.println(connect);
-        devpThread.read();
-        // 鍐�
-        StaProtocol staProtocol = devpThread.getStation().get(1);
-        staProtocol.setWorkNo((short) 978);
-        staProtocol.setStaNo((short) 150);
-        staProtocol.setAutoing(true);
-        staProtocol.setEmptyMk(true);
-        devpThread.write(staProtocol);
-        System.out.println("----------------------------------------");
-        // 璇�
-        devpThread.read();
-        System.out.println(JSON.toJSONString(devpThread.station));
-
-
-        System.out.println("[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
-        boolean[] status = new boolean[8];
-        status[0] = false;
-        status[1] = false;
-        status[2] = false;
-        status[3] = false;
-        status[4] = false;
-        OperateResult write2 = devpThread.siemensS7Net.Write("DB100.40", status);     //  鐘舵��
-        if (write2.IsSuccess) {
-            System.out.println("success");
-        }
-        OperateResultExOne<byte[]> result1 = devpThread.siemensS7Net.Read("DB100.40", (short) 10);
-        if (result1.IsSuccess) {
-//            System.out.println("鐘舵��:"+Arrays.toString(result1.Content));
-            System.out.println(Arrays.toString(result1.Content));
-            System.out.println(Arrays.toString(devpThread.siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 1)));
-            System.out.println(Arrays.toString(devpThread.siemensS7Net.getByteTransform().TransBool(result1.Content, 1, 1)));
-            System.out.println(Arrays.toString(devpThread.siemensS7Net.getByteTransform().TransBool(result1.Content, 2, 1)));
-        }
-    }
+    void setPakMk(Integer siteId, boolean pakMk);
 
 }

--
Gitblit v1.9.1