From 03f7617b415bc653fa2e14c28e4f41663a130476 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 04 一月 2026 09:27:27 +0800
Subject: [PATCH] 1.完善连接器库入库请求 2.完善电视机显示程序 3.新增PDA给输送线下发入库 4.新增绑定和解绑测试区域是否有空库位 5.新增AGV离站信号 6.完善空托盘入库
---
src/main/java/com/zy/asrs/controller/OpenController.java | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b0c8856..3dca0fe 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,10 +1,15 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.core.common.R;
+import com.zy.asrs.domain.param.ToInStaParam;
import com.zy.asrs.domain.param.ToOutStaParam;
import com.zy.asrs.entity.RcsReporterTask;
import com.zy.asrs.entity.RcsReturn;
import com.zy.asrs.service.RcsService;
+import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -13,16 +18,18 @@
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
@Slf4j
@RestController
public class OpenController {
@Autowired
private RcsService rcsService;
+ @Value("${zyHikUrl}")
+ private String zyHikUrl;
@RequestMapping("/open/toOutSta")
public R toOutSta(@RequestBody ToOutStaParam param) {
@@ -61,4 +68,55 @@
return rcsService.reporterTask(param);
}
+ @RequestMapping("/open/toInSta")
+ public R toInSta(@RequestBody ToInStaParam param) {
+ log.info("toInSta:{}",param);
+ SiemensDevpThread siemensDevpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ if(siemensDevpThread == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ StaProtocol staProtocol = siemensDevpThread.getStation().get(param.getStaNo()).clone();
+ if(staProtocol == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+
+ if (!staProtocol.isLoading()) {
+ return R.error("绔欑偣鏃犵墿");
+ }
+ Short s = 301;
+ if (param.getStaNo() == 304 || param.getStaNo() == 305 || param.getStaNo() == 306) {
+ s = 304;
+ }
+
+ staProtocol.setWorkNo(param.getWrkNo().shortValue());
+ staProtocol.setStaNo(s);
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ log.info("鍙戠敓鎴愬姛:{}",result);
+ return R.ok().add(result);
+ }
+ @RequestMapping("/open/capture")
+ public void startPic(@RequestParam String ip,@RequestParam String filename) {
+ try {
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("ip", ip);
+ data.put("filename", filename);
+
+ String response = new HttpHandler.Builder()
+ .setUri(zyHikUrl)
+ .setPath("/capture")
+ .setJson(JSON.toJSONString(data))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getBoolean("success")) {
+ News.error("璇锋眰鎺ュ彛鎴愬姛锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", zyHikUrl + "/startPic", JSON.toJSONString(data), response);
+ } else {
+ News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", zyHikUrl + "/startPic", JSON.toJSONString(data), response);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.9.1