From 6e7005a9c8f0e9c21f2d3a4d77a779381e859ac3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 11 四月 2026 10:35:09 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java
index 302f45d..e6f65b4 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java
@@ -1,22 +1,21 @@
package com.zy.acs.conveyor.core.operation.handler;
-import com.zy.acs.conveyor.core.cache.MessageQueue;
-import com.zy.acs.conveyor.core.cache.SlaveConnection;
+import com.zy.acs.common.utils.RedisSupport;
+import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
-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.operation.OperationHandler;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
import com.zy.acs.conveyor.core.properties.SlaveProperties;
-import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
+import com.zy.acs.conveyor.core.service.StationService;
import com.zy.acs.conveyor.entity.Job;
import com.zy.acs.conveyor.service.JobService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Map;
/**
* 妯℃嫙鐢ㄦ埛鎸夋寜閽�
@@ -33,6 +32,12 @@
private JobService jobService;
+ @Autowired
+ private StationService stationService;
+
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
+
@Override
public ConveyorStateType getType() {
return ConveyorStateType.FAKEUSER;
@@ -43,8 +48,8 @@
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- StaProtocol staProtocol = devpThread.getStation().get(1004);
+ Map<Integer, StaProtocol> stationMap = stationService.getStationMap(1);
+ StaProtocol staProtocol = stationMap.get(1004);
if (staProtocol == null) {
return;
} else {
@@ -54,23 +59,23 @@
if (!staProtocol.isLoading()) {
return;
}
- StaProtocol staProtocol5 = devpThread.getStation().get(1005);
- if (staProtocol5.isLoading()){
+ StaProtocol staProtocol5 = stationMap.get(1005);
+ if (staProtocol5.isLoading()) {
log.info("1005鏈夌墿锛岀瓑鏃犵墿涔嬪悗鎵嶅叆搴�");
return;
}
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
- Job jobByWorkNo = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(),ConveyorStateType.OUTBOUND.getStatus());
+ Job jobByWorkNo = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), ConveyorStateType.OUTBOUND.getStatus());
if (jobByWorkNo != null && jobByWorkNo.getJobSts() == ConveyorStateType.OUTBOUND.getStatus()) {
staProtocol.setWorkNo(9992);
staProtocol.setStaNo(1005);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(TaskType.WRITE, staProtocol));
- if (result) {
- jobByWorkNo.setJobSts(3);
- jobByWorkNo.setMemo("妯℃嫙鎸夋寜閽�");
- jobService.updateById(jobByWorkNo);
- log.info("鍏ュ簱杈撻�佺嚎涓嬪彂锛歿},{}", staProtocol.getWorkNo(), 1006);
- }
+ redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
+
+ jobByWorkNo.setJobSts(3);
+ jobByWorkNo.setMemo("妯℃嫙鎸夋寜閽�");
+ jobService.updateById(jobByWorkNo);
+ log.info("鍏ュ簱杈撻�佺嚎涓嬪彂锛歿},{}", staProtocol.getWorkNo(), 1006);
+
}
}
} catch (Exception e) {
--
Gitblit v1.9.1