From 1a3f0ed6b7f6d4112069a3c8679e7192365d5eef Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 31 三月 2026 12:38:44 +0800
Subject: [PATCH] #电视机退回时入库站点也显示信息
---
src/main/java/com/zy/asrs/controller/StationController.java | 133 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 114 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StationController.java b/src/main/java/com/zy/asrs/controller/StationController.java
index d232d99..f2fe531 100644
--- a/src/main/java/com/zy/asrs/controller/StationController.java
+++ b/src/main/java/com/zy/asrs/controller/StationController.java
@@ -1,12 +1,20 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.domain.param.StationCommandBarcodeParam;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.DeviceConfigService;
import com.zy.common.utils.RedisUtil;
+import com.zy.core.dispatch.StationCommandDispatchResult;
+import com.zy.core.dispatch.StationCommandDispatcher;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.StationCommandType;
import com.zy.core.model.StationObjModel;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,10 +24,8 @@
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.param.StationCommandMoveParam;
-import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.Task;
import com.zy.core.model.command.StationCommand;
import com.zy.core.thread.StationThread;
@@ -29,10 +35,18 @@
@RequestMapping("/station")
public class StationController {
+ @Value("${mainProcessPlugin}")
+ private String mainProcessPlugin;
@Autowired
private BasDevpService basDevpService;
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private DeviceConfigService deviceConfigService;
+ @Autowired
+ private StationCommandDispatcher stationCommandDispatcher;
@PostMapping("/command/move")
public R commandMove(@RequestBody StationCommandMoveParam param) {
@@ -44,21 +58,7 @@
Integer taskNo = param.getTaskNo();
Integer targetStationId = param.getTargetStationId();
- StationObjModel finalStation = null;
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
- for (BasDevp basDevp : basDevps) {
- List<StationObjModel> list = basDevp.getStationList$();
- for (StationObjModel entity : list) {
- if(entity.getStationId().equals(stationId)){
- finalStation = entity;
- break;
- }
- }
-
- if(finalStation != null){
- break;
- }
- }
+ StationObjModel finalStation = findStation(stationId);
if(finalStation == null){
return R.error("绔欑偣涓嶅瓨鍦�");
@@ -72,7 +72,63 @@
}
StationCommand command = stationThread.getCommand(StationCommandType.MOVE, taskNo, stationId, targetStationId, 0);
- MessageQueue.offer(SlaveType.Devp, devpNo, new Task(2, command));
+ if (command == null) {
+ return R.error("鐢熸垚杈撻�佸懡浠ゅけ璐ワ紝璺緞涓虹┖鎴栦笉鍙揪");
+ }
+ StationCommandDispatchResult dispatchResult = stationCommandDispatcher
+ .dispatch(devpNo, command, "station-controller", "manual-move");
+ if (!dispatchResult.isAccepted()) {
+ return R.error("杈撻�佸懡浠や笅鍙戝け璐�:" + dispatchResult.getReason());
+ }
+ return R.ok();
+ }
+
+ @PostMapping("/command/barcode")
+ public R commandBarcode(@RequestBody StationCommandBarcodeParam param) {
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getStationId())) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+
+ if (!mainProcessPlugin.contains("Fake")) {
+ return R.error("褰撳墠绯荤粺鏈惎鐢ㄤ豢鐪熸彃浠�");
+ }
+
+ Config enableFakeConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "enableFake"));
+ if (enableFakeConfig == null || !"Y".equals(enableFakeConfig.getValue())) {
+ return R.error("褰撳墠闈炰豢鐪熻繍琛屾ā寮忥紝绂佹淇敼鏉＄爜");
+ }
+
+ Integer stationId = param.getStationId();
+ StationObjModel finalStation = findStation(stationId);
+ if (finalStation == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+
+ Integer devpNo = finalStation.getDeviceNo();
+ DeviceConfig deviceConfig = deviceConfigService.getOne(new QueryWrapper<DeviceConfig>()
+ .eq("device_no", devpNo)
+ .eq("device_type", String.valueOf(SlaveType.Devp)));
+ if (deviceConfig == null || deviceConfig.getFake() == null || deviceConfig.getFake() != 1) {
+ return R.error("褰撳墠绔欑偣璁惧鏈惎鐢ㄤ豢鐪燂紝绂佹淇敼鏉＄爜");
+ }
+
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, devpNo);
+ if (stationThread == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ String barcode = param.getBarcode();
+ if (barcode == null) {
+ barcode = "";
+ }
+
+ StationCommand command = stationThread.getCommand(StationCommandType.WRITE_INFO, 9997, stationId, stationId, 0);
+ command.setBarcode(barcode.trim());
+ StationCommandDispatchResult dispatchResult = stationCommandDispatcher
+ .dispatch(devpNo, command, "station-controller", "manual-barcode");
+ if (!dispatchResult.isAccepted()) {
+ return R.error("鏉＄爜鍛戒护涓嬪彂澶辫触:" + dispatchResult.getReason());
+ }
return R.ok();
}
@@ -87,4 +143,43 @@
return R.ok();
}
+ @PostMapping("/command/clearPath")
+ public R commandClearPath(@RequestBody StationCommandMoveParam param) {
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getStationId()) || Cools.isEmpty(param.getTaskNo())) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+
+ StationObjModel finalStation = findStation(param.getStationId());
+ if (finalStation == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, finalStation.getDeviceNo());
+ if (stationThread == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ boolean cleared = stationThread.clearPath(param.getTaskNo());
+ if (!cleared) {
+ return R.error("鏈尮閰嶅埌鍙竻鐞嗚矾寰勬垨娓呯悊澶辫触");
+ }
+ return R.ok("娓呯悊璺緞鎴愬姛");
+ }
+
+ private StationObjModel findStation(Integer stationId) {
+ if (Cools.isEmpty(stationId)) {
+ return null;
+ }
+
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
+ for (BasDevp basDevp : basDevps) {
+ List<StationObjModel> list = basDevp.getStationList$();
+ for (StationObjModel entity : list) {
+ if (entity.getStationId().equals(stationId)) {
+ return entity;
+ }
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1