From 5b1a1d32abc8441bf73b7e2dc609def87e5a580a Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 二月 2026 08:57:36 +0800
Subject: [PATCH] 删除不用的方法
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 104 ----------------------------------------------------
1 files changed, 0 insertions(+), 104 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index bfe221e..dea54f0 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -1477,110 +1477,6 @@
}
/**
- * RGV寮傚父妫�娴嬪拰鎵樼洏閫�鍥�
- */
- public synchronized void recRgvErr() {
- Date now = new Date();
- for (RgvSlave rgv : slaveProperties.getRgv()) {
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
- if (rgvThread == null) {
- continue;
- }
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- if (rgvProtocol == null) {
- continue;
- }
-
- // 妫�娴婻GV鎶ヨ
- Short alarm = rgvProtocol.getAlarm();
- Short taskNo1 = rgvProtocol.getTaskNo1();
-
- // 濡傛灉鏈夋姤璀︿笖鏈変换鍔�
- if (alarm != null && alarm > 0 && taskNo1 != null && taskNo1 > 0 && taskNo1 <= 9000) {
- Integer workNo = taskNo1.intValue();
- WrkMast wrkMast = wrkMastMapper.selectById(workNo);
- if (wrkMast == null) {
- log.warn("銆怰GV鎶ヨ澶勭悊銆戝伐浣滄。涓嶅瓨鍦紝RGV锛歿}锛屽伐浣滃彿锛歿}", rgv.getId(), workNo);
- continue;
- }
-
- // 鑾峰彇鎶ヨ淇℃伅
- BasRgvErr rgvErr = basRgvErrMapper.selectById(alarm.longValue());
- String alarmMsg = rgvErr != null ? rgvErr.getErrName() : "鏈煡寮傚父(" + alarm + ")";
-
- log.info("銆怰GV鎶ヨ澶勭悊銆慠GV锛歿}锛屽伐浣滃彿锛歿}锛屾姤璀︼細{}", rgv.getId(), workNo, alarmMsg);
-
- // 鏍规嵁宸ヤ綔妗ｇ殑婧愮珯鐐规煡鎵惧搴旂殑杈撻�佺嚎绔欑偣鍜岄��鍥炵珯
- Integer sourceStaNo = wrkMast.getStaNo(); // 婧愮珯鐐癸紙鐩爣绔欙級
- if (sourceStaNo == null) {
- log.warn("銆怰GV鎶ヨ澶勭悊銆戝伐浣滄。婧愮珯鐐逛负绌猴紝RGV锛歿}锛屽伐浣滃彿锛歿}", rgv.getId(), workNo);
- continue;
- }
-
- // 鏌ユ壘瀵瑰簲鐨勮緭閫佺嚎閰嶇疆鍜岄��鍥炵珯
- Integer backSta = null;
- Integer finalDevpId = null;
- Integer siteNo = null;
- DevpThread devpThread = null;
- DevpSlave targetDevp = null;
-
- // 閬嶅巻鎵�鏈夎緭閫佺嚎锛屾煡鎵惧寘鍚绔欑偣鐨勯厤缃�
- for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread dt = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- if (dt == null) {
- continue;
- }
- Map<Integer, StaProtocol> station = dt.getStation();
- if (station != null && station.containsKey(sourceStaNo)) {
- // 鎵惧埌瀵瑰簲鐨勮緭閫佺嚎绔欑偣
- backSta = findBackSta(devp, sourceStaNo);
- if (backSta != null) {
- finalDevpId = devp.getId();
- siteNo = sourceStaNo;
- devpThread = dt;
- targetDevp = devp;
- break;
- }
- }
- }
-
- if (backSta != null && devpThread != null && siteNo != null && finalDevpId != null) {
- StaProtocol staProtocol = devpThread.getStation().get(siteNo);
- if (staProtocol != null && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk() && !staProtocol.isEmptyMk()) {
- log.info("銆怰GV鎶ヨ閫�鍥炪�慠GV锛歿}锛屽伐浣滃彿锛歿}锛屾姤璀︼細{}锛岀珯鐐癸細{}锛岄��鍥炵珯锛歿}", rgv.getId(), workNo, alarmMsg, siteNo, backSta);
-
- // 鎺ㄩ�佸埌LED鏄剧ず鎶ヨ淇℃伅
- Integer ledId = findLedId(targetDevp, siteNo);
- if (ledId != null) {
- MessageQueue.offer(SlaveType.Led, ledId, new Task(3, "RGV鎶ヨ锛�" + alarmMsg));
- }
-
- // 璁剧疆閫�鍥炵珯
- staProtocol.setWorkNo(9999);
- staProtocol.setStaNo(backSta.shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, finalDevpId, new Task(2, staProtocol));
- if (!result) {
- News.error("RGV鎶ヨ閫�鍥炲け璐ワ紝RGV锛歿}锛岀珯鐐癸細{}锛屽伐浣滃彿锛歿}", rgv.getId(), siteNo, workNo);
- } else {
- log.info("銆怰GV鎶ヨ閫�鍥炪�戞垚鍔熶笅鍙戦��鍥炴寚浠わ紝RGV锛歿}锛岀珯鐐癸細{}锛屽伐浣滃彿锛歿}锛岄��鍥炵珯锛歿}", rgv.getId(), siteNo, workNo, backSta);
- }
- } else {
- log.debug("銆怰GV鎶ヨ閫�鍥炪�戠珯鐐圭姸鎬佷笉绗﹀悎閫�鍥炴潯浠讹紝RGV锛歿}锛岀珯鐐癸細{}锛屽伐浣滃彿锛歿}锛宨nEnable锛歿}锛宭oading锛歿}锛宲akMk锛歿}锛宔mptyMk锛歿}",
- rgv.getId(), siteNo, workNo,
- staProtocol != null ? staProtocol.isInEnable() : false,
- staProtocol != null ? staProtocol.isLoading() : false,
- staProtocol != null ? staProtocol.isPakMk() : false,
- staProtocol != null ? staProtocol.isEmptyMk() : false);
- }
- } else {
- log.warn("銆怰GV鎶ヨ閫�鍥炪�戞湭鎵惧埌瀵瑰簲鐨勮緭閫佺嚎绔欑偣鎴栭��鍥炵珯閰嶇疆锛孯GV锛歿}锛屽伐浣滃彿锛歿}锛屾簮绔欑偣锛歿}", rgv.getId(), workNo, sourceStaNo);
- }
- }
- }
- }
-
- /**
* 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
*/
public synchronized void ledExecute() {
--
Gitblit v1.9.1