From b78572fb09a2c63398e8d87bd19d5d3f92f5aa58 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 10 四月 2026 15:17:26 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 431 +++++++++++++++++++++++++----------------------------
1 files changed, 204 insertions(+), 227 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
index 090619e..dbc7d9a 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
@@ -1,36 +1,23 @@
package com.zy.acs.conveyor.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.acs.common.utils.News;
-import com.zy.acs.conveyor.core.DevpThread;
-import com.zy.acs.conveyor.core.cache.MessageQueue;
-import com.zy.acs.conveyor.core.cache.OutputQueue;
-import com.zy.acs.conveyor.core.cache.SlaveConnection;
+import com.zy.acs.conveyor.core.constant.DeviceField;
+import com.zy.acs.conveyor.core.constant.PlcAlarmDefinition;
import com.zy.acs.conveyor.core.constant.StationStatusField;
-import com.zy.acs.conveyor.core.enums.SlaveType;
-import com.zy.acs.conveyor.core.enums.TaskType;
-import com.zy.acs.conveyor.core.model.Task;
-import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
+import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.entity.Devp;
import com.zy.acs.conveyor.service.DevpService;
import com.zy.acs.conveyor.utils.SpringContextUtil;
import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.common.DateUtils;
-import com.zy.acs.framework.exception.CoolException;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
/**
* 杈撻�佺嚎绾跨▼
@@ -38,268 +25,258 @@
*/
@Data
@Slf4j
-public class SiemensDevpThread implements Runnable, DevpThread {
+public class SiemensDevpThread implements Runnable {
private DevpSlave slave;
private SiemensS7Net siemensS7Net;
- private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
+ private Map<Integer, StaProtocol> station;
+
+ private volatile boolean connected = false;
+
+ private static final int WRITE_RETRY_MAX = 5;
+
+ private static final int WRITE_RETRY_INTERVAL_MS = 200;
+
+ private static final int READ_INTERVAL_MS = 100;
+
+ private static final int DB_UPDATE_INTERVAL_MS = 2000; // 鏁版嵁搴撴洿鏂伴棿闅�
+
+ private long lastDbUpdateTime = 0;
- public SiemensDevpThread(DevpSlave slave) {
+ public SiemensDevpThread(DevpSlave slave, SiemensS7Net siemensS7Net, Map<Integer, StaProtocol> station) {
this.slave = slave;
+ this.siemensS7Net = siemensS7Net;
+ this.station = station;
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- connect();
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
- TaskType step = TaskType.READ;
- Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
- if (task != null) {
- step = task.getStep();
- }
- switch (step) {
- // 璇绘暟鎹�
- case READ:
- read();
- break;
- // 鍐欐暟鎹� ID+鐩爣绔�
- case WRITE:
- write((StaProtocol) task.getData());
- break;
- default:
- break;
- }
- Thread.sleep(100);
+ read();
+ Thread.sleep(READ_INTERVAL_MS);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ log.warn("SiemensDevp绾跨▼琚腑鏂� [id:{}]", slave.getId());
+ break;
} catch (Exception e) {
- e.printStackTrace();
- }
-
- }
- }
-
- /**
- * 鍒濆鍖栫珯鐐圭姸鎬�
- */
- private void initSite() {
- List<Integer> staNos = slave.getStaNos();
- // 绔欑偣缂栧彿
- for (Integer siteId : staNos) {
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- staProtocol.setWorkNo(0); // ID
- staProtocol.setAutoing(false); // 鑷姩
- staProtocol.setLoading(false); // 鏈夌墿
- staProtocol.setInEnable(false); // 鍙叆
- staProtocol.setOutEnable(false); // 鍙嚭
- staProtocol.setEmptyMk(false); // 绌烘澘淇″彿
- staProtocol.setStaNo(0); // 鐩爣绔�
-
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
- staProtocol.setPakMk(true);
+ log.error("SiemensDevp绾跨▼杩愯寮傚父 [id:{}]", slave.getId(), e);
}
}
- }
-
- @Override
- public boolean connect() {
- boolean result = false;
- siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
- siemensS7Net.setRack(slave.getRack().byteValue());
- siemensS7Net.setSlot(slave.getSlot().byteValue());
- OperateResult connect = siemensS7Net.ConnectServer();
- if (connect.IsSuccess) {
- result = true;
- //OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- News.info("SiemensDevp" + " - 1" + " - 杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- } else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- News.error("SiemensDevp" + " - 2" + " - 杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
- siemensS7Net.ConnectClose();
- initSite();
- return result;
+ log.info("SiemensDevp璇荤嚎绋嬪凡閫�鍑� [id:{}]", slave.getId());
}
/**
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
+ if (!connected || siemensS7Net == null) {
+ log.warn("PLC鏈繛鎺ワ紝璺宠繃璇诲彇 [id:{}]", slave.getId());
+ return;
+ }
+
List<Integer> staNos = slave.getStaNos();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read(StationStatusField.ALL.buildAddress(), (short) (staNoSize * StationStatusField.ALL.getByteLength()));
- if (result.IsSuccess) {
- for (int i = 0; i < staNoSize; i++) {
- Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- staProtocol.setWorkNo((int) siemensS7Net.getByteTransform().TransUInt32(result.Content, i * StationStatusField.ALL.getByteLength()));
- staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(result.Content, i * StationStatusField.ALL.getByteLength() + 4));
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * StationStatusField.ALL.getByteLength()+6, 2);
- staProtocol.setAutoing(status[0]); // 鑷姩
- staProtocol.setLoading(status[1]); // 鏈夌墿
- staProtocol.setInEnable(status[2]); // 鍙叆
- staProtocol.setOutEnable(status[3]);// 鍙嚭
- staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
- staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]); // 楂樺簱浣�
- staProtocol.setLow(status[7]); // 浣庡簱浣�
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
- staProtocol.setPakMk(true);
- }
- }
+ // 璇诲彇绔欑偣鐘舵��
+ OperateResultExOne<byte[]> result = siemensS7Net.Read(
+ StationStatusField.ALL.buildAddress(),
+ (short) (staNoSize * StationStatusField.ALL.getByteLength()));
+
+ if (!result.IsSuccess) {
+ log.error("璇诲彇绔欑偣鐘舵�佸け璐� [id:{}] [error:{}]", slave.getId(), result.Message);
+ connected = false;
+ return;
}
-
- //鏉＄爜鎵弿鍣�
- List<Integer> barcodeList = slave.getBarcodeNumber();
- OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB101.102", (short) (barcodeList.size() * 8));
- if (result5.IsSuccess) {
- for (int i = 0; i < barcodeList.size(); i++) {
- Integer barcodeId = barcodeList.get(i);
- String barcode = siemensS7Net.getByteTransform().TransString(result5.Content, i * 8, 8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
- if (Cools.isEmpty(barcode)) {
- barcodeThread.clearBarcode();
- } else {
- if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
- log.info("鏂欑鐮侊細{}", barcode);
- }
- }
- }
+ byte[] content = result.Content;
+ for (int i = 0; i < staNoSize; i++) {
+ StaProtocol staProtocol = station.get(staNos.get(staNoSize));
+ parseStationStatus(content, i, staProtocol);
}
+ // 璇诲彇鏉＄爜
+ readBarcodes();
- OperateResultExOne<byte[]> resultError = siemensS7Net.Read("DB103.0", (short) (staNoSize * 2));
- if (resultError.IsSuccess) {
- ArrayList<Integer> staNoError = new ArrayList<Integer>() {{
- add(102);
- add(201);
- add(211);
- }};
- for (int i = 0; i < staNoError.size(); i++) {
- Integer siteId = staNoError.get(i); // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultError.Content, i * 2, 1);
- staProtocol.setFrontErr(status[0]);// 鍓嶈秴闄�
- staProtocol.setBackErr(status[1]);// 鍚庤秴闄�
- staProtocol.setHighErr(status[2]);// 楂樿秴闄�
- staProtocol.setLeftErr(status[3]);// 宸﹁秴闄�
- staProtocol.setRightErr(status[4]);// 鍙宠秴闄�
- staProtocol.setWeightErr(status[5]); // 瓒呴噸
- staProtocol.setBarcodeErr(status[6]);// 鎵爜澶辫触
- }
+ // 璇诲彇澶栧舰妫�娴嬮敊璇�
+ readDimensionErrors();
+
+ // 璇诲彇PLC鏁呴殰
+ readPlcAlarms(staNos, staNoSize);
+
+ // 瀹氭湡鏇存柊鏁版嵁搴擄紙闄嶄綆棰戠巼锛�
+ updateDatabaseIfNeeded();
+ }
+
+ /**
+ * 瑙ｆ瀽鍗曚釜绔欑偣鐘舵��
+ */
+ private void parseStationStatus(byte[] content, int index, StaProtocol staProtocol) {
+ int offset = index * StationStatusField.ALL.getByteLength();
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(content, offset));
+ staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(
+ content, offset + StationStatusField.FINAL_TARGET.getOffset()));
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(
+ content, offset + StationStatusField.STATUS_WORD.getOffset(),
+ StationStatusField.STATUS_WORD.getByteLength());
+
+ staProtocol.setAutoing(status[0]);
+ staProtocol.setLoading(status[1]);
+ staProtocol.setInEnable(status[2]);
+ staProtocol.setOutEnable(status[3]);
+ staProtocol.setEmptyMk(status[4]);
+ staProtocol.setFullPlt(status[5]);
+ staProtocol.setHigh(status[6]);
+ staProtocol.setLow(status[7]);
+
+
+ }
+
+ /**
+ * 璇诲彇鏉＄爜淇℃伅
+ */
+ private void readBarcodes() {
+ List<Integer> barcodeArr = slave.getBarcodeArr();
+ if (barcodeArr == null || barcodeArr.isEmpty()) {
+ return;
}
- //plc鏁呴殰
- OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB25.0", (short) (staNoSize * 4));
- if (resultErr2.IsSuccess) {
- for (int i = 0; i < staNoSize; i++) {
- Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i * 4, 2);
- StaProtocol staProtocol = station.get(siteId);
- if (staProtocol != null) {
- staProtocol.setBreakerErr(status[0]);
- staProtocol.setInfraredErr(status[1]);
- staProtocol.setOutTimeErr(status[2]);
- staProtocol.setSeizeSeatErr(status[3]);
- staProtocol.setWrkYgoodsN(status[4]);
- staProtocol.setInverterErr(status[5]);
- staProtocol.setContactErr(status[6]);
- staProtocol.setUpcontactErr(status[7]);
- }
- }
+ OperateResultExOne<byte[]> result = siemensS7Net.Read(
+ DeviceField.BARCODE.buildAddress(),
+ (short) (barcodeArr.size() * DeviceField.BARCODE.getByteLength()));
+
+ if (!result.IsSuccess) {
+ log.warn("璇诲彇鏉＄爜澶辫触 [id:{}]", slave.getId());
+ return;
}
- if (result.IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
+ byte[] content = result.Content;
+ for (int i = 0; i < barcodeArr.size(); i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(
+ content, i * DeviceField.BARCODE.getByteLength(),
+ DeviceField.BARCODE.getByteLength(), "UTF-8");
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- try {
- List<Devp> devps = new ArrayList<>();
- for (Integer siteId : staNos) {
- StaProtocol staProtocol = station.get(siteId);
- devps.add(staProtocol.toSqlModel());
- }
- DevpService devpService = SpringContextUtil.getBean(DevpService.class);
- if (null != devpService) {
- devpService.updateBatchByDevpNo(devps);
- } else {
- throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
- }
- } catch (Exception e) {
- initSite();
- e.printStackTrace();
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- News.error("SiemensDevp" + " - 3" + " - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ if (!Cools.isEmpty(barcode)) {
+ StaProtocol staProtocol = station.get(barcodeArr.get(i));
+ staProtocol.setBarcode(barcode);
+ log.info("鏂欑鐮侊細{}", barcode);
}
-
- } else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
}
}
/**
- * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
+ * 璇诲彇澶栧舰妫�娴嬮敊璇�
*/
- private void write(StaProtocol staProtocol) throws InterruptedException {
- if (null == staProtocol) {
+ private void readDimensionErrors() {
+ List<Integer> staNosError = slave.getStaNosError();
+ if (staNosError == null || staNosError.isEmpty()) {
return;
}
- List<Integer> staNos = slave.getStaNos();
- int index = staNos.indexOf(staProtocol.getSiteId());
- OperateResult write = null;
- OperateResult write1 = null;
- //浠诲姟涓嬪彂娆℃暟
- int writeCount = 0;
- do {
- write = siemensS7Net.Write("DB100." + index * 4, staProtocol.getWorkNo().shortValue()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- write1 = siemensS7Net.Write("DB100." + (index * 4 + 2), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
- if (write.IsSuccess && write1.IsSuccess) {
- log.info("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- break;
- } else {
- writeCount++;
- log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- }
- } while (writeCount < 5);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read(
+ DeviceField.DIMENSION_WORD.buildAddress(),
+ (short) (staNosError.size() * DeviceField.DIMENSION_WORD.getByteLength()));
- if (!write.IsSuccess) {
- staProtocol = station.get(staProtocol.getSiteId());
- if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() == 0) {
- staProtocol.setPakMk(true);
- }
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
- News.error("SiemensDevp" + " - 4" + " - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+ if (!result.IsSuccess) {
+ log.warn("璇诲彇澶栧舰妫�娴嬮敊璇け璐� [id:{}]", slave.getId());
+ return;
+ }
+
+ byte[] content = result.Content;
+ for (int i = 0; i < staNosError.size(); i++) {
+ Integer siteId = staNosError.get(i);
+ StaProtocol staProtocol = station.get(siteId);
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(
+ content, i * DeviceField.DIMENSION_WORD.getByteLength(),
+ DeviceField.DIMENSION_WORD.getByteLength());
+
+ staProtocol.setFrontErr(status[0]);
+ staProtocol.setBackErr(status[1]);
+ staProtocol.setHighErr(status[2]);
+ staProtocol.setLeftErr(status[3]);
+ staProtocol.setRightErr(status[4]);
+ staProtocol.setWeightErr(status[5]);
+ staProtocol.setBarcodeErr(status[6]);
}
}
+ /**
+ * 璇诲彇PLC鏁呴殰淇℃伅
+ */
+ private void readPlcAlarms(List<Integer> staNos, int staNoSize) {
+ OperateResultExOne<byte[]> result = siemensS7Net.Read(
+ PlcAlarmDefinition.ALL.buildAddress(),
+ (short) (staNoSize * PlcAlarmDefinition.ALL.getByteLength()));
- @Override
- public void close() {
- siemensS7Net.ConnectClose();
+ if (!result.IsSuccess) {
+ log.warn("璇诲彇PLC鏁呴殰淇℃伅澶辫触 [id:{}]", slave.getId());
+ return;
+ }
+
+ byte[] content = result.Content;
+ for (int i = 0; i < staNoSize; i++) {
+ Integer siteId = staNos.get(i);
+ StaProtocol staProtocol = station.get(siteId);
+ if (staProtocol == null) {
+ continue;
+ }
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(
+ content, i * PlcAlarmDefinition.ALL.getByteLength(), 1);
+
+ staProtocol.setBreakerErr(status[0]);
+ staProtocol.setInfraredErr(status[1]);
+ staProtocol.setOutTimeErr(status[2]);
+ staProtocol.setSeizeSeatErr(status[3]);
+ staProtocol.setWrkYgoodsN(status[4]);
+ staProtocol.setInverterErr(status[5]);
+ staProtocol.setContactErr(status[6]);
+ staProtocol.setUpcontactErr(status[7]);
+ }
+ }
+
+ /**
+ * 鎸夐渶鏇存柊鏁版嵁搴擄紙闄嶄綆鏇存柊棰戠巼锛�
+ */
+ private void updateDatabaseIfNeeded() {
+ long currentTime = System.currentTimeMillis();
+ if (currentTime - lastDbUpdateTime < DB_UPDATE_INTERVAL_MS) {
+ return;
+ }
+
+ try {
+ List<Integer> staNos = slave.getStaNos();
+ List<Devp> devps = new ArrayList<>(staNos.size());
+ for (Integer siteId : staNos) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (staProtocol != null) {
+ devps.add(staProtocol.toSqlModel());
+ }
+ }
+
+ if (devps.isEmpty()) {
+ return;
+ }
+
+ DevpService devpService = SpringContextUtil.getBean(DevpService.class);
+ if (devpService != null) {
+ devpService.updateBatchByDevpNo(devps);
+ lastDbUpdateTime = currentTime;
+ log.debug("鎵归噺鏇存柊鏁版嵁搴撴垚鍔� [id:{}] [count:{}]", slave.getId(), devps.size());
+ } else {
+ log.error("DevpService鏈壘鍒帮紝鏃犳硶鏇存柊鏁版嵁搴� [id:{}]", slave.getId());
+ }
+ } catch (Exception e) {
+ log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� [id:{}]", slave.getId(), e);
+ News.error("SiemensDevp - 3 - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}]", slave.getId());
+ }
}
--
Gitblit v1.9.1